From 8335fdff7d95f1173e771402af4c8495b1a94d6d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:56:52 +1200
Subject: [PATCH 01/61] Bug 506304. Walk all the way up to the nearest widget
 when computing event coordinates for windowless plugins. r=bz

--HG--
extra : rebase_source : be25ce5ffbae7c90cf0b211ae818046873b6e09a
---
 layout/generic/nsObjectFrame.cpp | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 0936741f5a2b..53b354167d54 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -1045,23 +1045,9 @@ nsIntPoint nsObjectFrame::GetWindowOriginInPixels(PRBool aWindowless)
   // if it's windowless, let's make sure we have our origin set right
   // it may need to be corrected, like after scrolling
   if (aWindowless && parentWithView) {
-    // XXX Should this be replaced by nsIView::GetNearestWidget?
-    // The implementation below doesn't handle cases where the widget's origin
-    // doesn't coincide with its view's origin.
-
-    nsIViewManager* parentVM = parentWithView->GetViewManager();
-
-    // Walk up all the views and add up their positions until we
-    // reach the first view with a window (non-null widget). This will give us our
-    // position relative to the containing window which is what we want to give the plugin
-    nsIView* theView = parentWithView;
-    while (theView && !theView->GetWidget()) {
-      if (theView->GetViewManager() != parentVM)
-        break;
-
-      origin += theView->GetPosition();
-      theView = theView->GetParent();
-    }  
+    nsPoint offsetToWidget;
+    parentWithView->GetNearestWidget(&offsetToWidget);
+    origin += offsetToWidget;
   }
 
   return nsIntPoint(PresContext()->AppUnitsToDevPixels(origin.x),

From db83f27954653560d14e5ea041773d9f27a02dfb Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:59:41 +1200
Subject: [PATCH 02/61] Bug 492309. Remove useless gfxTextRuNnFactory flags.
 r=vlad

--HG--
extra : rebase_source : 4cdbc37f404c07f509adbfb581c662187813bc4a
---
 gfx/thebes/public/gfxFont.h                 | 37 +++------------------
 gfx/thebes/public/gfxTextRunCache.h         |  3 +-
 gfx/thebes/public/gfxTextRunWordCache.h     | 16 ++++-----
 gfx/thebes/src/gfxAtsuiFonts.cpp            |  1 -
 gfx/thebes/src/gfxCoreTextFonts.cpp         |  1 -
 gfx/thebes/src/gfxFT2Fonts.cpp              |  2 --
 gfx/thebes/src/gfxFont.cpp                  | 24 -------------
 gfx/thebes/src/gfxOS2Fonts.cpp              |  2 --
 gfx/thebes/src/gfxPangoFonts.cpp            |  2 --
 gfx/thebes/src/gfxTextRunWordCache.cpp      |  4 +--
 gfx/thebes/src/gfxWindowsFonts.cpp          |  2 --
 gfx/thebes/test/gfxFontSelectionTest.cpp    |  1 -
 gfx/thebes/test/gfxTextRunPerfTest.cpp      |  1 -
 layout/generic/nsTextFrameThebes.cpp        |  7 +---
 layout/generic/nsTextRunTransformations.cpp |  6 ++--
 15 files changed, 19 insertions(+), 90 deletions(-)

diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/public/gfxFont.h
index 795cac374bee..ef2d98603a8f 100644
--- a/gfx/thebes/public/gfxFont.h
+++ b/gfx/thebes/public/gfxFont.h
@@ -745,25 +745,16 @@ public:
          * on the spacing provider.
          */
         TEXT_ENABLE_SPACING          = 0x0008,
-        /**
-         * When set, GetSpacing can return negative spacing.
-         */
-        TEXT_ENABLE_NEGATIVE_SPACING = 0x0010,
         /**
          * When set, GetHyphenationBreaks may return true for some character
          * positions, otherwise it will always return false for all characters.
          */
-        TEXT_ENABLE_HYPHEN_BREAKS    = 0x0040,
+        TEXT_ENABLE_HYPHEN_BREAKS    = 0x0010,
         /**
          * When set, the text has no characters above 255 and it is stored
          * in the textrun in 8-bit format.
          */
-        TEXT_IS_8BIT                 = 0x0080,
-        /**
-         * When set, the text may have UTF16 surrogate pairs, otherwise it
-         * doesn't.
-         */
-        TEXT_HAS_SURROGATES          = 0x0100,
+        TEXT_IS_8BIT                 = 0x0020,
         /**
          * When set, the RunMetrics::mBoundingBox field will be initialized
          * properly based on glyph extents, in particular, glyph extents that
@@ -771,18 +762,18 @@ public:
          * and advance width of the glyph). When not set, it may just be the
          * standard font-box even if glyphs overflow.
          */
-        TEXT_NEED_BOUNDING_BOX       = 0x0200,
+        TEXT_NEED_BOUNDING_BOX       = 0x0040,
         /**
          * When set, optional ligatures are disabled. Ligatures that are
          * required for legible text should still be enabled.
          */
-        TEXT_DISABLE_OPTIONAL_LIGATURES = 0x0400,
+        TEXT_DISABLE_OPTIONAL_LIGATURES = 0x0080,
         /**
          * When set, the textrun should favour speed of construction over
          * quality. This may involve disabling ligatures and/or kerning or
          * other effects.
          */
-        TEXT_OPTIMIZE_SPEED          = 0x0800
+        TEXT_OPTIMIZE_SPEED          = 0x0100
     };
 
     /**
@@ -1196,7 +1187,6 @@ public:
             FLAG_NOT_MISSING              = 0x01,
             FLAG_NOT_CLUSTER_START        = 0x02,
             FLAG_NOT_LIGATURE_GROUP_START = 0x04,
-            FLAG_LOW_SURROGATE            = 0x08,
             
             GLYPH_COUNT_MASK = 0x00FFFF00U,
             GLYPH_COUNT_SHIFT = 8
@@ -1222,9 +1212,6 @@ public:
         PRUint32 GetSimpleGlyph() const { return mValue & GLYPH_MASK; }
 
         PRBool IsMissing() const { return (mValue & (FLAG_NOT_MISSING|FLAG_IS_SIMPLE_GLYPH)) == 0; }
-        PRBool IsLowSurrogate() const {
-            return (mValue & (FLAG_LOW_SURROGATE|FLAG_IS_SIMPLE_GLYPH)) == FLAG_LOW_SURROGATE;
-        }
         PRBool IsClusterStart() const {
             return (mValue & FLAG_IS_SIMPLE_GLYPH) || !(mValue & FLAG_NOT_CLUSTER_START);
         }
@@ -1271,15 +1258,6 @@ public:
                 (aGlyphCount << GLYPH_COUNT_SHIFT);
             return *this;
         }
-        /**
-         * Low surrogates don't have any glyphs and are not the start of
-         * a cluster or ligature group.
-         */
-        CompressedGlyph& SetLowSurrogate() {
-            mValue = (mValue & FLAG_CAN_BREAK_BEFORE) | FLAG_NOT_MISSING |
-                FLAG_LOW_SURROGATE;
-            return *this;
-        }
         PRUint32 GetGlyphCount() const {
             NS_ASSERTION(!IsSimpleGlyph(), "Expected non-simple-glyph");
             return (mValue & GLYPH_COUNT_MASK) >> GLYPH_COUNT_SHIFT;
@@ -1351,11 +1329,6 @@ public:
 
     // API for setting up the textrun glyphs. Should only be called by
     // things that construct textruns.
-    /**
-     * Record every character that is the second half of a surrogate pair.
-     * This should be called after creating a Unicode textrun.
-     */
-    void RecordSurrogates(const PRUnichar *aString);
     /**
      * We've found a run of text that should use a particular font. Call this
      * only during initialization when font substitution has been computed.
diff --git a/gfx/thebes/public/gfxTextRunCache.h b/gfx/thebes/public/gfxTextRunCache.h
index 92d09446de30..dbc6d97878db 100644
--- a/gfx/thebes/public/gfxTextRunCache.h
+++ b/gfx/thebes/public/gfxTextRunCache.h
@@ -52,8 +52,7 @@ public:
      * Get a textrun for the given text, using a global cache. The textrun
      * must be released via ReleaseTextRun, not deleted.
      * Do not set any state in the textrun (e.g. actual or potential linebreaks).
-     * Flags IS_8BIT, IS_ASCII and HAS_SURROGATES are automatically set
-     * appropriately.
+     * Flags IS_8BIT and IS_ASCII are automatically set appropriately.
      * Flag IS_PERSISTENT must NOT be set unless aText is guaranteed to live
      * forever.
      * The string can contain any characters, invalid ones will be stripped
diff --git a/gfx/thebes/public/gfxTextRunWordCache.h b/gfx/thebes/public/gfxTextRunWordCache.h
index bc5dc9226a94..9584c9557554 100644
--- a/gfx/thebes/public/gfxTextRunWordCache.h
+++ b/gfx/thebes/public/gfxTextRunWordCache.h
@@ -70,10 +70,10 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable; TEXT_IN_CACHE is added if we
-     * have a reference to the textrun in the cache and RemoveTextRun must
-     * be called when the textrun dies.
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable; TEXT_IN_CACHE is added if we have a reference to
+     * the textrun in the cache and RemoveTextRun must be called when the
+     * textrun dies.
      */
     static gfxTextRun *MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
                                    gfxFontGroup *aFontGroup,
@@ -83,10 +83,10 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable; TEXT_IN_CACHE is added if we
-     * have a reference to the textrun in the cache and RemoveTextRun must
-     * be called when the textrun dies.
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable; TEXT_IN_CACHE is added if we have a reference to
+     * the textrun in the cache and RemoveTextRun must be called when the
+     * textrun dies.
      */
     static gfxTextRun *MakeTextRun(const PRUint8 *aText, PRUint32 aLength,
                                    gfxFontGroup *aFontGroup,
diff --git a/gfx/thebes/src/gfxAtsuiFonts.cpp b/gfx/thebes/src/gfxAtsuiFonts.cpp
index c743ef770a79..5aa2bd715d00 100644
--- a/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/gfx/thebes/src/gfxAtsuiFonts.cpp
@@ -714,7 +714,6 @@ gfxAtsuiFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
     gfxPlatformMac::SetupClusterBoundaries(textRun, aString);
 
     PRUint32 maxLen;
diff --git a/gfx/thebes/src/gfxCoreTextFonts.cpp b/gfx/thebes/src/gfxCoreTextFonts.cpp
index 5d31b8ea4f7d..9f138b33e3b8 100644
--- a/gfx/thebes/src/gfxCoreTextFonts.cpp
+++ b/gfx/thebes/src/gfxCoreTextFonts.cpp
@@ -721,7 +721,6 @@ gfxCoreTextFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
     gfxPlatformMac::SetupClusterBoundaries(textRun, aString);
 
     nsAutoString utf16;
diff --git a/gfx/thebes/src/gfxFT2Fonts.cpp b/gfx/thebes/src/gfxFT2Fonts.cpp
index d3b2d4381bff..8a7ef15ddbb0 100644
--- a/gfx/thebes/src/gfxFT2Fonts.cpp
+++ b/gfx/thebes/src/gfxFT2Fonts.cpp
@@ -289,8 +289,6 @@ gfxTextRun *gfxFT2FontGroup::MakeTextRun(const PRUnichar* aString, PRUint32 aLen
     if (!textRun)
         return nsnull;
 
-    textRun->RecordSurrogates(aString);
-
     mString.Assign(nsDependentSubstring(aString, aString + aLength));
 
     InitTextRun(textRun);
diff --git a/gfx/thebes/src/gfxFont.cpp b/gfx/thebes/src/gfxFont.cpp
index ffc3953f4d8c..75f22c583677 100644
--- a/gfx/thebes/src/gfxFont.cpp
+++ b/gfx/thebes/src/gfxFont.cpp
@@ -2377,30 +2377,6 @@ gfxTextRun::SetMissingGlyph(PRUint32 aIndex, PRUint32 aChar)
     mCharacterGlyphs[aIndex].SetMissing(1);
 }
 
-void
-gfxTextRun::RecordSurrogates(const PRUnichar *aString)
-{
-    // !! FIXME !!
-    //
-    // This is called from the platform font implementations when making text runs, but currently it
-    // doesn't do anything because callers do not (consistently, or ever?) set the TEXT_HAS_SURROGATES flag.
-    // However, I have not seen anything that relies on the surrogate flag on glyphs, so perhaps we can
-    // simply eliminate this and remove that flag from gfxTextRunFactory?
-
-    if (!(mFlags & gfxTextRunFactory::TEXT_HAS_SURROGATES))
-        return;
-
-    // Remember which characters are low surrogates (the second half of
-    // a surrogate pair).
-    PRUint32 i;
-    gfxTextRun::CompressedGlyph g;
-    for (i = 0; i < mCharacterCount; ++i) {
-        if (NS_IS_LOW_SURROGATE(aString[i])) {
-            SetGlyphs(i, g.SetLowSurrogate(), nsnull);
-        }
-    }
-}
-
 static void
 ClearCharacters(gfxTextRun::CompressedGlyph *aGlyphs, PRUint32 aLength)
 {
diff --git a/gfx/thebes/src/gfxOS2Fonts.cpp b/gfx/thebes/src/gfxOS2Fonts.cpp
index 861520fcb49e..bc6b45ca5a48 100644
--- a/gfx/thebes/src/gfxOS2Fonts.cpp
+++ b/gfx/thebes/src/gfxOS2Fonts.cpp
@@ -548,8 +548,6 @@ gfxTextRun *gfxOS2FontGroup::MakeTextRun(const PRUnichar* aString, PRUint32 aLen
 
     mEnableKerning = !(aFlags & gfxTextRunFactory::TEXT_OPTIMIZE_SPEED);
 
-    textRun->RecordSurrogates(aString);
-
     nsCAutoString utf8;
     PRInt32 headerLen = AppendDirectionalIndicatorUTF8(textRun->IsRightToLeft(), utf8);
     AppendUTF16toUTF8(Substring(aString, aString + aLength), utf8);
diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
index aaa0b2686d6d..316a64a399fb 100644
--- a/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/gfx/thebes/src/gfxPangoFonts.cpp
@@ -2860,8 +2860,6 @@ gfxPangoFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
     if (!run)
         return nsnull;
 
-    run->RecordSurrogates(aString);
-
     nsCAutoString utf8;
     PRInt32 headerLen = AppendDirectionalIndicatorUTF8(run->IsRightToLeft(), utf8);
     AppendUTF16toUTF8(Substring(aString, aString + aLength), utf8);
diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/src/gfxTextRunWordCache.cpp
index 35e051ace1b2..e92cca0d502d 100644
--- a/gfx/thebes/src/gfxTextRunWordCache.cpp
+++ b/gfx/thebes/src/gfxTextRunWordCache.cpp
@@ -93,8 +93,8 @@ public:
      * Create a textrun using cached words.
      * Invalid characters (see gfxFontGroup::IsInvalidChar) will be automatically
      * treated as invisible missing.
-     * @param aFlags the flags TEXT_IS_ASCII and TEXT_HAS_SURROGATES must be set
-     * by the caller, if applicable
+     * @param aFlags the flag TEXT_IS_ASCII must be set by the caller,
+     * if applicable
      * @param aIsInCache if true is returned, then RemoveTextRun must be called
      * before the textrun changes or dies.
      */
diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
index aec428abc3ea..9a97fcc180be 100644
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -1477,8 +1477,6 @@ gfxWindowsFontGroup::MakeTextRun(const PRUnichar *aString, PRUint32 aLength,
         return nsnull;
     NS_ASSERTION(aParams->mContext, "MakeTextRun called without a gfxContext");
 
-    textRun->RecordSurrogates(aString);
-    
 #ifdef FORCE_UNISCRIBE
     const PRBool isComplex = PR_TRUE;
 #else
diff --git a/gfx/thebes/test/gfxFontSelectionTest.cpp b/gfx/thebes/test/gfxFontSelectionTest.cpp
index 77f0b6422c00..6109babd0758 100644
--- a/gfx/thebes/test/gfxFontSelectionTest.cpp
+++ b/gfx/thebes/test/gfxFontSelectionTest.cpp
@@ -304,7 +304,6 @@ RunTest (TestEntry *test, gfxContext *ctx) {
         length = strlen(test->string);
         textRun = gfxTextRunWordCache::MakeTextRun(reinterpret_cast<PRUint8*>(test->string), length, fontGroup, &params, flags);
     } else {
-        flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->string));
         length = str.Length();
         textRun = gfxTextRunWordCache::MakeTextRun(str.get(), length, fontGroup, &params, flags);
diff --git a/gfx/thebes/test/gfxTextRunPerfTest.cpp b/gfx/thebes/test/gfxTextRunPerfTest.cpp
index 84b57672d9f7..483dd2ab6d7b 100644
--- a/gfx/thebes/test/gfxTextRunPerfTest.cpp
+++ b/gfx/thebes/test/gfxTextRunPerfTest.cpp
@@ -119,7 +119,6 @@ RunTest (TestEntry *test, gfxContext *ctx) {
         length = strlen(test->mString);
         textRun = fontGroup->MakeTextRun(reinterpret_cast<const PRUint8*>(test->mString), length, &params, flags);
     } else {
-        flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->mString));
         length = str.Length();
         textRun = fontGroup->MakeTextRun(str.get(), length, &params, flags);
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index dca4e620f05d..5bad68046cbc 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -1434,12 +1434,7 @@ BuildTextRunsScanner::GetNextBreakBeforeFrame(PRUint32* aIndex)
 static PRUint32
 GetSpacingFlags(nscoord spacing)
 {
-  if (!spacing)
-    return 0;
-  if (spacing > 0)
-    return gfxTextRunFactory::TEXT_ENABLE_SPACING;
-  return gfxTextRunFactory::TEXT_ENABLE_SPACING |
-         gfxTextRunFactory::TEXT_ENABLE_NEGATIVE_SPACING;
+  return spacing ? gfxTextRunFactory::TEXT_ENABLE_SPACING : 0;
 }
 
 static gfxFontGroup*
diff --git a/layout/generic/nsTextRunTransformations.cpp b/layout/generic/nsTextRunTransformations.cpp
index f0b5fb1cdd13..635b580f8891 100644
--- a/layout/generic/nsTextRunTransformations.cpp
+++ b/layout/generic/nsTextRunTransformations.cpp
@@ -173,15 +173,13 @@ MergeCharactersInTextRun(gfxTextRun* aDest, gfxTextRun* aSrc,
       // to merge S's (uppercase &szlig;), so it's not worth it.
 
       if (k + 1 < iter.GetStringEnd() && aCharsToMerge[k + 1]) {
-        NS_ASSERTION(g.IsClusterStart() && g.IsLigatureGroupStart() &&
-                     !g.IsLowSurrogate(),
+        NS_ASSERTION(g.IsClusterStart() && g.IsLigatureGroupStart(),
                      "Don't know how to merge this stuff");
         continue;
       }
 
       NS_ASSERTION(mergeRunStart == k ||
-                   (g.IsClusterStart() && g.IsLigatureGroupStart() &&
-                    !g.IsLowSurrogate()),
+                   (g.IsClusterStart() && g.IsLigatureGroupStart()),
                    "Don't know how to merge this stuff");
 
       // If the start of the merge run is actually a character that should

From 3a0de712cc6318741023866902a9dd223d147a5c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 15:02:22 +1200
Subject: [PATCH 03/61] Bug 504311. Don't reframe text when white-space changes
 between preformatted values, or between non-preformatted values. r=bz

--HG--
extra : rebase_source : 7f545ad1d85bcda74d18d9308539b45149a4a194
---
 layout/style/crashtests/504311-1.xul    | 24 ++++++++++++++++++++++++
 layout/style/crashtests/crashtests.list |  1 +
 layout/style/nsStyleStruct.cpp          |  3 ++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 layout/style/crashtests/504311-1.xul

diff --git a/layout/style/crashtests/504311-1.xul b/layout/style/crashtests/504311-1.xul
new file mode 100644
index 000000000000..e2d40fa70a07
--- /dev/null
+++ b/layout/style/crashtests/504311-1.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="f()">
+
+	<script type="text/javascript">
+		<![CDATA[
+			function f ()
+			{
+                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+                var tb = document. getElementById ("tb01");
+				var inputField = tb. inputField;
+				var editor = inputField. QueryInterface (Components. interfaces. nsIDOMNSEditableElement). editor;
+				editor = editor. QueryInterface (Components. interfaces. nsIEditor);
+				editor = editor. QueryInterface (Components. interfaces. nsIPlaintextEditor);
+				editor. wrapWidth = -1;
+			}
+		]]>
+	</script>
+	
+	<textbox id="tb01" multiline="true"/>
+
+</window>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index fe390f391c15..97ebd56f53e7 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -39,3 +39,4 @@ load 473914-1.html
 skip load long-url-list-stack-overflow.html # skipped due to being slow (bug 477490)
 load 495269-1.html
 load 495269-2.html
+load 504311-1.xul
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index beaa8ab012e3..49eb59a0043b 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1873,13 +1873,14 @@ nsStyleText::~nsStyleText(void) { }
 
 nsChangeHint nsStyleText::CalcDifference(const nsStyleText& aOther) const
 {
-  if (mWhiteSpace != aOther.mWhiteSpace) {
+  if (NewlineIsSignificant() != aOther.NewlineIsSignificant()) {
     // This may require construction of suppressed text frames
     return NS_STYLE_HINT_FRAMECHANGE;
   }
 
   if ((mTextAlign != aOther.mTextAlign) ||
       (mTextTransform != aOther.mTextTransform) ||
+      (mWhiteSpace != aOther.mWhiteSpace) ||
       (mWordWrap != aOther.mWordWrap) ||
       (mLetterSpacing != aOther.mLetterSpacing) ||
       (mLineHeight != aOther.mLineHeight) ||

From 039fd09cdf0456eb5ce5b6b1dcfb2f975e071f6a Mon Sep 17 00:00:00 2001
From: Saint Wesonga <wesongathedeveloper@yahoo.com>
Date: Thu, 30 Jul 2009 15:04:14 +1200
Subject: [PATCH 04/61] Bug 467988. Merge canvas mochitests into one file to
 speed up mochitest running. r=roc

--HG--
extra : rebase_source : 9a4f90fdbe07759e3970dbf665d753b7320b345a
---
 content/canvas/test/Makefile.in      |   687 +-
 content/canvas/test/test_canvas.html | 24276 +++++++++++++++++++++++++
 2 files changed, 24285 insertions(+), 678 deletions(-)
 create mode 100644 content/canvas/test/test_canvas.html

diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 96b52e9f87e2..571d677c1c23 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -45,656 +45,7 @@ relativesrcdir  = content/canvas/test
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 _TEST_FILES_0 = \
-	test_fallback.basic.html \
-	test_fallback.multiple.html \
-	test_fallback.nested.html \
-	test_type.name.html \
-	test_type.exists.html \
-	test_type.delete.html \
-	test_type.prototype.html \
-	test_type.replace.html \
-	test_type.extend.html \
-	test_size.attributes.html \
-	test_size.attributes.type.get.html \
-	test_size.attributes.type.set.html \
-	test_size.attributes.default.html \
-	test_size.attributes.reflect.1.html \
-	test_size.attributes.reflect.2.html \
-	test_size.attributes.removed.html \
-	test_size.attributes.parse.whitespace.html \
-	test_size.attributes.parse.nonnumber.html \
-	test_size.attributes.parse.zero.html \
-	test_size.attributes.parse.negative.html \
-	test_size.attributes.parse.zerosuffix.html \
-	test_size.attributes.parse.floatsuffix.html \
-	test_size.attributes.parse.badsuffix.html \
-	test_size.attributes.parse.percentsuffix.html \
-	test_size.attributes.setAttribute.whitespace.html \
-	test_size.attributes.setAttribute.nonnumber.html \
-	test_size.attributes.setAttribute.zero.html \
-	test_size.attributes.setAttribute.negative.html \
-	test_size.attributes.setAttribute.zerosuffix.html \
-	test_size.attributes.setAttribute.floatsuffix.html \
-	test_size.attributes.setAttribute.badsuffix.html \
-	test_size.attributes.setAttribute.percentsuffix.html \
-	test_size.attributes.style.html \
-	test_initial.colour.html \
-	test_initial.reset.different.html \
-	test_initial.reset.same.html \
-	test_initial.reset.path.html \
-	test_initial.reset.clip.html \
-	test_initial.reset.transform.html \
-	test_initial.reset.gradient.html \
-	test_initial.reset.pattern.html \
-	test_context.emptystring.html \
-	test_context.unrecognised.badname.html \
-	test_context.unrecognised.badsuffix.html \
-	test_context.unrecognised.nullsuffix.html \
-	test_context.unrecognised.unicode.html \
-	test_context.casesensitive.html \
-	test_context.arguments.missing.html \
-	test_context.arguments.extra.html \
-	test_toDataURL.default.html \
-	test_toDataURL.png.html \
-	test_toDataURL.unrecognised.html \
-	test_toDataURL.lowercase.html \
-	test_toDataURL.arguments.1.html \
-	test_toDataURL.arguments.2.html \
-	test_toDataURL.arguments.3.html \
-	test_toDataURL.nocontext.html \
-	test_toDataURL.zerosize.html \
-	test_toDataURL.primarycolours.html \
-	test_toDataURL.complexcolours.html \
-	test_2d.getcontext.exists.html \
-	test_2d.type.exists.html \
-	test_2d.type.delete.html \
-	test_2d.type.prototype.html \
-	test_2d.type.replace.html \
-	test_2d.type.extend.html \
-	test_2d.getcontext.unique.html \
-	test_2d.getcontext.shared.html \
-	test_2d.voidreturn.html \
-	test_2d.missingargs.html \
-	test_2d.scaled.html \
-	test_2d.canvas.reference.html \
-	test_2d.canvas.readonly.html \
-	test_2d.state.saverestore.strokeStyle.html \
-	test_2d.state.saverestore.fillStyle.html \
-	test_2d.state.saverestore.globalAlpha.html \
-	test_2d.state.saverestore.lineWidth.html \
-	test_2d.state.saverestore.lineCap.html \
-	test_2d.state.saverestore.lineJoin.html \
-	test_2d.state.saverestore.miterLimit.html \
-	test_2d.state.saverestore.shadowOffsetX.html \
-	test_2d.state.saverestore.shadowOffsetY.html \
-	test_2d.state.saverestore.shadowBlur.html \
-	test_2d.state.saverestore.shadowColor.html \
-	test_2d.state.saverestore.globalCompositeOperation.html \
-	test_initial.reset.2dstate.html \
-	test_2d.state.saverestore.transformation.html \
-	test_2d.state.saverestore.clip.html \
-	test_2d.state.saverestore.path.html \
-	test_2d.state.saverestore.bitmap.html \
-	test_2d.state.saverestore.stack.html \
-	test_2d.state.saverestore.stackdepth.html \
-	test_2d.state.saverestore.underflow.html \
-	test_2d.transformation.order.html \
-	test_2d.transformation.scale.basic.html \
-	test_2d.transformation.scale.zero.html \
-	test_2d.transformation.scale.negative.html \
-	test_2d.transformation.scale.large.html \
-	test_2d.transformation.scale.nonfinite.html \
-	test_2d.transformation.scale.multiple.html \
-	$(NULL)
-
-_TEST_FILES_1 = \
-	test_2d.transformation.rotate.zero.html \
-	test_2d.transformation.rotate.radians.html \
-	test_2d.transformation.rotate.direction.html \
-	test_2d.transformation.rotate.wrap.html \
-	test_2d.transformation.rotate.wrapnegative.html \
-	test_2d.transformation.rotate.nonfinite.html \
-	test_2d.transformation.translate.basic.html \
-	test_2d.transformation.translate.nonfinite.html \
-	test_2d.transformation.transform.identity.html \
-	test_2d.transformation.transform.skewed.html \
-	test_2d.transformation.transform.multiply.html \
-	test_2d.transformation.transform.nonfinite.html \
-	test_2d.transformation.setTransform.skewed.html \
-	test_2d.transformation.setTransform.multiple.html \
-	test_2d.transformation.setTransform.nonfinite.html \
-	test_2d.composite.globalAlpha.range.html \
-	test_2d.composite.globalAlpha.invalid.html \
-	test_2d.composite.globalAlpha.default.html \
-	test_2d.composite.globalAlpha.fill.html \
-	test_2d.composite.globalAlpha.image.html \
-	test_2d.composite.globalAlpha.canvas.html \
-	test_2d.composite.globalAlpha.imagepattern.html \
-	test_2d.composite.globalAlpha.canvaspattern.html \
-	test_2d.composite.solid.source-over.html \
-	test_2d.composite.solid.destination-over.html \
-	test_2d.composite.solid.source-in.html \
-	test_2d.composite.solid.destination-in.html \
-	test_2d.composite.solid.source-out.html \
-	test_2d.composite.solid.destination-out.html \
-	test_2d.composite.solid.source-atop.html \
-	test_2d.composite.solid.destination-atop.html \
-	test_2d.composite.solid.copy.html \
-	test_2d.composite.transparent.source-over.html \
-	test_2d.composite.transparent.destination-over.html \
-	test_2d.composite.transparent.source-in.html \
-	test_2d.composite.transparent.destination-in.html \
-	test_2d.composite.transparent.source-out.html \
-	test_2d.composite.transparent.destination-out.html \
-	test_2d.composite.transparent.source-atop.html \
-	test_2d.composite.transparent.destination-atop.html \
-	test_2d.composite.transparent.copy.html \
-	test_2d.composite.image.source-over.html \
-	test_2d.composite.image.destination-over.html \
-	test_2d.composite.image.destination-out.html \
-	test_2d.composite.image.source-atop.html \
-	test_2d.composite.image.copy.html \
-	test_2d.composite.canvas.source-over.html \
-	test_2d.composite.canvas.destination-over.html \
-	test_2d.composite.canvas.destination-out.html \
-	test_2d.composite.canvas.source-atop.html \
-	test_2d.composite.canvas.copy.html \
-	test_2d.composite.uncovered.fill.copy.html \
-	test_2d.composite.uncovered.image.copy.html \
-	test_2d.composite.uncovered.pattern.copy.html \
-	test_2d.composite.clip.source-over.html \
-	test_2d.composite.clip.destination-over.html \
-	test_2d.composite.clip.source-in.html \
-	test_2d.composite.clip.destination-in.html \
-	test_2d.composite.clip.source-out.html \
-	test_2d.composite.clip.destination-out.html \
-	test_2d.composite.clip.source-atop.html \
-	test_2d.composite.clip.destination-atop.html \
-	test_2d.composite.clip.copy.html \
-	test_2d.composite.operation.get.html \
-	test_2d.composite.operation.unrecognised.html \
-	test_2d.composite.operation.darker.html \
-	test_2d.composite.operation.over.html \
-	test_2d.composite.operation.clear.html \
-	test_2d.composite.operation.highlight.html \
-	test_2d.composite.operation.nullsuffix.html \
-	$(NULL)
-
-_TEST_FILES_2 = \
-	test_2d.composite.operation.casesensitive.html \
-	test_2d.composite.operation.default.html \
-	test_2d.fillStyle.parse.html4.html \
-	test_2d.fillStyle.parse.hex3.html \
-	test_2d.fillStyle.parse.hex6.html \
-	test_2d.fillStyle.parse.rgb-num.html \
-	test_2d.fillStyle.parse.rgb-clamp-1.html \
-	test_2d.fillStyle.parse.rgb-clamp-2.html \
-	test_2d.fillStyle.parse.rgb-clamp-3.html \
-	test_2d.fillStyle.parse.rgb-clamp-4.html \
-	test_2d.fillStyle.parse.rgb-clamp-5.html \
-	test_2d.fillStyle.parse.rgb-percent.html \
-	test_2d.fillStyle.parse.rgba-solid-1.html \
-	test_2d.fillStyle.parse.rgba-solid-2.html \
-	test_2d.fillStyle.parse.rgba-num-1.html \
-	test_2d.fillStyle.parse.rgba-num-2.html \
-	test_2d.fillStyle.parse.rgba-percent.html \
-	test_2d.fillStyle.parse.rgba-clamp-1.html \
-	test_2d.fillStyle.parse.rgba-clamp-2.html \
-	test_2d.fillStyle.parse.transparent-1.html \
-	test_2d.fillStyle.parse.transparent-2.html \
-	test_2d.fillStyle.parse.hsl-1.html \
-	test_2d.fillStyle.parse.hsl-2.html \
-	test_2d.fillStyle.parse.hsl-3.html \
-	test_2d.fillStyle.parse.hsl-4.html \
-	test_2d.fillStyle.parse.hsl-5.html \
-	test_2d.fillStyle.parse.hsl-clamp-1.html \
-	test_2d.fillStyle.parse.hsl-clamp-2.html \
-	test_2d.fillStyle.parse.hsl-clamp-3.html \
-	test_2d.fillStyle.parse.hsl-clamp-4.html \
-	test_2d.fillStyle.parse.hsla-1.html \
-	test_2d.fillStyle.parse.hsla-2.html \
-	test_2d.fillStyle.parse.hsla-clamp-1.html \
-	test_2d.fillStyle.parse.hsla-clamp-2.html \
-	test_2d.fillStyle.parse.hsla-clamp-3.html \
-	test_2d.fillStyle.parse.hsla-clamp-4.html \
-	test_2d.fillStyle.parse.hsla-clamp-5.html \
-	test_2d.fillStyle.parse.hsla-clamp-6.html \
-	test_2d.fillStyle.parse.svg-1.html \
-	test_2d.fillStyle.parse.svg-2.html \
-	test_2d.fillStyle.parse.invalid.hex3.html \
-	test_2d.fillStyle.parse.invalid.hex6.html \
-	test_2d.fillStyle.parse.invalid.rgb-1.html \
-	test_2d.fillStyle.parse.invalid.rgb-2.html \
-	test_2d.fillStyle.parse.invalid.rgb-3.html \
-	test_2d.fillStyle.parse.invalid.rgb-4.html \
-	test_2d.fillStyle.parse.invalid.rgb-5.html \
-	test_2d.fillStyle.parse.invalid.rgb-6.html \
-	test_2d.fillStyle.parse.invalid.rgb-7.html \
-	test_2d.fillStyle.parse.invalid.rgba-1.html \
-	test_2d.fillStyle.parse.invalid.rgba-2.html \
-	test_2d.fillStyle.parse.invalid.rgba-3.html \
-	test_2d.fillStyle.parse.invalid.rgba-4.html \
-	test_2d.fillStyle.parse.invalid.rgba-5.html \
-	test_2d.fillStyle.parse.invalid.hsl-1.html \
-	test_2d.fillStyle.parse.invalid.hsl-2.html \
-	test_2d.fillStyle.parse.invalid.hsl-3.html \
-	test_2d.fillStyle.parse.invalid.hsl-4.html \
-	test_2d.fillStyle.parse.invalid.hsl-5.html \
-	test_2d.fillStyle.parse.invalid.hsla-1.html \
-	test_2d.fillStyle.parse.invalid.hsla-2.html \
-	test_2d.fillStyle.parse.system.html \
-	test_2d.fillStyle.parse.current.basic.html \
-	test_2d.fillStyle.parse.current.changed.html \
-	test_2d.fillStyle.parse.current.removed.html \
-	test_2d.fillStyle.invalidstring.html \
-	test_2d.fillStyle.invalidtype.html \
-	test_2d.fillStyle.get.solid.html \
-	test_2d.fillStyle.get.semitransparent.html \
-	test_2d.fillStyle.get.transparent.html \
-	test_2d.fillStyle.default.html \
-	test_2d.strokeStyle.default.html \
-	test_2d.gradient.object.type.html \
-	test_2d.gradient.object.return.html \
-	test_2d.gradient.interpolate.solid.html \
-	test_2d.gradient.interpolate.colour.html \
-	test_2d.gradient.interpolate.alpha.html \
-	test_2d.gradient.interpolate.colouralpha.html \
-	test_2d.gradient.interpolate.outside.html \
-	test_2d.gradient.interpolate.zerosize.html \
-	test_2d.gradient.interpolate.vertical.html \
-	test_2d.gradient.interpolate.multiple.html \
-	test_2d.gradient.interpolate.overlap.html \
-	test_2d.gradient.interpolate.overlap2.html \
-	test_2d.gradient.empty.html \
-	test_2d.gradient.object.update.html \
-	test_2d.gradient.object.compare.html \
-	test_2d.gradient.object.crosscanvas.html \
-	test_2d.gradient.object.invalidoffset.html \
-	test_2d.gradient.object.invalidcolour.html \
-	test_2d.gradient.linear.nonfinite.html \
-	test_2d.gradient.linear.transform.1.html \
-	test_2d.gradient.linear.transform.2.html \
-	test_2d.gradient.linear.transform.3.html \
-	test_2d.gradient.radial.negative.html \
-	test_2d.gradient.radial.nonfinite.html \
-	test_2d.gradient.radial.inside1.html \
-	$(NULL)
-
-_TEST_FILES_3 = \
-	test_2d.gradient.radial.cone.bottom.html \
-	test_2d.gradient.radial.cone.cylinder.html \
-	test_2d.gradient.radial.cone.shape1.html \
-	test_2d.gradient.radial.transform.1.html \
-	test_2d.gradient.radial.transform.2.html \
-	test_2d.gradient.radial.transform.3.html \
-	test_2d.pattern.basic.type.html \
-	test_2d.pattern.basic.image.html \
-	test_2d.pattern.basic.canvas.html \
-	test_2d.pattern.basic.zerocanvas.html \
-	test_2d.pattern.basic.nocontext.html \
-	test_2d.pattern.image.undefined.html \
-	test_2d.pattern.image.null.html \
-	test_2d.pattern.image.string.html \
-	test_2d.pattern.image.incomplete.html \
-	test_2d.pattern.image.broken.html \
-	test_2d.pattern.repeat.empty.html \
-	test_2d.pattern.repeat.null.html \
-	test_2d.pattern.repeat.undefined.html \
-	test_2d.pattern.repeat.unrecognised.html \
-	test_2d.pattern.repeat.case.html \
-	test_2d.pattern.repeat.nullsuffix.html \
-	test_2d.pattern.modify.image1.html \
-	test_2d.pattern.modify.image2.html \
-	test_2d.pattern.modify.canvas1.html \
-	test_2d.pattern.modify.canvas2.html \
-	test_2d.pattern.crosscanvas.html \
-	test_2d.pattern.paint.norepeat.basic.html \
-	test_2d.pattern.paint.norepeat.outside.html \
-	test_2d.pattern.paint.norepeat.coord1.html \
-	test_2d.pattern.paint.norepeat.coord2.html \
-	test_2d.pattern.paint.norepeat.coord3.html \
-	test_2d.pattern.paint.repeat.basic.html \
-	test_2d.pattern.paint.repeat.outside.html \
-	test_2d.pattern.paint.repeat.coord1.html \
-	test_2d.pattern.paint.repeat.coord2.html \
-	test_2d.pattern.paint.repeat.coord3.html \
-	test_2d.pattern.paint.repeatx.basic.html \
-	test_2d.pattern.paint.repeatx.outside.html \
-	test_2d.pattern.paint.repeatx.coord1.html \
-	test_2d.pattern.paint.repeaty.basic.html \
-	test_2d.pattern.paint.repeaty.outside.html \
-	test_2d.pattern.paint.repeaty.coord1.html \
-	test_2d.pattern.paint.orientation.image.html \
-	test_2d.pattern.paint.orientation.canvas.html \
-	test_2d.pattern.animated.gif.html \
-	test_2d.line.defaults.html \
-	test_2d.line.width.basic.html \
-	test_2d.line.width.transformed.html \
-	test_2d.line.width.invalid.html \
-	test_2d.line.cap.butt.html \
-	test_2d.line.cap.round.html \
-	test_2d.line.cap.square.html \
-	test_2d.line.cap.open.html \
-	test_2d.line.cap.invalid.html \
-	test_2d.line.join.bevel.html \
-	test_2d.line.join.round.html \
-	test_2d.line.join.miter.html \
-	test_2d.line.join.open.html \
-	test_2d.line.join.closed.html \
-	test_2d.line.join.invalid.html \
-	test_2d.line.miter.exceeded.html \
-	test_2d.line.miter.acute.html \
-	test_2d.line.miter.obtuse.html \
-	test_2d.line.miter.rightangle.html \
-	test_2d.line.miter.lineedge.html \
-	test_2d.line.miter.within.html \
-	test_2d.line.miter.invalid.html \
-	test_2d.line.cross.html \
-	test_2d.line.union.html \
-	test_2d.clearRect.basic.html \
-	test_2d.clearRect.path.html \
-	test_2d.clearRect.zero.html \
-	test_2d.clearRect.negative.html \
-	test_2d.clearRect.transform.html \
-	test_2d.clearRect.globalalpha.html \
-	test_2d.clearRect.globalcomposite.html \
-	test_2d.clearRect.clip.html \
-	test_2d.clearRect.shadow.html \
-	test_2d.clearRect.nonfinite.html \
-	test_2d.fillRect.basic.html \
-	test_2d.fillRect.path.html \
-	test_2d.fillRect.zero.html \
-	test_2d.fillRect.negative.html \
-	test_2d.fillRect.transform.html \
-	test_2d.fillRect.clip.html \
-	test_2d.fillRect.shadow.html \
-	$(NULL)
-
-_TEST_FILES_4 = \
-	test_2d.fillRect.nonfinite.html \
-	test_2d.strokeRect.basic.html \
-	test_2d.strokeRect.path.html \
-	test_2d.strokeRect.zero.1.html \
-	test_2d.strokeRect.zero.2.html \
-	test_2d.strokeRect.zero.3.html \
-	test_2d.strokeRect.zero.4.html \
-	test_2d.strokeRect.negative.html \
-	test_2d.strokeRect.transform.html \
-	test_2d.strokeRect.globalalpha.html \
-	test_2d.strokeRect.globalcomposite.html \
-	test_2d.strokeRect.clip.html \
-	test_2d.strokeRect.shadow.html \
-	test_2d.strokeRect.nonfinite.html \
-	test_2d.path.initial.html \
-	test_2d.path.beginPath.html \
-	test_2d.path.moveTo.basic.html \
-	test_2d.path.moveTo.newsubpath.html \
-	test_2d.path.moveTo.multiple.html \
-	test_2d.path.moveTo.nonfinite.html \
-	test_2d.path.closePath.empty.html \
-	test_2d.path.closePath.newline.html \
-	test_2d.path.closePath.nextpoint.html \
-	test_2d.path.lineTo.emptysubpath.html \
-	test_2d.path.lineTo.basic.html \
-	test_2d.path.lineTo.nextpoint.html \
-	test_2d.path.lineTo.nonfinite.html \
-	test_2d.path.quadraticCurveTo.emptysubpath.html \
-	test_2d.path.quadraticCurveTo.basic.html \
-	test_2d.path.quadraticCurveTo.shape.html \
-	test_2d.path.quadraticCurveTo.scaled.html \
-	test_2d.path.quadraticCurveTo.nonfinite.html \
-	test_2d.path.bezierCurveTo.emptysubpath.html \
-	test_2d.path.bezierCurveTo.basic.html \
-	test_2d.path.bezierCurveTo.shape.html \
-	test_2d.path.bezierCurveTo.scaled.html \
-	test_2d.path.bezierCurveTo.nonfinite.html \
-	test_2d.path.arcTo.emptysubpath.html \
-	test_2d.path.arcTo.coincide.1.html \
-	test_2d.path.arcTo.coincide.2.html \
-	test_2d.path.arcTo.collinear.1.html \
-	test_2d.path.arcTo.collinear.2.html \
-	test_2d.path.arcTo.collinear.3.html \
-	test_2d.path.arcTo.shape.curve1.html \
-	test_2d.path.arcTo.shape.curve2.html \
-	test_2d.path.arcTo.shape.start.html \
-	test_2d.path.arcTo.shape.end.html \
-	test_2d.path.arcTo.negative.html \
-	test_2d.path.arcTo.zero.1.html \
-	test_2d.path.arcTo.zero.2.html \
-	test_2d.path.arcTo.transformation.html \
-	test_2d.path.arcTo.scale.html \
-	test_2d.path.arcTo.nonfinite.html \
-	test_2d.path.arc.empty.html \
-	test_2d.path.arc.nonempty.html \
-	test_2d.path.arc.end.html \
-	test_2d.path.arc.angle.1.html \
-	test_2d.path.arc.angle.2.html \
-	test_2d.path.arc.angle.3.html \
-	test_2d.path.arc.angle.4.html \
-	test_2d.path.arc.angle.5.html \
-	test_2d.path.arc.angle.6.html \
-	test_2d.path.arc.zero.1.html \
-	test_2d.path.arc.zero.2.html \
-	test_2d.path.arc.twopie.1.html \
-	test_2d.path.arc.twopie.2.html \
-	test_2d.path.arc.twopie.3.html \
-	test_2d.path.arc.twopie.4.html \
-	test_2d.path.arc.shape.1.html \
-	test_2d.path.arc.shape.2.html \
-	test_2d.path.arc.shape.4.html \
-	test_2d.path.arc.shape.5.html \
-	test_2d.path.arc.selfintersect.1.html \
-	test_2d.path.arc.selfintersect.2.html \
-	test_2d.path.arc.negative.html \
-	test_2d.path.arc.zeroradius.html \
-	test_2d.path.arc.scale.1.html \
-	test_2d.path.arc.scale.2.html \
-	test_2d.path.arc.nonfinite.html \
-	test_2d.path.rect.basic.html \
-	test_2d.path.rect.newsubpath.html \
-	test_2d.path.rect.closed.html \
-	test_2d.path.rect.end.1.html \
-	test_2d.path.rect.end.2.html \
-	test_2d.path.rect.zero.1.html \
-	test_2d.path.rect.zero.2.html \
-	test_2d.path.rect.zero.3.html \
-	test_2d.path.rect.zero.4.html \
-	test_2d.path.rect.zero.5.html \
-	test_2d.path.rect.negative.html \
-	test_2d.path.rect.winding.html \
-	test_2d.path.rect.nonfinite.html \
-	test_2d.path.fill.overlap.html \
-	test_2d.path.fill.winding.add.html \
-	test_2d.path.fill.winding.subtract.1.html \
-	test_2d.path.fill.winding.subtract.2.html \
-	$(NULL)
-
-_TEST_FILES_5 = \
-	test_2d.path.fill.winding.subtract.3.html \
-	test_2d.path.fill.closed.basic.html \
-	test_2d.path.fill.closed.unaffected.html \
-	test_2d.path.stroke.overlap.html \
-	test_2d.path.stroke.union.html \
-	test_2d.path.stroke.unaffected.html \
-	test_2d.path.stroke.scale1.html \
-	test_2d.path.stroke.scale2.html \
-	test_2d.path.stroke.skew.html \
-	test_2d.path.stroke.empty.html \
-	test_2d.path.stroke.prune.line.html \
-	test_2d.path.stroke.prune.closed.html \
-	test_2d.path.stroke.prune.curve.html \
-	test_2d.path.stroke.prune.arc.html \
-	test_2d.path.stroke.prune.rect.html \
-	test_2d.path.stroke.prune.corner.html \
-	test_2d.path.transformation.basic.html \
-	test_2d.path.transformation.multiple.html \
-	test_2d.path.transformation.changing.html \
-	test_2d.path.clip.empty.html \
-	test_2d.path.clip.basic.1.html \
-	test_2d.path.clip.basic.2.html \
-	test_2d.path.clip.intersect.html \
-	test_2d.path.clip.winding.1.html \
-	test_2d.path.clip.winding.2.html \
-	test_2d.path.clip.unaffected.html \
-	test_2d.path.isPointInPath.basic.1.html \
-	test_2d.path.isPointInPath.basic.2.html \
-	test_2d.path.isPointInPath.edge.html \
-	test_2d.path.isPointInPath.empty.html \
-	test_2d.path.isPointInPath.subpath.html \
-	test_2d.path.isPointInPath.outside.html \
-	test_2d.path.isPointInPath.unclosed.html \
-	test_2d.path.isPointInPath.arc.html \
-	test_2d.path.isPointInPath.bigarc.html \
-	test_2d.path.isPointInPath.bezier.html \
-	test_2d.path.isPointInPath.winding.html \
-	test_2d.path.isPointInPath.transform.1.html \
-	test_2d.path.isPointInPath.transform.2.html \
-	test_2d.path.isPointInPath.transform.3.html \
-	test_2d.path.isPointInPath.nonfinite.html \
-	test_2d.drawImage.3arg.html \
-	test_2d.drawImage.5arg.html \
-	test_2d.drawImage.9arg.basic.html \
-	test_2d.drawImage.9arg.sourcepos.html \
-	test_2d.drawImage.9arg.sourcesize.html \
-	test_2d.drawImage.9arg.destpos.html \
-	test_2d.drawImage.9arg.destsize.html \
-	test_2d.drawImage.canvas.html \
-	test_2d.drawImage.self.1.html \
-	test_2d.drawImage.self.2.html \
-	test_2d.drawImage.null.html \
-	test_2d.drawImage.wrongtype.html \
-	test_2d.drawImage.floatsource.html \
-	test_2d.drawImage.zerosource.html \
-	test_2d.drawImage.negativesource.html \
-	test_2d.drawImage.negativedest.html \
-	test_2d.drawImage.outsidesource.html \
-	test_2d.drawImage.incomplete.html \
-	test_2d.drawImage.broken.html \
-	test_2d.drawImage.animated.gif.html \
-	test_2d.drawImage.animated.apng.html \
-	test_2d.drawImage.animated.poster.html \
-	test_2d.drawImage.path.html \
-	test_2d.drawImage.transform.html \
-	test_2d.drawImage.alpha.html \
-	test_2d.drawImage.clip.html \
-	test_2d.drawImage.composite.html \
-	test_2d.drawImage.nowrap.html \
-	test_2d.drawImage.nonfinite.html \
-	test_2d.imageData.create.basic.html \
-	test_2d.imageData.create.type.html \
-	test_2d.imageData.create.initial.html \
-	test_2d.imageData.create.large.html \
-	test_2d.imageData.create.tiny.html \
-	test_2d.imageData.create.negative.html \
-	test_2d.imageData.create.zero.html \
-	test_2d.imageData.create.nonfinite.html \
-	test_2d.imageData.create.round.html \
-	test_2d.imageData.get.basic.html \
-	test_2d.imageData.get.type.html \
-	test_2d.imageData.get.zero.html \
-	test_2d.imageData.get.nonfinite.html \
-	test_2d.imageData.get.source.outside.html \
-	test_2d.imageData.get.source.negative.html \
-	test_2d.imageData.get.source.size.html \
-	test_2d.imageData.get.tiny.html \
-	test_2d.imageData.get.nonpremul.html \
-	test_2d.imageData.get.range.html \
-	test_2d.imageData.get.clamp.html \
-	test_2d.imageData.get.order.cols.html \
-	test_2d.imageData.get.order.rows.html \
-	test_2d.imageData.get.order.rgb.html \
-	test_2d.imageData.get.order.alpha.html \
-	test_2d.imageData.get.unaffected.html \
-	test_2d.imageData.object.properties.html \
-	test_2d.imageData.object.readonly.html \
-	test_2d.imageData.object.ctor.html \
-	test_2d.imageData.object.set.html \
-	test_2d.imageData.object.undefined.html \
-	$(NULL)
-
-_TEST_FILES_6 = \
-	test_2d.imageData.object.nan.html \
-	test_2d.imageData.object.string.html \
-	test_2d.imageData.object.clamp.html \
-	test_2d.imageData.object.round.html \
-	test_2d.imageData.put.null.html \
-	test_2d.imageData.put.nonfinite.html \
-	test_2d.imageData.put.basic.html \
-	test_2d.imageData.put.created.html \
-	test_2d.imageData.put.wrongtype.html \
-	test_2d.imageData.put.cross.html \
-	test_2d.imageData.put.alpha.html \
-	test_2d.imageData.put.modified.html \
-	test_2d.imageData.put.dirty.zero.html \
-	test_2d.imageData.put.dirty.rect1.html \
-	test_2d.imageData.put.dirty.rect2.html \
-	test_2d.imageData.put.dirty.negative.html \
-	test_2d.imageData.put.dirty.outside.html \
-	test_2d.imageData.put.unchanged.html \
-	test_2d.imageData.put.unaffected.html \
-	test_2d.imageData.put.clip.html \
-	test_2d.imageData.put.path.html \
-	test_2d.shadow.attributes.shadowBlur.1.html \
-	test_2d.shadow.attributes.shadowBlur.2.html \
-	test_2d.shadow.attributes.shadowOffset.1.html \
-	test_2d.shadow.attributes.shadowOffset.2.html \
-	test_2d.shadow.attributes.shadowColor.1.html \
-	test_2d.shadow.attributes.shadowColor.2.html \
-	test_2d.shadow.basic.1.html \
-	test_2d.shadow.basic.2.html \
-	test_2d.shadow.offset.positiveX.html \
-	test_2d.shadow.offset.negativeX.html \
-	test_2d.shadow.offset.positiveY.html \
-	test_2d.shadow.offset.negativeY.html \
-	test_2d.shadow.outside.html \
-	test_2d.shadow.clip.1.html \
-	test_2d.shadow.clip.2.html \
-	test_2d.shadow.clip.3.html \
-	test_2d.shadow.stroke.basic.html \
-	test_2d.shadow.stroke.cap.1.html \
-	test_2d.shadow.stroke.cap.2.html \
-	test_2d.shadow.stroke.join.1.html \
-	test_2d.shadow.stroke.join.2.html \
-	test_2d.shadow.stroke.join.3.html \
-	test_2d.shadow.image.basic.html \
-	test_2d.shadow.image.transparent.1.html \
-	test_2d.shadow.image.transparent.2.html \
-	test_2d.shadow.image.alpha.html \
-	test_2d.shadow.image.section.html \
-	test_2d.shadow.image.scale.html \
-	test_2d.shadow.canvas.basic.html \
-	test_2d.shadow.canvas.transparent.1.html \
-	test_2d.shadow.canvas.transparent.2.html \
-	test_2d.shadow.canvas.alpha.html \
-	test_2d.shadow.pattern.basic.html \
-	test_2d.shadow.pattern.transparent.1.html \
-	test_2d.shadow.pattern.transparent.2.html \
-	test_2d.shadow.pattern.alpha.html \
-	test_2d.shadow.gradient.basic.html \
-	test_2d.shadow.gradient.transparent.1.html \
-	test_2d.shadow.gradient.transparent.2.html \
-	test_2d.shadow.gradient.alpha.html \
-	test_2d.shadow.transform.1.html \
-	test_2d.shadow.transform.2.html \
-	test_2d.shadow.blur.low.html \
-	test_2d.shadow.blur.high.html \
-	test_2d.shadow.alpha.1.html \
-	test_2d.shadow.alpha.2.html \
-	test_2d.shadow.alpha.3.html \
-	test_2d.shadow.alpha.4.html \
-	test_2d.shadow.alpha.5.html \
-	test_2d.shadow.composite.1.html \
-	test_2d.shadow.composite.2.html \
-	test_2d.shadow.composite.3.html \
-	test_2d.shadow.composite.4.html \
-	test_2d.imageSmoothing.html \
-	test_bug397524.html \
-	test_bug405982.html \
-	test_text.font.html \
-	test_text.textAlign.html \
-	test_text.textBaseline.html \
-	test_text.measure.html \
-	test_text.space.replace.html \
+	test_canvas.html \
 	image_transparent50.png \
 	image_redtransparent.png \
 	image_yellow.png \
@@ -714,7 +65,6 @@ _TEST_FILES_6 = \
 	image_green.png \
 	image_green-redirect \
 	image_green-redirect^headers^ \
-	test_2d.imagedata_coercion.html \
 	$(NULL)
 
 # xor and lighter aren't well handled by cairo; they mostly work, but we don't want
@@ -746,14 +96,14 @@ _TEST_FILES_6 = \
 # Tests that fail on Mac (possibly because spec is underdefined?).  Bug 407105
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # XXX vlad don't test these anywhere, cairo behaviour changed
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.line.join.parallel.html \
 	test_2d.strokeRect.zero.5.html \
 	$(NULL)
 
 # This is an issue with Quartz's handling of radial gradients and some numeric
 # imprecision that results in errors here.
-_TEST_FILES_2 += \
+_TEST_FILES_0 += \
 	test_2d.gradient.radial.inside2.html \
 	test_2d.gradient.radial.inside3.html \
 	test_2d.gradient.radial.outside1.html \
@@ -761,7 +111,7 @@ _TEST_FILES_2 += \
 	test_2d.gradient.radial.cone.top.html \
 	$(NULL)
 
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.composite.uncovered.image.source-in.html \
 	test_2d.composite.uncovered.image.destination-in.html \
 	test_2d.composite.uncovered.image.source-out.html \
@@ -772,7 +122,7 @@ _TEST_FILES_3 += \
 # destination bounds seem to have problems with the BEVEL/SQUARE join/cap combo.
 # The joins are rendered as if with MITER; the correct behaviour is also seen
 # if BUTT is used instead of SQUARE.
-_TEST_FILES_4 += test_2d.line.cap.closed.html
+_TEST_FILES_0 += test_2d.line.cap.closed.html
 
 endif
 
@@ -780,7 +130,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 
 # still need bug numbers
-_TEST_FILES_1 += \
+_TEST_FILES_0 += \
 	test_2d.composite.uncovered.fill.source-in.html \
 	test_2d.composite.uncovered.fill.destination-in.html \
 	test_2d.composite.uncovered.fill.source-out.html \
@@ -792,7 +142,7 @@ _TEST_FILES_1 += \
 	$(NULL)
 
 # still need bug numbers
-_TEST_FILES_3 += \
+_TEST_FILES_0 += \
 	test_2d.gradient.radial.outside2.html \
 	test_2d.gradient.radial.outside3.html \
 	test_2d.gradient.radial.cone.shape2.html \
@@ -801,9 +151,9 @@ _TEST_FILES_3 += \
 	$(NULL)
 
 # still need bug numbers
-_TEST_FILES_4 += test_2d.path.arc.shape.3.html
+_TEST_FILES_0 += test_2d.path.arc.shape.3.html
 
-_TEST_FILES_5 += test_2d.path.rect.selfintersect.html
+_TEST_FILES_0 += test_2d.path.rect.selfintersect.html
 endif
 
 # These tests only pass on Mac OS X >= 10.5; see bug 450114
@@ -818,22 +168,3 @@ endif
 # split up into groups to work around command-line length limits
 libs:: $(_TEST_FILES_0)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_1)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_2)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_3)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_4)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_5)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(_TEST_FILES_6)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
new file mode 100644
index 000000000000..29b42967af71
--- /dev/null
+++ b/content/canvas/test/test_canvas.html
@@ -0,0 +1,24276 @@
+<!DOCTYPE HTML>
+<title>Canvas Tests</title>
+<script src="/MochiKit/packed.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+
+</script>
+<!-- Includes all the tests in the content/canvas/tests except for test_bug397524.html -->
+
+<!-- [[[ test_2d.canvas.readonly.html ]]] -->
+
+<p>Canvas test: 2d.canvas.readonly</p>
+<!-- Testing: CanvasRenderingContext2D.canvas is readonly -->
+<canvas id="c1" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_canvas_readonly() {
+
+var canvas = document.getElementById('c1');
+var ctx = canvas.getContext('2d');
+
+var c = document.createElement('canvas');
+var d = ctx.canvas;
+ok(c !== d, "c !== d");
+try { ctx.canvas = c; } catch (e) {} // not sure whether this should throw or not...
+ok(ctx.canvas === d, "ctx.canvas === d");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.canvas.reference.html ]]] -->
+
+<p>Canvas test: 2d.canvas.reference</p>
+<!-- Testing: CanvasRenderingContext2D.canvas refers back to its canvas -->
+<canvas id="c2" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_canvas_reference() {
+
+var canvas = document.getElementById('c2');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.canvas === canvas, "ctx.canvas === canvas");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.basic</p>
+<canvas id="c3" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function isPixel(ctx, x,y, r,g,b,a, d) {
+	var pos = x + "," + y;
+	var colour = r + "," + g + "," + b + "," + a;
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    ok(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+function test_2d_clearRect_basic() {
+
+var canvas = document.getElementById('c3');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.clip</p>
+<canvas id="c4" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_clip() {
+
+var canvas = document.getElementById('c4');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.clearRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 16);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.globalalpha.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.globalalpha</p>
+<canvas id="c5" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_globalalpha() {
+
+var canvas = document.getElementById('c5');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0.1;
+ctx.clearRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.globalcomposite.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.globalcomposite</p>
+<canvas id="c6" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_globalcomposite() {
+
+var canvas = document.getElementById('c6');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.clearRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.negative</p>
+<canvas id="c7" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_negative() {
+
+var canvas = document.getElementById('c7');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 50, 25);
+ctx.clearRect(100, 0, -50, 25);
+ctx.clearRect(0, 50, 50, -25);
+ctx.clearRect(100, 50, -50, -25);
+isPixel(ctx, 25,12, 0,0,0,0, 0);
+isPixel(ctx, 75,12, 0,0,0,0, 0);
+isPixel(ctx, 25,37, 0,0,0,0, 0);
+isPixel(ctx, 75,37, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.nonfinite</p>
+<!-- Testing: clearRect() with Infinity/NaN is ignored -->
+<canvas id="c8" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_nonfinite() {
+
+var canvas = document.getElementById('c8');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.clearRect(Infinity, 0, 100, 50);
+ctx.clearRect(-Infinity, 0, 100, 50);
+ctx.clearRect(NaN, 0, 100, 50);
+ctx.clearRect(0, Infinity, 100, 50);
+ctx.clearRect(0, -Infinity, 100, 50);
+ctx.clearRect(0, NaN, 100, 50);
+ctx.clearRect(0, 0, Infinity, 50);
+ctx.clearRect(0, 0, -Infinity, 50);
+ctx.clearRect(0, 0, NaN, 50);
+ctx.clearRect(0, 0, 100, Infinity);
+ctx.clearRect(0, 0, 100, -Infinity);
+ctx.clearRect(0, 0, 100, NaN);
+ctx.clearRect(Infinity, Infinity, 100, 50);
+ctx.clearRect(Infinity, Infinity, Infinity, 50);
+ctx.clearRect(Infinity, Infinity, Infinity, Infinity);
+ctx.clearRect(Infinity, Infinity, 100, Infinity);
+ctx.clearRect(Infinity, 0, Infinity, 50);
+ctx.clearRect(Infinity, 0, Infinity, Infinity);
+ctx.clearRect(Infinity, 0, 100, Infinity);
+ctx.clearRect(0, Infinity, Infinity, 50);
+ctx.clearRect(0, Infinity, Infinity, Infinity);
+ctx.clearRect(0, Infinity, 100, Infinity);
+ctx.clearRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.path.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.path</p>
+<canvas id="c9" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_path() {
+
+var canvas = document.getElementById('c9');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 16, 16);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.shadow</p>
+<canvas id="c10" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_shadow() {
+
+var canvas = document.getElementById('c10');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 50;
+ctx.clearRect(0, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.transform</p>
+<canvas id="c11" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_transform() {
+
+var canvas = document.getElementById('c11');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(10, 10);
+ctx.translate(0, 5);
+ctx.clearRect(0, -5, 10, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.clearRect.zero.html ]]] -->
+
+<p>Canvas test: 2d.clearRect.zero</p>
+<canvas id="c12" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_clearRect_zero() {
+
+var canvas = document.getElementById('c12');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.clearRect(0, 0, 100, 0);
+ctx.clearRect(0, 0, 0, 50);
+ctx.clearRect(0, 0, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.canvas.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.copy</p>
+<canvas id="c13" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_copy() {
+
+var canvas = document.getElementById('c13');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_1.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-atop</p>
+<canvas id="c14" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_atop() {
+
+var canvas = document.getElementById('c14');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_2.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 127,255,127,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-in</p>
+<canvas id="c15" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_in() {
+
+var canvas = document.getElementById('c15');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_3.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 0,255,255,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_3.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-out</p>
+<canvas id="c16" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_out() {
+
+var canvas = document.getElementById('c16');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_4.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 0,255,255,31, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_4.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.destination-over</p>
+<canvas id="c17" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_destination_over() {
+
+var canvas = document.getElementById('c17');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_5.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 109,255,145,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_5.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.lighter</p>
+<canvas id="c18" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_lighter() {
+
+var canvas = document.getElementById('c18');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_6.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,127,255, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_6.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-atop</p>
+<canvas id="c19" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_atop() {
+
+var canvas = document.getElementById('c19');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_7.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_7.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-in</p>
+<canvas id="c20" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_in() {
+
+var canvas = document.getElementById('c20');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_8.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_8.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-out</p>
+<canvas id="c21" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_out() {
+
+var canvas = document.getElementById('c21');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_9.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_9.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.source-over</p>
+<canvas id="c22" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_source_over() {
+
+var canvas = document.getElementById('c22');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_10.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 218,255,36,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_10.png" class="resource">
+
+<!-- [[[ test_2d.composite.canvas.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.canvas.xor</p>
+<canvas id="c23" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_canvas_xor() {
+
+var canvas = document.getElementById('c23');
+var ctx = canvas.getContext('2d');
+
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = canvas.width;
+canvas2.height = canvas.height;
+var ctx2 = canvas2.getContext('2d');
+ctx2.drawImage(document.getElementById('yellow75_11.png'), 0, 0);
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_11.png" class="resource">
+
+<!-- [[[ test_2d.composite.clip.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.copy</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c24" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_copy() {
+
+var canvas = document.getElementById('c24');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-atop</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c25" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_atop() {
+
+var canvas = document.getElementById('c25');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-in</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c26" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_in() {
+
+var canvas = document.getElementById('c26');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-out</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c27" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_out() {
+
+var canvas = document.getElementById('c27');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.destination-over</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c28" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_destination_over() {
+
+var canvas = document.getElementById('c28');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.lighter</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c29" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_lighter() {
+
+var canvas = document.getElementById('c29');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-atop</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c30" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_atop() {
+
+var canvas = document.getElementById('c30');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-in</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c31" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_in() {
+
+var canvas = document.getElementById('c31');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-out</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c32" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_out() {
+
+var canvas = document.getElementById('c32');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.source-over</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c33" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_source_over() {
+
+var canvas = document.getElementById('c33');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.clip.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.clip.xor</p>
+<!-- Testing: fill() does not affect pixels outside the clip region. -->
+<canvas id="c34" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_clip_xor() {
+
+var canvas = document.getElementById('c34');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.rect(-20, -20, 10, 10);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.canvas.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.canvas</p>
+<canvas id="c35" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_canvas() {
+
+var canvas = document.getElementById('c35');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+ctx.drawImage(canvas2, 0, 0);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.canvaspattern.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.canvaspattern - bug 401790</p>
+<canvas id="c36" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function todo_isPixel(ctx, x,y, r,g,b,a, d) {
+	var pos = x + "," + y;
+	var colour = r + "," + g + "," + b + "," + a;
+    var pixel = ctx.getImageData(x, y, 1, 1);
+    var pr = pixel.data[0],
+        pg = pixel.data[1],
+        pb = pixel.data[2],
+        pa = pixel.data[3];
+    todo(r-d <= pr && pr <= r+d &&
+       g-d <= pg && pg <= g+d &&
+       b-d <= pb && pb <= b+d &&
+       a-d <= pa && pa <= a+d,
+       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
+}
+
+function test_2d_composite_globalAlpha_canvaspattern() {
+
+var canvas = document.getElementById('c36');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = ctx.createPattern(canvas2, 'no-repeat');
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.default.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.default</p>
+<canvas id="c37" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_default() {
+
+var canvas = document.getElementById('c37');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.globalAlpha === 1.0, "ctx.globalAlpha === 1.0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.fill.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.fill</p>
+<canvas id="c38" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_fill() {
+
+var canvas = document.getElementById('c38');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.image.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.image</p>
+<canvas id="c39" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_globalAlpha_image() {
+
+var canvas = document.getElementById('c39');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+ctx.drawImage(document.getElementById('red_1.png'), 0, 0);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.globalAlpha.imagepattern.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.imagepattern - bug 401790</p>
+<canvas id="c40" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_globalAlpha_imagepattern() {
+
+var canvas = document.getElementById('c40');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = ctx.createPattern(document.getElementById('red_2.png'), 'no-repeat');
+ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 2,253,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.globalAlpha.invalid.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.invalid</p>
+<canvas id="c41" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_invalid() {
+
+var canvas = document.getElementById('c41');
+var ctx = canvas.getContext('2d');
+
+ctx.globalAlpha = 0.5;
+var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
+var _thrown = undefined; try {
+  ctx.globalAlpha = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+var _thrown = undefined; try {
+  ctx.globalAlpha = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+var _thrown = undefined; try {
+  ctx.globalAlpha = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.globalAlpha.range.html ]]] -->
+
+<p>Canvas test: 2d.composite.globalAlpha.range</p>
+<canvas id="c42" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_globalAlpha_range() {
+
+var canvas = document.getElementById('c42');
+var ctx = canvas.getContext('2d');
+
+ctx.globalAlpha = 0.5;
+var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
+ctx.globalAlpha = 1.1;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+ctx.globalAlpha = -0.1;
+ok(ctx.globalAlpha == a, "ctx.globalAlpha == a");
+ctx.globalAlpha = 0;
+ok(ctx.globalAlpha == 0, "ctx.globalAlpha == 0");
+ctx.globalAlpha = 1;
+ok(ctx.globalAlpha == 1, "ctx.globalAlpha == 1");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.image.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.copy</p>
+<canvas id="c43" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_copy() {
+
+var canvas = document.getElementById('c43');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.drawImage(document.getElementById('yellow75_12.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_12.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-atop</p>
+<canvas id="c44" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_atop() {
+
+var canvas = document.getElementById('c44');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(document.getElementById('yellow75_13.png'), 0, 0);
+isPixel(ctx, 50,25, 127,255,127,191, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_13.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-in</p>
+<canvas id="c45" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_in() {
+
+var canvas = document.getElementById('c45');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(document.getElementById('yellow75_14.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,255,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_14.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-out</p>
+<canvas id="c46" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_out() {
+
+var canvas = document.getElementById('c46');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.drawImage(document.getElementById('yellow75_15.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,255,31, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_15.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.destination-over</p>
+<canvas id="c47" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_destination_over() {
+
+var canvas = document.getElementById('c47');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.drawImage(document.getElementById('yellow75_16.png'), 0, 0);
+isPixel(ctx, 50,25, 109,255,145,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_16.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.lighter</p>
+<canvas id="c48" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_lighter() {
+
+var canvas = document.getElementById('c48');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.drawImage(document.getElementById('yellow75_17.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,127,255, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_17.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-atop</p>
+<canvas id="c49" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_atop() {
+
+var canvas = document.getElementById('c49');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.drawImage(document.getElementById('yellow75_18.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_18.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-in</p>
+<canvas id="c50" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_in() {
+
+var canvas = document.getElementById('c50');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(document.getElementById('yellow75_19.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_19.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-out</p>
+<canvas id="c51" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_out() {
+
+var canvas = document.getElementById('c51');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(document.getElementById('yellow75_20.png'), 0, 0);
+isPixel(ctx, 50,25, 255,255,0,95, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_20.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.source-over</p>
+<canvas id="c52" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_source_over() {
+
+var canvas = document.getElementById('c52');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.drawImage(document.getElementById('yellow75_21.png'), 0, 0);
+isPixel(ctx, 50,25, 218,255,36,223, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_21.png" class="resource">
+
+<!-- [[[ test_2d.composite.image.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.image.xor</p>
+<canvas id="c53" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_image_xor() {
+
+var canvas = document.getElementById('c53');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.drawImage(document.getElementById('yellow75_22.png'), 0, 0);
+isPixel(ctx, 50,25, 191,255,63,127, 5);
+
+
+}
+</script>
+<img src="image_yellow75.png" id="yellow75_22.png" class="resource">
+
+<!-- [[[ test_2d.composite.operation.casesensitive.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.casesensitive - bug 401788</p>
+<canvas id="c54" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_casesensitive() {
+
+var canvas = document.getElementById('c54');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'Source-over';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.clear.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.clear</p>
+<canvas id="c55" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_clear() {
+
+var canvas = document.getElementById('c55');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'clear';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.darker.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.darker</p>
+<canvas id="c56" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_darker() {
+
+var canvas = document.getElementById('c56');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'darker';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.default.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.default</p>
+<canvas id="c57" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_default() {
+
+var canvas = document.getElementById('c57');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.globalCompositeOperation == 'source-over', "ctx.globalCompositeOperation == 'source-over'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.get.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.get</p>
+<canvas id="c58" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_get() {
+
+var canvas = document.getElementById('c58');
+var ctx = canvas.getContext('2d');
+
+var modes = ['source-atop', 'source-in', 'source-out', 'source-over',
+    'destination-atop', 'destination-in', 'destination-out', 'destination-over',
+    'lighter', 'copy', 'xor'];
+for (var i = 0; i < modes.length; ++i)
+{
+    ctx.globalCompositeOperation = modes[i];
+    ok(ctx.globalCompositeOperation == modes[i], "ctx.globalCompositeOperation == modes[\""+(i)+"\"]");
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.highlight.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.highlight - bug 401788</p>
+<canvas id="c59" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_highlight() {
+
+var canvas = document.getElementById('c59');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'highlight';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.nullsuffix.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.nullsuffix - bug 401788</p>
+<canvas id="c60" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_nullsuffix() {
+
+var canvas = document.getElementById('c60');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'source-over\0';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.over.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.over</p>
+<canvas id="c61" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_over() {
+
+var canvas = document.getElementById('c61');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'over';
+todo(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.operation.unrecognised.html ]]] -->
+
+<p>Canvas test: 2d.composite.operation.unrecognised - bug 401788</p>
+<canvas id="c62" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_composite_operation_unrecognised() {
+
+var canvas = document.getElementById('c62');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.globalCompositeOperation = 'xor';
+ctx.globalCompositeOperation = 'nonexistent';
+ok(ctx.globalCompositeOperation == 'xor', "ctx.globalCompositeOperation == 'xor'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.copy</p>
+<canvas id="c63" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_copy() {
+
+var canvas = document.getElementById('c63');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,0,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-atop</p>
+<canvas id="c64" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_atop() {
+
+var canvas = document.getElementById('c64');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,255,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-in</p>
+<canvas id="c65" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_in() {
+
+var canvas = document.getElementById('c65');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,255,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-out</p>
+<canvas id="c66" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_out() {
+
+var canvas = document.getElementById('c66');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.destination-over</p>
+<canvas id="c67" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_destination_over() {
+
+var canvas = document.getElementById('c67');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,255,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.lighter</p>
+<canvas id="c68" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_lighter() {
+
+var canvas = document.getElementById('c68');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-atop</p>
+<canvas id="c69" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_atop() {
+
+var canvas = document.getElementById('c69');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,0,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-in</p>
+<canvas id="c70" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_in() {
+
+var canvas = document.getElementById('c70');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,0,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-out</p>
+<canvas id="c71" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_out() {
+
+var canvas = document.getElementById('c71');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.source-over</p>
+<canvas id="c72" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_source_over() {
+
+var canvas = document.getElementById('c72');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,0,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.solid.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.solid.xor</p>
+<canvas id="c73" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_solid_xor() {
+
+var canvas = document.getElementById('c73');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.fillStyle = 'rgba(255, 255, 0, 1.0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.copy</p>
+<canvas id="c74" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_copy() {
+
+var canvas = document.getElementById('c74');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,255,191, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-atop</p>
+<canvas id="c75" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_atop() {
+
+var canvas = document.getElementById('c75');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,127,127,191, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-in</p>
+<canvas id="c76" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_in() {
+
+var canvas = document.getElementById('c76');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,95, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-out</p>
+<canvas id="c77" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_out() {
+
+var canvas = document.getElementById('c77');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-out';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,31, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.destination-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.destination-over</p>
+<canvas id="c78" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_destination_over() {
+
+var canvas = document.getElementById('c78');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,145,109,223, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.lighter.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.lighter</p>
+<canvas id="c79" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_lighter() {
+
+var canvas = document.getElementById('c79');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'lighter';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,127,191,255, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-atop</p>
+<canvas id="c80" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_atop() {
+
+var canvas = document.getElementById('c80');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-atop';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,63,191,127, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-in</p>
+<canvas id="c81" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_in() {
+
+var canvas = document.getElementById('c81');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,255,95, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-out</p>
+<canvas id="c82" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_out() {
+
+var canvas = document.getElementById('c82');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,255,95, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.source-over.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.source-over</p>
+<canvas id="c83" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_source_over() {
+
+var canvas = document.getElementById('c83');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-over';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,36,218,223, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.transparent.xor.html ]]] -->
+
+<p>Canvas test: 2d.composite.transparent.xor</p>
+<canvas id="c84" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_composite_transparent_xor() {
+
+var canvas = document.getElementById('c84');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,63,191,127, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.copy</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c85" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_copy() {
+
+var canvas = document.getElementById('c85');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.destination-atop</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c86" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_destination_atop() {
+
+var canvas = document.getElementById('c86');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.destination-in</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c87" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_destination_in() {
+
+var canvas = document.getElementById('c87');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.source-in</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c88" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_source_in() {
+
+var canvas = document.getElementById('c88');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.fill.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.fill.source-out</p>
+<!-- Testing: fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c89" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_fill_source_out() {
+
+var canvas = document.getElementById('c89');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = 'rgba(0, 0, 255, 0.75)';
+ctx.translate(0, 25);
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.composite.uncovered.image.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.copy</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c90" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_copy() {
+
+var canvas = document.getElementById('c90');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.drawImage(document.getElementById('yellow_1.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+todo_isPixel(ctx, 15,15, 0,0,0,0, 5);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_1.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.destination-atop</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c91" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_destination_atop() {
+
+var canvas = document.getElementById('c91');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.drawImage(document.getElementById('yellow_2.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_2.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.destination-in</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c92" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_destination_in() {
+
+var canvas = document.getElementById('c92');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.drawImage(document.getElementById('yellow_3.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_3.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.source-in</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c93" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_source_in() {
+
+var canvas = document.getElementById('c93');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.drawImage(document.getElementById('yellow_4.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_4.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.image.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.image.source-out</p>
+<!-- Testing: drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c94" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_image_source_out() {
+
+var canvas = document.getElementById('c94');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.drawImage(document.getElementById('yellow_5.png'), 40, 40, 10, 10, 40, 50, 10, 10);
+isPixel(ctx, 15,15, 0,0,0,0, 5);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_5.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.copy.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.copy</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c95" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_copy() {
+
+var canvas = document.getElementById('c95');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'copy';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_6.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_6.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.destination-atop.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.destination-atop</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c96" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_destination_atop() {
+
+var canvas = document.getElementById('c96');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_7.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_7.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.destination-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.destination-in</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c97" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_destination_in() {
+
+var canvas = document.getElementById('c97');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_8.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_8.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.source-in.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.source-in</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c98" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_source_in() {
+
+var canvas = document.getElementById('c98');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-in';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_9.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_9.png" class="resource">
+
+<!-- [[[ test_2d.composite.uncovered.pattern.source-out.html ]]] -->
+
+<p>Canvas test: 2d.composite.uncovered.pattern.source-out</p>
+<!-- Testing: Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged. -->
+<canvas id="c99" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_composite_uncovered_pattern_source_out() {
+
+var canvas = document.getElementById('c99');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = 'rgba(0, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'source-out';
+ctx.fillStyle = ctx.createPattern(document.getElementById('yellow_10.png'), 'no-repeat');
+ctx.fillRect(0, 50, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 5);
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_10.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.3arg.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.3arg</p>
+<canvas id="c100" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_3arg() {
+
+var canvas = document.getElementById('c100');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('green_1.png'), 0, 0);
+ctx.drawImage(document.getElementById('red_3.png'), -100, 0);
+ctx.drawImage(document.getElementById('red_3.png'), 100, 0);
+ctx.drawImage(document.getElementById('red_3.png'), 0, -50);
+ctx.drawImage(document.getElementById('red_3.png'), 0, 50);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_3.png" class="resource">
+<img src="image_green.png" id="green_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.5arg.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.5arg</p>
+<canvas id="c101" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_5arg() {
+
+var canvas = document.getElementById('c101');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_2.png'), 50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_4.png'), 0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_4.png" class="resource">
+<img src="image_green.png" id="green_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.basic.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.basic</p>
+<canvas id="c102" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_basic() {
+
+var canvas = document.getElementById('c102');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_3.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_green.png" id="green_3.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.destpos.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.destpos</p>
+<canvas id="c103" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_destpos() {
+
+var canvas = document.getElementById('c103');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_4.png'), 0, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, -100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 100, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 0, -50, 100, 50);
+ctx.drawImage(document.getElementById('red_5.png'), 0, 0, 100, 50, 0, 50, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_5.png" class="resource">
+<img src="image_green.png" id="green_4.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.destsize.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.destsize</p>
+<canvas id="c104" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_destsize() {
+
+var canvas = document.getElementById('c104');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_5.png'), 1, 1, 1, 1, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, -50, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 100, 0, 50, 50);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 0, -25, 100, 25);
+ctx.drawImage(document.getElementById('red_6.png'), 0, 0, 100, 50, 0, 50, 100, 25);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_6.png" class="resource">
+<img src="image_green.png" id="green_5.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.sourcepos.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.sourcepos</p>
+<canvas id="c105" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_sourcepos() {
+
+var canvas = document.getElementById('c105');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256_1.png'), 140, 20, 100, 50, 0, 0, 100, 50);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.9arg.sourcesize.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.9arg.sourcesize</p>
+<canvas id="c106" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_9arg_sourcesize() {
+
+var canvas = document.getElementById('c106');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('rgrg-256x256_2.png'), 0, 0, 256, 256, 0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 51, 26);
+ctx.fillRect(49, 24, 51, 26);
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+isPixel(ctx, 20,20, 0,255,0,255, 2);
+isPixel(ctx, 80,20, 0,255,0,255, 2);
+isPixel(ctx, 20,30, 0,255,0,255, 2);
+isPixel(ctx, 80,30, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.alpha.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.alpha</p>
+<canvas id="c107" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_alpha() {
+
+var canvas = document.getElementById('c107');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalAlpha = 0;
+ctx.drawImage(document.getElementById('red_7.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_7.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.apng.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.apng</p>
+<!-- Testing: drawImage() of an APNG with no poster frame draws the first frame -->
+<canvas id="c108" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function deferTest() {
+    _deferred = true;
+}
+function wrapFunction(f) {
+    return function () {
+        f.apply(null, arguments);
+    };
+}
+
+var canvas108 = document.getElementById('c108');
+var ctx108 = canvas108.getContext('2d');
+var isDone_test_2d_drawImage_animated_apng = false;
+
+function test_2d_drawImage_animated_apng() {
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx108.drawImage(document.getElementById('anim-gr_1.png'), 0, 0);
+    todo_isPixel(ctx108, 50,25, 0,255,0,255, 2);
+	isDone_test_2d_drawImage_animated_apng = true;
+}), 5000);
+
+
+}
+</script>
+<img src="image_anim-gr.png" id="anim-gr_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.gif.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.gif</p>
+<!-- Testing: drawImage() of an animated GIF draws the first frame -->
+<canvas id="c109" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas109 = document.getElementById('c109');
+var ctx109 = canvas109.getContext('2d');
+var isDone_test_2d_drawImage_animated_gif = false;
+
+function test_2d_drawImage_animated_gif() {
+
+deferTest();
+setTimeout(wrapFunction(function () {
+    ctx109.drawImage(document.getElementById('anim-gr_1.gif'), 0, 0);
+    todo_isPixel(ctx109, 50,25, 0,255,0,255, 2);
+	isDone_test_2d_drawImage_animated_gif = true;
+}), 5000);
+
+
+}
+</script>
+<img src="image_anim-gr.gif" id="anim-gr_1.gif" class="resource">
+
+<!-- [[[ test_2d.drawImage.animated.poster.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.animated.poster</p>
+<!-- Testing: drawImage() of an APNG draws the poster frame -->
+<canvas id="c110" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas110 = document.getElementById('c110');
+var ctx110 = canvas110.getContext('2d');
+
+
+function test_2d_drawImage_animated_poster() {
+
+ctx110.drawImage(document.getElementById('anim-poster-gr_1.png'), 0, 0);
+todo_isPixel(ctx110, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_anim-poster-gr.png" id="anim-poster-gr_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.broken.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.broken</p>
+<canvas id="c111" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_broken() {
+
+var canvas = document.getElementById('c111');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('broken_1.png');
+todo(img.complete === false, "img.complete === false");
+var _thrown = undefined; try {
+  ctx.drawImage(img, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
+
+
+}
+</script>
+<img src="image_broken.png" id="broken_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.canvas.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.canvas</p>
+<canvas id="c112" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_canvas() {
+
+var canvas = document.getElementById('c112');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.drawImage(canvas2, 0, 0);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.clip.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.clip</p>
+<canvas id="c113" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_clip() {
+
+var canvas = document.getElementById('c113');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.rect(-10, -10, 1, 1);
+ctx.clip();
+ctx.drawImage(document.getElementById('red_8.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_8.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.composite.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.composite</p>
+<canvas id="c114" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_composite() {
+
+var canvas = document.getElementById('c114');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'destination-over';
+ctx.drawImage(document.getElementById('red_9.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_9.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.floatsource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.floatsource</p>
+<canvas id="c115" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_floatsource() {
+
+var canvas = document.getElementById('c115');
+var ctx = canvas.getContext('2d');
+
+ctx.drawImage(document.getElementById('green_6.png'), 10.1, 10.1, 0.1, 0.1, 0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_green.png" id="green_6.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.incomplete.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.incomplete</p>
+<canvas id="c116" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_incomplete() {
+
+var canvas = document.getElementById('c116');
+var ctx = canvas.getContext('2d');
+
+var img = new Image();
+todo(img.complete === false, "img.complete === false");
+var _thrown = undefined; try {
+  ctx.drawImage(img, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.negativedest.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.negativedest</p>
+<canvas id="c117" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_negativedest() {
+
+var canvas = document.getElementById('c117');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256_1.png'), 100, 78, 50, 50, 0, 50, 50, -50);
+ctx.drawImage(document.getElementById('ggrr-256x256_1.png'), 100, 128, 50, -50, 100, 50, -50, -50);
+isPixel(ctx, 1,1, 0,255,0,255, 2);
+isPixel(ctx, 1,48, 0,255,0,255, 2);
+isPixel(ctx, 98,1, 0,255,0,255, 2);
+isPixel(ctx, 98,48, 0,255,0,255, 2);
+isPixel(ctx, 48,1, 0,255,0,255, 2);
+isPixel(ctx, 48,48, 0,255,0,255, 2);
+isPixel(ctx, 51,1, 0,255,0,255, 2);
+isPixel(ctx, 51,48, 0,255,0,255, 2);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.negativesource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.negativesource</p>
+<canvas id="c118" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_negativesource() {
+
+var canvas = document.getElementById('c118');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256_2.png'), 100, 78, -100, 50, 0, 0, 50, 50);
+ctx.drawImage(document.getElementById('ggrr-256x256_2.png'), 100, 128, -100, -50, 50, 0, 50, 50);
+isPixel(ctx, 1,1, 0,255,0,255, 2);
+isPixel(ctx, 1,48, 0,255,0,255, 2);
+isPixel(ctx, 98,1, 0,255,0,255, 2);
+isPixel(ctx, 98,48, 0,255,0,255, 2);
+isPixel(ctx, 48,1, 0,255,0,255, 2);
+isPixel(ctx, 48,48, 0,255,0,255, 2);
+isPixel(ctx, 51,1, 0,255,0,255, 2);
+isPixel(ctx, 51,48, 0,255,0,255, 2);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_2.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.nonfinite</p>
+<!-- Testing: drawImage() with Infinity/NaN is ignored -->
+<canvas id="c119" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_nonfinite() {
+
+var canvas = document.getElementById('c119');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var red = document.getElementById('red_10.png');
+ctx.drawImage(red, Infinity, 0);
+ctx.drawImage(red, -Infinity, 0);
+ctx.drawImage(red, NaN, 0);
+ctx.drawImage(red, 0, Infinity);
+ctx.drawImage(red, 0, -Infinity);
+ctx.drawImage(red, 0, NaN);
+ctx.drawImage(red, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50);
+ctx.drawImage(red, -Infinity, 0, 100, 50);
+ctx.drawImage(red, NaN, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, -Infinity, 100, 50);
+ctx.drawImage(red, 0, NaN, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, -Infinity, 50);
+ctx.drawImage(red, 0, 0, NaN, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, -Infinity);
+ctx.drawImage(red, 0, 0, 100, NaN);
+ctx.drawImage(red, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, -Infinity, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, NaN, 0, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, -Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, NaN, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, -Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, NaN, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, -Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, NaN, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, -Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, NaN, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, -Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, NaN, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, -Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, NaN, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, -Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, 100, NaN);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, Infinity, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, Infinity, 0, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, Infinity, 100, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, Infinity, 50, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, Infinity, 0, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, Infinity, 0, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, 50);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, Infinity, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, Infinity, 100, Infinity);
+ctx.drawImage(red, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_red.png" id="red_10.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.nowrap.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.nowrap</p>
+<!-- Testing: Stretched images do not get pixels wrapping around the edges -->
+<canvas id="c120" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_nowrap() {
+
+var canvas = document.getElementById('c120');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('redtransparent_1.png'), -1950, 0, 2000, 50);
+isPixel(ctx, 45,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 55,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_1.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.null.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.null</p>
+<canvas id="c121" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_null() {
+
+var canvas = document.getElementById('c121');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.drawImage(null, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.outsidesource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.outsidesource</p>
+<canvas id="c122" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_drawImage_outsidesource() {
+
+var canvas = document.getElementById('c122');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.drawImage(document.getElementById('green_7.png'), 10.5, 10.5, 89.5, 39.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_7.png'), 5.5, 5.5, -5.5, -5.5, 0, 0, 100, 50);
+ctx.drawImage(document.getElementById('green_7.png'), 100, 50, -5, -5, 0, 0, 100, 50);
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), -0.001, 0, 100, 50, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 0, -0.001, 100, 50, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 0, 0, 100.001, 50, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 0, 0, 100, 50.001, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 50, 0, 50.001, 50, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 0, 0, -5, 5, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 0, 0, 5, -5, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_11.png'), 110, 60, -20, -20, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+todo_isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+<img src="image_green.png" id="green_7.png" class="resource">
+<img src="image_red.png" id="red_11.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.path.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.path</p>
+<canvas id="c123" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_path() {
+
+var canvas = document.getElementById('c123');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 100, 50);
+ctx.drawImage(document.getElementById('red_12.png'), 0, 0);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_12.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.self.1.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.self.1 - bug 433235</p>
+<canvas id="c124" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_self_1() {
+
+var canvas = document.getElementById('c124');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.drawImage(canvas, 50, 0);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.self.2.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.self.2 - bug 433235</p>
+<canvas id="c125" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_self_2() {
+
+var canvas = document.getElementById('c125');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 1, 100, 49);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 1);
+ctx.drawImage(canvas, 0, 1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 2);
+
+isPixel(ctx, 0,0, 0,255,0,255, 2);
+isPixel(ctx, 99,0, 0,255,0,255, 2);
+isPixel(ctx, 0,49, 0,255,0,255, 2);
+isPixel(ctx, 99,49, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.transform.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.transform</p>
+<canvas id="c126" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_transform() {
+
+var canvas = document.getElementById('c126');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(100, 0);
+ctx.drawImage(document.getElementById('red_13.png'), 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_13.png" class="resource">
+
+<!-- [[[ test_2d.drawImage.wrongtype.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.wrongtype</p>
+<canvas id="c127" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_drawImage_wrongtype() {
+
+var canvas = document.getElementById('c127');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.drawImage(undefined, 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(0, 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage("", 0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.createElement('p'), 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.drawImage.zerosource.html ]]] -->
+
+<p>Canvas test: 2d.drawImage.zerosource</p>
+<!-- Testing: drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR -->
+<canvas id="c128" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_drawImage_zerosource() {
+
+var canvas = document.getElementById('c128');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_14.png'), 10, 10, 0, 1, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_14.png'), 10, 10, 1, 0, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(document.getElementById('red_14.png'), 10, 10, 0, 0, 0, 0, 100, 50);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_red.png" id="red_14.png" class="resource">
+
+<!-- [[[ test_2d.fillRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.basic</p>
+<canvas id="c129" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_basic() {
+
+var canvas = document.getElementById('c129');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.clip</p>
+<canvas id="c130" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_clip() {
+
+var canvas = document.getElementById('c130');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 16);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.negative</p>
+<canvas id="c131" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_negative() {
+
+var canvas = document.getElementById('c131');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 25);
+ctx.fillRect(100, 0, -50, 25);
+ctx.fillRect(0, 50, 50, -25);
+ctx.fillRect(100, 50, -50, -25);
+isPixel(ctx, 25,12, 0,255,0,255, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.nonfinite</p>
+<!-- Testing: fillRect() with Infinity/NaN is ignored -->
+<canvas id="c132" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_nonfinite() {
+
+var canvas = document.getElementById('c132');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(Infinity, 0, 100, 50);
+ctx.fillRect(-Infinity, 0, 100, 50);
+ctx.fillRect(NaN, 0, 100, 50);
+ctx.fillRect(0, Infinity, 100, 50);
+ctx.fillRect(0, -Infinity, 100, 50);
+ctx.fillRect(0, NaN, 100, 50);
+ctx.fillRect(0, 0, Infinity, 50);
+ctx.fillRect(0, 0, -Infinity, 50);
+ctx.fillRect(0, 0, NaN, 50);
+ctx.fillRect(0, 0, 100, Infinity);
+ctx.fillRect(0, 0, 100, -Infinity);
+ctx.fillRect(0, 0, 100, NaN);
+ctx.fillRect(Infinity, Infinity, 100, 50);
+ctx.fillRect(Infinity, Infinity, Infinity, 50);
+ctx.fillRect(Infinity, Infinity, Infinity, Infinity);
+ctx.fillRect(Infinity, Infinity, 100, Infinity);
+ctx.fillRect(Infinity, 0, Infinity, 50);
+ctx.fillRect(Infinity, 0, Infinity, Infinity);
+ctx.fillRect(Infinity, 0, 100, Infinity);
+ctx.fillRect(0, Infinity, Infinity, 50);
+ctx.fillRect(0, Infinity, Infinity, Infinity);
+ctx.fillRect(0, Infinity, 100, Infinity);
+ctx.fillRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.path.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.path</p>
+<canvas id="c133" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_path() {
+
+var canvas = document.getElementById('c133');
+var ctx = canvas.getContext('2d');
+
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 16, 16);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.shadow</p>
+<canvas id="c134" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_shadow() {
+
+var canvas = document.getElementById('c134');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 50;
+
+// Shadows are optional, so just test that if they apply to fill() then they apply to fillRect() too
+ctx.beginPath();
+ctx.rect(0, -50, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.fill();
+
+ctx.shadowColor = '#0f0';
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.transform</p>
+<canvas id="c135" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_transform() {
+
+var canvas = document.getElementById('c135');
+var ctx = canvas.getContext('2d');
+
+ctx.scale(10, 10);
+ctx.translate(0, 5);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, -5, 10, 5);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillRect.zero.html ]]] -->
+
+<p>Canvas test: 2d.fillRect.zero</p>
+<canvas id="c136" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillRect_zero() {
+
+var canvas = document.getElementById('c136');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 0);
+ctx.fillRect(0, 0, 0, 50);
+ctx.fillRect(0, 0, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.default.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.default</p>
+<canvas id="c137" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_default() {
+
+var canvas = document.getElementById('c137');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.fillStyle == '#000000', "ctx.fillStyle == '#000000'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.semitransparent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.semitransparent</p>
+<canvas id="c138" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_semitransparent() {
+
+var canvas = document.getElementById('c138');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgba(255,255,255,0.45)';
+ok(ctx.fillStyle =~ /^rgba\(255, 255, 255, 0\.4\d+\)$/, "ctx.fillStyle =~ /^rgba\\(255, 255, 255, 0\\.4\\d+\\)$/");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.solid.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.solid</p>
+<canvas id="c139" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_solid() {
+
+var canvas = document.getElementById('c139');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#fa0';
+ok(ctx.fillStyle === '#ffaa00', "ctx.fillStyle === '#ffaa00'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.get.transparent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.get.transparent</p>
+<canvas id="c140" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_get_transparent() {
+
+var canvas = document.getElementById('c140');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgba(0,0,0,0)';
+ok(ctx.fillStyle == 'rgba(0, 0, 0, 0.0)', "ctx.fillStyle == 'rgba(0, 0, 0, 0.0)'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.invalidstring.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.invalidstring</p>
+<canvas id="c141" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_invalidstring() {
+
+var canvas = document.getElementById('c141');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillStyle = 'invalid';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.invalidtype.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.invalidtype</p>
+<canvas id="c142" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_invalidtype() {
+
+var canvas = document.getElementById('c142');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillStyle = null;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.basic.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.basic</p>
+<!-- Testing: currentColor is computed from the canvas element -->
+<canvas id="c143" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_basic() {
+
+var canvas = document.getElementById('c143');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('style', 'color: #0f0');
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'currentColor';
+ctx.fillRect(0, 0, 100, 50);
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.changed.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.changed</p>
+<!-- Testing: currentColor is computed when the attribute is set, not when it is painted -->
+<canvas id="c144" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_changed() {
+
+var canvas = document.getElementById('c144');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('style', 'color: #0f0');
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'currentColor';
+canvas.setAttribute('style', 'color: #f00');
+ctx.fillRect(0, 0, 100, 50);
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.current.removed.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.current.removed</p>
+<!-- Testing: currentColor is solid black when the canvas element is not in a document -->
+<canvas id="c145" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_fillStyle_parse_current_removed() {
+
+var canvas = document.getElementById('c145');
+var ctx = canvas.getContext('2d');
+
+// Try not to let it undetectably incorrectly pick up opaque-black
+// from other parts of the document:
+document.body.parentNode.setAttribute('style', 'color: #f00');
+document.body.setAttribute('style', 'color: #f00');
+canvas.setAttribute('style', 'color: #f00');
+
+var canvas2 = document.createElement('canvas');
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillStyle = 'currentColor';
+ctx2.fillRect(0, 0, 100, 50);
+ctx.drawImage(canvas2, 0, 0);
+
+document.body.parentNode.removeAttribute('style');
+document.body.removeAttribute('style');
+
+todo_isPixel(ctx, 50,25, 0,0,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hex3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hex3</p>
+<canvas id="c146" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hex3() {
+
+var canvas = document.getElementById('c146');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hex6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hex6</p>
+<canvas id="c147" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hex6() {
+
+var canvas = document.getElementById('c147');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = '#00fF00';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-1</p>
+<canvas id="c148" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_1() {
+
+var canvas = document.getElementById('c148');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 100%, 50%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-2</p>
+<canvas id="c149" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_2() {
+
+var canvas = document.getElementById('c149');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl( -240 , 100% , 50% )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-3</p>
+<canvas id="c150" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_3() {
+
+var canvas = document.getElementById('c150');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(360120, 100%, 50%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-4</p>
+<canvas id="c151" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_4() {
+
+var canvas = document.getElementById('c151');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(-360240, 100%, 50%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-5</p>
+<canvas id="c152" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_5() {
+
+var canvas = document.getElementById('c152');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120.0, 100.0%, 50.0%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-1</p>
+<canvas id="c153" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_1() {
+
+var canvas = document.getElementById('c153');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 200%, 50%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-2</p>
+<canvas id="c154" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_2() {
+
+var canvas = document.getElementById('c154');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, -200%, 49.9%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 127,127,127,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-3</p>
+<canvas id="c155" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_3() {
+
+var canvas = document.getElementById('c155');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 100%, 200%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsl-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsl-clamp-4</p>
+<canvas id="c156" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsl_clamp_4() {
+
+var canvas = document.getElementById('c156');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsl(120, 100%, -200%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-1</p>
+<canvas id="c157" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_1() {
+
+var canvas = document.getElementById('c157');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 50%, 0.499)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,127, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-2</p>
+<canvas id="c158" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_2() {
+
+var canvas = document.getElementById('c158');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla( 120.0 , 100.0% , 50.0% , 1 )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-1</p>
+<canvas id="c159" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_1() {
+
+var canvas = document.getElementById('c159');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 200%, 50%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-2</p>
+<canvas id="c160" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_2() {
+
+var canvas = document.getElementById('c160');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, -200%, 49.9%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 127,127,127,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-3</p>
+<canvas id="c161" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_3() {
+
+var canvas = document.getElementById('c161');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 200%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 255,255,255,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-4</p>
+<canvas id="c162" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_4() {
+
+var canvas = document.getElementById('c162');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, -200%, 1)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-5</p>
+<canvas id="c163" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_5() {
+
+var canvas = document.getElementById('c163');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 50%, 2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.hsla-clamp-6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.hsla-clamp-6</p>
+<canvas id="c164" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_hsla_clamp_6() {
+
+var canvas = document.getElementById('c164');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'hsla(120, 100%, 0%, -2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.html4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.html4</p>
+<canvas id="c165" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_html4() {
+
+var canvas = document.getElementById('c165');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'limE';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hex3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hex3</p>
+<canvas id="c166" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hex3() {
+
+var canvas = document.getElementById('c166');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = '#g00'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hex6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hex6</p>
+<canvas id="c167" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hex6() {
+
+var canvas = document.getElementById('c167');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = '#fg0000'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-1</p>
+<canvas id="c168" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_1() {
+
+var canvas = document.getElementById('c168');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(0%, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-2</p>
+<canvas id="c169" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_2() {
+
+var canvas = document.getElementById('c169');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(z, 100%, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-3</p>
+<canvas id="c170" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_3() {
+
+var canvas = document.getElementById('c170');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 0, 50%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-4</p>
+<canvas id="c171" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_4() {
+
+var canvas = document.getElementById('c171');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 100%, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsl-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsl-5</p>
+<canvas id="c172" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsl_5() {
+
+var canvas = document.getElementById('c172');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsl(0, 100%, 100%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsla-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsla-1</p>
+<canvas id="c173" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsla_1() {
+
+var canvas = document.getElementById('c173');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsla(0%, 100%, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.hsla-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.hsla-2</p>
+<canvas id="c174" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_hsla_2() {
+
+var canvas = document.getElementById('c174');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'hsla(0, 0, 50%, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-1</p>
+<canvas id="c175" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_1() {
+
+var canvas = document.getElementById('c175');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255.0, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-2</p>
+<canvas id="c176" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_2() {
+
+var canvas = document.getElementById('c176');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255, 0.0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-3</p>
+<canvas id="c177" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_3() {
+
+var canvas = document.getElementById('c177');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255.0, 0, 0,)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-4</p>
+<canvas id="c178" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_4() {
+
+var canvas = document.getElementById('c178');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(100%, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-5</p>
+<canvas id="c179" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_5() {
+
+var canvas = document.getElementById('c179');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255 0 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-6.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-6</p>
+<canvas id="c180" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_6() {
+
+var canvas = document.getElementById('c180');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255, - 1, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgb-7.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgb-7</p>
+<canvas id="c181" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgb_7() {
+
+var canvas = document.getElementById('c181');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgb(255, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-1</p>
+<canvas id="c182" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_1() {
+
+var canvas = document.getElementById('c182');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgba(255, 0, 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-2</p>
+<canvas id="c183" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_2() {
+
+var canvas = document.getElementById('c183');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgba(255.0, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-3</p>
+<canvas id="c184" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_3() {
+
+var canvas = document.getElementById('c184');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgba(100%, 0, 0, 1)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-4</p>
+<canvas id="c185" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_4() {
+
+var canvas = document.getElementById('c185');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgba(255, 0, 0, 100%)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.rgba-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.rgba-5</p>
+<canvas id="c186" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_rgba_5() {
+
+var canvas = document.getElementById('c186');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'rgba(255, 0, 0, 1. 0)'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-1</p>
+<canvas id="c187" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_1() {
+
+var canvas = document.getElementById('c187');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-1000, 1000, -1000)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-2</p>
+<canvas id="c188" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_2() {
+
+var canvas = document.getElementById('c188');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-200%, 200%, -200%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-3</p>
+<canvas id="c189" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_3() {
+
+var canvas = document.getElementById('c189');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-2147483649, 4294967298, -18446744073709551619)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-4.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-4</p>
+<canvas id="c190" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_4() {
+
+var canvas = document.getElementById('c190');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-1000000000000000000000000000000000000000, 1000000000000000000000000000000000000000, -1000000000000000000000000000000000000000)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-clamp-5.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-clamp-5</p>
+<canvas id="c191" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_clamp_5() {
+
+var canvas = document.getElementById('c191');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(-10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, -10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-num.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-num</p>
+<canvas id="c192" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_num() {
+
+var canvas = document.getElementById('c192');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(0,255,0)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgb-percent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgb-percent</p>
+<canvas id="c193" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgb_percent() {
+
+var canvas = document.getElementById('c193');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgb(0% ,100% ,0%)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-clamp-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-clamp-1</p>
+<canvas id="c194" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_clamp_1() {
+
+var canvas = document.getElementById('c194');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(0, 255, 0, -2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-clamp-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-clamp-2</p>
+<canvas id="c195" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_clamp_2() {
+
+var canvas = document.getElementById('c195');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(0, 255, 0, 2)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-num-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-num-1</p>
+<canvas id="c196" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_num_1() {
+
+var canvas = document.getElementById('c196');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  .499  )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,127, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-num-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-num-2</p>
+<canvas id="c197" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_num_2() {
+
+var canvas = document.getElementById('c197');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  0.499  )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,127, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-percent.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-percent</p>
+<canvas id="c198" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_percent() {
+
+var canvas = document.getElementById('c198');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(0%,100%,0%,0.499)';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,127, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-solid-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-solid-1</p>
+<canvas id="c199" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_solid_1() {
+
+var canvas = document.getElementById('c199');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1  )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.rgba-solid-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.rgba-solid-2</p>
+<canvas id="c200" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_rgba_solid_2() {
+
+var canvas = document.getElementById('c200');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'rgba(  0  ,  255  ,  0  ,  1.0  )';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.svg-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.svg-1</p>
+<canvas id="c201" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_svg_1() {
+
+var canvas = document.getElementById('c201');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'gray';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 128,128,128,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.svg-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.svg-2</p>
+<canvas id="c202" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_svg_2() {
+
+var canvas = document.getElementById('c202');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'grey';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 128,128,128,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.system.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.system</p>
+<canvas id="c203" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_fillStyle_parse_system() {
+
+var canvas = document.getElementById('c203');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'ThreeDDarkShadow';
+ok(ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/, "ctx.fillStyle =~ /^#(?!(FF0000|ff0000|f00)$)/"); // test that it's not red
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.transparent-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.transparent-1</p>
+<canvas id="c204" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_transparent_1() {
+
+var canvas = document.getElementById('c204');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'transparent';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.transparent-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.transparent-2</p>
+<canvas id="c205" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_transparent_2() {
+
+var canvas = document.getElementById('c205');
+var ctx = canvas.getContext('2d');
+
+
+ctx.fillStyle = '#f00';
+ctx.fillStyle = 'TrAnSpArEnT';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.exists.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.exists</p>
+<!-- Testing: The 2D context is implemented -->
+<canvas id="c206" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_getcontext_exists() {
+
+var canvas = document.getElementById('c206');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d') !== null, "canvas.getContext('2d') !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.shared.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.shared</p>
+<!-- Testing: getContext('2d') returns objects which share canvas state -->
+<canvas id="c207" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_getcontext_shared() {
+
+var canvas = document.getElementById('c207');
+var ctx = canvas.getContext('2d');
+
+var ctx2 = canvas.getContext('2d');
+ctx.fillStyle = '#f00';
+ctx2.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.getcontext.unique.html ]]] -->
+
+<p>Canvas test: 2d.getcontext.unique</p>
+<!-- Testing: getContext('2d') returns the same object -->
+<canvas id="c208" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_getcontext_unique() {
+
+var canvas = document.getElementById('c208');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d') === canvas.getContext('2d'), "canvas.getContext('2d') === canvas.getContext('2d')");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.empty.html ]]] -->
+
+<p>Canvas test: 2d.gradient.empty</p>
+<canvas id="c209" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_empty() {
+
+var canvas = document.getElementById('c209');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+var g = ctx.createLinearGradient(0, 0, 0, 50);
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.alpha.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.alpha</p>
+<canvas id="c210" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_alpha() {
+
+var canvas = document.getElementById('c210');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, 'rgba(0,0,255, 0)');
+g.addColorStop(1, 'rgba(0,0,255, 1)');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 25,25, 191,191,63,255, 3);
+isPixel(ctx, 50,25, 127,127,127,255, 3);
+isPixel(ctx, 75,25, 63,63,191,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.colour.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.colour</p>
+<canvas id="c211" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_colour() {
+
+var canvas = document.getElementById('c211');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#ff0');
+g.addColorStop(1, '#00f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 25,25, 191,191,63,255, 3);
+isPixel(ctx, 50,25, 127,127,127,255, 3);
+isPixel(ctx, 75,25, 63,63,191,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.colouralpha.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.colouralpha</p>
+<canvas id="c212" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_colouralpha() {
+
+var canvas = document.getElementById('c212');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, 'rgba(255,255,0, 0)');
+g.addColorStop(1, 'rgba(0,0,255, 1)');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 25,25, 191,191,63,63, 3);
+isPixel(ctx, 50,25, 127,127,127,127, 3);
+isPixel(ctx, 75,25, 63,63,191,191, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.multiple.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.multiple</p>
+<canvas id="c213" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_multiple() {
+
+var canvas = document.getElementById('c213');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 200;
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#ff0');
+g.addColorStop(0.5, '#0ff');
+g.addColorStop(1, '#f0f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 200, 50);
+isPixel(ctx, 50,25, 127,255,127,255, 3);
+isPixel(ctx, 100,25, 0,255,255,255, 3);
+isPixel(ctx, 150,25, 127,127,255,255, 3);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.outside.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.outside</p>
+<canvas id="c214" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_outside() {
+
+var canvas = document.getElementById('c214');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createLinearGradient(25, 0, 75, 0);
+g.addColorStop(0.4, '#0f0');
+g.addColorStop(0.6, '#0f0');
+
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 20,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 80,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.overlap.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.overlap</p>
+<canvas id="c215" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_overlap() {
+
+var canvas = document.getElementById('c215');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 200;
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0, '#ff0');
+g.addColorStop(0.25, '#00f');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.25, '#ff0');
+g.addColorStop(0.5, '#00f');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.75, '#00f');
+g.addColorStop(0.75, '#f00');
+g.addColorStop(0.75, '#ff0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.5, '#ff0');
+g.addColorStop(1, '#00f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 200, 50);
+isPixel(ctx, 49,25, 0,0,255,255, 16);
+isPixel(ctx, 51,25, 255,255,0,255, 16);
+isPixel(ctx, 99,25, 0,0,255,255, 16);
+isPixel(ctx, 101,25, 255,255,0,255, 16);
+isPixel(ctx, 149,25, 0,0,255,255, 16);
+isPixel(ctx, 151,25, 255,255,0,255, 16);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.overlap2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.overlap2</p>
+<canvas id="c216" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_overlap2() {
+
+var canvas = document.getElementById('c216');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+var ps = [ 0, 1/10, 1/4, 1/3, 1/2, 3/4, 1 ];
+for (var p = 0; p < ps.length; ++p)
+{
+        g.addColorStop(ps[p], '#0f0');
+        for (var i = 0; i < 15; ++i)
+                g.addColorStop(ps[p], '#f00');
+        g.addColorStop(ps[p], '#0f0');
+}
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 30,25, 0,255,0,255, 0);
+isPixel(ctx, 40,25, 0,255,0,255, 0);
+isPixel(ctx, 60,25, 0,255,0,255, 0);
+isPixel(ctx, 80,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.solid.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.solid</p>
+<canvas id="c217" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_solid() {
+
+var canvas = document.getElementById('c217');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.vertical.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.vertical</p>
+<canvas id="c218" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_interpolate_vertical() {
+
+var canvas = document.getElementById('c218');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 0, 50);
+g.addColorStop(0, '#ff0');
+g.addColorStop(1, '#00f');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,12, 191,191,63,255, 10);
+isPixel(ctx, 50,25, 127,127,127,255, 5);
+isPixel(ctx, 50,37, 63,63,191,255, 10);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.interpolate.zerosize.html ]]] -->
+
+<p>Canvas test: 2d.gradient.interpolate.zerosize</p>
+<canvas id="c219" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_interpolate_zerosize() {
+
+var canvas = document.getElementById('c219');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createLinearGradient(50, 25, 50, 25); // zero-length line (undefined direction)
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+todo_isPixel(ctx, 40,20, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.nonfinite</p>
+<!-- Testing: createLinearGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c220" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_linear_nonfinite() {
+
+var canvas = document.getElementById('c220');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(-Infinity, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(NaN, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, -Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, NaN, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, -Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, NaN, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, Infinity, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(Infinity, 0, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, Infinity, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, Infinity, 1, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.1</p>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c221" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_linear_transform_1() {
+
+var canvas = document.getElementById('c221');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-50, 0);
+ctx.fillRect(50, 0, 100, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.2</p>
+<!-- Testing: Linear gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c222" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_linear_transform_2() {
+
+var canvas = document.getElementById('c222');
+var ctx = canvas.getContext('2d');
+
+ctx.translate(100, 0);
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-150, 0);
+ctx.fillRect(50, 0, 100, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.linear.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.linear.transform.3</p>
+<!-- Testing: Linear gradient transforms do not experience broken caching effects -->
+<canvas id="c223" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_linear_transform_3() {
+
+var canvas = document.getElementById('c223');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.25, '#0f0');
+g.addColorStop(0.75, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(-50, 0);
+ctx.fillRect(50, 0, 100, 50);
+todo_isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.compare.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.compare</p>
+<canvas id="c224" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_compare() {
+
+var canvas = document.getElementById('c224');
+var ctx = canvas.getContext('2d');
+
+var g1 = ctx.createLinearGradient(0, 0, 100, 0);
+var g2 = ctx.createLinearGradient(0, 0, 100, 0);
+ok(g1 !== g2, "g1 !== g2");
+ctx.fillStyle = g1;
+ok(ctx.fillStyle === g1, "ctx.fillStyle === g1");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.crosscanvas.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.crosscanvas</p>
+<canvas id="c225" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_object_crosscanvas() {
+
+var canvas = document.getElementById('c225');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var g = document.createElement('canvas').getContext('2d').createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.invalidcolour.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.invalidcolour</p>
+<canvas id="c226" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_invalidcolour() {
+
+var canvas = document.getElementById('c226');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+var _thrown = undefined; try {
+  g.addColorStop(0, "");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(0, 'undefined');
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.invalidoffset.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.invalidoffset</p>
+<canvas id="c227" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_invalidoffset() {
+
+var canvas = document.getElementById('c227');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+var _thrown = undefined; try {
+  g.addColorStop(-1, '#000');
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(2, '#000');
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(Infinity, '#000');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(-Infinity, '#000');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(NaN, '#000');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.return.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.return</p>
+<!-- Testing: createLinearGradient() and createRadialGradient() returns objects implementing CanvasGradient -->
+<canvas id="c228" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_return() {
+
+var canvas = document.getElementById('c228');
+var ctx = canvas.getContext('2d');
+
+window.CanvasGradient.prototype.thisImplementsCanvasGradient = true;
+
+var g1 = ctx.createLinearGradient(0, 0, 100, 0);
+ok(g1.addColorStop !== undefined, "g1.addColorStop !== undefined");
+ok(g1.thisImplementsCanvasGradient === true, "g1.thisImplementsCanvasGradient === true");
+
+var g2 = ctx.createRadialGradient(0, 0, 10, 0, 0, 20);
+ok(g2.addColorStop !== undefined, "g2.addColorStop !== undefined");
+ok(g2.thisImplementsCanvasGradient === true, "g2.thisImplementsCanvasGradient === true");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.type.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.type</p>
+<!-- Testing: window.CanvasGradient exists and has the right properties -->
+<canvas id="c229" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_object_type() {
+
+var canvas = document.getElementById('c229');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasGradient !== undefined, "window.CanvasGradient !== undefined");
+ok(window.CanvasGradient.prototype.addColorStop !== undefined, "window.CanvasGradient.prototype.addColorStop !== undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.object.update.html ]]] -->
+
+<p>Canvas test: 2d.gradient.object.update</p>
+<canvas id="c230" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_object_update() {
+
+var canvas = document.getElementById('c230');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createLinearGradient(-100, 0, 200, 0);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+g.addColorStop(0.1, '#0f0');
+g.addColorStop(0.9, '#0f0');
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.behind.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.behind</p>
+<canvas id="c231" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_behind() {
+
+var canvas = document.getElementById('c231');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, 25, 10, 211, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.beside.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.beside</p>
+<canvas id="c232" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_beside() {
+
+var canvas = document.getElementById('c232');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(0, 100, 40, 100, 100, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.bottom.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.bottom</p>
+<canvas id="c233" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_bottom() {
+
+var canvas = document.getElementById('c233');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(210, 25, 100, 230, 25, 101);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.cylinder.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.cylinder</p>
+<canvas id="c234" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_cylinder() {
+
+var canvas = document.getElementById('c234');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(210, 25, 100, 230, 25, 100);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.front.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.front</p>
+<canvas id="c235" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_front() {
+
+var canvas = document.getElementById('c235');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(311, 25, 10, 210, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.shape1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.shape1</p>
+<canvas id="c236" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_shape1() {
+
+var canvas = document.getElementById('c236');
+var ctx = canvas.getContext('2d');
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(30+tol, 40);
+ctx.lineTo(110, -20+tol);
+ctx.lineTo(110, 100-tol);
+ctx.fill();
+
+var g = ctx.createRadialGradient(30+10*5/2, 40, 10*3/2, 30+10*15/4, 40, 10*9/4);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.shape2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.shape2</p>
+<canvas id="c237" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_cone_shape2() {
+
+var canvas = document.getElementById('c237');
+var ctx = canvas.getContext('2d');
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(30+10*5/2, 40, 10*3/2, 30+10*15/4, 40, 10*9/4);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(30-tol, 40);
+ctx.lineTo(110, -20-tol);
+ctx.lineTo(110, 100+tol);
+ctx.fill();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.cone.top.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.cone.top</p>
+<canvas id="c238" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_cone_top() {
+
+var canvas = document.getElementById('c238');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(230, 25, 100, 100, 25, 101);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.equal.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.equal</p>
+<canvas id="c239" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_equal() {
+
+var canvas = document.getElementById('c239');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 20, 50, 25, 20);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside1</p>
+<canvas id="c240" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside1() {
+
+var canvas = document.getElementById('c240');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 100, 50, 25, 200);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside2</p>
+<canvas id="c241" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside2() {
+
+var canvas = document.getElementById('c241');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.inside3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.inside3</p>
+<canvas id="c242" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_inside3() {
+
+var canvas = document.getElementById('c242');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(50, 25, 200, 50, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.993, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.negative.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.negative</p>
+<!-- Testing: createRadialGradient() throws INDEX_SIZE_ERR if either radius is negative -->
+<canvas id="c243" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_radial_negative() {
+
+var canvas = document.getElementById('c243');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, -0.1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, -0.1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, -0.1, 0, 0, -0.1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.nonfinite</p>
+<!-- Testing: createRadialGradient() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c244" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_gradient_radial_nonfinite() {
+
+var canvas = document.getElementById('c244');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(-Infinity, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(NaN, 0, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, -Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, NaN, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, -Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, NaN, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, -Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, NaN, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, -Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, NaN, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, Infinity, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(Infinity, 0, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, Infinity, 1, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, Infinity, 0, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, Infinity, 0, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside1</p>
+<canvas id="c245" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_outside1() {
+
+var canvas = document.getElementById('c245');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 10, 200, 25, 20);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#0f0');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside2</p>
+<canvas id="c246" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_outside2() {
+
+var canvas = document.getElementById('c246');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.outside3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.outside3</p>
+<canvas id="c247" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_outside3() {
+
+var canvas = document.getElementById('c247');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(200, 25, 20, 200, 25, 10);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.001, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch1</p>
+<canvas id="c248" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch1() {
+
+var canvas = document.getElementById('c248');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(150, 25, 50, 200, 25, 100);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch2</p>
+<canvas id="c249" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch2() {
+
+var canvas = document.getElementById('c249');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(-80, 25, 70, 0, 25, 150);
+g.addColorStop(0, '#f00');
+g.addColorStop(0.01, '#0f0');
+g.addColorStop(0.99, '#0f0');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.touch3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.touch3</p>
+<canvas id="c250" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_touch3() {
+
+var canvas = document.getElementById('c250');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var g = ctx.createRadialGradient(120, -15, 25, 140, -30, 50);
+g.addColorStop(0, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.1</p>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c251" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_transform_1() {
+
+var canvas = document.getElementById('c251');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.2</p>
+<!-- Testing: Radial gradient coordinates are relative to the coordinate space at the time of filling -->
+<canvas id="c252" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_gradient_radial_transform_2() {
+
+var canvas = document.getElementById('c252');
+var ctx = canvas.getContext('2d');
+
+ctx.translate(100, 0);
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.translate(-50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.gradient.radial.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.gradient.radial.transform.3</p>
+<!-- Testing: Radial gradient transforms do not experience broken caching effects -->
+<canvas id="c253" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_gradient_radial_transform_3() {
+
+var canvas = document.getElementById('c253');
+var ctx = canvas.getContext('2d');
+
+var g = ctx.createRadialGradient(0, 0, 0, 0, 0, 11.2);
+g.addColorStop(0, '#0f0');
+g.addColorStop(0.5, '#0f0');
+g.addColorStop(0.51, '#f00');
+g.addColorStop(1, '#f00');
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+ctx.translate(50, 25);
+ctx.scale(10, 10);
+ctx.fillRect(-5, -2.5, 10, 5);
+todo_isPixel(ctx, 25,25, 0,255,0,255, 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+todo_isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.basic - bug 433004</p>
+<!-- Testing: createImageData() exists and returns something -->
+<canvas id="c254" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_basic() {
+
+var canvas = document.getElementById('c254');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.createImageData(1, 1) !== null, "ctx.createImageData(1, 1) !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.initial.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.initial - bug 433004</p>
+<!-- Testing: createImageData() returns transparent black data of the right size -->
+<canvas id="c255" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_initial() {
+
+var canvas = document.getElementById('c255');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.createImageData(10, 20);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
+ok(imgdata.width > 0, "imgdata.width > 0");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; ++i)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.large.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.large - bug 433004</p>
+<!-- Testing: createImageData() works for sizes much larger than the canvas -->
+<canvas id="c256" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_large() {
+
+var canvas = document.getElementById('c256');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+
+var imgdata = ctx.createImageData(1000, 2000);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
+ok(imgdata.width > 0, "imgdata.width > 0");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assuming normal scaling)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.negative - bug 433004</p>
+<!-- Testing: createImageData() takes the absolute magnitude of the size arguments -->
+<canvas id="c257" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_negative() {
+
+var canvas = document.getElementById('c257');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata1 = ctx.createImageData(10, 20);
+var imgdata2 = ctx.createImageData(-10, 20);
+var imgdata3 = ctx.createImageData(10, -20);
+var imgdata4 = ctx.createImageData(-10, -20);
+ok(imgdata1.data.length == imgdata2.data.length, "imgdata1.data.length == imgdata2.data.length");
+ok(imgdata2.data.length == imgdata3.data.length, "imgdata2.data.length == imgdata3.data.length");
+ok(imgdata3.data.length == imgdata4.data.length, "imgdata3.data.length == imgdata4.data.length");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.nonfinite - bug 433004</p>
+<!-- Testing: createImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c258" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_nonfinite() {
+
+var canvas = document.getElementById('c258');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createImageData(Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(-Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.round.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.round - bug 433004</p>
+<!-- Testing: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h) -->
+<canvas id="c259" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_round() {
+
+var canvas = document.getElementById('c259');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+
+var imgdata1 = ctx.createImageData(10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
+ok(imgdata1.width == imgdata2.width, "imgdata1.width == imgdata2.width");
+ok(imgdata1.height == imgdata2.height, "imgdata1.height == imgdata2.height");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.tiny.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.tiny - bug 433004</p>
+<!-- Testing: createImageData() works for sizes smaller than one pixel -->
+<canvas id="c260" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_tiny() {
+
+var canvas = document.getElementById('c260');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.createImageData(0.0001, 0.0001);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width == 1, "imgdata.width == 1");
+ok(imgdata.height == 1, "imgdata.height == 1");
+var isTransparentBlack = true;
+for (var i = 0; i < imgdata.data.length; ++i)
+    if (imgdata.data[i] !== 0)
+        isTransparentBlack = false;
+ok(isTransparentBlack, "isTransparentBlack");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.type.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.type - bug 433004</p>
+<!-- Testing: createImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<canvas id="c261" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_type() {
+
+var canvas = document.getElementById('c261');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
+window.ImageData.prototype.thisImplementsImageData = true;
+window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+var imgdata = ctx.createImageData(1, 1);
+ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
+ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.create.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.create.zero - bug 433004</p>
+<!-- Testing: createImageData() throws INDEX_SIZE_ERR if size is zero -->
+<canvas id="c262" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_create_zero() {
+
+var canvas = document.getElementById('c262');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createImageData(10, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(0, 10);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.createImageData(0, 0);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.basic</p>
+<!-- Testing: getImageData() exists and returns something -->
+<canvas id="c263" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_basic() {
+
+var canvas = document.getElementById('c263');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.getImageData(0, 0, 100, 50) !== null, "ctx.getImageData(0, 0, 100, 50) !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.clamp.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.clamp</p>
+<!-- Testing: getImageData() clamps colours to the range [0, 255] -->
+<canvas id="c264" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_clamp() {
+
+var canvas = document.getElementById('c264');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgb(-100, -200, -300)';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = 'rgb(256, 300, 400)';
+ctx.fillRect(20, 10, 60, 10);
+var imgdata1 = ctx.getImageData(10, 5, 1, 1);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+var imgdata2 = ctx.getImageData(30, 15, 1, 1);
+ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
+ok(imgdata2.data[1] === 255, "imgdata2.data[\""+(1)+"\"] === 255");
+ok(imgdata2.data[2] === 255, "imgdata2.data[\""+(2)+"\"] === 255");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.nonfinite</p>
+<!-- Testing: getImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c265" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_nonfinite() {
+
+var canvas = document.getElementById('c265');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(-Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(NaN, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, -Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, NaN, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, -Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, 10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.nonpremul.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.nonpremul</p>
+<!-- Testing: getImageData() returns non-premultiplied colours -->
+<canvas id="c266" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_nonpremul() {
+
+var canvas = document.getElementById('c266');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgba(255, 255, 255, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(10, 10, 10, 10);
+ok(imgdata.data[0] > 200, "imgdata.data[\""+(0)+"\"] > 200");
+ok(imgdata.data[1] > 200, "imgdata.data[\""+(1)+"\"] > 200");
+ok(imgdata.data[2] > 200, "imgdata.data[\""+(2)+"\"] > 200");
+ok(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
+ok(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.alpha.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.alpha</p>
+<!-- Testing: getImageData() returns A in the fourth component -->
+<canvas id="c267" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_alpha() {
+
+var canvas = document.getElementById('c267');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
+ctx.fillRect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
+ok(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.cols.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.cols</p>
+<!-- Testing: getImageData() returns leftmost columns first -->
+<canvas id="c268" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_cols() {
+
+var canvas = document.getElementById('c268');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#fff';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 2, 50);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+ok(imgdata.data[Math.round(imgdata.width/2*4)] === 255, "imgdata.data[Math.round(imgdata.width/2*4)] === 255");
+ok(imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0, "imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.rgb.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.rgb</p>
+<!-- Testing: getImageData() returns R then G then B -->
+<canvas id="c269" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_rgb() {
+
+var canvas = document.getElementById('c269');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#48c';
+ctx.fillRect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(imgdata.data[0] === 0x44, "imgdata.data[\""+(0)+"\"] === 0x44");
+ok(imgdata.data[1] === 0x88, "imgdata.data[\""+(1)+"\"] === 0x88");
+ok(imgdata.data[2] === 0xCC, "imgdata.data[\""+(2)+"\"] === 0xCC");
+ok(imgdata.data[3] === 255, "imgdata.data[\""+(3)+"\"] === 255");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.order.rows.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.order.rows</p>
+<!-- Testing: getImageData() returns topmost rows first -->
+<canvas id="c270" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_order_rows() {
+
+var canvas = document.getElementById('c270');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#fff';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 2);
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+ok(imgdata.data[Math.floor(imgdata.width/2*4)] === 0, "imgdata.data[Math.floor(imgdata.width/2*4)] === 0");
+ok(imgdata.data[(imgdata.height/2)*imgdata.width*4] === 255, "imgdata.data[(imgdata.height/2)*imgdata.width*4] === 255");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.range.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.range</p>
+<!-- Testing: getImageData() returns values in the range [0, 255] -->
+<canvas id="c271" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_range() {
+
+var canvas = document.getElementById('c271');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#fff';
+ctx.fillRect(20, 10, 60, 10);
+var imgdata1 = ctx.getImageData(10, 5, 1, 1);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+var imgdata2 = ctx.getImageData(30, 15, 1, 1);
+ok(imgdata2.data[0] === 255, "imgdata2.data[\""+(0)+"\"] === 255");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.negative</p>
+<!-- Testing: getImageData() works with negative width and height -->
+<canvas id="c272" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_negative() {
+
+var canvas = document.getElementById('c272');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#fff';
+ctx.fillRect(20, 10, 60, 10);
+
+var imgdata1 = ctx.getImageData(85, 25, -10, -10);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+ok(imgdata1.data[3] === 255, "imgdata1.data[\""+(3)+"\"] === 255");
+ok(imgdata1.data[imgdata1.length-4+0] === 255, "imgdata1.data[imgdata1.length-4+0] === 255");
+ok(imgdata1.data[imgdata1.length-4+1] === 255, "imgdata1.data[imgdata1.length-4+1] === 255");
+ok(imgdata1.data[imgdata1.length-4+2] === 255, "imgdata1.data[imgdata1.length-4+2] === 255");
+ok(imgdata1.data[imgdata1.length-4+3] === 255, "imgdata1.data[imgdata1.length-4+3] === 255");
+
+var imgdata2 = ctx.getImageData(0, 0, -1, -1);
+ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
+ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
+ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
+ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.outside.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.outside</p>
+<!-- Testing: getImageData() returns transparent black outside the canvas -->
+<canvas id="c273" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_outside() {
+
+var canvas = document.getElementById('c273');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#08f';
+ctx.fillRect(0, 0, 100, 50);
+
+var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
+ok(imgdata1.data[0] === 0, "imgdata1.data[\""+(0)+"\"] === 0");
+ok(imgdata1.data[1] === 0, "imgdata1.data[\""+(1)+"\"] === 0");
+ok(imgdata1.data[2] === 0, "imgdata1.data[\""+(2)+"\"] === 0");
+ok(imgdata1.data[3] === 0, "imgdata1.data[\""+(3)+"\"] === 0");
+
+var imgdata2 = ctx.getImageData(10, -5, 1, 1);
+ok(imgdata2.data[0] === 0, "imgdata2.data[\""+(0)+"\"] === 0");
+ok(imgdata2.data[1] === 0, "imgdata2.data[\""+(1)+"\"] === 0");
+ok(imgdata2.data[2] === 0, "imgdata2.data[\""+(2)+"\"] === 0");
+ok(imgdata2.data[3] === 0, "imgdata2.data[\""+(3)+"\"] === 0");
+
+var imgdata3 = ctx.getImageData(200, 5, 1, 1);
+ok(imgdata3.data[0] === 0, "imgdata3.data[\""+(0)+"\"] === 0");
+ok(imgdata3.data[1] === 0, "imgdata3.data[\""+(1)+"\"] === 0");
+ok(imgdata3.data[2] === 0, "imgdata3.data[\""+(2)+"\"] === 0");
+ok(imgdata3.data[3] === 0, "imgdata3.data[\""+(3)+"\"] === 0");
+
+var imgdata4 = ctx.getImageData(10, 60, 1, 1);
+ok(imgdata4.data[0] === 0, "imgdata4.data[\""+(0)+"\"] === 0");
+ok(imgdata4.data[1] === 0, "imgdata4.data[\""+(1)+"\"] === 0");
+ok(imgdata4.data[2] === 0, "imgdata4.data[\""+(2)+"\"] === 0");
+ok(imgdata4.data[3] === 0, "imgdata4.data[\""+(3)+"\"] === 0");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.source.size.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.source.size</p>
+<!-- Testing: getImageData() returns bigger ImageData for bigger source rectangle -->
+<canvas id="c274" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_source_size() {
+
+var canvas = document.getElementById('c274');
+var ctx = canvas.getContext('2d');
+
+var imgdata1 = ctx.getImageData(0, 0, 10, 10);
+var imgdata2 = ctx.getImageData(0, 0, 20, 20);
+ok(imgdata2.width > imgdata1.width, "imgdata2.width > imgdata1.width");
+ok(imgdata2.height > imgdata1.height, "imgdata2.height > imgdata1.height");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.tiny.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.tiny</p>
+<!-- Testing: getImageData() works for sizes smaller than one pixel -->
+<canvas id="c275" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_tiny() {
+
+var canvas = document.getElementById('c275');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
+ok(imgdata.data.length == imgdata.width*imgdata.height*4, "imgdata.data.length == imgdata.width*imgdata.height*4");
+ok(imgdata.width == 1, "imgdata.width == 1");
+ok(imgdata.height == 1, "imgdata.height == 1");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.type.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.type</p>
+<!-- Testing: getImageData() returns an ImageData object containing a CanvasPixelArray object -->
+<canvas id="c276" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_type() {
+
+var canvas = document.getElementById('c276');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+todo(window.CanvasPixelArray !== undefined, "window.CanvasPixelArray !== undefined");
+window.ImageData.prototype.thisImplementsImageData = true;
+window.CanvasPixelArray.prototype.thisImplementsCanvasPixelArray = true;
+var imgdata = ctx.getImageData(0, 0, 1, 1);
+ok(imgdata.thisImplementsImageData, "imgdata.thisImplementsImageData");
+ok(imgdata.data.thisImplementsCanvasPixelArray, "imgdata.data.thisImplementsCanvasPixelArray");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.unaffected</p>
+<!-- Testing: getImageData() is not affected by context state -->
+<canvas id="c277" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_get_unaffected() {
+
+var canvas = document.getElementById('c277');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50)
+ctx.save();
+ctx.translate(50, 0);
+ctx.globalAlpha = 0.1;
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.shadowColor = '#f00';
+ctx.rect(0, 0, 5, 5);
+ctx.clip();
+var imgdata = ctx.getImageData(0, 0, 50, 50);
+ctx.restore();
+ctx.putImageData(imgdata, 50, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.get.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.get.zero</p>
+<!-- Testing: getImageData() throws INDEX_SIZE_ERR if size is zero -->
+<canvas id="c278" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_get_zero() {
+
+var canvas = document.getElementById('c278');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 10, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 0, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+var _thrown = undefined; try {
+  ctx.getImageData(1, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.clamp.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.clamp</p>
+<!-- Testing: ImageData.data clamps numbers to [0, 255] -->
+<canvas id="c279" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_clamp() {
+
+var canvas = document.getElementById('c279');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 300;
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -100;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = 200+Math.pow(2, 32);
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -200-Math.pow(2, 32);
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = Math.pow(10, 39);
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+imgdata.data[0] = 100;
+imgdata.data[0] = -Math.pow(10, 39);
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+imgdata.data[0] = 100;
+imgdata.data[0] = -Infinity;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 100;
+imgdata.data[0] = Infinity;
+todo(imgdata.data[0] === 255, "imgdata.data[\""+(0)+"\"] === 255");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.ctor.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.ctor</p>
+<!-- Testing: ImageData does not have a usable constructor -->
+<canvas id="c280" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_ctor() {
+
+var canvas = document.getElementById('c280');
+var ctx = canvas.getContext('2d');
+
+todo(window.ImageData !== undefined, "window.ImageData !== undefined");
+try { var _thrown = false;
+  new window.ImageData(1,1);
+} catch (e) { _thrown = true; } finally { ok(_thrown, "should throw exception"); }
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.nan.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.nan</p>
+<!-- Testing: ImageData.data converts NaN to 0 -->
+<canvas id="c281" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_nan() {
+
+var canvas = document.getElementById('c281');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = NaN;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 100;
+imgdata.data[0] = "cheese";
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.properties.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.properties</p>
+<!-- Testing: ImageData objects have the right properties -->
+<canvas id="c282" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_properties() {
+
+var canvas = document.getElementById('c282');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+ok(typeof(imgdata.width) == 'number', "typeof(imgdata.width) == 'number'");
+ok(typeof(imgdata.height) == 'number', "typeof(imgdata.height) == 'number'");
+ok(typeof(imgdata.data) == 'object', "typeof(imgdata.data) == 'object'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.readonly.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.readonly</p>
+<!-- Testing: ImageData objects properties are read-only -->
+<canvas id="c283" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_readonly() {
+
+var canvas = document.getElementById('c283');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+var w = imgdata.width;
+var h = imgdata.height;
+var d = imgdata.data;
+imgdata.width = 123;
+imgdata.height = 123;
+imgdata.data = [100,100,100,100];
+todo(imgdata.width === w, "imgdata.width === w");
+todo(imgdata.height === h, "imgdata.height === h");
+todo(imgdata.data === d, "imgdata.data === d");
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+todo(imgdata.data[1] === 0, "imgdata.data[\""+(1)+"\"] === 0");
+todo(imgdata.data[2] === 0, "imgdata.data[\""+(2)+"\"] === 0");
+todo(imgdata.data[3] === 0, "imgdata.data[\""+(3)+"\"] === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.round.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.round</p>
+<!-- Testing: ImageData.data rounds numbers with convertToIntegerTiesToEven -->
+<canvas id="c284" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_round() {
+
+var canvas = document.getElementById('c284');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 0.499;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 0.5;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+imgdata.data[0] = 0.501;
+todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
+imgdata.data[0] = 1.499;
+todo(imgdata.data[0] === 1, "imgdata.data[\""+(0)+"\"] === 1");
+imgdata.data[0] = 1.5;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 1.501;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 2.5;
+todo(imgdata.data[0] === 2, "imgdata.data[\""+(0)+"\"] === 2");
+imgdata.data[0] = 3.5;
+todo(imgdata.data[0] === 4, "imgdata.data[\""+(0)+"\"] === 4");
+imgdata.data[0] = 252.5;
+todo(imgdata.data[0] === 252, "imgdata.data[\""+(0)+"\"] === 252");
+imgdata.data[0] = 253.5;
+todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
+imgdata.data[0] = 254.5;
+todo(imgdata.data[0] === 254, "imgdata.data[\""+(0)+"\"] === 254");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.set.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.set</p>
+<!-- Testing: ImageData.data can be modified -->
+<canvas id="c285" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_set() {
+
+var canvas = document.getElementById('c285');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+ok(imgdata.data[0] === 100, "imgdata.data[\""+(0)+"\"] === 100");
+imgdata.data[0] = 200;
+ok(imgdata.data[0] === 200, "imgdata.data[\""+(0)+"\"] === 200");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.string.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.string</p>
+<!-- Testing: ImageData.data converts strings to numbers with ToNumber -->
+<canvas id="c286" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_string() {
+
+var canvas = document.getElementById('c286');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = "110";
+todo(imgdata.data[0] === 110, "imgdata.data[\""+(0)+"\"] === 110");
+imgdata.data[0] = 100;
+imgdata.data[0] = "0x78";
+todo(imgdata.data[0] === 120, "imgdata.data[\""+(0)+"\"] === 120");
+imgdata.data[0] = 100;
+imgdata.data[0] = " +130e0 ";
+todo(imgdata.data[0] === 130, "imgdata.data[\""+(0)+"\"] === 130");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.object.undefined.html ]]] -->
+
+<p>Canvas test: 2d.imageData.object.undefined</p>
+<!-- Testing: ImageData.data converts undefined to 0 -->
+<canvas id="c287" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_object_undefined() {
+
+var canvas = document.getElementById('c287');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+imgdata.data[0] = 100;
+imgdata.data[0] = undefined;
+todo(imgdata.data[0] === 0, "imgdata.data[\""+(0)+"\"] === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.alpha.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.alpha</p>
+<!-- Testing: putImageData() puts non-solid image data correctly -->
+<canvas id="c288" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_alpha() {
+
+var canvas = document.getElementById('c288');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.25)';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,64, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.basic.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.basic</p>
+<!-- Testing: putImageData() puts image data from getImageData() onto the canvas -->
+<canvas id="c289" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_basic() {
+
+var canvas = document.getElementById('c289');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.clip.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.clip - bug 433397</p>
+<!-- Testing: putImageData() is not affected by clipping regions -->
+<canvas id="c290" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_imageData_put_clip() {
+
+var canvas = document.getElementById('c290');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.created.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.created - bug 433004</p>
+<!-- Testing: putImageData() puts image data from createImageData() onto the canvas -->
+<canvas id="c291" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_created() {
+
+var canvas = document.getElementById('c291');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.createImageData(100, 50);
+for (var i = 0; i < imgdata.data.length; i += 4) {
+    imgdata.data[i] = 0;
+    imgdata.data[i+1] = 255;
+    imgdata.data[i+2] = 0;
+    imgdata.data[i+3] = 255;
+}
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.cross.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.cross</p>
+<!-- Testing: putImageData() accepts image data got from a different canvas -->
+<canvas id="c292" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_cross() {
+
+var canvas = document.getElementById('c292');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50)
+var imgdata = ctx2.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.negative.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.negative</p>
+<!-- Testing: putImageData() handles negative-sized dirty rectangles correctly -->
+<canvas id="c293" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_negative() {
+
+var canvas = document.getElementById('c293');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.outside.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.outside</p>
+<!-- Testing: putImageData() handles dirty rectangles outside the canvas correctly -->
+<canvas id="c294" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_outside() {
+
+var canvas = document.getElementById('c294');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+
+ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
+ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
+ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
+ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 98,15, 0,255,0,255, 2);
+isPixel(ctx, 98,25, 0,255,0,255, 2);
+isPixel(ctx, 98,45, 0,255,0,255, 2);
+isPixel(ctx, 1,5, 0,255,0,255, 2);
+isPixel(ctx, 1,25, 0,255,0,255, 2);
+isPixel(ctx, 1,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.rect1.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.rect1</p>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using width and height -->
+<canvas id="c295" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_rect1() {
+
+var canvas = document.getElementById('c295');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.rect2.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.rect2</p>
+<!-- Testing: putImageData() only modifies areas inside the dirty rectangle, using x and y -->
+<canvas id="c296" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_dirty_rect2() {
+
+var canvas = document.getElementById('c296');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#0f0';
+ctx.fillRect(60, 30, 20, 20)
+
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(40, 20, 20, 20)
+ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 35,25, 0,255,0,255, 2);
+isPixel(ctx, 65,25, 0,255,0,255, 2);
+isPixel(ctx, 50,15, 0,255,0,255, 2);
+isPixel(ctx, 50,45, 0,255,0,255, 2);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.dirty.zero.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.dirty.zero</p>
+<!-- Testing: putImageData() with zero-sized dirty rectangle puts nothing -->
+<canvas id="c297" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_imageData_put_dirty_zero() {
+
+var canvas = document.getElementById('c297');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
+todo_isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.modified.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.modified</p>
+<!-- Testing: putImageData() puts modified image data correctly -->
+<canvas id="c298" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_modified() {
+
+var canvas = document.getElementById('c298');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+ctx.fillStyle = '#f00';
+ctx.fillRect(45, 20, 10, 10)
+var imgdata = ctx.getImageData(45, 20, 10, 10);
+for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
+{
+    imgdata.data[i] = 0;
+    imgdata.data[i+1] = 255;
+}
+ctx.putImageData(imgdata, 45, 20);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.nonfinite</p>
+<!-- Testing: putImageData() throws NOT_SUPPORTED_ERR if arguments are not finite -->
+<canvas id="c299" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_nonfinite() {
+
+var canvas = document.getElementById('c299');
+var ctx = canvas.getContext('2d');
+
+var imgdata = ctx.getImageData(0, 0, 10, 10);
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, -Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, -Infinity, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, NaN, 10, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, -Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, NaN, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, -Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, NaN, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, -Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, NaN, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, -Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, NaN, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, -Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, 10, NaN);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, Infinity, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, Infinity, 10, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, Infinity, 10, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, Infinity, 10, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, 10);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.null.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.null - bug 421715</p>
+<!-- Testing: putImageData() with null imagedata throws TYPE_MISMATCH_ERR -->
+<canvas id="c300" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_null() {
+
+var canvas = document.getElementById('c300');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.putImageData(null, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.path.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.path</p>
+<!-- Testing: putImageData() does not affect the current path -->
+<canvas id="c301" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_path() {
+
+var canvas = document.getElementById('c301');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.rect(0, 0, 100, 50);
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.putImageData(imgdata, 0, 0);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.unaffected</p>
+<!-- Testing: putImageData() is not affected by context state -->
+<canvas id="c302" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_imageData_put_unaffected() {
+
+var canvas = document.getElementById('c302');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50)
+var imgdata = ctx.getImageData(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50)
+ctx.globalAlpha = 0.1;
+ctx.globalCompositeOperation = 'destination-atop';
+ctx.shadowColor = '#f00';
+ctx.translate(100, 50);
+ctx.scale(0.1, 0.1);
+ctx.putImageData(imgdata, 0, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.unchanged.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.unchanged</p>
+<!-- Testing: putImageData(getImageData(...), ...) has no effect -->
+<canvas id="c303" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_unchanged() {
+
+var canvas = document.getElementById('c303');
+var ctx = canvas.getContext('2d');
+
+var i = 0;
+for (var y = 0; y < 16; ++y) {
+    for (var x = 0; x < 16; ++x, ++i) {
+        ctx.fillStyle = 'rgba(' + i + ',' + (Math.floor(i*1.5) % 256) + ',' + (Math.floor(i*23.3) % 256) + ',' + (i/256) + ')';
+        ctx.fillRect(x, y, 1, 1);
+    }
+}
+var imgdata1 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
+var olddata = [];
+for (var i = 0; i < imgdata1.data.length; ++i)
+    olddata[i] = imgdata1.data[i];
+
+ctx.putImageData(imgdata1, 0.1, 0.2);
+
+var imgdata2 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
+for (var i = 0; i < imgdata2.data.length; ++i) {
+    ok(olddata[i] === imgdata2.data[i], "olddata[\""+(i)+"\"] === imgdata2.data[\""+(i)+"\"]");
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imageData.put.wrongtype.html ]]] -->
+
+<p>Canvas test: 2d.imageData.put.wrongtype</p>
+<!-- Testing: putImageData() does not accept non-ImageData objects -->
+<canvas id="c304" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_imageData_put_wrongtype() {
+
+var canvas = document.getElementById('c304');
+var ctx = canvas.getContext('2d');
+
+var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
+var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData("cheese", 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+var _thrown = undefined; try {
+  ctx.putImageData(42, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.butt.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.butt</p>
+<!-- Testing: lineCap 'butt' is rendered correctly -->
+<canvas id="c305" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_butt() {
+
+var canvas = document.getElementById('c305');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineCap = 'butt';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 25,14, 0,255,0,255, 0);
+isPixel(ctx, 25,15, 0,255,0,255, 0);
+isPixel(ctx, 25,16, 0,255,0,255, 0);
+isPixel(ctx, 25,34, 0,255,0,255, 0);
+isPixel(ctx, 25,35, 0,255,0,255, 0);
+isPixel(ctx, 25,36, 0,255,0,255, 0);
+
+isPixel(ctx, 75,14, 0,255,0,255, 0);
+isPixel(ctx, 75,15, 0,255,0,255, 0);
+isPixel(ctx, 75,16, 0,255,0,255, 0);
+isPixel(ctx, 75,34, 0,255,0,255, 0);
+isPixel(ctx, 75,35, 0,255,0,255, 0);
+isPixel(ctx, 75,36, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.closed.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.closed</p>
+<!-- Testing: Line caps are not drawn at the corners of an unclosed rectangle -->
+<canvas id="c306" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_closed() {
+
+var canvas = document.getElementById('c306');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'bevel';
+ctx.lineCap = 'square';
+ctx.lineWidth = 400;
+
+ctx.beginPath();
+ctx.moveTo(200, 200);
+ctx.lineTo(200, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 200);
+ctx.closePath();
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.invalid - bug 401788</p>
+<!-- Testing: Setting lineCap to invalid values is ignored -->
+<canvas id="c307" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_cap_invalid() {
+
+var canvas = document.getElementById('c307');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineCap = 'butt'
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'invalid';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'ROUND';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'round\0';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'round ';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = "";
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+ctx.lineCap = 'butt';
+ctx.lineCap = 'bevel';
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.open.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.open</p>
+<!-- Testing: Line caps are drawn at the corners of an unclosed rectangle -->
+<canvas id="c308" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_open() {
+
+var canvas = document.getElementById('c308');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'bevel';
+ctx.lineCap = 'square';
+ctx.lineWidth = 400;
+
+ctx.beginPath();
+ctx.moveTo(200, 200);
+ctx.lineTo(200, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 200);
+ctx.lineTo(200, 200);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.round.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.round</p>
+<!-- Testing: lineCap 'round' is rendered correctly -->
+<canvas id="c309" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_round() {
+
+var canvas = document.getElementById('c309');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineCap = 'round';
+ctx.lineWidth = 20;
+
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.beginPath();
+ctx.moveTo(35-tol, 15);
+ctx.arc(25, 15, 10-tol, 0, Math.PI, true);
+ctx.arc(25, 35, 10-tol, Math.PI, 0, true);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(85+tol, 15);
+ctx.arc(75, 15, 10+tol, 0, Math.PI, true);
+ctx.arc(75, 35, 10+tol, Math.PI, 0, true);
+ctx.fill();
+
+isPixel(ctx, 17,6, 0,255,0,255, 0);
+isPixel(ctx, 25,6, 0,255,0,255, 0);
+isPixel(ctx, 32,6, 0,255,0,255, 0);
+isPixel(ctx, 17,43, 0,255,0,255, 0);
+isPixel(ctx, 25,43, 0,255,0,255, 0);
+isPixel(ctx, 32,43, 0,255,0,255, 0);
+
+isPixel(ctx, 67,6, 0,255,0,255, 0);
+isPixel(ctx, 75,6, 0,255,0,255, 0);
+isPixel(ctx, 82,6, 0,255,0,255, 0);
+isPixel(ctx, 67,43, 0,255,0,255, 0);
+isPixel(ctx, 75,43, 0,255,0,255, 0);
+isPixel(ctx, 82,43, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cap.square.html ]]] -->
+
+<p>Canvas test: 2d.line.cap.square</p>
+<!-- Testing: lineCap 'square' is rendered correctly -->
+<canvas id="c310" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cap_square() {
+
+var canvas = document.getElementById('c310');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineCap = 'square';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 5, 20, 40);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 5, 20, 40);
+
+isPixel(ctx, 25,4, 0,255,0,255, 0);
+isPixel(ctx, 25,5, 0,255,0,255, 0);
+isPixel(ctx, 25,6, 0,255,0,255, 0);
+isPixel(ctx, 25,44, 0,255,0,255, 0);
+isPixel(ctx, 25,45, 0,255,0,255, 0);
+isPixel(ctx, 25,46, 0,255,0,255, 0);
+
+isPixel(ctx, 75,4, 0,255,0,255, 0);
+isPixel(ctx, 75,5, 0,255,0,255, 0);
+isPixel(ctx, 75,6, 0,255,0,255, 0);
+isPixel(ctx, 75,44, 0,255,0,255, 0);
+isPixel(ctx, 75,45, 0,255,0,255, 0);
+isPixel(ctx, 75,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.cross.html ]]] -->
+
+<p>Canvas test: 2d.line.cross</p>
+<canvas id="c311" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_cross() {
+
+var canvas = document.getElementById('c311');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 200;
+ctx.lineJoin = 'bevel';
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(110, 50);
+ctx.lineTo(110, 60);
+ctx.lineTo(100, 60);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.defaults.html ]]] -->
+
+<p>Canvas test: 2d.line.defaults</p>
+<canvas id="c312" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_defaults() {
+
+var canvas = document.getElementById('c312');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.lineWidth === 1, "ctx.lineWidth === 1");
+ok(ctx.lineCap === 'butt', "ctx.lineCap === 'butt'");
+ok(ctx.lineJoin === 'miter', "ctx.lineJoin === 'miter'");
+ok(ctx.miterLimit === 10, "ctx.miterLimit === 10");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.bevel.html ]]] -->
+
+<p>Canvas test: 2d.line.join.bevel</p>
+<!-- Testing: lineJoin 'bevel' is rendered correctly -->
+<canvas id="c313" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_bevel() {
+
+var canvas = document.getElementById('c313');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineJoin = 'bevel';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 20, 20);
+ctx.fillRect(20, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(30, 20);
+ctx.lineTo(40-tol, 20);
+ctx.lineTo(30, 10+tol);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 20, 20);
+ctx.fillRect(70, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(80, 20);
+ctx.lineTo(90+tol, 20);
+ctx.lineTo(80, 10-tol);
+ctx.fill();
+
+isPixel(ctx, 34,16, 0,255,0,255, 0);
+isPixel(ctx, 34,15, 0,255,0,255, 0);
+isPixel(ctx, 35,15, 0,255,0,255, 0);
+isPixel(ctx, 36,15, 0,255,0,255, 0);
+isPixel(ctx, 36,14, 0,255,0,255, 0);
+
+isPixel(ctx, 84,16, 0,255,0,255, 0);
+isPixel(ctx, 84,15, 0,255,0,255, 0);
+isPixel(ctx, 85,15, 0,255,0,255, 0);
+isPixel(ctx, 86,15, 0,255,0,255, 0);
+isPixel(ctx, 86,14, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.closed.html ]]] -->
+
+<p>Canvas test: 2d.line.join.closed</p>
+<!-- Testing: Line joins are drawn at the corner of a closed rectangle -->
+<canvas id="c314" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_closed() {
+
+var canvas = document.getElementById('c314');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 200;
+
+ctx.beginPath();
+ctx.moveTo(100, 50);
+ctx.lineTo(100, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 50);
+ctx.closePath();
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.join.invalid - bug 401788</p>
+<!-- Testing: Setting lineJoin to invalid values is ignored -->
+<canvas id="c315" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_join_invalid() {
+
+var canvas = document.getElementById('c315');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineJoin = 'bevel'
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'invalid';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'ROUND';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'round\0';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'round ';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = "";
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+ctx.lineJoin = 'bevel';
+ctx.lineJoin = 'butt';
+ok(ctx.lineJoin === 'bevel', "ctx.lineJoin === 'bevel'");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.miter.html ]]] -->
+
+<p>Canvas test: 2d.line.join.miter</p>
+<!-- Testing: lineJoin 'miter' is rendered correctly -->
+<canvas id="c316" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_miter() {
+
+var canvas = document.getElementById('c316');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 30, 20);
+ctx.fillRect(20, 10, 20, 30);
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 30, 20);
+ctx.fillRect(70, 10, 20, 30);
+
+isPixel(ctx, 38,12, 0,255,0,255, 0);
+isPixel(ctx, 39,11, 0,255,0,255, 0);
+isPixel(ctx, 40,10, 0,255,0,255, 0);
+isPixel(ctx, 41,9, 0,255,0,255, 0);
+isPixel(ctx, 42,8, 0,255,0,255, 0);
+
+isPixel(ctx, 88,12, 0,255,0,255, 0);
+isPixel(ctx, 89,11, 0,255,0,255, 0);
+isPixel(ctx, 90,10, 0,255,0,255, 0);
+isPixel(ctx, 91,9, 0,255,0,255, 0);
+isPixel(ctx, 92,8, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.open.html ]]] -->
+
+<p>Canvas test: 2d.line.join.open</p>
+<!-- Testing: Line joins are not drawn at the corner of an unclosed rectangle -->
+<canvas id="c317" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_open() {
+
+var canvas = document.getElementById('c317');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineJoin = 'miter';
+ctx.lineWidth = 200;
+
+ctx.beginPath();
+ctx.moveTo(100, 50);
+ctx.lineTo(100, 1000);
+ctx.lineTo(1000, 1000);
+ctx.lineTo(1000, 50);
+ctx.lineTo(100, 50);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.parallel.html ]]] -->
+
+<p>Canvas test: 2d.line.join.parallel</p>
+<!-- Testing: Line joins are drawn at 180-degree joins -->
+<canvas id="c318" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_parallel() {
+
+var canvas = document.getElementById('c318');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 300;
+ctx.lineJoin = 'round';
+ctx.beginPath();
+ctx.moveTo(-100, 25);
+ctx.lineTo(0, 25);
+ctx.lineTo(-100, 25);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.join.round.html ]]] -->
+
+<p>Canvas test: 2d.line.join.round</p>
+<!-- Testing: lineJoin 'round' is rendered correctly -->
+<canvas id="c319" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_join_round() {
+
+var canvas = document.getElementById('c319');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var tol = 1; // tolerance to avoid antialiasing artifacts
+
+ctx.lineJoin = 'round';
+ctx.lineWidth = 20;
+
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+
+ctx.fillRect(10, 10, 20, 20);
+ctx.fillRect(20, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(30, 20);
+ctx.arc(30, 20, 10-tol, 0, 2*Math.PI, true);
+ctx.fill();
+
+ctx.beginPath();
+ctx.moveTo(10, 20);
+ctx.lineTo(30, 20);
+ctx.lineTo(30, 40);
+ctx.stroke();
+
+
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+
+ctx.beginPath();
+ctx.moveTo(60, 20);
+ctx.lineTo(80, 20);
+ctx.lineTo(80, 40);
+ctx.stroke();
+
+ctx.fillRect(60, 10, 20, 20);
+ctx.fillRect(70, 20, 20, 20);
+ctx.beginPath();
+ctx.moveTo(80, 20);
+ctx.arc(80, 20, 10+tol, 0, 2*Math.PI, true);
+ctx.fill();
+
+isPixel(ctx, 36,14, 0,255,0,255, 0);
+isPixel(ctx, 36,13, 0,255,0,255, 0);
+isPixel(ctx, 37,13, 0,255,0,255, 0);
+isPixel(ctx, 38,13, 0,255,0,255, 0);
+isPixel(ctx, 38,12, 0,255,0,255, 0);
+
+isPixel(ctx, 86,14, 0,255,0,255, 0);
+isPixel(ctx, 86,13, 0,255,0,255, 0);
+isPixel(ctx, 87,13, 0,255,0,255, 0);
+isPixel(ctx, 88,13, 0,255,0,255, 0);
+isPixel(ctx, 88,12, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.acute.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.acute</p>
+<!-- Testing: Miter joins are drawn correctly with acute angles -->
+<canvas id="c320" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_acute() {
+
+var canvas = document.getElementById('c320');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 2.614;
+ctx.beginPath();
+ctx.moveTo(100, 1000);
+ctx.lineTo(100, 100);
+ctx.lineTo(1000, 1000);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 2.613;
+ctx.beginPath();
+ctx.moveTo(100, 1000);
+ctx.lineTo(100, 100);
+ctx.lineTo(1000, 1000);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.exceeded.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.exceeded</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded -->
+<canvas id="c321" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_exceeded() {
+
+var canvas = document.getElementById('c321');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 201); // slightly non-right-angle to avoid being a special case
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.invalid</p>
+<!-- Testing: Setting miterLimit to invalid values is ignored -->
+<canvas id="c322" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_miter_invalid() {
+
+var canvas = document.getElementById('c322');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.miterLimit = 1.5;
+ok(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = 0;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = -1;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = Infinity;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = -Infinity;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+ctx.miterLimit = 1.5;
+ctx.miterLimit = NaN;
+todo(ctx.miterLimit === 1.5, "ctx.miterLimit === 1.5");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.lineedge.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.lineedge - bug 401791</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded at the corners of a zero-height rectangle -->
+<canvas id="c323" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_lineedge() {
+
+var canvas = document.getElementById('c323');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.strokeRect(100, 25, 200, 0);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.obtuse.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.obtuse</p>
+<!-- Testing: Miter joins are drawn correctly with obtuse angles -->
+<canvas id="c324" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_obtuse() {
+
+var canvas = document.getElementById('c324');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var x=800;
+var y=300;
+ctx.lineWidth = 1600;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 1.083;
+ctx.beginPath();
+ctx.moveTo(800, 10000);
+ctx.lineTo(800, 300);
+ctx.lineTo(10000, -8900);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.082;
+ctx.beginPath();
+ctx.moveTo(800, 10000);
+ctx.lineTo(800, 300);
+ctx.lineTo(10000, -8900);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.rightangle.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.rightangle - bug 401791</p>
+<!-- Testing: Miter joins are not drawn when the miter limit is exceeded, on exact right angles -->
+<canvas id="c325" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_rightangle() {
+
+var canvas = document.getElementById('c325');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#f00';
+ctx.miterLimit = 1.414;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 200);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.miter.within.html ]]] -->
+
+<p>Canvas test: 2d.line.miter.within</p>
+<!-- Testing: Miter joins are drawn when the miter limit is not quite exceeded -->
+<canvas id="c326" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_miter_within() {
+
+var canvas = document.getElementById('c326');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+
+ctx.strokeStyle = '#0f0';
+ctx.miterLimit = 1.416;
+ctx.beginPath();
+ctx.moveTo(200, 1000);
+ctx.lineTo(200, 200);
+ctx.lineTo(1000, 201);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.union.html ]]] -->
+
+<p>Canvas test: 2d.line.union</p>
+<canvas id="c327" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_union() {
+
+var canvas = document.getElementById('c327');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 24);
+ctx.lineTo(100, 25);
+ctx.lineTo(0, 26);
+ctx.closePath();
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 25,1, 0,255,0,255, 0);
+isPixel(ctx, 48,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 25,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.basic.html ]]] -->
+
+<p>Canvas test: 2d.line.width.basic</p>
+<!-- Testing: lineWidth determines the width of line strokes -->
+<canvas id="c328" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_width_basic() {
+
+var canvas = document.getElementById('c328');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 20;
+// Draw a green line over a red box, to check the line is not too small
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.beginPath();
+ctx.moveTo(25, 15);
+ctx.lineTo(25, 35);
+ctx.stroke();
+
+// Draw a green box over a red line, to check the line is not too large
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(75, 15);
+ctx.lineTo(75, 35);
+ctx.stroke();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 14,25, 0,255,0,255, 0);
+isPixel(ctx, 15,25, 0,255,0,255, 0);
+isPixel(ctx, 16,25, 0,255,0,255, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 34,25, 0,255,0,255, 0);
+isPixel(ctx, 35,25, 0,255,0,255, 0);
+isPixel(ctx, 36,25, 0,255,0,255, 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, 0);
+isPixel(ctx, 65,25, 0,255,0,255, 0);
+isPixel(ctx, 66,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+isPixel(ctx, 84,25, 0,255,0,255, 0);
+isPixel(ctx, 85,25, 0,255,0,255, 0);
+isPixel(ctx, 86,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.invalid.html ]]] -->
+
+<p>Canvas test: 2d.line.width.invalid</p>
+<!-- Testing: Setting lineWidth to invalid values is ignored -->
+<canvas id="c329" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_line_width_invalid() {
+
+var canvas = document.getElementById('c329');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.lineWidth = 1.5;
+ok(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = 0;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = -1;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = Infinity;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = -Infinity;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+ctx.lineWidth = 1.5;
+ctx.lineWidth = NaN;
+todo(ctx.lineWidth === 1.5, "ctx.lineWidth === 1.5");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.line.width.transformed.html ]]] -->
+
+<p>Canvas test: 2d.line.width.transformed</p>
+<!-- Testing: Line stroke widths are affected by scale transformations -->
+<canvas id="c330" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_line_width_transformed() {
+
+var canvas = document.getElementById('c330');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 4;
+// Draw a green line over a red box, to check the line is not too small
+ctx.fillStyle = '#f00';
+ctx.strokeStyle = '#0f0';
+ctx.fillRect(15, 15, 20, 20);
+ctx.save();
+ ctx.scale(5, 1);
+ ctx.beginPath();
+ ctx.moveTo(5, 15);
+ ctx.lineTo(5, 35);
+ ctx.stroke();
+ctx.restore();
+
+// Draw a green box over a red line, to check the line is not too large
+ctx.fillStyle = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.save();
+ ctx.scale(-5, 1);
+ ctx.beginPath();
+ ctx.moveTo(-15, 15);
+ ctx.lineTo(-15, 35);
+ ctx.stroke();
+ctx.restore();
+ctx.fillRect(65, 15, 20, 20);
+
+isPixel(ctx, 14,25, 0,255,0,255, 0);
+isPixel(ctx, 15,25, 0,255,0,255, 0);
+isPixel(ctx, 16,25, 0,255,0,255, 0);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 34,25, 0,255,0,255, 0);
+isPixel(ctx, 35,25, 0,255,0,255, 0);
+isPixel(ctx, 36,25, 0,255,0,255, 0);
+
+isPixel(ctx, 64,25, 0,255,0,255, 0);
+isPixel(ctx, 65,25, 0,255,0,255, 0);
+isPixel(ctx, 66,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+isPixel(ctx, 84,25, 0,255,0,255, 0);
+isPixel(ctx, 85,25, 0,255,0,255, 0);
+isPixel(ctx, 86,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.missingargs.html ]]] -->
+
+<p>Canvas test: 2d.missingargs</p>
+<!-- Testing: Missing arguments cause NOT_SUPPORTED_ERR -->
+<canvas id="c331" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_missingargs() {
+
+var canvas = document.getElementById('c331');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.scale();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.scale(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rotate();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.translate();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.translate(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+if (ctx.transform) { // (avoid spurious failures, since the aim here is not to test that all features are supported)
+    var _thrown = undefined; try {
+  ctx.transform();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.transform(1, 0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.setTransform) {
+    var _thrown = undefined; try {
+  ctx.setTransform();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.setTransform(1, 0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var _thrown = undefined; try {
+  ctx.createLinearGradient();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createLinearGradient(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createRadialGradient(0, 0, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.createPattern(canvas);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.clearRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.fillRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.strokeRect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.moveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.moveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.lineTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.lineTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.quadraticCurveTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.bezierCurveTo(0, 0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.rect(0, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.arc(0, 0, 1, 0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+if (ctx.isPointInPath) {
+    var _thrown = undefined; try {
+  ctx.isPointInPath();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.isPointInPath(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var _thrown = undefined; try {
+  ctx.drawImage();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(canvas);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.drawImage(canvas, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+// TODO: n >= 3 args on drawImage could be either a valid overload,
+// or too few for another overload, or too many for another
+// overload - what should happen?
+if (ctx.createImageData) {
+    var _thrown = undefined; try {
+  ctx.createImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.createImageData(1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.getImageData) {
+    var _thrown = undefined; try {
+  ctx.getImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.getImageData(0, 0, 1);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+if (ctx.putImageData) {
+    var imgdata = ctx.getImageData(0, 0, 1, 1);
+    var _thrown = undefined; try {
+  ctx.putImageData();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.putImageData(imgdata);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+    var _thrown = undefined; try {
+  ctx.putImageData(imgdata, 0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+}
+var g = ctx.createLinearGradient(0, 0, 0, 0);
+var _thrown = undefined; try {
+  g.addColorStop();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  g.addColorStop(0);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.1</p>
+<!-- Testing: arc() draws pi/2 .. -pi anticlockwise correctly -->
+<canvas id="c332" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_1() {
+
+var canvas = document.getElementById('c332');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, Math.PI/2, -Math.PI, true);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.2</p>
+<!-- Testing: arc() draws -3pi/2 .. -pi anticlockwise correctly -->
+<canvas id="c333" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_2() {
+
+var canvas = document.getElementById('c333');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, -3*Math.PI/2, -Math.PI, true);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.3</p>
+<!-- Testing: arc() wraps angles mod 2pi when anticlockwise and end > start+2pi -->
+<canvas id="c334" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_3() {
+
+var canvas = document.getElementById('c334');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, (512+1/2)*Math.PI, (1024-1)*Math.PI, true);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.4</p>
+<!-- Testing: arc() draws a full circle when clockwise and end > start+2pi -->
+<canvas id="c335" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_4() {
+
+var canvas = document.getElementById('c335');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arc(50, 25, 60, (512+1/2)*Math.PI, (1024-1)*Math.PI, false);
+ctx.fill();
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.5.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.5</p>
+<!-- Testing: arc() wraps angles mod 2pi when clockwise and start > end+2pi -->
+<canvas id="c336" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_5() {
+
+var canvas = document.getElementById('c336');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 0);
+ctx.arc(100, 0, 150, (1024-1)*Math.PI, (512+1/2)*Math.PI, false);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.angle.6.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.angle.6</p>
+<!-- Testing: arc() draws a full circle when anticlockwise and start > end+2pi -->
+<canvas id="c337" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_angle_6() {
+
+var canvas = document.getElementById('c337');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arc(50, 25, 60, (1024-1)*Math.PI, (512+1/2)*Math.PI, true);
+ctx.fill();
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.empty</p>
+<!-- Testing: arc() with an empty path does not draw a straight line to the start point -->
+<canvas id="c338" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_empty() {
+
+var canvas = document.getElementById('c338');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.end.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.end</p>
+<!-- Testing: arc() adds the end point of the arc to the subpath -->
+<canvas id="c339" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_end() {
+
+var canvas = document.getElementById('c339');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(-100, 0);
+ctx.arc(-100, 0, 25, -Math.PI/2, Math.PI/2, true);
+ctx.lineTo(100, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.negative</p>
+<!-- Testing: arc() with negative radius throws INDEX_SIZE_ERR -->
+<canvas id="c340" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_arc_negative() {
+
+var canvas = document.getElementById('c340');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.arc(0, 0, -1, 0, 0, true);
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.nonempty.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.nonempty</p>
+<!-- Testing: arc() with a non-empty path does draw a straight line to the start point -->
+<canvas id="c341" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_nonempty() {
+
+var canvas = document.getElementById('c341');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arc(200, 25, 5, 0, 2*Math.PI, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.nonfinite</p>
+<!-- Testing: arc() with Infinity/NaN is ignored -->
+<canvas id="c342" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_nonfinite() {
+
+var canvas = document.getElementById('c342');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.arc(Infinity, 50, 0, 2*Math.PI, true);
+ctx.arc(-Infinity, 50, 0, 2*Math.PI, true);
+ctx.arc(NaN, 50, 0, 2*Math.PI, true);
+ctx.arc(0, Infinity, 0, 2*Math.PI, true);
+ctx.arc(0, -Infinity, 0, 2*Math.PI, true);
+ctx.arc(0, NaN, 0, 2*Math.PI, true);
+ctx.arc(0, 50, Infinity, 2*Math.PI, true);
+ctx.arc(0, 50, -Infinity, 2*Math.PI, true);
+ctx.arc(0, 50, NaN, 2*Math.PI, true);
+ctx.arc(0, 50, 0, Infinity, true);
+ctx.arc(0, 50, 0, -Infinity, true);
+ctx.arc(0, 50, 0, NaN, true);
+ctx.arc(Infinity, Infinity, 0, 2*Math.PI, true);
+ctx.arc(Infinity, Infinity, Infinity, 2*Math.PI, true);
+ctx.arc(Infinity, Infinity, Infinity, Infinity, true);
+ctx.arc(Infinity, Infinity, 0, Infinity, true);
+ctx.arc(Infinity, 50, Infinity, 2*Math.PI, true);
+ctx.arc(Infinity, 50, Infinity, Infinity, true);
+ctx.arc(Infinity, 50, 0, Infinity, true);
+ctx.arc(0, Infinity, Infinity, 2*Math.PI, true);
+ctx.arc(0, Infinity, Infinity, Infinity, true);
+ctx.arc(0, Infinity, 0, Infinity, true);
+ctx.arc(0, 50, Infinity, Infinity, true);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.scale.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.scale.1</p>
+<!-- Testing: Non-uniformly scaled arcs are the right shape -->
+<canvas id="c343" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_scale_1() {
+
+var canvas = document.getElementById('c343');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(2, 0.5);
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(25, 50, 56, 0, 2*Math.PI, false);
+ctx.fill();
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(-25, 50);
+ctx.arc(-25, 50, 24, 0, 2*Math.PI, false);
+ctx.moveTo(75, 50);
+ctx.arc(75, 50, 24, 0, 2*Math.PI, false);
+ctx.moveTo(25, -25);
+ctx.arc(25, -25, 24, 0, 2*Math.PI, false);
+ctx.moveTo(25, 125);
+ctx.arc(25, 125, 24, 0, 2*Math.PI, false);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.scale.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.scale.2</p>
+<!-- Testing: Highly scaled arcs are the right shape -->
+<canvas id="c344" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_scale_2() {
+
+var canvas = document.getElementById('c344');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.scale(100, 100);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 1.2;
+ctx.beginPath();
+ctx.arc(0, 0, 0.6, 0, Math.PI/2, false);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.selfintersect.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.selfintersect.1</p>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
+<canvas id="c345" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_selfintersect_1() {
+
+var canvas = document.getElementById('c345');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 200;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(100, 50, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+ctx.beginPath();
+ctx.arc(0, 0, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.selfintersect.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.selfintersect.2</p>
+<!-- Testing: arc() with lineWidth > 2*radius is drawn sensibly -->
+<canvas id="c346" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_selfintersect_2() {
+
+var canvas = document.getElementById('c346');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 180;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(-50, 50, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+ctx.beginPath();
+ctx.arc(100, 0, 25, 0, -Math.PI/2, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,10, 0,255,0,255, 0);
+isPixel(ctx, 97,1, 0,255,0,255, 0);
+isPixel(ctx, 97,2, 0,255,0,255, 0);
+isPixel(ctx, 97,3, 0,255,0,255, 0);
+isPixel(ctx, 2,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.1</p>
+<!-- Testing: arc() from 0 to pi does not draw anything in the wrong half -->
+<canvas id="c347" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_1() {
+
+var canvas = document.getElementById('c347');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(50, 50, 50, 0, Math.PI, false);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 20,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.2</p>
+<!-- Testing: arc() from 0 to pi draws stuff in the right half -->
+<canvas id="c348" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_2() {
+
+var canvas = document.getElementById('c348');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 100;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(50, 50, 50, 0, Math.PI, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 20,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.3</p>
+<!-- Testing: arc() from 0 to -pi/2 does not draw anything in the wrong quadrant -->
+<canvas id="c349" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arc_shape_3() {
+
+var canvas = document.getElementById('c349');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 100;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(0, 50, 50, 0, -Math.PI/2, false);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.4</p>
+<!-- Testing: arc() from 0 to -pi/2 draws stuff in the right quadrant -->
+<canvas id="c350" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_4() {
+
+var canvas = document.getElementById('c350');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 150;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.arc(-50, 50, 100, 0, -Math.PI/2, true);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.shape.5.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.shape.5</p>
+<!-- Testing: arc() from 0 to 5pi does not draw crazy things -->
+<canvas id="c351" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_shape_5() {
+
+var canvas = document.getElementById('c351');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 200;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arc(300, 0, 100, 0, 5*Math.PI, false);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.1</p>
+<!-- Testing: arc() draws nothing when end = start + 2pi-e and anticlockwise -->
+<canvas id="c352" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_1() {
+
+var canvas = document.getElementById('c352');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, true);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.2</p>
+<!-- Testing: arc() draws a full circle when end = start + 2pi-e and clockwise -->
+<canvas id="c353" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_2() {
+
+var canvas = document.getElementById('c353');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 2*Math.PI - 1e-4, false);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.3</p>
+<!-- Testing: arc() draws a full circle when end = start + 2pi+e and anticlockwise -->
+<canvas id="c354" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_3() {
+
+var canvas = document.getElementById('c354');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, true);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.twopie.4.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.twopie.4</p>
+<!-- Testing: arc() draws nothing when end = start + 2pi+e and clockwise -->
+<canvas id="c355" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_twopie_4() {
+
+var canvas = document.getElementById('c355');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 2*Math.PI + 1e-4, false);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zero.1</p>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and anticlockwise -->
+<canvas id="c356" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_zero_1() {
+
+var canvas = document.getElementById('c356');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 0, true);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zero.2</p>
+<!-- Testing: arc() draws nothing when startAngle = endAngle and clockwise -->
+<canvas id="c357" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arc_zero_2() {
+
+var canvas = document.getElementById('c357');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.arc(50, 25, 50, 0, 0, false);
+ctx.stroke();
+isPixel(ctx, 50,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arc.zeroradius.html ]]] -->
+
+<p>Canvas test: 2d.path.arc.zeroradius</p>
+<!-- Testing: arc() with zero radius draws a line to the start point -->
+<canvas id="c358" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arc_zeroradius() {
+
+var canvas = document.getElementById('c358');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00'
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arc(200, 25, 0, 0, Math.PI, true);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.coincide.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.coincide.1</p>
+<!-- Testing: arcTo() has no effect if P0 = P1 -->
+<canvas id="c359" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_coincide_1() {
+
+var canvas = document.getElementById('c359');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(0, 25, 50, 1000, 1);
+ctx.lineTo(100, 25);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arcTo(50, 25, 100, 25, 1);
+ctx.stroke();
+
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.coincide.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.coincide.2</p>
+<!-- Testing: arcTo() draws a straight line to P1 if P1 = P2 -->
+<canvas id="c360" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_coincide_2() {
+
+var canvas = document.getElementById('c360');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 100, 25, 1);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.1</p>
+<!-- Testing: arcTo() with all points on a line, and P1 between P0/P2, draws a straight line to P1 -->
+<canvas id="c361" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_1() {
+
+var canvas = document.getElementById('c361');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 200, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(-100, 25);
+ctx.arcTo(0, 25, 100, 25, 1);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.2</p>
+<!-- Testing: arcTo() with all points on a line, and P2 between P0/P1, draws an infinite line along P1..P2 -->
+<canvas id="c362" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_2() {
+
+var canvas = document.getElementById('c362');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(1000, 25);
+ctx.arcTo(1100, 25, 1050, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, -50, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.collinear.3.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.collinear.3</p>
+<!-- Testing: arcTo() with all points on a line, and P0 between P1/P2, draws an infinite line along P1..P2 -->
+<canvas id="c363" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_collinear_3() {
+
+var canvas = document.getElementById('c363');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(150, 25);
+ctx.arcTo(200, 25, 100, 25, 1);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 50, 25, 1);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.emptysubpath</p>
+<!-- Testing: arcTo() does nothing if there are no subpaths -->
+<canvas id="c364" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_emptysubpath() {
+
+var canvas = document.getElementById('c364');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.arcTo(0, 25, 0, 25, 0.1);
+ctx.arcTo(100, 25, 100, 25, 0.1);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.negative</p>
+<!-- Testing: arcTo() with negative radius throws an exception -->
+<canvas id="c365" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_arcTo_negative() {
+
+var canvas = document.getElementById('c365');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.arcTo(0, 0, 0, 0, -1);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.INDEX_SIZE_ERR, "should throw INDEX_SIZE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.nonfinite</p>
+<!-- Testing: arcTo() with Infinity/NaN is ignored -->
+<canvas id="c366" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_nonfinite() {
+
+var canvas = document.getElementById('c366');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.arcTo(Infinity, 50, 0, 50, 0);
+ctx.arcTo(-Infinity, 50, 0, 50, 0);
+ctx.arcTo(NaN, 50, 0, 50, 0);
+ctx.arcTo(0, Infinity, 0, 50, 0);
+ctx.arcTo(0, -Infinity, 0, 50, 0);
+ctx.arcTo(0, NaN, 0, 50, 0);
+ctx.arcTo(0, 50, Infinity, 50, 0);
+ctx.arcTo(0, 50, -Infinity, 50, 0);
+ctx.arcTo(0, 50, NaN, 50, 0);
+ctx.arcTo(0, 50, 0, Infinity, 0);
+ctx.arcTo(0, 50, 0, -Infinity, 0);
+ctx.arcTo(0, 50, 0, NaN, 0);
+ctx.arcTo(0, 50, 0, 50, Infinity);
+ctx.arcTo(0, 50, 0, 50, -Infinity);
+ctx.arcTo(0, 50, 0, 50, NaN);
+ctx.arcTo(Infinity, Infinity, 0, 50, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, 50, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, Infinity, 0);
+ctx.arcTo(Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.arcTo(Infinity, Infinity, Infinity, 50, Infinity);
+ctx.arcTo(Infinity, Infinity, 0, Infinity, 0);
+ctx.arcTo(Infinity, Infinity, 0, Infinity, Infinity);
+ctx.arcTo(Infinity, Infinity, 0, 50, Infinity);
+ctx.arcTo(Infinity, 50, Infinity, 50, 0);
+ctx.arcTo(Infinity, 50, Infinity, Infinity, 0);
+ctx.arcTo(Infinity, 50, Infinity, Infinity, Infinity);
+ctx.arcTo(Infinity, 50, Infinity, 50, Infinity);
+ctx.arcTo(Infinity, 50, 0, Infinity, 0);
+ctx.arcTo(Infinity, 50, 0, Infinity, Infinity);
+ctx.arcTo(Infinity, 50, 0, 50, Infinity);
+ctx.arcTo(0, Infinity, Infinity, 50, 0);
+ctx.arcTo(0, Infinity, Infinity, Infinity, 0);
+ctx.arcTo(0, Infinity, Infinity, Infinity, Infinity);
+ctx.arcTo(0, Infinity, Infinity, 50, Infinity);
+ctx.arcTo(0, Infinity, 0, Infinity, 0);
+ctx.arcTo(0, Infinity, 0, Infinity, Infinity);
+ctx.arcTo(0, Infinity, 0, 50, Infinity);
+ctx.arcTo(0, 50, Infinity, Infinity, 0);
+ctx.arcTo(0, 50, Infinity, Infinity, Infinity);
+ctx.arcTo(0, 50, Infinity, 50, Infinity);
+ctx.arcTo(0, 50, 0, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.scale.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.scale</p>
+<!-- Testing: arcTo scales the curve, not just the control points -->
+<canvas id="c367" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_scale() {
+
+var canvas = document.getElementById('c367');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 50);
+ctx.translate(100, 0);
+ctx.scale(0.1, 1);
+ctx.arcTo(50, 50, 50, 0, 50);
+ctx.lineTo(-1000, 0);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.curve1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.curve1</p>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<canvas id="c368" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_curve1() {
+
+var canvas = document.getElementById('c368');
+var ctx = canvas.getContext('2d');
+
+var tol = 1.5; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 10;
+ctx.beginPath();
+ctx.moveTo(10, 25);
+ctx.arcTo(75, 25, 75, 60, 20);
+ctx.stroke();
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.rect(10, 20, 45, 10);
+ctx.moveTo(80, 45);
+ctx.arc(55, 45, 25+tol, 0, -Math.PI/2, true);
+ctx.arc(55, 45, 15-tol, -Math.PI/2, 0, false);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 55,19, 0,255,0,255, 0);
+isPixel(ctx, 55,20, 0,255,0,255, 0);
+isPixel(ctx, 55,21, 0,255,0,255, 0);
+isPixel(ctx, 64,22, 0,255,0,255, 0);
+isPixel(ctx, 65,21, 0,255,0,255, 0);
+isPixel(ctx, 72,28, 0,255,0,255, 0);
+isPixel(ctx, 73,27, 0,255,0,255, 0);
+isPixel(ctx, 78,36, 0,255,0,255, 0);
+isPixel(ctx, 79,35, 0,255,0,255, 0);
+isPixel(ctx, 80,44, 0,255,0,255, 0);
+isPixel(ctx, 80,45, 0,255,0,255, 0);
+isPixel(ctx, 80,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.curve2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.curve2</p>
+<!-- Testing: arcTo() curves in the right kind of shape -->
+<canvas id="c369" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_curve2() {
+
+var canvas = document.getElementById('c369');
+var ctx = canvas.getContext('2d');
+
+var tol = 1.5; // tolerance to avoid antialiasing artifacts
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.beginPath();
+ctx.rect(10, 20, 45, 10);
+ctx.moveTo(80, 45);
+ctx.arc(55, 45, 25-tol, 0, -Math.PI/2, true);
+ctx.arc(55, 45, 15+tol, -Math.PI/2, 0, false);
+ctx.fill();
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 10;
+ctx.beginPath();
+ctx.moveTo(10, 25);
+ctx.arcTo(75, 25, 75, 60, 20);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 55,19, 0,255,0,255, 0);
+isPixel(ctx, 55,20, 0,255,0,255, 0);
+isPixel(ctx, 55,21, 0,255,0,255, 0);
+isPixel(ctx, 64,22, 0,255,0,255, 0);
+isPixel(ctx, 65,21, 0,255,0,255, 0);
+isPixel(ctx, 72,28, 0,255,0,255, 0);
+isPixel(ctx, 73,27, 0,255,0,255, 0);
+isPixel(ctx, 78,36, 0,255,0,255, 0);
+isPixel(ctx, 79,35, 0,255,0,255, 0);
+isPixel(ctx, 80,44, 0,255,0,255, 0);
+isPixel(ctx, 80,45, 0,255,0,255, 0);
+isPixel(ctx, 80,46, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.end.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.end</p>
+<!-- Testing: arcTo() does not draw anything from P1 to P2 -->
+<canvas id="c370" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_end() {
+
+var canvas = document.getElementById('c370');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(-100, -100);
+ctx.arcTo(-100, 25, 200, 25, 10);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.shape.start.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.shape.start</p>
+<!-- Testing: arcTo() draws a straight line from P0 to P1 -->
+<canvas id="c371" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_arcTo_shape_start() {
+
+var canvas = document.getElementById('c371');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(200, 25, 200, 50, 10);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.transformation.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.transformation</p>
+<!-- Testing: arcTo joins up to the last subpath point correctly -->
+<canvas id="c372" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_transformation() {
+
+var canvas = document.getElementById('c372');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 50);
+ctx.translate(100, 0);
+ctx.arcTo(50, 50, 50, 0, 50);
+ctx.lineTo(-100, 0);
+ctx.fill();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.zero.1</p>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1 -->
+<canvas id="c373" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_zero_1() {
+
+var canvas = document.getElementById('c373');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, 100, 100, 0);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(0, -25);
+ctx.arcTo(50, -25, 50, 50, 0);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+ok(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.arcTo.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.arcTo.zero.2</p>
+<!-- Testing: arcTo() with zero radius draws a straight line from P0 to P1, even when all points are collinear -->
+<canvas id="c374" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_arcTo_zero_2() {
+
+var canvas = document.getElementById('c374');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.lineWidth = 50;
+
+ctx.strokeStyle = '#0f0';
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.arcTo(100, 25, -100, 25, 0);
+ctx.stroke();
+
+ctx.strokeStyle = '#f00';
+ctx.beginPath();
+ctx.moveTo(100, 25);
+ctx.arcTo(200, 25, 50, 25, 0);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+ok(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.beginPath.html ]]] -->
+
+<p>Canvas test: 2d.path.beginPath</p>
+<canvas id="c375" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_beginPath() {
+
+var canvas = document.getElementById('c375');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.basic</p>
+<canvas id="c376" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_basic() {
+
+var canvas = document.getElementById('c376');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.emptysubpath</p>
+<canvas id="c377" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_bezierCurveTo_emptysubpath() {
+
+var canvas = document.getElementById('c377');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.bezierCurveTo(0, 25, 0, 25, 0, 25);
+ctx.bezierCurveTo(100, 25, 100, 25, 100, 25);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.nonfinite</p>
+<!-- Testing: bezierCurveTo() with Infinity/NaN is ignored -->
+<canvas id="c378" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_nonfinite() {
+
+var canvas = document.getElementById('c378');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(-Infinity, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(NaN, 50, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, -Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, NaN, 0, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, -Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, NaN, 50, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, -Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, NaN, 0, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, -Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, NaN, 50);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, -Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, 0, NaN);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, Infinity, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(Infinity, 50, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, 50);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, 50);
+ctx.bezierCurveTo(0, Infinity, 0, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, Infinity, 0, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, 50);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, 50);
+ctx.bezierCurveTo(0, 50, Infinity, 50, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, Infinity, 50, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, 50);
+ctx.bezierCurveTo(0, 50, 0, Infinity, Infinity, Infinity);
+ctx.bezierCurveTo(0, 50, 0, Infinity, 0, Infinity);
+ctx.bezierCurveTo(0, 50, 0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.scaled.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.scaled</p>
+<canvas id="c379" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_scaled() {
+
+var canvas = document.getElementById('c379');
+var ctx = canvas.getContext('2d');
+
+ctx.scale(1000, 1000);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 0.055;
+ctx.beginPath();
+ctx.moveTo(-2, 3.1);
+ctx.bezierCurveTo(-2, -1, 2.1, -1, 2.1, 3.1);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.bezierCurveTo.shape.html ]]] -->
+
+<p>Canvas test: 2d.path.bezierCurveTo.shape</p>
+<canvas id="c380" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_bezierCurveTo_shape() {
+
+var canvas = document.getElementById('c380');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 55;
+ctx.beginPath();
+ctx.moveTo(-2000, 3100);
+ctx.bezierCurveTo(-2000, -1000, 2100, -1000, 2100, 3100);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.basic.1</p>
+<canvas id="c381" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_basic_1() {
+
+var canvas = document.getElementById('c381');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.clip();
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.basic.2</p>
+<canvas id="c382" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_basic_2() {
+
+var canvas = document.getElementById('c382');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(-100, 0, 100, 50);
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.empty</p>
+<canvas id="c383" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_empty() {
+
+var canvas = document.getElementById('c383');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.intersect.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.intersect</p>
+<canvas id="c384" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_intersect() {
+
+var canvas = document.getElementById('c384');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.beginPath();
+ctx.rect(50, 0, 50, 50)
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.unaffected</p>
+<canvas id="c385" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_unaffected() {
+
+var canvas = document.getElementById('c385');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+
+ctx.beginPath();
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.clip();
+
+ctx.lineTo(0, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.winding.1.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.winding.1</p>
+<canvas id="c386" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_winding_1() {
+
+var canvas = document.getElementById('c386');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.clip();
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.clip.winding.2.html ]]] -->
+
+<p>Canvas test: 2d.path.clip.winding.2</p>
+<canvas id="c387" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_clip_winding_2() {
+
+var canvas = document.getElementById('c387');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.clip();
+
+ctx.beginPath();
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.lineTo(0, 0);
+ctx.clip();
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.empty</p>
+<canvas id="c388" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_empty() {
+
+var canvas = document.getElementById('c388');
+var ctx = canvas.getContext('2d');
+
+ctx.closePath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.newline.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.newline</p>
+<canvas id="c389" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_newline() {
+
+var canvas = document.getElementById('c389');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -100);
+ctx.lineTo(200, -100);
+ctx.lineTo(200, 25);
+ctx.closePath();
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.closePath.nextpoint.html ]]] -->
+
+<p>Canvas test: 2d.path.closePath.nextpoint</p>
+<canvas id="c390" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_closePath_nextpoint() {
+
+var canvas = document.getElementById('c390');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -1000);
+ctx.closePath();
+ctx.lineTo(1000, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.closed.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.closed.basic</p>
+<canvas id="c391" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_closed_basic() {
+
+var canvas = document.getElementById('c391');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.closed.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.closed.unaffected</p>
+<canvas id="c392" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_closed_unaffected() {
+
+var canvas = document.getElementById('c392');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#00f';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.fillStyle = '#f00';
+ctx.fill();
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+
+isPixel(ctx, 90,10, 0,255,0,255, 0);
+isPixel(ctx, 10,40, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.overlap.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.overlap</p>
+<canvas id="c393" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_overlap() {
+
+var canvas = document.getElementById('c393');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.rect(0, 0, 100, 50);
+ctx.closePath();
+ctx.rect(10, 10, 80, 30);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,127,0,255, 1);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.add.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.add</p>
+<canvas id="c394" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_add() {
+
+var canvas = document.getElementById('c394');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.1.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.1</p>
+<canvas id="c395" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_1() {
+
+var canvas = document.getElementById('c395');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.2.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.2</p>
+<canvas id="c396" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_2() {
+
+var canvas = document.getElementById('c396');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.moveTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.fill.winding.subtract.3.html ]]] -->
+
+<p>Canvas test: 2d.path.fill.winding.subtract.3</p>
+<canvas id="c397" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_fill_winding_subtract_3() {
+
+var canvas = document.getElementById('c397');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.moveTo(-10, -10);
+ctx.lineTo(110, -10);
+ctx.lineTo(110, 60);
+ctx.lineTo(-10, 60);
+ctx.lineTo(-10, -10);
+ctx.lineTo(-20, -20);
+ctx.lineTo(120, -20);
+ctx.lineTo(120, 70);
+ctx.lineTo(-20, 70);
+ctx.lineTo(-20, -20);
+ctx.lineTo(0, 0);
+ctx.lineTo(0, 50);
+ctx.lineTo(100, 50);
+ctx.lineTo(100, 0);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.initial.html ]]] -->
+
+<p>Canvas test: 2d.path.initial</p>
+<canvas id="c398" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_initial() {
+
+var canvas = document.getElementById('c398');
+var ctx = canvas.getContext('2d');
+
+ctx.lineTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.closePath();
+ctx.fillStyle = '#f00';
+ctx.fill();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.arc.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.arc</p>
+<!-- Testing: isPointInPath() works on arcs -->
+<canvas id="c399" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_arc() {
+
+var canvas = document.getElementById('c399');
+var ctx = canvas.getContext('2d');
+
+ctx.arc(50, 25, 10, 0, Math.PI, false);
+ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
+ok(ctx.isPointInPath(50, 20) === false, "ctx.isPointInPath(50, 20) === false");
+ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
+ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
+ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
+ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.basic.1</p>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
+<canvas id="c400" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_basic_1() {
+
+var canvas = document.getElementById('c400');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.basic.2</p>
+<!-- Testing: isPointInPath() detects whether the point is inside the path -->
+<canvas id="c401" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_basic_2() {
+
+var canvas = document.getElementById('c401');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(20, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.bezier.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.bezier</p>
+<!-- Testing: isPointInPath() works on Bezier curves -->
+<canvas id="c402" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_bezier() {
+
+var canvas = document.getElementById('c402');
+var ctx = canvas.getContext('2d');
+
+ctx.moveTo(25, 25);
+ctx.bezierCurveTo(50, -50, 50, 100, 75, 25);
+ok(ctx.isPointInPath(25, 20) == false, "ctx.isPointInPath(25, 20) == false");
+ok(ctx.isPointInPath(25, 30) == false, "ctx.isPointInPath(25, 30) == false");
+ok(ctx.isPointInPath(30, 20) == true, "ctx.isPointInPath(30, 20) == true");
+ok(ctx.isPointInPath(30, 30) == false, "ctx.isPointInPath(30, 30) == false");
+ok(ctx.isPointInPath(40, 2) == false, "ctx.isPointInPath(40, 2) == false");
+ok(ctx.isPointInPath(40, 20) == true, "ctx.isPointInPath(40, 20) == true");
+ok(ctx.isPointInPath(40, 30) == false, "ctx.isPointInPath(40, 30) == false");
+ok(ctx.isPointInPath(40, 47) == false, "ctx.isPointInPath(40, 47) == false");
+ok(ctx.isPointInPath(45, 20) == true, "ctx.isPointInPath(45, 20) == true");
+ok(ctx.isPointInPath(45, 30) == false, "ctx.isPointInPath(45, 30) == false");
+ok(ctx.isPointInPath(55, 20) == false, "ctx.isPointInPath(55, 20) == false");
+ok(ctx.isPointInPath(55, 30) == true, "ctx.isPointInPath(55, 30) == true");
+ok(ctx.isPointInPath(60, 2) == false, "ctx.isPointInPath(60, 2) == false");
+ok(ctx.isPointInPath(60, 20) == false, "ctx.isPointInPath(60, 20) == false");
+ok(ctx.isPointInPath(60, 30) == true, "ctx.isPointInPath(60, 30) == true");
+ok(ctx.isPointInPath(60, 47) == false, "ctx.isPointInPath(60, 47) == false");
+ok(ctx.isPointInPath(70, 20) == false, "ctx.isPointInPath(70, 20) == false");
+ok(ctx.isPointInPath(70, 30) == true, "ctx.isPointInPath(70, 30) == true");
+ok(ctx.isPointInPath(75, 20) == false, "ctx.isPointInPath(75, 20) == false");
+ok(ctx.isPointInPath(75, 30) == false, "ctx.isPointInPath(75, 30) == false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.bigarc.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.bigarc</p>
+<!-- Testing: isPointInPath() works on unclosed arcs larger than 2pi -->
+<canvas id="c403" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_bigarc() {
+
+var canvas = document.getElementById('c403');
+var ctx = canvas.getContext('2d');
+
+ctx.arc(50, 25, 10, 0, 7, false);
+ok(ctx.isPointInPath(50, 10) === false, "ctx.isPointInPath(50, 10) === false");
+ok(ctx.isPointInPath(50, 20) === true, "ctx.isPointInPath(50, 20) === true");
+ok(ctx.isPointInPath(50, 30) === true, "ctx.isPointInPath(50, 30) === true");
+ok(ctx.isPointInPath(50, 40) === false, "ctx.isPointInPath(50, 40) === false");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+ok(ctx.isPointInPath(70, 20) === false, "ctx.isPointInPath(70, 20) === false");
+ok(ctx.isPointInPath(30, 30) === false, "ctx.isPointInPath(30, 30) === false");
+ok(ctx.isPointInPath(70, 30) === false, "ctx.isPointInPath(70, 30) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.edge.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.edge</p>
+<!-- Testing: isPointInPath() counts points on the path as being inside -->
+<canvas id="c404" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_edge() {
+
+var canvas = document.getElementById('c404');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 20, 20);
+ok(ctx.isPointInPath(0, 0) === true, "ctx.isPointInPath(0, 0) === true");
+ok(ctx.isPointInPath(10, 0) === true, "ctx.isPointInPath(10, 0) === true");
+ok(ctx.isPointInPath(20, 0) === true, "ctx.isPointInPath(20, 0) === true");
+ok(ctx.isPointInPath(20, 10) === true, "ctx.isPointInPath(20, 10) === true");
+ok(ctx.isPointInPath(20, 20) === true, "ctx.isPointInPath(20, 20) === true");
+ok(ctx.isPointInPath(10, 20) === true, "ctx.isPointInPath(10, 20) === true");
+ok(ctx.isPointInPath(0, 20) === true, "ctx.isPointInPath(0, 20) === true");
+ok(ctx.isPointInPath(0, 10) === true, "ctx.isPointInPath(0, 10) === true");
+ok(ctx.isPointInPath(10, -0.01) === false, "ctx.isPointInPath(10, -0.01) === false");
+ok(ctx.isPointInPath(10, 20.01) === false, "ctx.isPointInPath(10, 20.01) === false");
+ok(ctx.isPointInPath(-0.01, 10) === false, "ctx.isPointInPath(-0.01, 10) === false");
+ok(ctx.isPointInPath(20.01, 10) === false, "ctx.isPointInPath(20.01, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.empty</p>
+<!-- Testing: isPointInPath() works when there is no path -->
+<canvas id="c405" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_empty() {
+
+var canvas = document.getElementById('c405');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.isPointInPath(0, 0) === false, "ctx.isPointInPath(0, 0) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.nonfinite</p>
+<!-- Testing: isPointInPath() returns false for non-finite arguments -->
+<canvas id="c406" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_nonfinite() {
+
+var canvas = document.getElementById('c406');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.rect(-100, -50, 200, 100);
+ok(ctx.isPointInPath(Infinity, 0) === false, "ctx.isPointInPath(Infinity, 0) === false");
+ok(ctx.isPointInPath(-Infinity, 0) === false, "ctx.isPointInPath(-Infinity, 0) === false");
+ok(ctx.isPointInPath(NaN, 0) === false, "ctx.isPointInPath(NaN, 0) === false");
+ok(ctx.isPointInPath(0, Infinity) === false, "ctx.isPointInPath(0, Infinity) === false");
+ok(ctx.isPointInPath(0, -Infinity) === false, "ctx.isPointInPath(0, -Infinity) === false");
+ok(ctx.isPointInPath(0, NaN) === false, "ctx.isPointInPath(0, NaN) === false");
+ok(ctx.isPointInPath(NaN, NaN) === false, "ctx.isPointInPath(NaN, NaN) === false");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.outside.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.outside</p>
+<!-- Testing: isPointInPath() works on paths outside the canvas -->
+<canvas id="c407" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_outside() {
+
+var canvas = document.getElementById('c407');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, -100, 20, 20);
+ctx.rect(20, -10, 20, 20);
+ok(ctx.isPointInPath(10, -110) === false, "ctx.isPointInPath(10, -110) === false");
+ok(ctx.isPointInPath(10, -90) === true, "ctx.isPointInPath(10, -90) === true");
+ok(ctx.isPointInPath(10, -70) === false, "ctx.isPointInPath(10, -70) === false");
+ok(ctx.isPointInPath(30, -20) === false, "ctx.isPointInPath(30, -20) === false");
+ok(ctx.isPointInPath(30, 0) === true, "ctx.isPointInPath(30, 0) === true");
+ok(ctx.isPointInPath(30, 20) === false, "ctx.isPointInPath(30, 20) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.subpath.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.subpath</p>
+<!-- Testing: isPointInPath() uses the current path, not just the subpath -->
+<canvas id="c408" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_subpath() {
+
+var canvas = document.getElementById('c408');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 20, 20);
+ctx.beginPath();
+ctx.rect(20, 0, 20, 20);
+ctx.closePath();
+ctx.rect(40, 0, 20, 20);
+ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(30, 10) === true, "ctx.isPointInPath(30, 10) === true");
+ok(ctx.isPointInPath(50, 10) === true, "ctx.isPointInPath(50, 10) === true");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.1 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c409" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_1() {
+
+var canvas = document.getElementById('c409');
+var ctx = canvas.getContext('2d');
+
+ctx.translate(50, 0);
+ctx.rect(0, 0, 20, 20);
+ok(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
+todo(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(49, 10) === false, "ctx.isPointInPath(49, 10) === false");
+todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
+todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
+ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.2 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c410" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_2() {
+
+var canvas = document.getElementById('c410');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(50, 0, 20, 20);
+ctx.translate(50, 0);
+ok(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
+todo(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(49, 10) === false, "ctx.isPointInPath(49, 10) === false");
+todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
+todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
+ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.transform.3.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.transform.3 - bug 405300</p>
+<!-- Testing: isPointInPath() handles transformations correctly -->
+<canvas id="c411" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_transform_3() {
+
+var canvas = document.getElementById('c411');
+var ctx = canvas.getContext('2d');
+
+ctx.scale(-1, 1);
+ctx.rect(-70, 0, 20, 20);
+ok(ctx.isPointInPath(-40, 10) === false, "ctx.isPointInPath(-40, 10) === false");
+ok(ctx.isPointInPath(10, 10) === false, "ctx.isPointInPath(10, 10) === false");
+ok(ctx.isPointInPath(49, 10) === false, "ctx.isPointInPath(49, 10) === false");
+todo(ctx.isPointInPath(51, 10) === true, "ctx.isPointInPath(51, 10) === true");
+todo(ctx.isPointInPath(69, 10) === true, "ctx.isPointInPath(69, 10) === true");
+ok(ctx.isPointInPath(71, 10) === false, "ctx.isPointInPath(71, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.unclosed.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.unclosed</p>
+<!-- Testing: isPointInPath() works on unclosed subpaths -->
+<canvas id="c412" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_unclosed() {
+
+var canvas = document.getElementById('c412');
+var ctx = canvas.getContext('2d');
+
+ctx.moveTo(0, 0);
+ctx.lineTo(20, 0);
+ctx.lineTo(20, 20);
+ctx.lineTo(0, 20);
+ok(ctx.isPointInPath(10, 10) === true, "ctx.isPointInPath(10, 10) === true");
+ok(ctx.isPointInPath(30, 10) === false, "ctx.isPointInPath(30, 10) === false");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.isPointInPath.winding.html ]]] -->
+
+<p>Canvas test: 2d.path.isPointInPath.winding</p>
+<!-- Testing: isPointInPath() uses the non-zero winding number rule -->
+<canvas id="c413" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_path_isPointInPath_winding() {
+
+var canvas = document.getElementById('c413');
+var ctx = canvas.getContext('2d');
+
+// Create a square ring, using opposite windings to make a hole in the centre
+ctx.moveTo(0, 0);
+ctx.lineTo(50, 0);
+ctx.lineTo(50, 50);
+ctx.lineTo(0, 50);
+ctx.lineTo(0, 0);
+ctx.lineTo(10, 10);
+ctx.lineTo(10, 40);
+ctx.lineTo(40, 40);
+ctx.lineTo(40, 10);
+ctx.lineTo(10, 10);
+
+ok(ctx.isPointInPath(5, 5) === true, "ctx.isPointInPath(5, 5) === true");
+ok(ctx.isPointInPath(25, 5) === true, "ctx.isPointInPath(25, 5) === true");
+ok(ctx.isPointInPath(45, 5) === true, "ctx.isPointInPath(45, 5) === true");
+ok(ctx.isPointInPath(5, 25) === true, "ctx.isPointInPath(5, 25) === true");
+ok(ctx.isPointInPath(25, 25) === false, "ctx.isPointInPath(25, 25) === false");
+ok(ctx.isPointInPath(45, 25) === true, "ctx.isPointInPath(45, 25) === true");
+ok(ctx.isPointInPath(5, 45) === true, "ctx.isPointInPath(5, 45) === true");
+ok(ctx.isPointInPath(25, 45) === true, "ctx.isPointInPath(25, 45) === true");
+ok(ctx.isPointInPath(45, 45) === true, "ctx.isPointInPath(45, 45) === true");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.basic</p>
+<canvas id="c414" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_basic() {
+
+var canvas = document.getElementById('c414');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.lineTo(100, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.emptysubpath</p>
+<canvas id="c415" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_lineTo_emptysubpath() {
+
+var canvas = document.getElementById('c415');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.lineTo(0, 25);
+ctx.lineTo(100, 25);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.nextpoint.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.nextpoint</p>
+<canvas id="c416" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_nextpoint() {
+
+var canvas = document.getElementById('c416');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(-100, -100);
+ctx.lineTo(0, 25);
+ctx.lineTo(100, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.lineTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.lineTo.nonfinite</p>
+<!-- Testing: lineTo() with Infinity/NaN is ignored -->
+<canvas id="c417" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_lineTo_nonfinite() {
+
+var canvas = document.getElementById('c417');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.lineTo(Infinity, 50);
+ctx.lineTo(-Infinity, 50);
+ctx.lineTo(NaN, 50);
+ctx.lineTo(0, Infinity);
+ctx.lineTo(0, -Infinity);
+ctx.lineTo(0, NaN);
+ctx.lineTo(Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.basic</p>
+<canvas id="c418" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_basic() {
+
+var canvas = document.getElementById('c418');
+var ctx = canvas.getContext('2d');
+
+ctx.rect(0, 0, 10, 50);
+ctx.moveTo(100, 0);
+ctx.lineTo(10, 0);
+ctx.lineTo(10, 50);
+ctx.lineTo(100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 90,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.multiple.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.multiple</p>
+<canvas id="c419" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_multiple() {
+
+var canvas = document.getElementById('c419');
+var ctx = canvas.getContext('2d');
+
+ctx.moveTo(0, 25);
+ctx.moveTo(100, 25);
+ctx.moveTo(0, 25);
+ctx.lineTo(100, 25);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.newsubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.newsubpath</p>
+<canvas id="c420" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_newsubpath() {
+
+var canvas = document.getElementById('c420');
+var ctx = canvas.getContext('2d');
+
+ctx.beginPath();
+ctx.moveTo(0, 0);
+ctx.moveTo(100, 0);
+ctx.moveTo(100, 50);
+ctx.moveTo(0, 50);
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.moveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.moveTo.nonfinite</p>
+<!-- Testing: moveTo() with Infinity/NaN is ignored -->
+<canvas id="c421" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_moveTo_nonfinite() {
+
+var canvas = document.getElementById('c421');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.moveTo(Infinity, 50);
+ctx.moveTo(-Infinity, 50);
+ctx.moveTo(NaN, 50);
+ctx.moveTo(0, Infinity);
+ctx.moveTo(0, -Infinity);
+ctx.moveTo(0, NaN);
+ctx.moveTo(Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.basic</p>
+<canvas id="c422" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_basic() {
+
+var canvas = document.getElementById('c422');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.moveTo(0, 25);
+ctx.quadraticCurveTo(100, 25, 100, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.emptysubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.emptysubpath</p>
+<canvas id="c423" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_quadraticCurveTo_emptysubpath() {
+
+var canvas = document.getElementById('c423');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.beginPath();
+ctx.quadraticCurveTo(0, 25, 0, 25);
+ctx.quadraticCurveTo(100, 25, 100, 25);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.nonfinite</p>
+<!-- Testing: quadraticCurveTo() with Infinity/NaN is ignored -->
+<canvas id="c424" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_nonfinite() {
+
+var canvas = document.getElementById('c424');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.quadraticCurveTo(Infinity, 50, 0, 50);
+ctx.quadraticCurveTo(-Infinity, 50, 0, 50);
+ctx.quadraticCurveTo(NaN, 50, 0, 50);
+ctx.quadraticCurveTo(0, Infinity, 0, 50);
+ctx.quadraticCurveTo(0, -Infinity, 0, 50);
+ctx.quadraticCurveTo(0, NaN, 0, 50);
+ctx.quadraticCurveTo(0, 50, Infinity, 50);
+ctx.quadraticCurveTo(0, 50, -Infinity, 50);
+ctx.quadraticCurveTo(0, 50, NaN, 50);
+ctx.quadraticCurveTo(0, 50, 0, Infinity);
+ctx.quadraticCurveTo(0, 50, 0, -Infinity);
+ctx.quadraticCurveTo(0, 50, 0, NaN);
+ctx.quadraticCurveTo(Infinity, Infinity, 0, 50);
+ctx.quadraticCurveTo(Infinity, Infinity, Infinity, 50);
+ctx.quadraticCurveTo(Infinity, Infinity, Infinity, Infinity);
+ctx.quadraticCurveTo(Infinity, Infinity, 0, Infinity);
+ctx.quadraticCurveTo(Infinity, 50, Infinity, 50);
+ctx.quadraticCurveTo(Infinity, 50, Infinity, Infinity);
+ctx.quadraticCurveTo(Infinity, 50, 0, Infinity);
+ctx.quadraticCurveTo(0, Infinity, Infinity, 50);
+ctx.quadraticCurveTo(0, Infinity, Infinity, Infinity);
+ctx.quadraticCurveTo(0, Infinity, 0, Infinity);
+ctx.quadraticCurveTo(0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.scaled.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.scaled</p>
+<canvas id="c425" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_scaled() {
+
+var canvas = document.getElementById('c425');
+var ctx = canvas.getContext('2d');
+
+ctx.scale(1000, 1000);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 0.055;
+ctx.beginPath();
+ctx.moveTo(-1, 1.05);
+ctx.quadraticCurveTo(0, -1, 1.2, 1.05);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.quadraticCurveTo.shape.html ]]] -->
+
+<p>Canvas test: 2d.path.quadraticCurveTo.shape</p>
+<canvas id="c426" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_quadraticCurveTo_shape() {
+
+var canvas = document.getElementById('c426');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 55;
+ctx.beginPath();
+ctx.moveTo(-1000, 1050);
+ctx.quadraticCurveTo(0, -1000, 1200, 1050);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.basic</p>
+<canvas id="c427" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_basic() {
+
+var canvas = document.getElementById('c427');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 100, 50);
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.closed.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.closed</p>
+<canvas id="c428" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_closed() {
+
+var canvas = document.getElementById('c428');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+ctx.rect(100, 50, 100, 100);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.end.1.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.end.1</p>
+<canvas id="c429" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_end_1() {
+
+var canvas = document.getElementById('c429');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.rect(200, 100, 400, 1000);
+ctx.lineTo(-2000, -1000);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.end.2.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.end.2</p>
+<canvas id="c430" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_end_2() {
+
+var canvas = document.getElementById('c430');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 450;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'bevel';
+ctx.rect(150, 150, 2000, 2000);
+ctx.lineTo(160, 160);
+ctx.stroke();
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.negative.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.negative</p>
+<canvas id="c431" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_negative() {
+
+var canvas = document.getElementById('c431');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#0f0';
+ctx.rect(0, 0, 50, 25);
+ctx.rect(100, 0, -50, 25);
+ctx.rect(0, 50, 50, -25);
+ctx.rect(100, 50, -50, -25);
+ctx.fill();
+isPixel(ctx, 25,12, 0,255,0,255, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.newsubpath.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.newsubpath</p>
+<canvas id="c432" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_newsubpath() {
+
+var canvas = document.getElementById('c432');
+var ctx = canvas.getContext('2d');
+
+ctx.beginPath();
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-50, 25);
+ctx.rect(200, 25, 1, 1);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.nonfinite</p>
+<!-- Testing: rect() with Infinity/NaN is ignored -->
+<canvas id="c433" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_nonfinite() {
+
+var canvas = document.getElementById('c433');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.moveTo(0, 0);
+ctx.lineTo(100, 0);
+ctx.rect(Infinity, 50, 1, 1);
+ctx.rect(-Infinity, 50, 1, 1);
+ctx.rect(NaN, 50, 1, 1);
+ctx.rect(0, Infinity, 1, 1);
+ctx.rect(0, -Infinity, 1, 1);
+ctx.rect(0, NaN, 1, 1);
+ctx.rect(0, 50, Infinity, 1);
+ctx.rect(0, 50, -Infinity, 1);
+ctx.rect(0, 50, NaN, 1);
+ctx.rect(0, 50, 1, Infinity);
+ctx.rect(0, 50, 1, -Infinity);
+ctx.rect(0, 50, 1, NaN);
+ctx.rect(Infinity, Infinity, 1, 1);
+ctx.rect(Infinity, Infinity, Infinity, 1);
+ctx.rect(Infinity, Infinity, Infinity, Infinity);
+ctx.rect(Infinity, Infinity, 1, Infinity);
+ctx.rect(Infinity, 50, Infinity, 1);
+ctx.rect(Infinity, 50, Infinity, Infinity);
+ctx.rect(Infinity, 50, 1, Infinity);
+ctx.rect(0, Infinity, Infinity, 1);
+ctx.rect(0, Infinity, Infinity, Infinity);
+ctx.rect(0, Infinity, 1, Infinity);
+ctx.rect(0, 50, Infinity, Infinity);
+ctx.lineTo(100, 50);
+ctx.lineTo(0, 50);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 90,45, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.selfintersect.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.selfintersect</p>
+<canvas id="c434" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_rect_selfintersect() {
+
+var canvas = document.getElementById('c434');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 90;
+ctx.beginPath();
+ctx.rect(45, 20, 10, 10);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.winding.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.winding</p>
+<canvas id="c435" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_winding() {
+
+var canvas = document.getElementById('c435');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.beginPath();
+ctx.fillStyle = '#f00';
+ctx.rect(0, 0, 50, 50);
+ctx.rect(100, 50, -50, -50);
+ctx.rect(0, 25, 100, -25);
+ctx.rect(100, 25, -100, 25);
+ctx.fill();
+isPixel(ctx, 25,12, 0,255,0,255, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.1</p>
+<canvas id="c436" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_1() {
+
+var canvas = document.getElementById('c436');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.rect(0, 50, 100, 0);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.2</p>
+<canvas id="c437" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_2() {
+
+var canvas = document.getElementById('c437');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.rect(50, -100, 0, 250);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.3.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.3</p>
+<canvas id="c438" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_3() {
+
+var canvas = document.getElementById('c438');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.beginPath();
+ctx.rect(50, 25, 0, 0);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.4.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.4</p>
+<canvas id="c439" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_4() {
+
+var canvas = document.getElementById('c439');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.rect(100, 25, 0, 0);
+ctx.lineTo(0, 25);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.5.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.5</p>
+<canvas id="c440" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_rect_zero_5() {
+
+var canvas = document.getElementById('c440');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.moveTo(0, 0);
+ctx.rect(100, 25, 0, 0);
+ctx.stroke();
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.rect.zero.6.html ]]] -->
+
+<p>Canvas test: 2d.path.rect.zero.6</p>
+<canvas id="c441" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_rect_zero_6() {
+
+var canvas = document.getElementById('c441');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 1.5;
+ctx.lineWidth = 200;
+ctx.beginPath();
+ctx.rect(100, 25, 1000, 0);
+ctx.stroke();
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.empty.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.empty</p>
+<!-- Testing: Empty subpaths are not stroked -->
+<canvas id="c442" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_empty() {
+
+var canvas = document.getElementById('c442');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(40, 25);
+ctx.moveTo(60, 25);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.overlap.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.overlap</p>
+<!-- Testing: Stroked subpaths are combined before being drawn -->
+<canvas id="c443" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_overlap() {
+
+var canvas = document.getElementById('c443');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#000';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = 'rgba(0, 255, 0, 0.5)';
+ctx.lineWidth = 50;
+ctx.moveTo(0, 20);
+ctx.lineTo(100, 20);
+ctx.moveTo(0, 30);
+ctx.lineTo(100, 30);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,127,0,255, 1);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.arc.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.arc</p>
+<!-- Testing: Zero-length line segments from arcTo and arc are removed before stroking -->
+<canvas id="c444" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_arc() {
+
+var canvas = document.getElementById('c444');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arcTo(50, 25, 150, 25, 10);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.arc(50, 25, 10, 0, 0, false);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.closed.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.closed</p>
+<!-- Testing: Zero-length line segments from closed paths are removed before stroking -->
+<canvas id="c445" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_closed() {
+
+var canvas = document.getElementById('c445');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.lineTo(50, 25);
+ctx.closePath();
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.corner.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.corner</p>
+<!-- Testing: Zero-length line segments are removed before stroking with miters -->
+<canvas id="c446" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_prune_corner() {
+
+var canvas = document.getElementById('c446');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 400;
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 1.4;
+
+ctx.beginPath();
+ctx.moveTo(-1000, 200, 0, 0);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 200);
+ctx.lineTo(-100, 1000);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.curve.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.curve</p>
+<!-- Testing: Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking -->
+<canvas id="c447" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_curve() {
+
+var canvas = document.getElementById('c447');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.quadraticCurveTo(50, 25, 50, 25);
+ctx.stroke();
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.bezierCurveTo(50, 25, 50, 25, 50, 25);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.line.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.line</p>
+<!-- Testing: Zero-length line segments from lineTo are removed before stroking -->
+<canvas id="c448" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_line() {
+
+var canvas = document.getElementById('c448');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.moveTo(50, 25);
+ctx.lineTo(50, 25);
+ctx.stroke();
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.prune.rect.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.prune.rect</p>
+<!-- Testing: Zero-length line segments from rect and strokeRect are removed before stroking -->
+<canvas id="c449" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_path_stroke_prune_rect() {
+
+var canvas = document.getElementById('c449');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 100;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+
+ctx.beginPath();
+ctx.rect(50, 25, 0, 0);
+ctx.stroke();
+
+ctx.strokeRect(50, 25, 0, 0);
+
+todo_isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.scale1.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.scale1</p>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<canvas id="c450" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_scale1() {
+
+var canvas = document.getElementById('c450');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(25, 12.5, 50, 25);
+ctx.save();
+ctx.scale(50, 25);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.beginPath();
+ctx.rect(-25, -12.5, 150, 75);
+ctx.save();
+ctx.scale(50, 25);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.scale2.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.scale2</p>
+<!-- Testing: Stroke line widths are scaled by the current transformation matrix -->
+<canvas id="c451" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_scale2() {
+
+var canvas = document.getElementById('c451');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(25, 12.5, 50, 25);
+ctx.save();
+ctx.rotate(Math.PI/2);
+ctx.scale(25, 50);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.beginPath();
+ctx.rect(-25, -12.5, 150, 75);
+ctx.save();
+ctx.rotate(Math.PI/2);
+ctx.scale(25, 50);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.skew.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.skew</p>
+<!-- Testing: Strokes lines are skewed by the current transformation matrix -->
+<canvas id="c452" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_skew() {
+
+var canvas = document.getElementById('c452');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.moveTo(49, -50);
+ctx.lineTo(201, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 283);
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+ctx.restore();
+
+ctx.save();
+ctx.beginPath();
+ctx.translate(-150, 0);
+ctx.moveTo(49, -50);
+ctx.lineTo(199, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 142);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+ctx.save();
+ctx.beginPath();
+ctx.translate(-150, 0);
+ctx.moveTo(49, -50);
+ctx.lineTo(199, -50);
+ctx.rotate(Math.PI/4);
+ctx.scale(1, 142);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+ctx.restore();
+
+isPixel(ctx, 0,0, 0,255,0,255, 0);
+isPixel(ctx, 50,0, 0,255,0,255, 0);
+isPixel(ctx, 99,0, 0,255,0,255, 0);
+isPixel(ctx, 0,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 99,25, 0,255,0,255, 0);
+isPixel(ctx, 0,49, 0,255,0,255, 0);
+isPixel(ctx, 50,49, 0,255,0,255, 0);
+isPixel(ctx, 99,49, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.unaffected.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.unaffected</p>
+<!-- Testing: Stroking does not start a new path or subpath -->
+<canvas id="c453" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_unaffected() {
+
+var canvas = document.getElementById('c453');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.lineWidth = 50;
+ctx.moveTo(-100, 25);
+ctx.lineTo(-100, -100);
+ctx.lineTo(200, -100);
+ctx.lineTo(200, 25);
+ctx.strokeStyle = '#f00';
+ctx.stroke();
+
+ctx.closePath();
+ctx.strokeStyle = '#0f0';
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.stroke.union.html ]]] -->
+
+<p>Canvas test: 2d.path.stroke.union</p>
+<!-- Testing: Strokes in opposite directions are unioned, not subtracted -->
+<canvas id="c454" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_stroke_union() {
+
+var canvas = document.getElementById('c454');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 40;
+ctx.moveTo(0, 10);
+ctx.lineTo(100, 10);
+ctx.moveTo(100, 40);
+ctx.lineTo(0, 40);
+ctx.stroke();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.basic.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.basic</p>
+<canvas id="c455" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_basic() {
+
+var canvas = document.getElementById('c455');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(-100, 0);
+ctx.rect(100, 0, 100, 50);
+ctx.translate(0, -100);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.changing.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.changing</p>
+<!-- Testing: Transformations are applied while building paths, not when drawing -->
+<canvas id="c456" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_changing() {
+
+var canvas = document.getElementById('c456');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.moveTo(0, 0);
+ctx.translate(100, 0);
+ctx.lineTo(0, 0);
+ctx.translate(0, 50);
+ctx.lineTo(0, 0);
+ctx.translate(-100, 0);
+ctx.lineTo(0, 0);
+ctx.translate(1000, 1000);
+ctx.rotate(Math.PI/2);
+ctx.scale(0.1, 0.1);
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.path.transformation.multiple.html ]]] -->
+
+<p>Canvas test: 2d.path.transformation.multiple</p>
+<canvas id="c457" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_path_transformation_multiple() {
+
+var canvas = document.getElementById('c457');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rect(0, 0, 100, 50);
+ctx.fill();
+ctx.translate(-100, 0);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.animated.gif.html ]]] -->
+
+<p>Canvas test: 2d.pattern.animated.gif</p>
+<!-- Testing: createPattern() of an animated GIF draws the first frame -->
+<canvas id="c458" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas458 = document.getElementById('c458');
+var ctx458 = canvas458.getContext('2d');
+var isDone_test_2d_pattern_animated_gif = false;
+
+function test_2d_pattern_animated_gif() {
+
+deferTest();
+setTimeout(function () {
+    var pattern = ctx458.createPattern(document.getElementById('anim-gr_2.gif'), 'repeat');
+    ctx458.fillStyle = pattern;
+    ctx458.fillRect(0, 0, 50, 50);
+    setTimeout(wrapFunction(function () {
+        ctx458.fillRect(50, 0, 50, 50);
+        todo_isPixel(ctx458, 25,25, 0,255,0,255, 2);
+        todo_isPixel(ctx458, 75,25, 0,255,0,255, 2);
+		isDone_test_2d_pattern_animated_gif = true;
+    }), 2500);
+}, 2500);
+
+
+}
+</script>
+<img src="image_anim-gr.gif" id="anim-gr_2.gif" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.canvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.canvas</p>
+<canvas id="c459" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_canvas() {
+
+var canvas = document.getElementById('c459');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.basic.image.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.image</p>
+<canvas id="c460" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_image() {
+
+var canvas = document.getElementById('c460');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green_8.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_8.png" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.nocontext.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.nocontext</p>
+<canvas id="c461" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_basic_nocontext() {
+
+var canvas = document.getElementById('c461');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.basic.type.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.type</p>
+<canvas id="c462" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_basic_type() {
+
+var canvas = document.getElementById('c462');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasPattern !== undefined, "window.CanvasPattern !== undefined");
+
+window.CanvasPattern.prototype.thisImplementsCanvasPattern = true;
+
+var img = document.getElementById('green_9.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ok(pattern.thisImplementsCanvasPattern, "pattern.thisImplementsCanvasPattern");
+
+
+}
+</script>
+<img src="image_green.png" id="green_9.png" class="resource">
+
+<!-- [[[ test_2d.pattern.basic.zerocanvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.basic.zerocanvas</p>
+<canvas id="c463" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_basic_zerocanvas() {
+
+var canvas = document.getElementById('c463');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 0;
+canvas2.height = 0;
+ok(canvas2.width === 0, "canvas2.width === 0");
+ok(canvas2.height === 0, "canvas2.height === 0");
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+var pattern = ctx.createPattern(canvas2, 'repeat');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.crosscanvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.crosscanvas</p>
+<canvas id="c464" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_crosscanvas() {
+
+var canvas = document.getElementById('c464');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('green_10.png');
+
+var pattern = document.createElement('canvas').getContext('2d').createPattern(img, 'no-repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_10.png" class="resource">
+
+<!-- [[[ test_2d.pattern.image.broken.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.broken</p>
+<canvas id="c465" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_broken() {
+
+var canvas = document.getElementById('c465');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('broken_2.png');
+todo(img.complete === false, "img.complete === false");
+var _thrown = undefined; try {
+  ctx.createPattern(img, 'repeat');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
+
+
+}
+</script>
+<img src="image_broken.png" id="broken_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.image.incomplete.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.incomplete</p>
+<canvas id="c466" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_incomplete() {
+
+var canvas = document.getElementById('c466');
+var ctx = canvas.getContext('2d');
+
+var img = new Image();
+todo(img.complete === false, "img.complete === false");
+var _thrown = undefined; try {
+  ctx.createPattern(img, 'repeat');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.INVALID_STATE_ERR, "should throw INVALID_STATE_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.null.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.null</p>
+<canvas id="c467" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_null() {
+
+var canvas = document.getElementById('c467');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(null, 'repeat');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.string.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.string</p>
+<canvas id="c468" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_string() {
+
+var canvas = document.getElementById('c468');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern('image_red.png', 'repeat');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.image.undefined.html ]]] -->
+
+<p>Canvas test: 2d.pattern.image.undefined</p>
+<canvas id="c469" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_image_undefined() {
+
+var canvas = document.getElementById('c469');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(undefined, 'repeat');
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.TYPE_MISMATCH_ERR, "should throw TYPE_MISMATCH_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.canvas1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.canvas1</p>
+<canvas id="c470" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_modify_canvas1() {
+
+var canvas = document.getElementById('c470');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.canvas2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.canvas2</p>
+<canvas id="c471" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_modify_canvas2() {
+
+var canvas = document.getElementById('c471');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 0, 100, 50);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.modify.image1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.image1</p>
+<canvas id="c472" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas472 = document.getElementById('c472');
+var ctx472 = canvas472.getContext('2d');
+
+function test_2d_pattern_modify_image1() {
+
+var img = document.getElementById('green_11.png');
+var pattern = ctx472.createPattern(img, 'no-repeat');
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx472.fillStyle = pattern;
+    ctx472.fillRect(0, 0, 100, 50);
+
+    isPixel(ctx472, 1,1, 0,255,0,255, 0);
+    isPixel(ctx472, 98,1, 0,255,0,255, 0);
+    isPixel(ctx472, 1,48, 0,255,0,255, 0);
+    isPixel(ctx472, 98,48, 0,255,0,255, 0);
+});
+img.src = 'image_red.png';
+
+
+}
+</script>
+<img src="image_green.png" id="green_11.png" class="resource">
+
+<!-- [[[ test_2d.pattern.modify.image2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.modify.image2</p>
+<canvas id="c473" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+var canvas473 = document.getElementById('c473');
+var ctx473 = canvas473.getContext('2d');
+
+function test_2d_pattern_modify_image2() {
+
+var img = document.getElementById('green_12.png');
+var pattern = ctx473.createPattern(img, 'no-repeat');
+ctx473.fillStyle = pattern;
+ctx473.fillRect(0, 0, 100, 50);
+ctx473.fillStyle = '#00f';
+ctx473.fillRect(0, 0, 100, 50);
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx473.fillStyle = pattern;
+    ctx473.fillRect(0, 0, 100, 50);
+
+    isPixel(ctx473, 1,1, 0,255,0,255, 0);
+    isPixel(ctx473, 98,1, 0,255,0,255, 0);
+    isPixel(ctx473, 1,48, 0,255,0,255, 0);
+    isPixel(ctx473, 98,48, 0,255,0,255, 0);
+});
+img.src = 'image_red.png';
+
+
+}
+</script>
+<img src="image_green.png" id="green_12.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.basic</p>
+<canvas id="c474" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_basic() {
+
+var canvas = document.getElementById('c474');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green_13.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_13.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord1</p>
+<canvas id="c475" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord1() {
+
+var canvas = document.getElementById('c475');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+var img = document.getElementById('green_14.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 0);
+ctx.fillRect(-50, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_14.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord2</p>
+<canvas id="c476" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord2() {
+
+var canvas = document.getElementById('c476');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('green_15.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 50, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.fillStyle = pattern;
+ctx.translate(50, 0);
+ctx.fillRect(-50, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green.png" id="green_15.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.coord3.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.coord3</p>
+<canvas id="c477" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_coord3() {
+
+var canvas = document.getElementById('c477');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red_15.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 25);
+ctx.fillRect(-50, -25, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 25);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_15.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.norepeat.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.norepeat.outside</p>
+<canvas id="c478" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_norepeat_outside() {
+
+var canvas = document.getElementById('c478');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red_16.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+ctx.fillRect(-100, 0, 100, 50);
+ctx.fillRect(0, 50, 100, 50);
+ctx.fillRect(100, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_16.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.orientation.canvas.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.orientation.canvas</p>
+<!-- Testing: Canvas patterns do not get flipped when painted -->
+<canvas id="c479" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_orientation_canvas() {
+
+var canvas = document.getElementById('c479');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 25);
+ctx2.fillStyle = '#0f0';
+ctx2.fillRect(0, 25, 100, 25);
+
+var pattern = ctx.createPattern(canvas2, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 25);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.paint.orientation.image.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.orientation.image</p>
+<!-- Testing: Image patterns do not get flipped when painted -->
+<canvas id="c480" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_orientation_image() {
+
+var canvas = document.getElementById('c480');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rrgg-256x256_1.png');
+var pattern = ctx.createPattern(img, 'no-repeat');
+ctx.fillStyle = pattern;
+ctx.save();
+ctx.translate(0, -103);
+ctx.fillRect(0, 103, 100, 50);
+ctx.restore();
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 25);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rrgg-256x256.png" id="rrgg-256x256_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.basic</p>
+<canvas id="c481" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_basic() {
+
+var canvas = document.getElementById('c481');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16_1.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord1</p>
+<canvas id="c482" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_coord1() {
+
+var canvas = document.getElementById('c482');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('rgrg-256x256_3.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.translate(-128, -78);
+ctx.fillRect(128, 78, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord2.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord2</p>
+<canvas id="c483" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_coord2() {
+
+var canvas = document.getElementById('c483');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('ggrr-256x256_3.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_ggrr-256x256.png" id="ggrr-256x256_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.coord3.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.coord3</p>
+<canvas id="c484" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeat_coord3() {
+
+var canvas = document.getElementById('c484');
+var ctx = canvas.getContext('2d');
+
+var img = document.getElementById('rgrg-256x256_4.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(-128, -78);
+ctx.fillRect(128, 78, 100, 50);
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_rgrg-256x256.png" id="rgrg-256x256_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeat.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeat.outside</p>
+<canvas id="c485" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeat_outside() {
+
+var canvas = document.getElementById('c485');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('green-16x16_2.png');
+var pattern = ctx.createPattern(img, 'repeat');
+ctx.fillStyle = pattern;
+ctx.translate(50, 25);
+ctx.fillRect(-50, -25, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.basic</p>
+<canvas id="c486" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeatx_basic() {
+
+var canvas = document.getElementById('c486');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 16);
+
+var img = document.getElementById('green-16x16_3.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.coord1</p>
+<canvas id="c487" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeatx_coord1() {
+
+var canvas = document.getElementById('c487');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_1.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.translate(0, 16);
+ctx.fillRect(0, -16, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 16);
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeatx.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeatx.outside</p>
+<canvas id="c488" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeatx_outside() {
+
+var canvas = document.getElementById('c488');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_2.png');
+var pattern = ctx.createPattern(img, 'repeat-x');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 16);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.basic.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.basic</p>
+<canvas id="c489" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_paint_repeaty_basic() {
+
+var canvas = document.getElementById('c489');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 16, 50);
+
+var img = document.getElementById('green-16x16_4.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-16x16.png" id="green-16x16_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.coord1.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.coord1</p>
+<canvas id="c490" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeaty_coord1() {
+
+var canvas = document.getElementById('c490');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_3.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.translate(48, 0);
+ctx.fillRect(-48, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 50);
+
+todo_isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 50,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 50,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_3.png" class="resource">
+
+<!-- [[[ test_2d.pattern.paint.repeaty.outside.html ]]] -->
+
+<p>Canvas test: 2d.pattern.paint.repeaty.outside</p>
+<canvas id="c491" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_pattern_paint_repeaty_outside() {
+
+var canvas = document.getElementById('c491');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+var img = document.getElementById('red-16x16_4.png');
+var pattern = ctx.createPattern(img, 'repeat-y');
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+todo_isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red-16x16.png" id="red-16x16_4.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.case.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.case</p>
+<canvas id="c492" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_case() {
+
+var canvas = document.getElementById('c492');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(canvas, "Repeat");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.empty.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.empty</p>
+<canvas id="c493" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_repeat_empty() {
+
+var canvas = document.getElementById('c493');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1_1.png');
+var pattern = ctx.createPattern(img, "");
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 200, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-1x1.png" id="green-1x1_1.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.null.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.null</p>
+<canvas id="c494" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_pattern_repeat_null() {
+
+var canvas = document.getElementById('c494');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+var img = document.getElementById('green-1x1_2.png');
+var pattern = ctx.createPattern(img, null);
+ctx.fillStyle = pattern;
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 98,1, 0,255,0,255, 0);
+isPixel(ctx, 1,48, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_green-1x1.png" id="green-1x1_2.png" class="resource">
+
+<!-- [[[ test_2d.pattern.repeat.nullsuffix.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.nullsuffix</p>
+<canvas id="c495" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_nullsuffix() {
+
+var canvas = document.getElementById('c495');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(canvas, "repeat\0");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.undefined.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.undefined</p>
+<canvas id="c496" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_undefined() {
+
+var canvas = document.getElementById('c496');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(canvas, undefined);
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.pattern.repeat.unrecognised.html ]]] -->
+
+<p>Canvas test: 2d.pattern.repeat.unrecognised</p>
+<canvas id="c497" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_pattern_repeat_unrecognised() {
+
+var canvas = document.getElementById('c497');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.createPattern(canvas, "invalid");
+} catch (e) { _thrown = e }; ok(_thrown && _thrown.code == DOMException.SYNTAX_ERR, "should throw SYNTAX_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.scaled.html ]]] -->
+
+<p>Canvas test: 2d.scaled</p>
+<!-- Testing: CSS-scaled canvases get drawn correctly -->
+<canvas id="c498" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_scaled() {
+
+var canvas = document.getElementById('c498');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#00f';
+ctx.fillRect(0, 0, 50, 25);
+ctx.fillStyle = '#0ff';
+ctx.fillRect(0, 0, 25, 10);
+
+todo(false, "test completed successfully"); // (Bug 483989)
+
+}
+
+</script>
+<!-- [[[ test_2d.shadow.alpha.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.1</p>
+<canvas id="c499" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_alpha_1() {
+
+var canvas = document.getElementById('c499');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = 'rgba(255, 0, 0, 0.01)';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 4);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.2</p>
+<canvas id="c500" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_2() {
+
+var canvas = document.getElementById('c500');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = 'rgba(0, 0, 255, 0.5)';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.3</p>
+<canvas id="c501" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_3() {
+
+var canvas = document.getElementById('c501');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 50;
+ctx.globalAlpha = 0.5;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.4.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.4</p>
+<canvas id="c502" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_4() {
+
+var canvas = document.getElementById('c502');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00'; // (work around broken Firefox globalAlpha caching)
+ctx.shadowColor = 'rgba(0, 0, 255, 0.707)';
+ctx.shadowOffsetY = 50;
+ctx.globalAlpha = 0.707;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.alpha.5.html ]]] -->
+
+<p>Canvas test: 2d.shadow.alpha.5</p>
+<canvas id="c503" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_alpha_5() {
+
+var canvas = document.getElementById('c503');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = 'rgba(64, 0, 0, 0.5)';
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 50;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowBlur.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowBlur.1</p>
+<canvas id="c504" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowBlur_1() {
+
+var canvas = document.getElementById('c504');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowBlur = 1;
+ok(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
+ctx.shadowBlur = 0.5;
+ok(ctx.shadowBlur === 0.5, "ctx.shadowBlur === 0.5");
+ctx.shadowBlur = 1e6;
+ok(ctx.shadowBlur === 1e6, "ctx.shadowBlur === 1e6");
+ctx.shadowBlur = 1;
+ctx.shadowBlur = -2;
+ok(ctx.shadowBlur === 1, "ctx.shadowBlur === 1");
+ctx.shadowBlur = 0;
+ok(ctx.shadowBlur === 0, "ctx.shadowBlur === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowBlur.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowBlur.2</p>
+<canvas id="c505" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowBlur_2() {
+
+var canvas = document.getElementById('c505');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.shadowBlur = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowBlur = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowBlur = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowColor.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowColor.1</p>
+<canvas id="c506" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowColor_1() {
+
+var canvas = document.getElementById('c506');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowColor = 'lime';
+ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = 'RGBA(0,255, 0,0)';
+ok(ctx.shadowColor === 'rgba(0, 255, 0, 0.0)', "ctx.shadowColor === 'rgba(0, 255, 0, 0.0)'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowColor.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowColor.2</p>
+<canvas id="c507" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowColor_2() {
+
+var canvas = document.getElementById('c507');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowColor = '#00ff00';
+ctx.shadowColor = 'bogus';
+ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = ctx;
+ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+ctx.shadowColor = undefined;
+ok(ctx.shadowColor === '#00ff00', "ctx.shadowColor === '#00ff00'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowOffset.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowOffset.1</p>
+<canvas id="c508" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowOffset_1() {
+
+var canvas = document.getElementById('c508');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowOffsetX = 1;
+ctx.shadowOffsetY = 2;
+ok(ctx.shadowOffsetX === 1, "ctx.shadowOffsetX === 1");
+ok(ctx.shadowOffsetY === 2, "ctx.shadowOffsetY === 2");
+ctx.shadowOffsetX = 0.5;
+ctx.shadowOffsetY = 0.25;
+ok(ctx.shadowOffsetX === 0.5, "ctx.shadowOffsetX === 0.5");
+ok(ctx.shadowOffsetY === 0.25, "ctx.shadowOffsetY === 0.25");
+ctx.shadowOffsetX = -0.5;
+ctx.shadowOffsetY = -0.25;
+ok(ctx.shadowOffsetX === -0.5, "ctx.shadowOffsetX === -0.5");
+ok(ctx.shadowOffsetY === -0.25, "ctx.shadowOffsetY === -0.25");
+ctx.shadowOffsetX = 1e6;
+ctx.shadowOffsetY = 1e6;
+ok(ctx.shadowOffsetX === 1e6, "ctx.shadowOffsetX === 1e6");
+ok(ctx.shadowOffsetY === 1e6, "ctx.shadowOffsetY === 1e6");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.attributes.shadowOffset.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.attributes.shadowOffset.2</p>
+<canvas id="c509" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_attributes_shadowOffset_2() {
+
+var canvas = document.getElementById('c509');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  ctx.shadowOffsetX = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowOffsetX = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowOffsetX = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowOffsetY = Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowOffsetY = -Infinity;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+var _thrown = undefined; try {
+  ctx.shadowOffsetY = NaN;
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.basic.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.basic.1</p>
+<canvas id="c510" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_basic_1() {
+
+var canvas = document.getElementById('c510');
+var ctx = canvas.getContext('2d');
+
+ctx.shadowColor = '#f00';
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.basic.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.basic.2</p>
+<canvas id="c511" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_basic_2() {
+
+var canvas = document.getElementById('c511');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.fillRect(0, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.blur.high.html ]]] -->
+
+<p>Canvas test: 2d.shadow.blur.high</p>
+<canvas id="c512" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_blur_high() {
+
+var canvas = document.getElementById('c512');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 0;
+ctx.shadowBlur = 555.6;
+ctx.fillRect(-200, -200, 200, 400);
+
+todo(false, "test completed successfully"); // (Bug 483989)
+
+}
+
+</script>
+<!-- [[[ test_2d.shadow.blur.low.html ]]] -->
+
+<p>Canvas test: 2d.shadow.blur.low</p>
+<canvas id="c513" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_shadow_blur_low() {
+
+var canvas = document.getElementById('c513');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#ff0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#00f';
+ctx.shadowOffsetY = 25;
+for (var x = 0; x < 100; ++x) {
+    ctx.save();
+    ctx.beginPath();
+    ctx.rect(x, 0, 1, 50);
+    ctx.clip();
+    ctx.shadowBlur = x;
+    ctx.fillRect(-200, -200, 500, 200);
+    ctx.restore();
+}
+
+todo(false, "test completed successfully"); // (Bug 483989)
+
+}
+</script>
+<!-- [[[ test_2d.shadow.canvas.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.alpha</p>
+<canvas id="c514" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_alpha() {
+
+var canvas = document.getElementById('c514');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = 'rgba(255, 0, 0, 0.5)';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.drawImage(canvas2, 0, -50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_1.png" class="resource">
+
+<!-- [[[ test_2d.shadow.canvas.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.basic</p>
+<canvas id="c515" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_basic() {
+
+var canvas = document.getElementById('c515');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(canvas2, 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.canvas.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.transparent.1</p>
+<canvas id="c516" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_canvas_transparent_1() {
+
+var canvas = document.getElementById('c516');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(canvas2, 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.canvas.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.canvas.transparent.2</p>
+<canvas id="c517" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_canvas_transparent_2() {
+
+var canvas = document.getElementById('c517');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+canvas2.width = 100;
+canvas2.height = 50;
+var ctx2 = canvas2.getContext('2d');
+ctx2.fillStyle = '#f00';
+ctx2.fillRect(0, 0, 50, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(canvas2, 50, -50);
+ctx.shadowColor = '#f00';
+ctx.drawImage(canvas2, -50, -50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.1</p>
+<canvas id="c518" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_clip_1() {
+
+var canvas = document.getElementById('c518');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(50, 0, 50, 50);
+ctx.clip();
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+ctx.restore();
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.2</p>
+<canvas id="c519" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_clip_2() {
+
+var canvas = document.getElementById('c519');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+ctx.restore();
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.clip.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.clip.3</p>
+<canvas id="c520" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_clip_3() {
+
+var canvas = document.getElementById('c520');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+
+ctx.save();
+ctx.beginPath();
+ctx.rect(0, 0, 50, 50);
+ctx.clip();
+ctx.fillStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(-50, 0, 50, 50);
+ctx.restore();
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.1</p>
+<canvas id="c521" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_1() {
+
+var canvas = document.getElementById('c521');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, 0, 200, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.2</p>
+<canvas id="c522" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_2() {
+
+var canvas = document.getElementById('c522');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.shadowBlur = 1;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-10, -10, 120, 70);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.3</p>
+<canvas id="c523" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_3() {
+
+var canvas = document.getElementById('c523');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.globalCompositeOperation = 'xor';
+ctx.shadowColor = '#f00';
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.composite.4.html ]]] -->
+
+<p>Canvas test: 2d.shadow.composite.4</p>
+<canvas id="c524" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_composite_4() {
+
+var canvas = document.getElementById('c524');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'destination-over';
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.alpha</p>
+<canvas id="c525" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_alpha() {
+
+var canvas = document.getElementById('c525');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, 'rgba(255,0,0,0.5)');
+gradient.addColorStop(1, 'rgba(255,0,0,0.5)');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.basic</p>
+<canvas id="c526" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_basic() {
+
+var canvas = document.getElementById('c526');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, '#f00');
+gradient.addColorStop(1, '#f00');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.transparent.1</p>
+<canvas id="c527" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_gradient_transparent_1() {
+
+var canvas = document.getElementById('c527');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, 'rgba(0,0,0,0)');
+gradient.addColorStop(1, 'rgba(0,0,0,0)');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.gradient.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.gradient.transparent.2</p>
+<canvas id="c528" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_gradient_transparent_2() {
+
+var canvas = document.getElementById('c528');
+var ctx = canvas.getContext('2d');
+
+var gradient = ctx.createLinearGradient(0, 0, 100, 0);
+gradient.addColorStop(0, '#f00');
+gradient.addColorStop(0.499, '#f00');
+gradient.addColorStop(0.5, 'rgba(0,0,0,0)');
+gradient.addColorStop(1, 'rgba(0,0,0,0)');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = gradient;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.image.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.alpha</p>
+<canvas id="c529" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_alpha() {
+
+var canvas = document.getElementById('c529');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.drawImage(document.getElementById('transparent50_2.png'), 0, -50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.basic</p>
+<canvas id="c530" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_basic() {
+
+var canvas = document.getElementById('c530');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(document.getElementById('red_17.png'), 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_17.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.scale.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.scale</p>
+<canvas id="c531" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_scale() {
+
+var canvas = document.getElementById('c531');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(document.getElementById('redtransparent_2.png'), 0, 0, 100, 50, -10, -50, 240, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.section.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.section</p>
+<canvas id="c532" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_image_section() {
+
+var canvas = document.getElementById('c532');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#f00';
+ctx.drawImage(document.getElementById('redtransparent_3.png'), 50, 0, 50, 50, 0, -50, 50, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 2);
+isPixel(ctx, 75,25, 0,255,0,255, 2);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_3.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.transparent.1</p>
+<canvas id="c533" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_image_transparent_1() {
+
+var canvas = document.getElementById('c533');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.drawImage(document.getElementById('transparent_1.png'), 0, -50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_transparent.png" id="transparent_1.png" class="resource">
+
+<!-- [[[ test_2d.shadow.image.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.image.transparent.2</p>
+<canvas id="c534" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_image_transparent_2() {
+
+var canvas = document.getElementById('c534');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.drawImage(document.getElementById('redtransparent_4.png'), 50, -50);
+ctx.shadowColor = '#f00';
+ctx.drawImage(document.getElementById('redtransparent_4.png'), -50, -50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_4.png" class="resource">
+
+<!-- [[[ test_2d.shadow.offset.negativeX.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.negativeX</p>
+<canvas id="c535" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_negativeX() {
+
+var canvas = document.getElementById('c535');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = -50;
+ctx.fillRect(50, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.negativeY.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.negativeY</p>
+<canvas id="c536" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_negativeY() {
+
+var canvas = document.getElementById('c536');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = -25;
+ctx.fillRect(0, 25, 100, 25);
+isPixel(ctx, 50,12, 0,255,0,255, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.positiveX.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.positiveX</p>
+<canvas id="c537" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_positiveX() {
+
+var canvas = document.getElementById('c537');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 50;
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.offset.positiveY.html ]]] -->
+
+<p>Canvas test: 2d.shadow.offset.positiveY</p>
+<canvas id="c538" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_offset_positiveY() {
+
+var canvas = document.getElementById('c538');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#0f0';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 25;
+ctx.fillRect(0, 0, 100, 25);
+isPixel(ctx, 50,12, 0,255,0,255, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.outside.html ]]] -->
+
+<p>Canvas test: 2d.shadow.outside</p>
+<canvas id="c539" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_outside() {
+
+var canvas = document.getElementById('c539');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 100;
+ctx.fillRect(-100, 0, 25, 50);
+ctx.shadowOffsetX = -100;
+ctx.fillRect(175, 0, 25, 50);
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 100;
+ctx.fillRect(25, -100, 50, 25);
+ctx.shadowOffsetY = -100;
+ctx.fillRect(25, 125, 50, 25);
+isPixel(ctx, 12,25, 0,255,0,255, 0);
+isPixel(ctx, 87,25, 0,255,0,255, 0);
+isPixel(ctx, 50,12, 0,255,0,255, 0);
+isPixel(ctx, 50,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.pattern.alpha.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.alpha</p>
+<canvas id="c540" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_alpha() {
+
+var canvas = document.getElementById('c540');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent50_3.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#00f';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 127,0,127,255, 2);
+
+
+}
+</script>
+<img src="image_transparent50.png" id="transparent50_3.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.basic</p>
+<canvas id="c541" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_basic() {
+
+var canvas = document.getElementById('c541');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('red_18.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_red.png" id="red_18.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.transparent.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.transparent.1</p>
+<canvas id="c542" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_pattern_transparent_1() {
+
+var canvas = document.getElementById('c542');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('transparent_2.png'), 'repeat');
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_transparent.png" id="transparent_2.png" class="resource">
+
+<!-- [[[ test_2d.shadow.pattern.transparent.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.pattern.transparent.2</p>
+<canvas id="c543" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_pattern_transparent_2() {
+
+var canvas = document.getElementById('c543');
+var ctx = canvas.getContext('2d');
+
+var pattern = ctx.createPattern(document.getElementById('redtransparent_5.png'), 'repeat');
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.fillStyle = pattern;
+ctx.fillRect(0, -50, 100, 50);
+
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+<img src="image_redtransparent.png" id="redtransparent_5.png" class="resource">
+
+<!-- [[[ test_2d.shadow.stroke.basic.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.basic</p>
+<canvas id="c544" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_basic() {
+
+var canvas = document.getElementById('c544');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.moveTo(0, -25);
+ctx.lineTo(100, -25);
+ctx.stroke();
+
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.cap.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.cap.1</p>
+<canvas id="c545" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_cap_1() {
+
+var canvas = document.getElementById('c545');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.lineCap = 'butt';
+ctx.moveTo(-50, -25);
+ctx.lineTo(0, -25);
+ctx.moveTo(100, -25);
+ctx.lineTo(150, -25);
+ctx.stroke();
+
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.cap.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.cap.2</p>
+<canvas id="c546" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_cap_2() {
+
+var canvas = document.getElementById('c546');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetY = 50;
+ctx.beginPath();
+ctx.lineWidth = 50;
+ctx.lineCap = 'square';
+ctx.moveTo(25, -25);
+ctx.lineTo(75, -25);
+ctx.stroke();
+
+isPixel(ctx, 1,25, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.1</p>
+<canvas id="c547" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_join_1() {
+
+var canvas = document.getElementById('c547');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'bevel';
+ctx.beginPath();
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.2</p>
+<canvas id="c548" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_stroke_join_2() {
+
+var canvas = document.getElementById('c548');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, 0, 50, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#0f0';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+ctx.beginPath();
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100);
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.stroke.join.3.html ]]] -->
+
+<p>Canvas test: 2d.shadow.stroke.join.3</p>
+<canvas id="c549" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_shadow_stroke_join_3() {
+
+var canvas = document.getElementById('c549');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.shadowColor = '#f00';
+ctx.shadowOffsetX = 100;
+ctx.lineWidth = 200;
+ctx.lineJoin = 'miter';
+ctx.miterLimit = 0.1;
+ctx.beginPath();
+ctx.moveTo(-200, -50);
+ctx.lineTo(-150, -50);
+ctx.lineTo(-151, -100); // (not an exact right angle, to avoid some other bug in Firefox 3)
+ctx.stroke();
+
+isPixel(ctx, 1,1, 0,255,0,255, 0);
+isPixel(ctx, 48,48, 0,255,0,255, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,48, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.transform.1.html ]]] -->
+
+<p>Canvas test: 2d.shadow.transform.1</p>
+<canvas id="c550" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_transform_1() {
+
+var canvas = document.getElementById('c550');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.translate(100, 100);
+ctx.fillRect(-100, -150, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.shadow.transform.2.html ]]] -->
+
+<p>Canvas test: 2d.shadow.transform.2</p>
+<canvas id="c551" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_shadow_transform_2() {
+
+var canvas = document.getElementById('c551');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.shadowOffsetY = 50;
+ctx.shadowColor = '#0f0';
+ctx.rotate(Math.PI)
+ctx.fillRect(-100, 0, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.bitmap.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.bitmap</p>
+<!-- Testing: save()/restore() does not affect the current bitmap -->
+<canvas id="c552" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_bitmap() {
+
+var canvas = document.getElementById('c552');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.restore();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.clip.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.clip</p>
+<!-- Testing: save()/restore() affects the clipping path -->
+<canvas id="c553" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_clip() {
+
+var canvas = document.getElementById('c553');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.rect(0, 0, 1, 1);
+ctx.clip();
+ctx.restore();
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.fillStyle.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.fillStyle</p>
+<!-- Testing: save()/restore() works for fillStyle -->
+<canvas id="c554" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_fillStyle() {
+
+var canvas = document.getElementById('c554');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.fillStyle;
+ctx.save();
+ctx.fillStyle = "#ff0000";
+ctx.restore();
+ok(ctx.fillStyle === old, "ctx.fillStyle === old");
+
+// Also test that save() doesn't modify the values
+ctx.fillStyle = "#ff0000";
+old = ctx.fillStyle;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.fillStyle === old, "ctx.fillStyle === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.globalAlpha.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.globalAlpha</p>
+<!-- Testing: save()/restore() works for globalAlpha -->
+<canvas id="c555" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_globalAlpha() {
+
+var canvas = document.getElementById('c555');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.globalAlpha;
+ctx.save();
+ctx.globalAlpha = 0.5;
+ctx.restore();
+ok(ctx.globalAlpha === old, "ctx.globalAlpha === old");
+
+// Also test that save() doesn't modify the values
+ctx.globalAlpha = 0.5;
+old = ctx.globalAlpha;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.globalAlpha === old, "ctx.globalAlpha === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.globalCompositeOperation.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.globalCompositeOperation</p>
+<!-- Testing: save()/restore() works for globalCompositeOperation -->
+<canvas id="c556" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_globalCompositeOperation() {
+
+var canvas = document.getElementById('c556');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.globalCompositeOperation;
+ctx.save();
+ctx.globalCompositeOperation = "copy";
+ctx.restore();
+ok(ctx.globalCompositeOperation === old, "ctx.globalCompositeOperation === old");
+
+// Also test that save() doesn't modify the values
+ctx.globalCompositeOperation = "copy";
+old = ctx.globalCompositeOperation;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "copy"
+ctx.save();
+ok(ctx.globalCompositeOperation === old, "ctx.globalCompositeOperation === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineCap.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineCap</p>
+<!-- Testing: save()/restore() works for lineCap -->
+<canvas id="c557" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineCap() {
+
+var canvas = document.getElementById('c557');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineCap;
+ctx.save();
+ctx.lineCap = "round";
+ctx.restore();
+ok(ctx.lineCap === old, "ctx.lineCap === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineCap = "round";
+old = ctx.lineCap;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "round"
+ctx.save();
+ok(ctx.lineCap === old, "ctx.lineCap === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineJoin.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineJoin</p>
+<!-- Testing: save()/restore() works for lineJoin -->
+<canvas id="c558" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineJoin() {
+
+var canvas = document.getElementById('c558');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineJoin;
+ctx.save();
+ctx.lineJoin = "round";
+ctx.restore();
+ok(ctx.lineJoin === old, "ctx.lineJoin === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineJoin = "round";
+old = ctx.lineJoin;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "round"
+ctx.save();
+ok(ctx.lineJoin === old, "ctx.lineJoin === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.lineWidth.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.lineWidth</p>
+<!-- Testing: save()/restore() works for lineWidth -->
+<canvas id="c559" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_lineWidth() {
+
+var canvas = document.getElementById('c559');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.lineWidth;
+ctx.save();
+ctx.lineWidth = 0.5;
+ctx.restore();
+ok(ctx.lineWidth === old, "ctx.lineWidth === old");
+
+// Also test that save() doesn't modify the values
+ctx.lineWidth = 0.5;
+old = ctx.lineWidth;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.lineWidth === old, "ctx.lineWidth === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.miterLimit.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.miterLimit</p>
+<!-- Testing: save()/restore() works for miterLimit -->
+<canvas id="c560" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_miterLimit() {
+
+var canvas = document.getElementById('c560');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.miterLimit;
+ctx.save();
+ctx.miterLimit = 0.5;
+ctx.restore();
+ok(ctx.miterLimit === old, "ctx.miterLimit === old");
+
+// Also test that save() doesn't modify the values
+ctx.miterLimit = 0.5;
+old = ctx.miterLimit;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 0.5
+ctx.save();
+ok(ctx.miterLimit === old, "ctx.miterLimit === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.path.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.path</p>
+<!-- Testing: save()/restore() does not affect the current path -->
+<canvas id="c561" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_path() {
+
+var canvas = document.getElementById('c561');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.rect(0, 0, 100, 50);
+ctx.restore();
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowBlur.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowBlur</p>
+<!-- Testing: save()/restore() works for shadowBlur -->
+<canvas id="c562" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowBlur() {
+
+var canvas = document.getElementById('c562');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowBlur;
+ctx.save();
+ctx.shadowBlur = 5;
+ctx.restore();
+ok(ctx.shadowBlur === old, "ctx.shadowBlur === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowBlur = 5;
+old = ctx.shadowBlur;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowBlur === old, "ctx.shadowBlur === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowColor.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowColor</p>
+<!-- Testing: save()/restore() works for shadowColor -->
+<canvas id="c563" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowColor() {
+
+var canvas = document.getElementById('c563');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowColor;
+ctx.save();
+ctx.shadowColor = "#ff0000";
+ctx.restore();
+ok(ctx.shadowColor === old, "ctx.shadowColor === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowColor = "#ff0000";
+old = ctx.shadowColor;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.shadowColor === old, "ctx.shadowColor === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowOffsetX.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowOffsetX</p>
+<!-- Testing: save()/restore() works for shadowOffsetX -->
+<canvas id="c564" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowOffsetX() {
+
+var canvas = document.getElementById('c564');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowOffsetX;
+ctx.save();
+ctx.shadowOffsetX = 5;
+ctx.restore();
+ok(ctx.shadowOffsetX === old, "ctx.shadowOffsetX === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowOffsetX = 5;
+old = ctx.shadowOffsetX;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowOffsetX === old, "ctx.shadowOffsetX === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.shadowOffsetY.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.shadowOffsetY</p>
+<!-- Testing: save()/restore() works for shadowOffsetY -->
+<canvas id="c565" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_shadowOffsetY() {
+
+var canvas = document.getElementById('c565');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.shadowOffsetY;
+ctx.save();
+ctx.shadowOffsetY = 5;
+ctx.restore();
+ok(ctx.shadowOffsetY === old, "ctx.shadowOffsetY === old");
+
+// Also test that save() doesn't modify the values
+ctx.shadowOffsetY = 5;
+old = ctx.shadowOffsetY;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against 5
+ctx.save();
+ok(ctx.shadowOffsetY === old, "ctx.shadowOffsetY === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.stack.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.stack</p>
+<!-- Testing: save()/restore() can be nested as a stack -->
+<canvas id="c566" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_stack() {
+
+var canvas = document.getElementById('c566');
+var ctx = canvas.getContext('2d');
+
+ctx.lineWidth = 1;
+ctx.save();
+ctx.lineWidth = 2;
+ctx.save();
+ctx.lineWidth = 3;
+ok(ctx.lineWidth == 3, "ctx.lineWidth == 3");
+ctx.restore();
+ok(ctx.lineWidth == 2, "ctx.lineWidth == 2");
+ctx.restore();
+ok(ctx.lineWidth == 1, "ctx.lineWidth == 1");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.stackdepth.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.stackdepth</p>
+<!-- Testing: save()/restore() stack depth is not unreasonably limited -->
+<canvas id="c567" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_stackdepth() {
+
+var canvas = document.getElementById('c567');
+var ctx = canvas.getContext('2d');
+
+var limit = 512;
+for (var i = 1; i < limit; ++i)
+{
+    ctx.save();
+    ctx.lineWidth = i;
+}
+for (var i = limit-1; i > 0; --i)
+{
+    ok(ctx.lineWidth == i, "ctx.lineWidth == i");
+    ctx.restore();
+}
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.strokeStyle.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.strokeStyle</p>
+<!-- Testing: save()/restore() works for strokeStyle -->
+<canvas id="c568" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_strokeStyle() {
+
+var canvas = document.getElementById('c568');
+var ctx = canvas.getContext('2d');
+
+// Test that restore() undoes any modifications
+var old = ctx.strokeStyle;
+ctx.save();
+ctx.strokeStyle = "#ff0000";
+ctx.restore();
+ok(ctx.strokeStyle === old, "ctx.strokeStyle === old");
+
+// Also test that save() doesn't modify the values
+ctx.strokeStyle = "#ff0000";
+old = ctx.strokeStyle;
+    // we're not interested in failures caused by get(set(x)) != x (e.g.
+    // from rounding), so compare against d instead of against "#ff0000"
+ctx.save();
+ok(ctx.strokeStyle === old, "ctx.strokeStyle === old");
+ctx.restore();
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.transformation.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.transformation</p>
+<!-- Testing: save()/restore() affects the current transformation matrix -->
+<canvas id="c569" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_state_saverestore_transformation() {
+
+var canvas = document.getElementById('c569');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.save();
+ctx.translate(200, 0);
+ctx.restore();
+ctx.fillStyle = '#f00';
+ctx.fillRect(-200, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.state.saverestore.underflow.html ]]] -->
+
+<p>Canvas test: 2d.state.saverestore.underflow - bug 296821</p>
+<!-- Testing: restore() with an empty stack has no effect -->
+<canvas id="c570" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_state_saverestore_underflow() {
+
+var canvas = document.getElementById('c570');
+var ctx = canvas.getContext('2d');
+
+for (var i = 0; i < 16; ++i)
+    ctx.restore();
+ctx.lineWidth = 0.5;
+ctx.restore();
+ok(ctx.lineWidth == 0.5, "ctx.lineWidth == 0.5");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.basic.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.basic</p>
+<canvas id="c571" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_basic() {
+
+var canvas = document.getElementById('c571');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.strokeRect(25, 24, 50, 2);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.clip.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.clip</p>
+<canvas id="c572" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_clip() {
+
+var canvas = document.getElementById('c572');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.beginPath();
+ctx.rect(0, 0, 16, 16);
+ctx.clip();
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.strokeRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 16, 16);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.globalalpha.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.globalalpha</p>
+<canvas id="c573" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_globalalpha() {
+
+var canvas = document.getElementById('c573');
+var ctx = canvas.getContext('2d');
+
+ctx.globalAlpha = 0;
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.strokeRect(25, 24, 50, 2);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.globalcomposite.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.globalcomposite</p>
+<canvas id="c574" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_globalcomposite() {
+
+var canvas = document.getElementById('c574');
+var ctx = canvas.getContext('2d');
+
+ctx.globalCompositeOperation = 'source-in';
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.strokeRect(25, 24, 50, 2);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.negative.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.negative</p>
+<canvas id="c575" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_negative() {
+
+var canvas = document.getElementById('c575');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 25;
+ctx.strokeRect(12, 12, 26, 1);
+ctx.strokeRect(88, 12, -26, 1);
+ctx.strokeRect(12, 38, 26, -1);
+ctx.strokeRect(88, 38, -26, -1);
+isPixel(ctx, 25,12, 0,255,0,255, 0);
+isPixel(ctx, 75,12, 0,255,0,255, 0);
+isPixel(ctx, 25,37, 0,255,0,255, 0);
+isPixel(ctx, 75,37, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.nonfinite</p>
+<!-- Testing: strokeRect() with Infinity/NaN is ignored -->
+<canvas id="c576" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_nonfinite() {
+
+var canvas = document.getElementById('c576');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 150;
+ctx.strokeRect(Infinity, 0, 100, 50);
+ctx.strokeRect(-Infinity, 0, 100, 50);
+ctx.strokeRect(NaN, 0, 100, 50);
+ctx.strokeRect(0, Infinity, 100, 50);
+ctx.strokeRect(0, -Infinity, 100, 50);
+ctx.strokeRect(0, NaN, 100, 50);
+ctx.strokeRect(0, 0, Infinity, 50);
+ctx.strokeRect(0, 0, -Infinity, 50);
+ctx.strokeRect(0, 0, NaN, 50);
+ctx.strokeRect(0, 0, 100, Infinity);
+ctx.strokeRect(0, 0, 100, -Infinity);
+ctx.strokeRect(0, 0, 100, NaN);
+ctx.strokeRect(Infinity, Infinity, 100, 50);
+ctx.strokeRect(Infinity, Infinity, Infinity, 50);
+ctx.strokeRect(Infinity, Infinity, Infinity, Infinity);
+ctx.strokeRect(Infinity, Infinity, 100, Infinity);
+ctx.strokeRect(Infinity, 0, Infinity, 50);
+ctx.strokeRect(Infinity, 0, Infinity, Infinity);
+ctx.strokeRect(Infinity, 0, 100, Infinity);
+ctx.strokeRect(0, Infinity, Infinity, 50);
+ctx.strokeRect(0, Infinity, Infinity, Infinity);
+ctx.strokeRect(0, Infinity, 100, Infinity);
+ctx.strokeRect(0, 0, Infinity, Infinity);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.path.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.path</p>
+<canvas id="c577" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_path() {
+
+var canvas = document.getElementById('c577');
+var ctx = canvas.getContext('2d');
+
+ctx.beginPath();
+ctx.rect(0, 0, 100, 50);
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 5;
+ctx.strokeRect(0, 0, 16, 16);
+ctx.fillStyle = '#0f0';
+ctx.fill();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.shadow.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.shadow</p>
+<canvas id="c578" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_shadow() {
+
+var canvas = document.getElementById('c578');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.fillStyle = '#f00';
+ctx.shadowBlur = 0;
+ctx.shadowOffsetX = 0;
+ctx.shadowOffsetY = 50;
+
+// Shadows are optional, so just test that if they apply to fill() then they apply to strokeRect() too
+ctx.beginPath();
+ctx.rect(0, -50, 100, 50);
+ctx.shadowColor = '#f00';
+ctx.fill();
+
+ctx.shadowColor = '#0f0';
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 50;
+ctx.strokeRect(0, -75, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.transform.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.transform</p>
+<canvas id="c579" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_transform() {
+
+var canvas = document.getElementById('c579');
+var ctx = canvas.getContext('2d');
+
+ctx.scale(10, 10);
+ctx.translate(0, 5);
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 5;
+ctx.strokeRect(2.5, -2.6, 5, 0.2);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.1.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.1</p>
+<canvas id="c580" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_1() {
+
+var canvas = document.getElementById('c580');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 250;
+ctx.strokeRect(50, 25, 0, 0);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.2.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.2</p>
+<canvas id="c581" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+
+function test_2d_strokeRect_zero_2() {
+
+var canvas = document.getElementById('c581');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 250;
+ctx.lineCap = 'round';
+ctx.lineJoin = 'round';
+ctx.strokeRect(50, 25, 0, 0);
+todo_isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.3.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.3</p>
+<canvas id="c582" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_3() {
+
+var canvas = document.getElementById('c582');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 50;
+ctx.strokeRect(0, 25, 100, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.4.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.4</p>
+<canvas id="c583" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_4() {
+
+var canvas = document.getElementById('c583');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#f00';
+ctx.lineWidth = 250;
+ctx.lineCap = 'round';
+ctx.strokeRect(100, 25, 100, 0);
+isPixel(ctx, 50,25, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeRect.zero.5.html ]]] -->
+
+<p>Canvas test: 2d.strokeRect.zero.5</p>
+<canvas id="c584" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_strokeRect_zero_5() {
+
+var canvas = document.getElementById('c584');
+var ctx = canvas.getContext('2d');
+
+ctx.strokeStyle = '#0f0';
+ctx.lineWidth = 250;
+ctx.lineJoin = 'round';
+ctx.strokeRect(100, 25, 100, 0);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.strokeStyle.default.html ]]] -->
+
+<p>Canvas test: 2d.strokeStyle.default</p>
+<canvas id="c585" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_strokeStyle_default() {
+
+var canvas = document.getElementById('c585');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.strokeStyle == '#000000', "ctx.strokeStyle == '#000000'");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.order.html ]]] -->
+
+<p>Canvas test: 2d.transformation.order</p>
+<!-- Testing: Transformations are applied in the right order -->
+<canvas id="c586" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_order() {
+
+var canvas = document.getElementById('c586');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(2, 1);
+ctx.rotate(Math.PI / 2);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, -50, 50, 50);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.direction.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.direction</p>
+<!-- Testing: rotate() is clockwise -->
+<canvas id="c587" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_direction() {
+
+var canvas = document.getElementById('c587');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(Math.PI / 2);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, -100, 50, 100);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.nonfinite</p>
+<!-- Testing: rotate() with Infinity/NaN is ignored -->
+<canvas id="c588" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_nonfinite() {
+
+var canvas = document.getElementById('c588');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.rotate(Infinity);
+ctx.rotate(-Infinity);
+ctx.rotate(NaN);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.radians.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.radians</p>
+<!-- Testing: rotate() uses radians -->
+<canvas id="c589" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_radians() {
+
+var canvas = document.getElementById('c589');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(Math.PI); // should fail obviously if this is 3.1 degrees
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.wrap.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.wrap</p>
+<!-- Testing: rotate() wraps large positive values correctly -->
+<canvas id="c590" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_wrap() {
+
+var canvas = document.getElementById('c590');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(Math.PI * (1 + 4096)); // == pi (mod 2*pi)
+// We need about pi +/- 0.001 in order to get correct-looking results
+// 32-bit floats can store pi*4097 with precision 2^-10, so that should
+// be safe enough on reasonable implementations
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,2, 0,255,0,255, 0);
+isPixel(ctx, 98,47, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.wrapnegative.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.wrapnegative</p>
+<!-- Testing: rotate() wraps large negative values correctly -->
+<canvas id="c591" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_wrapnegative() {
+
+var canvas = document.getElementById('c591');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(-Math.PI * (1 + 4096));
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+isPixel(ctx, 98,2, 0,255,0,255, 0);
+isPixel(ctx, 98,47, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.rotate.zero.html ]]] -->
+
+<p>Canvas test: 2d.transformation.rotate.zero</p>
+<!-- Testing: rotate() by 0 does nothing -->
+<canvas id="c592" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_rotate_zero() {
+
+var canvas = document.getElementById('c592');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.rotate(0);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.basic.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.basic</p>
+<!-- Testing: scale() works -->
+<canvas id="c593" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_basic() {
+
+var canvas = document.getElementById('c593');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(2, 4);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 12.5);
+isPixel(ctx, 90,40, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.large.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.large</p>
+<!-- Testing: scale() with large scale factors works -->
+<canvas id="c594" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_large() {
+
+var canvas = document.getElementById('c594');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(1e5, 1e5);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 1, 1);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.multiple.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.multiple</p>
+<!-- Testing: Multiple scale()s combine -->
+<canvas id="c595" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_multiple() {
+
+var canvas = document.getElementById('c595');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.scale(Math.sqrt(2), Math.sqrt(2));
+ctx.scale(Math.sqrt(2), Math.sqrt(2));
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 25);
+isPixel(ctx, 90,40, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.negative.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.negative</p>
+<!-- Testing: scale() with negative scale factors works -->
+<canvas id="c596" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_negative() {
+
+var canvas = document.getElementById('c596');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.scale(-1, 1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-50, 0, 50, 50);
+ctx.restore();
+
+ctx.save();
+ctx.scale(1, -1);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(50, -50, 50, 50);
+ctx.restore();
+isPixel(ctx, 25,25, 0,255,0,255, 0);
+isPixel(ctx, 75,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.nonfinite</p>
+<!-- Testing: scale() with Infinity/NaN is ignored -->
+<canvas id="c597" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_nonfinite() {
+
+var canvas = document.getElementById('c597');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.scale(Infinity, 0.1);
+ctx.scale(-Infinity, 0.1);
+ctx.scale(NaN, 0.1);
+ctx.scale(0.1, Infinity);
+ctx.scale(0.1, -Infinity);
+ctx.scale(0.1, NaN);
+ctx.scale(Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.scale.zero.html ]]] -->
+
+<p>Canvas test: 2d.transformation.scale.zero</p>
+<!-- Testing: scale() with a scale factor of zero works -->
+<canvas id="c598" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_scale_zero() {
+
+var canvas = document.getElementById('c598');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.save();
+ctx.translate(50, 0);
+ctx.scale(0, 1);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.restore();
+
+ctx.save();
+ctx.translate(0, 25);
+ctx.scale(1, 0);
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.restore();
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.multiple.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.multiple</p>
+<canvas id="c599" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_multiple() {
+
+var canvas = document.getElementById('c599');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.setTransform(1/2,0, 0,1/2, 0,0);
+ctx.setTransform(2,0, 0,2, 0,0);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 25);
+isPixel(ctx, 75,35, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.nonfinite</p>
+<!-- Testing: setTransform() with Infinity/NaN is ignored -->
+<canvas id="c600" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_nonfinite() {
+
+var canvas = document.getElementById('c600');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.setTransform(Infinity, 0, 0, 0, 0, 0);
+ctx.setTransform(-Infinity, 0, 0, 0, 0, 0);
+ctx.setTransform(NaN, 0, 0, 0, 0, 0);
+ctx.setTransform(0, Infinity, 0, 0, 0, 0);
+ctx.setTransform(0, -Infinity, 0, 0, 0, 0);
+ctx.setTransform(0, NaN, 0, 0, 0, 0);
+ctx.setTransform(0, 0, Infinity, 0, 0, 0);
+ctx.setTransform(0, 0, -Infinity, 0, 0, 0);
+ctx.setTransform(0, 0, NaN, 0, 0, 0);
+ctx.setTransform(0, 0, 0, Infinity, 0, 0);
+ctx.setTransform(0, 0, 0, -Infinity, 0, 0);
+ctx.setTransform(0, 0, 0, NaN, 0, 0);
+ctx.setTransform(0, 0, 0, 0, Infinity, 0);
+ctx.setTransform(0, 0, 0, 0, -Infinity, 0);
+ctx.setTransform(0, 0, 0, 0, NaN, 0);
+ctx.setTransform(0, 0, 0, 0, 0, Infinity);
+ctx.setTransform(0, 0, 0, 0, 0, -Infinity);
+ctx.setTransform(0, 0, 0, 0, 0, NaN);
+ctx.setTransform(Infinity, Infinity, 0, 0, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, Infinity, 0, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, 0);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, 0);
+ctx.setTransform(Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, Infinity, 0, 0, 0, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, 0, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, 0);
+ctx.setTransform(Infinity, 0, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, Infinity, 0, 0, Infinity);
+ctx.setTransform(Infinity, 0, 0, Infinity, 0, 0);
+ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, 0);
+ctx.setTransform(Infinity, 0, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, 0, Infinity, 0, Infinity);
+ctx.setTransform(Infinity, 0, 0, 0, Infinity, 0);
+ctx.setTransform(Infinity, 0, 0, 0, Infinity, Infinity);
+ctx.setTransform(Infinity, 0, 0, 0, 0, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, 0, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, 0, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, Infinity, 0);
+ctx.setTransform(0, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(0, Infinity, Infinity, 0, 0, Infinity);
+ctx.setTransform(0, Infinity, 0, Infinity, 0, 0);
+ctx.setTransform(0, Infinity, 0, Infinity, Infinity, 0);
+ctx.setTransform(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.setTransform(0, Infinity, 0, 0, Infinity, 0);
+ctx.setTransform(0, Infinity, 0, 0, Infinity, Infinity);
+ctx.setTransform(0, Infinity, 0, 0, 0, Infinity);
+ctx.setTransform(0, 0, Infinity, Infinity, 0, 0);
+ctx.setTransform(0, 0, Infinity, Infinity, Infinity, 0);
+ctx.setTransform(0, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.setTransform(0, 0, Infinity, Infinity, 0, Infinity);
+ctx.setTransform(0, 0, Infinity, 0, Infinity, 0);
+ctx.setTransform(0, 0, Infinity, 0, Infinity, Infinity);
+ctx.setTransform(0, 0, Infinity, 0, 0, Infinity);
+ctx.setTransform(0, 0, 0, Infinity, Infinity, 0);
+ctx.setTransform(0, 0, 0, Infinity, Infinity, Infinity);
+ctx.setTransform(0, 0, 0, Infinity, 0, Infinity);
+ctx.setTransform(0, 0, 0, 0, Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.setTransform.skewed.html ]]] -->
+
+<p>Canvas test: 2d.transformation.setTransform.skewed</p>
+<canvas id="c601" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_setTransform_skewed() {
+
+var canvas = document.getElementById('c601');
+var ctx = canvas.getContext('2d');
+
+// Create green with a red square ring inside it
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(20, 10, 60, 30);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(40, 20, 20, 10);
+
+// Draw a skewed shape to fill that gap, to make sure it is aligned correctly
+ctx.setTransform(1,4, 2,3, 5,6);
+// Post-transform coordinates:
+//   [[20,10],[80,10],[80,40],[20,40],[20,10],[40,20],[40,30],[60,30],[60,20],[40,20],[20,10]];
+// Hence pre-transform coordinates:
+var pts=[[-7.4,11.2],[-43.4,59.2],[-31.4,53.2],[4.6,5.2],[-7.4,11.2],
+         [-15.4,25.2],[-11.4,23.2],[-23.4,39.2],[-27.4,41.2],[-15.4,25.2],
+         [-7.4,11.2]];
+ctx.beginPath();
+ctx.moveTo(pts[0][0], pts[0][1]);
+for (var i = 0; i < pts.length; ++i)
+    ctx.lineTo(pts[i][0], pts[i][1]);
+ctx.fill();
+isPixel(ctx, 21,11, 0,255,0,255, 0);
+isPixel(ctx, 79,11, 0,255,0,255, 0);
+isPixel(ctx, 21,39, 0,255,0,255, 0);
+isPixel(ctx, 79,39, 0,255,0,255, 0);
+isPixel(ctx, 39,19, 0,255,0,255, 0);
+isPixel(ctx, 61,19, 0,255,0,255, 0);
+isPixel(ctx, 39,31, 0,255,0,255, 0);
+isPixel(ctx, 61,31, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.identity.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.identity</p>
+<!-- Testing: transform() with the identity matrix does nothing -->
+<canvas id="c602" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_identity() {
+
+var canvas = document.getElementById('c602');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.transform(1,0, 0,1, 0,0);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.multiply.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.multiply</p>
+<!-- Testing: transform() multiplies the CTM -->
+<canvas id="c603" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_multiply() {
+
+var canvas = document.getElementById('c603');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.transform(1,2, 3,4, 5,6);
+ctx.transform(-2,1, 3/2,-1/2, 1,-2);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.nonfinite</p>
+<!-- Testing: transform() with Infinity/NaN is ignored -->
+<canvas id="c604" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_nonfinite() {
+
+var canvas = document.getElementById('c604');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.transform(Infinity, 0, 0, 0, 0, 0);
+ctx.transform(-Infinity, 0, 0, 0, 0, 0);
+ctx.transform(NaN, 0, 0, 0, 0, 0);
+ctx.transform(0, Infinity, 0, 0, 0, 0);
+ctx.transform(0, -Infinity, 0, 0, 0, 0);
+ctx.transform(0, NaN, 0, 0, 0, 0);
+ctx.transform(0, 0, Infinity, 0, 0, 0);
+ctx.transform(0, 0, -Infinity, 0, 0, 0);
+ctx.transform(0, 0, NaN, 0, 0, 0);
+ctx.transform(0, 0, 0, Infinity, 0, 0);
+ctx.transform(0, 0, 0, -Infinity, 0, 0);
+ctx.transform(0, 0, 0, NaN, 0, 0);
+ctx.transform(0, 0, 0, 0, Infinity, 0);
+ctx.transform(0, 0, 0, 0, -Infinity, 0);
+ctx.transform(0, 0, 0, 0, NaN, 0);
+ctx.transform(0, 0, 0, 0, 0, Infinity);
+ctx.transform(0, 0, 0, 0, 0, -Infinity);
+ctx.transform(0, 0, 0, 0, 0, NaN);
+ctx.transform(Infinity, Infinity, 0, 0, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, 0, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, 0);
+ctx.transform(Infinity, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, Infinity, 0, 0, Infinity);
+ctx.transform(Infinity, Infinity, 0, Infinity, 0, 0);
+ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, 0);
+ctx.transform(Infinity, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, 0, Infinity, 0, Infinity);
+ctx.transform(Infinity, Infinity, 0, 0, Infinity, 0);
+ctx.transform(Infinity, Infinity, 0, 0, Infinity, Infinity);
+ctx.transform(Infinity, Infinity, 0, 0, 0, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, 0, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, 0, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, 0);
+ctx.transform(Infinity, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, 0, Infinity, Infinity, 0, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, Infinity, 0);
+ctx.transform(Infinity, 0, Infinity, 0, Infinity, Infinity);
+ctx.transform(Infinity, 0, Infinity, 0, 0, Infinity);
+ctx.transform(Infinity, 0, 0, Infinity, 0, 0);
+ctx.transform(Infinity, 0, 0, Infinity, Infinity, 0);
+ctx.transform(Infinity, 0, 0, Infinity, Infinity, Infinity);
+ctx.transform(Infinity, 0, 0, Infinity, 0, Infinity);
+ctx.transform(Infinity, 0, 0, 0, Infinity, 0);
+ctx.transform(Infinity, 0, 0, 0, Infinity, Infinity);
+ctx.transform(Infinity, 0, 0, 0, 0, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, 0, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, 0, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, Infinity, 0);
+ctx.transform(0, Infinity, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(0, Infinity, Infinity, Infinity, 0, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, Infinity, 0);
+ctx.transform(0, Infinity, Infinity, 0, Infinity, Infinity);
+ctx.transform(0, Infinity, Infinity, 0, 0, Infinity);
+ctx.transform(0, Infinity, 0, Infinity, 0, 0);
+ctx.transform(0, Infinity, 0, Infinity, Infinity, 0);
+ctx.transform(0, Infinity, 0, Infinity, Infinity, Infinity);
+ctx.transform(0, Infinity, 0, Infinity, 0, Infinity);
+ctx.transform(0, Infinity, 0, 0, Infinity, 0);
+ctx.transform(0, Infinity, 0, 0, Infinity, Infinity);
+ctx.transform(0, Infinity, 0, 0, 0, Infinity);
+ctx.transform(0, 0, Infinity, Infinity, 0, 0);
+ctx.transform(0, 0, Infinity, Infinity, Infinity, 0);
+ctx.transform(0, 0, Infinity, Infinity, Infinity, Infinity);
+ctx.transform(0, 0, Infinity, Infinity, 0, Infinity);
+ctx.transform(0, 0, Infinity, 0, Infinity, 0);
+ctx.transform(0, 0, Infinity, 0, Infinity, Infinity);
+ctx.transform(0, 0, Infinity, 0, 0, Infinity);
+ctx.transform(0, 0, 0, Infinity, Infinity, 0);
+ctx.transform(0, 0, 0, Infinity, Infinity, Infinity);
+ctx.transform(0, 0, 0, Infinity, 0, Infinity);
+ctx.transform(0, 0, 0, 0, Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.transform.skewed.html ]]] -->
+
+<p>Canvas test: 2d.transformation.transform.skewed</p>
+<!-- Testing: transform() with skewy matrix transforms correctly -->
+<canvas id="c605" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_transform_skewed() {
+
+var canvas = document.getElementById('c605');
+var ctx = canvas.getContext('2d');
+
+// Create green with a red square ring inside it
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = '#f00';
+ctx.fillRect(20, 10, 60, 30);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(40, 20, 20, 10);
+
+// Draw a skewed shape to fill that gap, to make sure it is aligned correctly
+ctx.transform(1,4, 2,3, 5,6);
+// Post-transform coordinates:
+//   [[20,10],[80,10],[80,40],[20,40],[20,10],[40,20],[40,30],[60,30],[60,20],[40,20],[20,10]];
+// Hence pre-transform coordinates:
+var pts=[[-7.4,11.2],[-43.4,59.2],[-31.4,53.2],[4.6,5.2],[-7.4,11.2],
+         [-15.4,25.2],[-11.4,23.2],[-23.4,39.2],[-27.4,41.2],[-15.4,25.2],
+         [-7.4,11.2]];
+ctx.beginPath();
+ctx.moveTo(pts[0][0], pts[0][1]);
+for (var i = 0; i < pts.length; ++i)
+    ctx.lineTo(pts[i][0], pts[i][1]);
+ctx.fill();
+isPixel(ctx, 21,11, 0,255,0,255, 0);
+isPixel(ctx, 79,11, 0,255,0,255, 0);
+isPixel(ctx, 21,39, 0,255,0,255, 0);
+isPixel(ctx, 79,39, 0,255,0,255, 0);
+isPixel(ctx, 39,19, 0,255,0,255, 0);
+isPixel(ctx, 61,19, 0,255,0,255, 0);
+isPixel(ctx, 39,31, 0,255,0,255, 0);
+isPixel(ctx, 61,31, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.translate.basic.html ]]] -->
+
+<p>Canvas test: 2d.transformation.translate.basic</p>
+<!-- Testing: translate() works -->
+<canvas id="c606" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_translate_basic() {
+
+var canvas = document.getElementById('c606');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 50);
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -50, 100, 50);
+isPixel(ctx, 90,40, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.transformation.translate.nonfinite.html ]]] -->
+
+<p>Canvas test: 2d.transformation.translate.nonfinite</p>
+<!-- Testing: translate() with Infinity/NaN is ignored -->
+<canvas id="c607" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_transformation_translate_nonfinite() {
+
+var canvas = document.getElementById('c607');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+
+ctx.translate(100, 10);
+ctx.translate(Infinity, 0.1);
+ctx.translate(-Infinity, 0.1);
+ctx.translate(NaN, 0.1);
+ctx.translate(0.1, Infinity);
+ctx.translate(0.1, -Infinity);
+ctx.translate(0.1, NaN);
+ctx.translate(Infinity, Infinity);
+
+ctx.fillStyle = '#0f0';
+ctx.fillRect(-100, -10, 100, 50);
+
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.delete.html ]]] -->
+
+<p>Canvas test: 2d.type.delete</p>
+<!-- Testing: window.CanvasRenderingContext2D is DontDelete -->
+<canvas id="c608" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_delete() {
+
+var canvas = document.getElementById('c608');
+var ctx = canvas.getContext('2d');
+
+delete window.CanvasRenderingContext2D;
+ok(window.CanvasRenderingContext2D !== undefined, "window.CanvasRenderingContext2D !== undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.exists.html ]]] -->
+
+<p>Canvas test: 2d.type.exists</p>
+<!-- Testing: The 2D context interface is a property of 'window' -->
+<canvas id="c609" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_exists() {
+
+var canvas = document.getElementById('c609');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasRenderingContext2D, "window.CanvasRenderingContext2D");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.extend.html ]]] -->
+
+<p>Canvas test: 2d.type.extend</p>
+<!-- Testing: Interface methods can be added -->
+<canvas id="c610" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_type_extend() {
+
+var canvas = document.getElementById('c610');
+var ctx = canvas.getContext('2d');
+
+window.CanvasRenderingContext2D.prototype.fillRectGreen = function (x, y, w, h)
+{
+    this.fillStyle = '#0f0';
+    this.fillRect(x, y, w, h);
+};
+ctx.fillStyle = '#f00';
+ctx.fillRectGreen(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.prototype.html ]]] -->
+
+<p>Canvas test: 2d.type.prototype</p>
+<!-- Testing: window.CanvasRenderingContext2D.prototype is { DontDelete, ReadOnly }, and its methods are not -->
+<canvas id="c611" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_type_prototype() {
+
+var canvas = document.getElementById('c611');
+var ctx = canvas.getContext('2d');
+
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+ok(window.CanvasRenderingContext2D.prototype.fill, "window.CanvasRenderingContext2D.prototype.fill");
+window.CanvasRenderingContext2D.prototype = null;
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+delete window.CanvasRenderingContext2D.prototype;
+ok(window.CanvasRenderingContext2D.prototype, "window.CanvasRenderingContext2D.prototype");
+window.CanvasRenderingContext2D.prototype.fill = 1;
+ok(window.CanvasRenderingContext2D.prototype.fill === 1, "window.CanvasRenderingContext2D.prototype.fill === 1");
+delete window.CanvasRenderingContext2D.prototype.fill;
+todo(window.CanvasRenderingContext2D.prototype.fill === undefined, "window.CanvasRenderingContext2D.prototype.fill === undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.type.replace.html ]]] -->
+
+<p>Canvas test: 2d.type.replace</p>
+<!-- Testing: Interface methods can be overridden -->
+<canvas id="c612" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_type_replace() {
+
+var canvas = document.getElementById('c612');
+var ctx = canvas.getContext('2d');
+
+var fillRect = window.CanvasRenderingContext2D.prototype.fillRect;
+window.CanvasRenderingContext2D.prototype.fillRect = function (x, y, w, h)
+{
+    this.fillStyle = '#0f0';
+    fillRect.call(this, x, y, w, h);
+};
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+//restore the original method to ensure that other tests can run successfully
+window.CanvasRenderingContext2D.prototype.fillRect = fillRect;
+}
+</script>
+
+<!-- [[[ test_2d.voidreturn.html ]]] -->
+
+<p>Canvas test: 2d.voidreturn</p>
+<!-- Testing: void methods return undefined -->
+<canvas id="c613" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_2d_voidreturn() {
+
+var canvas = document.getElementById('c613');
+var ctx = canvas.getContext('2d');
+
+ok(ctx.save() === undefined, "ctx.save() === undefined");
+ok(ctx.restore() === undefined, "ctx.restore() === undefined");
+ok(ctx.scale(1, 1) === undefined, "ctx.scale(1, 1) === undefined");
+ok(ctx.rotate(0) === undefined, "ctx.rotate(0) === undefined");
+ok(ctx.translate(0, 0) === undefined, "ctx.translate(0, 0) === undefined");
+if (ctx.transform) { // (avoid spurious failures, since the aim here is not to test that all features are supported)
+    ok(ctx.transform(1, 0, 0, 1, 0, 0) === undefined, "ctx.transform(1, 0, 0, 1, 0, 0) === undefined");
+}
+if (ctx.setTransform) {
+    ok(ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined, "ctx.setTransform(1, 0, 0, 1, 0, 0) === undefined");
+}
+ok(ctx.clearRect(0, 0, 0, 0) === undefined, "ctx.clearRect(0, 0, 0, 0) === undefined");
+ok(ctx.fillRect(0, 0, 0, 0) === undefined, "ctx.fillRect(0, 0, 0, 0) === undefined");
+ok(ctx.strokeRect(0, 0, 0, 0) === undefined, "ctx.strokeRect(0, 0, 0, 0) === undefined");
+ok(ctx.beginPath() === undefined, "ctx.beginPath() === undefined");
+ok(ctx.closePath() === undefined, "ctx.closePath() === undefined");
+ok(ctx.moveTo(0, 0) === undefined, "ctx.moveTo(0, 0) === undefined");
+ok(ctx.lineTo(0, 0) === undefined, "ctx.lineTo(0, 0) === undefined");
+ok(ctx.quadraticCurveTo(0, 0, 0, 0) === undefined, "ctx.quadraticCurveTo(0, 0, 0, 0) === undefined");
+ok(ctx.bezierCurveTo(0, 0, 0, 0, 0, 0) === undefined, "ctx.bezierCurveTo(0, 0, 0, 0, 0, 0) === undefined");
+ok(ctx.arcTo(0, 0, 0, 0, 1) === undefined, "ctx.arcTo(0, 0, 0, 0, 1) === undefined");
+ok(ctx.rect(0, 0, 0, 0) === undefined, "ctx.rect(0, 0, 0, 0) === undefined");
+ok(ctx.arc(0, 0, 1, 0, 0, true) === undefined, "ctx.arc(0, 0, 1, 0, 0, true) === undefined");
+ok(ctx.fill() === undefined, "ctx.fill() === undefined");
+ok(ctx.stroke() === undefined, "ctx.stroke() === undefined");
+ok(ctx.clip() === undefined, "ctx.clip() === undefined");
+if (ctx.putImageData) {
+    ok(ctx.putImageData(ctx.getImageData(0, 0, 1, 1), 0, 0) === undefined, "ctx.putImageData(ctx.getImageData(0, 0, 1, 1), 0, 0) === undefined");
+}
+ok(ctx.drawImage(document.getElementById('yellow_11.png'), 0, 0, 0, 0, 0, 0, 0, 0) === undefined, "ctx.drawImage(document.getElementById('yellow_11.png'), 0, 0, 0, 0, 0, 0, 0, 0) === undefined");
+ok(ctx.drawImage(canvas, 0, 0, 0, 0, 0, 0, 0, 0) === undefined, "ctx.drawImage(canvas, 0, 0, 0, 0, 0, 0, 0, 0) === undefined");
+ok(ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined, "ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white') === undefined");
+
+
+}
+</script>
+<img src="image_yellow.png" id="yellow_11.png" class="resource">
+
+<!-- [[[ test_bug397524.html ]]] -->
+
+<p>Test for Bug 397524</p>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=397524">Mozilla Bug 397524</a>
+<p id="display">
+  <canvas id="canvas1" width="1" height="1"></canvas>
+  <canvas id="canvas2" width="1" height="1"></canvas>
+  <canvas id="canvas3" width="1" height="1"></canvas>
+  <img id="i1", src="image_green-1x1.png">
+  <img id="i2" src="http://example.com/tests/content/canvas/test/image_green-1x1.png">
+  <img id="i3" src="image_green-redirect">
+</p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 397524 **/
+
+function draw(n) {
+  $("canvas" + n).getContext('2d').drawImage($("i" + n), 0, 0);
+}
+
+function test_bug397524() {
+  draw(1);
+  draw(2);
+  draw(3);
+
+  // Should be able to get the data out of the first canvas
+  $("canvas1").toDataURL("image/png");
+
+  // Should not be able to get the data out of a cross-site load
+  var gotData = false;  
+  try {
+    $("canvas2").toDataURL("image/png");
+    gotData = true;
+  } catch (ex if (ex.code == 1000 && ex.name == "NS_ERROR_DOM_SECURITY_ERR")) {
+  }
+  is(gotData, false, "Shouldn't be able to read images cross-site!");
+
+  // Should not be able to get the data out of a redirected cross-site load
+  var gotData = false;  
+  try {
+    $("canvas3").toDataURL("image/png");
+    gotData = true;
+  } catch (ex if (ex.code == 1000 && ex.name == "NS_ERROR_DOM_SECURITY_ERR")) {
+  }
+  is(gotData, false, "Shouldn't be able to read images redirected cross-site!");
+
+}
+
+</script>
+</pre>
+
+<!-- [[[ test_bug405982.html ]]] -->
+
+<p>Canvas test: toDataURL.png</p>
+<canvas id="c614" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+function test_bug405982() {
+
+var canvas = document.getElementById('c614');
+var ctx = canvas.getContext('2d');
+netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+try {
+  var data = canvas.toDataURL('image/png', 'quality=100');
+  ok(false, "Should have thrown an exception for invalid args to png encoder");
+}
+catch (e) {
+  is(e.result, Components.results.NS_ERROR_INVALID_ARG, "Exception was wrong for png encoder");
+}
+
+try {
+  var data = canvas.toDataURL('image/jpeg', 'foobar=true');
+  ok(false, "Should have thrown an exception for invalid args to jpeg encoder");
+}
+catch (e) {
+  is(e.result, Components.results.NS_ERROR_INVALID_ARG, "Exception was wrong for jpeg encoder");
+}
+
+}
+</script>
+<!-- [[[ test_context.arguments.extra.html ]]] -->
+
+<p>Canvas test: context.arguments.extra</p>
+<canvas id="c615" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_arguments_extra() {
+
+var canvas = document.getElementById('c615');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.getContext('2d', 'foo') !== null, "canvas.getContext('2d', 'foo') !== null");
+
+
+}
+</script>
+
+<!-- [[[ test_context.arguments.missing.html ]]] -->
+
+<p>Canvas test: context.arguments.missing</p>
+<canvas id="c616" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_arguments_missing() {
+
+var canvas = document.getElementById('c616');
+var ctx = canvas.getContext('2d');
+
+var _thrown = undefined; try {
+  canvas.getContext();
+} catch (e) { _thrown = e }; todo(_thrown && _thrown.code == DOMException.NOT_SUPPORTED_ERR, "should throw NOT_SUPPORTED_ERR");
+
+
+}
+</script>
+
+<!-- [[[ test_context.casesensitive.html ]]] -->
+
+<p>Canvas test: context.casesensitive - bug 401788</p>
+<!-- Testing: Context name "2D" is unrecognised; matching is case sensitive -->
+<canvas id="c617" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_casesensitive() {
+
+var canvas = document.getElementById('c617');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext('2D') === null, "canvas.getContext('2D') === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_context.emptystring.html ]]] -->
+
+<p>Canvas test: context.emptystring - bug 401788</p>
+<!-- Testing: getContext with empty string returns null -->
+<canvas id="c618" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_emptystring() {
+
+var canvas = document.getElementById('c618');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("") === null, "canvas.getContext(\"\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.badname.html ]]] -->
+
+<p>Canvas test: context.unrecognised.badname - bug 401788</p>
+<!-- Testing: getContext with unrecognised context name returns null -->
+<canvas id="c619" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_badname() {
+
+var canvas = document.getElementById('c619');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext('This is not an implemented context in any real browser') === null, "canvas.getContext('This is not an implemented context in any real browser') === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.badsuffix.html ]]] -->
+
+<p>Canvas test: context.unrecognised.badsuffix - bug 401788</p>
+<!-- Testing: Context name "2d" plus a suffix is unrecognised -->
+<canvas id="c620" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_badsuffix() {
+
+var canvas = document.getElementById('c620');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2d#") === null, "canvas.getContext(\"2d#\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.nullsuffix.html ]]] -->
+
+<p>Canvas test: context.unrecognised.nullsuffix - bug 401788</p>
+<!-- Testing: Context name "2d" plus a "\0" suffix is unrecognised -->
+<canvas id="c621" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_nullsuffix() {
+
+var canvas = document.getElementById('c621');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2d\0") === null, "canvas.getContext(\"2d\\0\") === null");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_context.unrecognised.unicode.html ]]] -->
+
+<p>Canvas test: context.unrecognised.unicode - bug 401788</p>
+<!-- Testing: Context name which kind of looks like "2d" is unrecognised -->
+<canvas id="c622" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_context_unrecognised_unicode() {
+
+var canvas = document.getElementById('c622');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+ok(canvas.getContext("2\uFF44") === null, "canvas.getContext(\"2\\uFF44\") === null"); // Fullwidth Latin Small Letter D
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.basic.html ]]] -->
+
+<p>Canvas test: fallback.basic</p>
+<!-- Testing: Fallback content is inserted into the DOM -->
+<canvas id="c623" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_fallback_basic() {
+
+var canvas = document.getElementById('c623');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 1, "canvas.childNodes.length == 1");
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.multiple.html ]]] -->
+
+<p>Canvas test: fallback.multiple</p>
+<!-- Testing: Fallback content with multiple elements -->
+<canvas id="c624" width="100" height="50"><p class="fallback">FAIL</p><p class="fallback">FAIL</p></canvas>
+<script>
+
+function test_fallback_multiple() {
+
+var canvas = document.getElementById('c624');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+
+}
+</script>
+
+<!-- [[[ test_fallback.nested.html ]]] -->
+
+<p>Canvas test: fallback.nested</p>
+<!-- Testing: Fallback content containing another canvas (mostly testing parsers) -->
+<canvas id="c625" width="100" height="50"><canvas><p class="fallback">FAIL (fallback content)</p></canvas><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_fallback_nested() {
+
+var canvas = document.getElementById('c625');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.childNodes.length == 2, "canvas.childNodes.length == 2");
+
+
+}
+</script>
+
+<!-- [[[ test_initial.colour.html ]]] -->
+
+<p>Canvas test: initial.colour</p>
+<!-- Testing: Initial state is transparent black -->
+<canvas id="c626" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_colour() {
+
+var canvas = document.getElementById('c626');
+var ctx = canvas.getContext('2d');
+
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.2dstate.html ]]] -->
+
+<p>Canvas test: initial.reset.2dstate</p>
+<!-- Testing: Resetting the canvas state resets 2D state variables -->
+<canvas id="c627" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_initial_reset_2dstate() {
+
+var canvas = document.getElementById('c627');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 100;
+var default_val;
+
+default_val = ctx.strokeStyle;
+ctx.strokeStyle = "#ff0000";
+canvas.width = 100;
+ok(ctx.strokeStyle === default_val, "ctx.strokeStyle === default_val");
+
+default_val = ctx.fillStyle;
+ctx.fillStyle = "#ff0000";
+canvas.width = 100;
+ok(ctx.fillStyle === default_val, "ctx.fillStyle === default_val");
+
+default_val = ctx.globalAlpha;
+ctx.globalAlpha = 0.5;
+canvas.width = 100;
+ok(ctx.globalAlpha === default_val, "ctx.globalAlpha === default_val");
+
+default_val = ctx.lineWidth;
+ctx.lineWidth = 0.5;
+canvas.width = 100;
+ok(ctx.lineWidth === default_val, "ctx.lineWidth === default_val");
+
+default_val = ctx.lineCap;
+ctx.lineCap = "round";
+canvas.width = 100;
+ok(ctx.lineCap === default_val, "ctx.lineCap === default_val");
+
+default_val = ctx.lineJoin;
+ctx.lineJoin = "round";
+canvas.width = 100;
+ok(ctx.lineJoin === default_val, "ctx.lineJoin === default_val");
+
+default_val = ctx.miterLimit;
+ctx.miterLimit = 0.5;
+canvas.width = 100;
+ok(ctx.miterLimit === default_val, "ctx.miterLimit === default_val");
+
+default_val = ctx.shadowOffsetX;
+ctx.shadowOffsetX = 5;
+canvas.width = 100;
+ok(ctx.shadowOffsetX === default_val, "ctx.shadowOffsetX === default_val");
+
+default_val = ctx.shadowOffsetY;
+ctx.shadowOffsetY = 5;
+canvas.width = 100;
+ok(ctx.shadowOffsetY === default_val, "ctx.shadowOffsetY === default_val");
+
+default_val = ctx.shadowBlur;
+ctx.shadowBlur = 5;
+canvas.width = 100;
+ok(ctx.shadowBlur === default_val, "ctx.shadowBlur === default_val");
+
+default_val = ctx.shadowColor;
+ctx.shadowColor = "#ff0000";
+canvas.width = 100;
+ok(ctx.shadowColor === default_val, "ctx.shadowColor === default_val");
+
+default_val = ctx.globalCompositeOperation;
+ctx.globalCompositeOperation = "copy";
+canvas.width = 100;
+ok(ctx.globalCompositeOperation === default_val, "ctx.globalCompositeOperation === default_val");
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.clip.html ]]] -->
+
+<p>Canvas test: initial.reset.clip</p>
+<!-- Testing: Resetting the canvas state resets the current clip region -->
+<canvas id="c628" width="100" height="50" style="background: #f00"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_clip() {
+
+var canvas = document.getElementById('c628');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 100;
+ctx.rect(0, 0, 1, 1);
+ctx.clip();
+canvas.width = 100;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 20,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.different.html ]]] -->
+
+<p>Canvas test: initial.reset.different</p>
+<!-- Testing: Changing size resets canvas to transparent black -->
+<canvas id="c629" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_different() {
+
+var canvas = document.getElementById('c629');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 20,20, 255,0,0,255, 0);
+canvas.width = 50;
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.gradient.html ]]] -->
+
+<p>Canvas test: initial.reset.gradient</p>
+<!-- Testing: Resetting the canvas state does not invalidate any existing gradients -->
+<canvas id="c630" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_gradient() {
+
+var canvas = document.getElementById('c630');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 50;
+var g = ctx.createLinearGradient(0, 0, 100, 0);
+g.addColorStop(0, '#0f0');
+g.addColorStop(1, '#0f0');
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = g;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.path.html ]]] -->
+
+<p>Canvas test: initial.reset.path</p>
+<!-- Testing: Resetting the canvas state resets the current path -->
+<canvas id="c631" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_path() {
+
+var canvas = document.getElementById('c631');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 100;
+ctx.rect(0, 0, 100, 50);
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fill();
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.pattern.html ]]] -->
+
+<p>Canvas test: initial.reset.pattern</p>
+<!-- Testing: Resetting the canvas state does not invalidate any existing patterns -->
+<canvas id="c632" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_pattern() {
+
+var canvas = document.getElementById('c632');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 50;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 50, 50);
+var p = ctx.createPattern(canvas, 'repeat-x');
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 100, 50);
+ctx.fillStyle = p;
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.same.html ]]] -->
+
+<p>Canvas test: initial.reset.same</p>
+<!-- Testing: Setting size (not changing the value) resets canvas to transparent black -->
+<canvas id="c633" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_same() {
+
+var canvas = document.getElementById('c633');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 100;
+ctx.fillStyle = '#f00';
+ctx.fillRect(0, 0, 50, 50);
+isPixel(ctx, 20,20, 255,0,0,255, 0);
+canvas.width = 100;
+isPixel(ctx, 20,20, 0,0,0,0, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_initial.reset.transform.html ]]] -->
+
+<p>Canvas test: initial.reset.transform</p>
+<!-- Testing: Resetting the canvas state resets the current transformation matrix -->
+<canvas id="c634" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_initial_reset_transform() {
+
+var canvas = document.getElementById('c634');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 100;
+ctx.scale(0, 0);
+canvas.width = 100;
+ctx.fillStyle = '#0f0';
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 20,20, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.default.html ]]] -->
+
+<p>Canvas test: size.attributes.default</p>
+<!-- Testing: Default width/height -->
+<canvas id="c635" ><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_default() {
+
+var canvas = document.getElementById('c635');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 300, "canvas.width == 300");
+ok(canvas.height == 150, "canvas.height == 150");
+ok(!canvas.hasAttribute('width'), "!canvas.hasAttribute('width')");
+ok(!canvas.hasAttribute('height'), "!canvas.hasAttribute('height')");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.html ]]] -->
+
+<p>Canvas test: size.attributes</p>
+<!-- Testing: width/height DOM attributes and content attributes -->
+<canvas id="c636" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes() {
+
+var canvas = document.getElementById('c636');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 120, "canvas.width == 120");
+ok(canvas.height == 60, "canvas.height == 60");
+ok(canvas.getAttribute('width') == 120, "canvas.getAttribute('width') == 120");
+ok(canvas.getAttribute('height') == 60, "canvas.getAttribute('height') == 60");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.badsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.badsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c637" width="100foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_badsuffix() {
+
+var canvas = document.getElementById('c637');
+var ctx = canvas.getContext('2d');
+
+todo(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.floatsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.floatsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c638" width="100.9" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_floatsuffix() {
+
+var canvas = document.getElementById('c638');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.negative.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.negative</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c639" width="-100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_negative() {
+
+var canvas = document.getElementById('c639');
+var ctx = canvas.getContext('2d');
+
+todo(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.nonnumber.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.nonnumber</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c640" width="foo" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_nonnumber() {
+
+var canvas = document.getElementById('c640');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.percentsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.percentsuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c641" width="100%" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_percentsuffix() {
+
+var canvas = document.getElementById('c641');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.whitespace.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.whitespace</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c642" width="   100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_whitespace() {
+
+var canvas = document.getElementById('c642');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.zero.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.zero</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c643" width="0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_zero() {
+
+var canvas = document.getElementById('c643');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 0, "canvas.width == 0");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.parse.zerosuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.parse.zerosuffix</p>
+<!-- Testing: Parsing of non-negative integers -->
+<canvas id="c644" width="100.0" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_parse_zerosuffix() {
+
+var canvas = document.getElementById('c644');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.reflect.1.html ]]] -->
+
+<p>Canvas test: size.attributes.reflect.1</p>
+<!-- Testing: Setting DOM attributes updates DOM and content attributes -->
+<canvas id="c645" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_reflect_1() {
+
+var canvas = document.getElementById('c645');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 120;
+canvas.height = 60;
+ok(canvas.getAttribute('width') == '120', "canvas.getAttribute('width') == '120'");
+ok(canvas.getAttribute('height') == '60', "canvas.getAttribute('height') == '60'");
+ok(canvas.width == 120, "canvas.width == 120");
+ok(canvas.height == 60, "canvas.height == 60");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.reflect.2.html ]]] -->
+
+<p>Canvas test: size.attributes.reflect.2</p>
+<!-- Testing: Setting content attributes updates DOM and content attributes -->
+<canvas id="c646" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_reflect_2() {
+
+var canvas = document.getElementById('c646');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '120');
+canvas.setAttribute('height', '60');
+ok(canvas.getAttribute('width') == '120', "canvas.getAttribute('width') == '120'");
+ok(canvas.getAttribute('height') == '60', "canvas.getAttribute('height') == '60'");
+ok(canvas.width == 120, "canvas.width == 120");
+ok(canvas.height == 60, "canvas.height == 60");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.removed.html ]]] -->
+
+<p>Canvas test: size.attributes.removed</p>
+<!-- Testing: Removing content attributes reverts to default size -->
+<canvas id="c647" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_removed() {
+
+var canvas = document.getElementById('c647');
+var ctx = canvas.getContext('2d');
+
+canvas.removeAttribute('width');
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.badsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.badsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c648" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_badsuffix() {
+
+var canvas = document.getElementById('c648');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '100foo');
+todo(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.floatsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.floatsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c649" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_floatsuffix() {
+
+var canvas = document.getElementById('c649');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.9');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.negative.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.negative</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c650" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_negative() {
+
+var canvas = document.getElementById('c650');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '-100');
+todo(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.nonnumber.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.nonnumber</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c651" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_nonnumber() {
+
+var canvas = document.getElementById('c651');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', 'foo');
+ok(canvas.width == 300, "canvas.width == 300");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.percentsuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.percentsuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c652" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_percentsuffix() {
+
+var canvas = document.getElementById('c652');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '100%');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.whitespace.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.whitespace</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c653" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_whitespace() {
+
+var canvas = document.getElementById('c653');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '   100');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.zero.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.zero</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c654" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_zero() {
+
+var canvas = document.getElementById('c654');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '0');
+ok(canvas.width == 0, "canvas.width == 0");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.setAttribute.zerosuffix.html ]]] -->
+
+<p>Canvas test: size.attributes.setAttribute.zerosuffix</p>
+<!-- Testing: Parsing of non-negative integers in setAttribute -->
+<canvas id="c655" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_setAttribute_zerosuffix() {
+
+var canvas = document.getElementById('c655');
+var ctx = canvas.getContext('2d');
+
+canvas.setAttribute('width', '1');
+canvas.setAttribute('width', '100.0');
+ok(canvas.width == 100, "canvas.width == 100");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.style.html ]]] -->
+
+<p>Canvas test: size.attributes.style</p>
+<!-- Testing: Canvas size is independent of CSS resizing -->
+<canvas id="c656" width="50" height="30" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_style() {
+
+var canvas = document.getElementById('c656');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width == 50, "canvas.width == 50");
+ok(canvas.height == 30, "canvas.height == 30");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.type.get.html ]]] -->
+
+<p>Canvas test: size.attributes.type.get</p>
+<!-- Testing: width/height DOM/content attributes - string vs number types -->
+<canvas id="c657" width="120" height="60"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_type_get() {
+
+var canvas = document.getElementById('c657');
+var ctx = canvas.getContext('2d');
+
+ok(canvas.width === 120, "canvas.width === 120");
+ok(canvas.height === 60, "canvas.height === 60");
+ok(canvas.getAttribute('width') === '120', "canvas.getAttribute('width') === '120'");
+ok(canvas.getAttribute('height') === '60', "canvas.getAttribute('height') === '60'");
+
+
+}
+</script>
+
+<!-- [[[ test_size.attributes.type.set.html ]]] -->
+
+<p>Canvas test: size.attributes.type.set</p>
+<!-- Testing: Setting width/height DOM attributes -->
+<canvas id="c658" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_size_attributes_type_set() {
+
+var canvas = document.getElementById('c658');
+var ctx = canvas.getContext('2d');
+
+canvas.width = 120;
+canvas.height = 60;
+ok(canvas.width === 120, "canvas.width === 120");
+ok(canvas.height === 60, "canvas.height === 60");
+
+
+}
+</script>
+
+<!-- [[[ test_text.font.html ]]] -->
+
+<p>Canvas test: text.font</p>
+<canvas id="c659" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_font() {
+
+var canvas = document.getElementById('c659');
+var ctx = canvas.getContext('2d');
+
+is(ctx.font, '10px sans-serif', "default font is not '10px sans-serif'");
+
+ctx.save();
+ctx.font = '20pt serif';
+is(ctx.font, '20pt serif', 'font getter returns incorrect value');
+
+ctx.restore();
+is(ctx.font, '10px sans-serif', 'font not being stored in the context state');
+
+if (!_deferred) SimpleTest.finish();
+}
+</script>
+
+<!-- [[[ test_text.measure.html ]]] -->
+
+<p>Canvas test: text.measure</p>
+<canvas id="c660" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_measure() {
+
+var canvas = document.getElementById('c660');
+var ctx = canvas.getContext('2d');
+
+ctx.font = "10px sans-serif";
+ctx.textAlign = "left";
+ctx.textBaseline = "top";
+
+var str = 'Test String';
+var wid = ctx.measureText(str).width;
+
+ok(wid > 0, "measureText returns nonpositive value for non-empty string");
+
+ctx.font = "20px sans-serif";
+isnot(wid, ctx.measureText(str).width, "measureText does not change with a different font size");
+
+ctx.font = "10px sans-serif";
+ctx.textAlign = "center";
+ctx.textBaseline = "alphabetic";
+
+is(wid, ctx.measureText(str).width, "measureText changes when alignement/baseline is changed");
+
+
+if (!_deferred) SimpleTest.finish();
+}
+</script>
+
+<!-- [[[ test_text.space.replace.html ]]] -->
+
+<p>Canvas test: text.space.replace</p>
+<canvas id="c661" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_space_replace() {
+
+var canvas = document.getElementById('c661');
+var ctx = canvas.getContext('2d');
+
+var swid = ctx.measureText(' ').width;
+ctx.font = "10px sans-serif";
+
+isnot(swid, 0.0, "measureText reutuns zero for a non-empty string");
+is(swid, ctx.measureText('\x09').width, "measureText does not replace whitespace char with a space");
+is(swid, ctx.measureText('\x0A').width, "measureText does not replace whitespace char with a space");
+is(swid, ctx.measureText('\x0B').width, "measureText does not replace whitespace char with a space");
+is(swid, ctx.measureText('\x0C').width, "measureText does not replace whitespace char with a space");
+is(swid, ctx.measureText('\x0D').width, "measureText does not replace whitespace char with a space");
+
+if (!_deferred) SimpleTest.finish();
+}
+</script>
+
+<!-- [[[ test_text.textAlign.html ]]] -->
+
+<p>Canvas test: text.textAlign</p>
+<canvas id="c662" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_textAlign() {
+
+var canvas = document.getElementById('c662');
+var ctx = canvas.getContext('2d');
+
+is(ctx.textAlign, 'start', "default textAlign is not 'start'");
+
+ctx.save();
+ctx.textAlign = 'end';
+is(ctx.textAlign, 'end', 'textAlign getter returns incorrect value');
+
+ctx.save();
+ctx.textAlign = 'left';
+is(ctx.textAlign, 'left', 'textAlign getter returns incorrect value');
+
+ctx.save();
+ctx.textAlign = 'center';
+is(ctx.textAlign, 'center', 'textAlign getter returns incorrect value');
+
+ctx.save();
+ctx.textAlign = 'right';
+is(ctx.textAlign, 'right', 'textAlign getter returns incorrect value');
+
+ctx.save();
+ctx.textAlign = 'start';
+is(ctx.textAlign, 'start', 'textAlign getter returns incorrect value');
+
+ctx.restore();
+is(ctx.textAlign, 'right', 'textAlign not being stored in the context state');
+
+ctx.restore();
+is(ctx.textAlign, 'center', 'textAlign not being stored in the context state');
+
+ctx.restore();
+is(ctx.textAlign, 'left', 'textAlign not being stored in the context state');
+
+ctx.restore();
+is(ctx.textAlign, 'end', 'textAlign not being stored in the context state');
+
+ctx.restore();
+is(ctx.textAlign, 'start', 'textAlign not being stored in the context state');
+
+if (!_deferred) SimpleTest.finish();
+}
+</script>
+
+<!-- [[[ test_text.textBaseline.html ]]] -->
+
+<p>Canvas test: text.textBaseline</p>
+<canvas id="c663" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var _deferred = true;
+
+function test_text_textBaseline() {
+
+var canvas = document.getElementById('c663');
+var ctx = canvas.getContext('2d');
+
+is(ctx.textBaseline, 'alphabetic', "default textBaseline is not 'alphabetic'");
+
+ctx.save();
+ctx.textBaseline = 'ideographic';
+is(ctx.textBaseline, 'ideographic', 'textBaseline getter returns incorrect value');
+
+ctx.save();
+ctx.textBaseline = 'top';
+is(ctx.textBaseline, 'top', 'textBaseline getter returns incorrect value');
+
+ctx.save();
+ctx.textBaseline = 'middle';
+is(ctx.textBaseline, 'middle', 'textBaseline getter returns incorrect value');
+
+ctx.save();
+ctx.textBaseline = 'bottom';
+is(ctx.textBaseline, 'bottom', 'textBaseline getter returns incorrect value');
+
+ctx.save();
+ctx.textBaseline = 'hanging';
+is(ctx.textBaseline, 'hanging', 'textBaseline getter returns incorrect value');
+
+ctx.save();
+ctx.textBaseline = 'alphabetic';
+is(ctx.textBaseline, 'alphabetic', 'textBaseline getter returns incorrect value');
+
+ctx.restore();
+is(ctx.textBaseline, 'hanging', 'textBaseline not being stored in the context state');
+
+ctx.restore();
+is(ctx.textBaseline, 'bottom', 'textBaseline not being stored in the context state');
+
+ctx.restore();
+is(ctx.textBaseline, 'middle', 'textBaseline not being stored in the context state');
+
+ctx.restore();
+is(ctx.textBaseline, 'top', 'textBaseline not being stored in the context state');
+
+ctx.restore();
+is(ctx.textBaseline, 'ideographic', 'textBaseline not being stored in the context state');
+
+ctx.restore();
+is(ctx.textBaseline, 'alphabetic', 'textBaseline not being stored in the context state');
+
+if (!_deferred) SimpleTest.finish();
+}
+</script>
+
+<!-- [[[ test_toDataURL.arguments.1.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.1 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c664" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_1() {
+
+var canvas = document.getElementById('c664');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.arguments.2.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.2 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c665" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_2() {
+
+var canvas = document.getElementById('c665');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/png', 'another argument that should not raise an exception', 'and another');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.arguments.3.html ]]] -->
+
+<p>Canvas test: toDataURL.arguments.3 - bug 401795</p>
+<!-- Testing: toDataURL ignores extra arguments -->
+<canvas id="c666" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_arguments_3() {
+
+var canvas = document.getElementById('c666');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+// More arguments that should not raise exceptions
+var data = canvas.toDataURL('image/png', null, null, null);
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.complexcolours.html ]]] -->
+
+<p>Canvas test: toDataURL.complexcolours</p>
+<!-- Testing: toDataURL handles non-primary and non-solid colours correctly -->
+<canvas id="c667" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+var canvas667 = document.getElementById('c667');
+var ctx667 = canvas667.getContext('2d');
+
+function test_toDataURL_complexcolours() {
+
+// (These values are chosen to survive relatively alright through being premultiplied)
+ctx667.fillStyle = 'rgba(1, 3, 254, 1)';
+ctx667.fillRect(0, 0, 25, 25);
+ctx667.fillStyle = 'rgba(8, 252, 248, 0.75)';
+ctx667.fillRect(25, 0, 25, 25);
+ctx667.fillStyle = 'rgba(6, 10, 250, 0.502)';
+ctx667.fillRect(50, 0, 25, 25);
+ctx667.fillStyle = 'rgba(12, 16, 244, 0.25)';
+ctx667.fillRect(75, 0, 25, 25);
+var img = new Image();
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx667.drawImage(img, 0, 25);
+    // (The alpha values do not really survive float->int conversion, so just
+    // do approximate comparisons)
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
+    isPixel(ctx667, 12,40, 1,3,254,255, 0);
+    isPixel(ctx667, 37,40, 8,252,248,191, 2);
+    isPixel(ctx667, 62,40, 6,10,250,127, 4);
+    isPixel(ctx667, 87,40, 12,16,244,63, 8);
+});
+img.src = canvas667.toDataURL();
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.default.html ]]] -->
+
+<p>Canvas test: toDataURL.default</p>
+<!-- Testing: toDataURL with no arguments returns a PNG -->
+<canvas id="c668" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_default() {
+
+var canvas = document.getElementById('c668');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.lowercase.html ]]] -->
+
+<p>Canvas test: toDataURL.lowercase - bug 401795</p>
+<!-- Testing: toDataURL type is case-sensitive -->
+<canvas id="c669" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_lowercase() {
+
+var canvas = document.getElementById('c669');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('ImAgE/PnG');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.nocontext.html ]]] -->
+
+<p>Canvas test: toDataURL.nocontext</p>
+<!-- Testing: toDataURL works before any context has been got -->
+<canvas id="c670" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_nocontext() {
+
+var canvas = document.getElementById('c670');
+var ctx = canvas.getContext('2d');
+
+var canvas2 = document.createElement('canvas');
+var data = canvas2.toDataURL();
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.png.html ]]] -->
+
+<p>Canvas test: toDataURL.png</p>
+<!-- Testing: toDataURL with image/png returns a PNG -->
+<canvas id="c671" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_png() {
+
+var canvas = document.getElementById('c671');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL('image/png');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.primarycolours.html ]]] -->
+
+<p>Canvas test: toDataURL.primarycolours</p>
+<!-- Testing: toDataURL handles simple colours correctly -->
+<canvas id="c672" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+var canvas672 = document.getElementById('c672');
+var ctx672 = canvas672.getContext('2d');
+
+function test_toDataURL_primarycolours() {
+
+ctx672.fillStyle = '#ff0';
+ctx672.fillRect(0, 0, 25, 40);
+ctx672.fillStyle = '#0ff';
+ctx672.fillRect(25, 0, 50, 40);
+ctx672.fillStyle = '#00f';
+ctx672.fillRect(75, 0, 25, 40);
+ctx672.fillStyle = '#fff';
+ctx672.fillRect(0, 40, 100, 10);
+var data = canvas672.toDataURL();
+ctx672.fillStyle = '#f00';
+ctx672.fillRect(0, 0, 100, 50);
+var img = new Image();
+deferTest();
+img.onload = wrapFunction(function ()
+{
+    ctx672.drawImage(img, 0, 0);
+    netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead');
+    isPixel(ctx672, 12,20, 255,255,0,255, 0);
+    isPixel(ctx672, 50,20, 0,255,255,255, 0);
+    isPixel(ctx672, 87,20, 0,0,255,255, 0);
+    isPixel(ctx672, 50,45, 255,255,255,255, 0);
+});
+img.src = data;
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.unrecognised.html ]]] -->
+
+<p>Canvas test: toDataURL.unrecognised - bug 401795</p>
+<!-- Testing: toDataURL with an unhandled type returns a PNG -->
+<canvas id="c673" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_unrecognised() {
+
+var canvas = document.getElementById('c673');
+var ctx = canvas.getContext('2d');
+
+var _thrown_outer = false;
+try {
+
+var data = canvas.toDataURL('image/example');
+ok(data =~ /^data:image\/png[;,]/, "data =~ /^data:image\\/png[;,]/");
+
+} catch (e) {
+    _thrown_outer = true;
+}
+todo(!_thrown_outer, 'should not throw exception');
+
+
+}
+</script>
+
+<!-- [[[ test_toDataURL.zerosize.html ]]] -->
+
+<p>Canvas test: toDataURL.zerosize</p>
+<!-- Testing: toDataURL on zero-size canvas returns 'data:,' -->
+<canvas id="c674" width="0" height="0"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_toDataURL_zerosize() {
+
+var canvas = document.getElementById('c674');
+var ctx = canvas.getContext('2d');
+
+var data = canvas.toDataURL();
+todo(data === 'data:,', "data === 'data:,'");
+
+
+}
+</script>
+
+<!-- [[[ test_type.delete.html ]]] -->
+
+<p>Canvas test: type.delete</p>
+<!-- Testing: window.HTMLCanvasElement interface object is DontDelete -->
+<canvas id="c675" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_delete() {
+
+var canvas = document.getElementById('c675');
+var ctx = canvas.getContext('2d');
+
+delete window.HTMLCanvasElement;
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+
+}
+</script>
+
+<!-- [[[ test_type.exists.html ]]] -->
+
+<p>Canvas test: type.exists</p>
+<!-- Testing: HTMLCanvasElement is a property of window -->
+<canvas id="c676" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_exists() {
+
+var canvas = document.getElementById('c676');
+var ctx = canvas.getContext('2d');
+
+ok(window.HTMLCanvasElement, "window.HTMLCanvasElement");
+
+
+}
+</script>
+
+<!-- [[[ test_type.extend.html ]]] -->
+
+<p>Canvas test: type.extend</p>
+<!-- Testing: HTMLCanvasElement methods can be added, and the new methods used by canvases -->
+<canvas id="c677" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_extend() {
+
+var canvas = document.getElementById('c677');
+var ctx = canvas.getContext('2d');
+
+window.HTMLCanvasElement.prototype.getZero = function () { return 0; };
+ok(canvas.getZero() === 0, "canvas.getZero() === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_type.name.html ]]] -->
+
+<p>Canvas test: type.name</p>
+<!-- Testing: HTMLCanvasElement type and toString -->
+<canvas id="c678" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_name() {
+
+var canvas = document.getElementById('c678');
+var ctx = canvas.getContext('2d');
+
+ok(Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]', "Object.prototype.toString.call(canvas) === '[object HTMLCanvasElement]'");
+
+
+}
+</script>
+
+<!-- [[[ test_type.prototype.html ]]] -->
+
+<p>Canvas test: type.prototype</p>
+<!-- Testing: window.HTMLCanvasElement has prototype, which is { ReadOnly, DontDelete }. prototype has getContext, which is not -->
+<canvas id="c679" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_prototype() {
+
+var canvas = document.getElementById('c679');
+var ctx = canvas.getContext('2d');
+
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+ok(window.HTMLCanvasElement.prototype.getContext, "window.HTMLCanvasElement.prototype.getContext");
+window.HTMLCanvasElement.prototype = null;
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+delete window.HTMLCanvasElement.prototype;
+ok(window.HTMLCanvasElement.prototype, "window.HTMLCanvasElement.prototype");
+window.HTMLCanvasElement.prototype.getContext = 1;
+ok(window.HTMLCanvasElement.prototype.getContext === 1, "window.HTMLCanvasElement.prototype.getContext === 1");
+delete window.HTMLCanvasElement.prototype.getContext;
+todo(window.HTMLCanvasElement.prototype.getContext === undefined, "window.HTMLCanvasElement.prototype.getContext === undefined");
+
+
+}
+</script>
+
+<!-- [[[ test_type.replace.html ]]] -->
+
+<p>Canvas test: type.replace</p>
+<!-- Testing: HTMLCanvasElement methods can be replaced, and the replacement methods used by canvases -->
+<canvas id="c680" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+function test_type_replace() {
+
+var canvas = document.getElementById('c680');
+var ctx = canvas.getContext('2d');
+
+window.HTMLCanvasElement.prototype.getContext = function (name) { return 0; };
+ok(canvas.getContext('2d') === 0, "canvas.getContext('2d') === 0");
+
+
+}
+</script>
+
+<!-- [[[ test_2d.imagedata_coercion.html ]]] -->
+
+<p>Canvas test: 2d.imagedata_coercion</p>
+<!-- Testing: imagedata coerced correctly on set -->
+<canvas id="c681" width="100" height="1"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+/* NOTE: Due to round-tripping through premultiplied values and the rounding
+that ensues, values of alpha < 255 will tend to do weird things.  In
+particular, the premultiplied color values are computed by multiplying by a,
+dividing by 255, then always rounding up.  The conversion the other way is done
+by multiplying by 255/a and rounding down.  So if
+
+  255/a * (amount added when rounding) > 1
+
+we will get a change in value when we go through a putImageData/getImageData cycle.  Therefore, to make sure we don't have to worry about our color
+channels, our alpha channel should never be < 250, unless it's 0.  And when it's 0, all our color channels will come back as 0 too. */
+  
+/* Our tests.  Each test has two arrays: the array of values to set and the
+   array of values that should read back as a result. */
+var tests = [
+  [
+    [ 0, 1, 3, 250 ], [ 0, 1, 3, 250 ]
+  ],
+  [
+    [ 0, 1, 2, 250, 4, 5, 6, 250 ], [ 0, 1, 2, 250, 4, 5, 6, 250 ]
+  ],
+  [
+    [ 0, 1000, 2, 300, 400, 5, 600, 250 ], [ 0, 255, 2, 255, 255, 5, 255, 250 ]
+  ],
+  [
+    [ -10, -5, NaN, 250, 4, 5, 6, -250 ], [ 0, 0, 0, 250, 0, 0, 0, 0 ]
+  ],
+  [
+    [ 0.5, 12.2, 12.8, 251.5, 12.5, 13.5, 13.2, 250.5 ],
+    [ 0, 12, 13, 252, 12, 14, 13, 250 ]
+  ]
+];
+
+function doTest(type, idx) {
+  var testPair = tests[idx];
+  var test = testPair[0];
+  var ref = testPair[1];
+  var descSuffix = " for " + type + " test #" + (idx+1);
+  function myIs(a, b, str) {
+    is(a, b, str + descSuffix);
+  }
+
+  myIs(test.length, ref.length, "Length mismatch");
+  myIs(test.length % 4, 0, "Length not a multiple of 4");
+  var pixels = test.length / 4;
+  var imageData = ctx681.createImageData(pixels, 1);
+  myIs(imageData.width, pixels, "Incorrect created data width");
+  myIs(imageData.height, 1, "Incorrect created data height");
+  myIs(imageData.data.length, test.length,
+       "Incorrect length in created image data");
+
+  ctx681.putImageData(imageData, 0, 0);
+  var testImageData = ctx681.getImageData(0, 0, pixels, 1);
+  myIs(testImageData.data.length, test.length,
+       "Incorrect length in test image data after clearing pixels");
+  var j;
+  for (j = 0; j < testImageData.data.length; ++j) {
+    myIs(testImageData.data[j], 0,
+         "Nonzero value at position " + j + " in test image data " +
+         "after clearing pixels");
+  }
+  for (j = 0; j < imageData.data.length; ++j) {
+    imageData.data[j] = test[j];
+  }
+  if (type == "slow") {
+    // convert to a non-dense array so we can test that codepath
+    imageData.data.makeMeSlow = 1;
+  }
+  ctx681.putImageData(imageData, 0, 0);
+  testImageData = ctx681.getImageData(0, 0, pixels, 1);
+  myIs(testImageData.data.length, test.length,
+       "Incorrect length in test image data after putting our imagedata");
+  for (j = 0; j < testImageData.data.length; ++j) {
+    myIs(testImageData.data[j], ref[j],
+         "Incorrect value at position " + j + " in test image data " +
+         "after putting our imagedata");
+  }
+}
+
+function doTests(type) {
+  for (var i = 0; i < tests.length; ++i) {
+    doTest(type, i);
+  }
+}
+
+var canvas681;
+var ctx681;
+                      
+function test_2d_imagedata_coercion() {
+
+canvas681 = document.getElementById('c681');
+ctx681 = canvas681.getContext('2d');
+
+doTests("fast");
+doTests("slow");
+
+}
+</script>
+
+<!-- [[[ test_2d.imageSmoothing.html ]]] -->
+
+<p>Canvas test: 2d.imageRenderingQuality</p>
+<canvas id="c682" width="10" height="10"></canvas><br>
+<canvas style="visibility: hidden" id="c683" width="2" height="2"></canvas>
+<script type="text/javascript">
+
+function setup_test_2d_imageSmoothing() {
+  var c683 = document.getElementById("c683");
+  var cx683 = c683.getContext("2d");
+
+  cx683.fillStyle = "red";
+  cx683.fillRect(0, 0, 2, 2);
+
+  cx683.fillStyle = "rgb(0,255,0)";
+  cx683.fillRect(0, 0, 1, 1);
+}
+
+function test_2d_imageSmoothing() {
+  setup_test_2d_imageSmoothing();
+
+  var c682 = document.getElementById("c682");
+  var c683 = document.getElementById("c683");
+
+  var cx682 = c682.getContext("2d");
+
+  ok(cx682.mozImageSmoothingEnabled == true, "initial mozImageSmoothingEnabled is true");
+
+  // check that mozImageSmoothingEnabled is part of the context
+  cx682.save();
+  cx682.mozImageSmoothingEnabled = false;
+  ok(cx682.mozImageSmoothingEnabled == false, "mozImageSmoothingEnabled is false after setting");
+  cx682.restore();
+  ok(cx682.mozImageSmoothingEnabled == true, "mozImageSmoothingEnabled is true after restore");
+
+  // check that false works
+  cx682.mozImageSmoothingEnabled = false;
+
+  cx682.scale(10,10);
+  cx682.drawImage(c683, 0, 0);
+
+  // this should be all red
+  var data = cx682.getImageData(9, 9, 1, 1);
+  var pixels = data.data;
+  ok (pixels[0] == 0 &&
+      pixels[1] == 255 &&
+      pixels[2] == 0 &&
+      pixels[3] == 255,
+      "pixel is " + pixels.toSource() + " (expected [0,255,0,255])");
+}
+
+</script>
+
+<script>
+
+function asyncTestsDone() {
+	if (isDone_test_2d_drawImage_animated_apng &&
+		isDone_test_2d_drawImage_animated_gif) {
+		SimpleTest.finish();
+	} else {
+		setTimeout(asyncTestsDone, 500);
+	}
+ }
+ 
+function runTests() {
+/**
+ * xor and lighter aren't well handled by cairo; they mostly work, but we don't want
+ * to test that
+ */
+ //test_2d_composite_solid_lighter();
+ //test_2d_composite_transparent_xor();
+ //test_2d_composite_solid_xor();
+ //test_2d_composite_transparent_lighter();
+ //test_2d_composite_image_xor();
+ //test_2d_composite_image_lighter();
+ //test_2d_composite_canvas_xor();
+ //test_2d_composite_canvas_lighter();
+ //test_2d_composite_clip_xor();
+ //test_2d_composite_clip_lighter();
+ 
+/**
+ * Temporarily disabled tests; unbounded operators changed behaviour, need to reevaluate tests
+ */
+ //test_2d_composite_canvas_destination_atop();
+ //test_2d_composite_canvas_destination_in();
+ //test_2d_composite_canvas_source_in();
+ //test_2d_composite_canvas_source_out();
+ //test_2d_composite_image_destination_atop();
+ //test_2d_composite_image_destination_in();
+ //test_2d_composite_image_source_in();
+ //test_2d_composite_image_source_out();
+ 
+ /**
+  * These tests only pass on Mac OS X >= 10.5; see bug 450114
+  */
+ //test_2d_gradient_radial_equal();
+ //test_2d_gradient_radial_touch1();
+ //test_2d_gradient_radial_touch2();
+ //test_2d_gradient_radial_touch3();
+ 
+ /**
+  * These 19 tests recieve special makefile treatment
+  */
+ //test_2d_composite_uncovered_image_destination_atop();
+ //test_2d_composite_uncovered_image_destination_in();
+ //test_2d_composite_uncovered_image_source_in();
+ //test_2d_composite_uncovered_image_source_out();
+ //test_2d_gradient_radial_cone_behind();
+ //test_2d_gradient_radial_cone_beside();
+ //test_2d_gradient_radial_cone_front();
+ //test_2d_gradient_radial_cone_shape2();
+ //test_2d_gradient_radial_cone_top();
+ //test_2d_gradient_radial_inside2();
+ //test_2d_gradient_radial_inside3();
+ //test_2d_gradient_radial_outside1();
+ //test_2d_gradient_radial_outside2();
+ //test_2d_gradient_radial_outside3();
+ //test_2d_line_cap_closed();
+ //test_2d_line_join_parallel();
+ //test_2d_path_arc_shape_3();
+ //test_2d_path_rect_selfintersect();
+ //test_2d_strokeRect_zero_5();
+ 
+ /**
+  * Other tests not being run
+  */
+ //test_2d_composite_uncovered_fill_destination_atop();
+ //test_2d_composite_uncovered_fill_destination_in();
+ //test_2d_composite_uncovered_fill_source_in();
+ //test_2d_composite_uncovered_fill_source_out();
+ //test_2d_composite_uncovered_pattern_destination_atop();
+ //test_2d_composite_uncovered_pattern_destination_in();
+ //test_2d_composite_uncovered_pattern_source_in();
+ //test_2d_composite_uncovered_pattern_source_out();
+ 
+ //test_2d_path_rect_zero_6();	// This test is bogus according to the spec; see bug 407107
+ 
+ try {
+  test_2d_canvas_readonly();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_canvas_readonly");
+ }
+ try {
+  test_2d_canvas_reference();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_canvas_reference");
+ }
+ try {
+  test_2d_clearRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_basic");
+ }
+ try {
+  test_2d_clearRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_clip");
+ }
+ try {
+  test_2d_clearRect_globalalpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_globalalpha");
+ }
+ try {
+  test_2d_clearRect_globalcomposite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_globalcomposite");
+ }
+ try {
+  test_2d_clearRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_negative");
+ }
+ try {
+  test_2d_clearRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_nonfinite");
+ }
+ try {
+  test_2d_clearRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_path");
+ }
+ try {
+  test_2d_clearRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_shadow");
+ }
+ try {
+  test_2d_clearRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_transform");
+ }
+ try {
+  test_2d_clearRect_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_clearRect_zero");
+ }
+ try {
+  test_2d_composite_canvas_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_copy");
+ }
+ try {
+  test_2d_composite_canvas_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_destination_out");
+ }
+ try {
+  test_2d_composite_canvas_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_destination_over");
+ }
+ try {
+  test_2d_composite_canvas_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_source_atop");
+ }
+ try {
+  test_2d_composite_canvas_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_canvas_source_over");
+ }
+ try {
+  test_2d_composite_clip_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_copy");
+ }
+ try {
+  test_2d_composite_clip_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_atop");
+ }
+ try {
+  test_2d_composite_clip_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_in");
+ }
+ try {
+  test_2d_composite_clip_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_out");
+ }
+ try {
+  test_2d_composite_clip_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_destination_over");
+ }
+ try {
+  test_2d_composite_clip_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_atop");
+ }
+ try {
+  test_2d_composite_clip_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_in");
+ }
+ try {
+  test_2d_composite_clip_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_out");
+ }
+ try {
+  test_2d_composite_clip_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_clip_source_over");
+ }
+ try {
+  test_2d_composite_globalAlpha_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_canvas");
+ }
+ try {
+  test_2d_composite_globalAlpha_canvaspattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_canvaspattern");
+ }
+ try {
+  test_2d_composite_globalAlpha_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_default");
+ }
+ try {
+  test_2d_composite_globalAlpha_fill();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_fill");
+ }
+ try {
+  test_2d_composite_globalAlpha_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_image");
+ }
+ try {
+  test_2d_composite_globalAlpha_imagepattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_imagepattern");
+ }
+ try {
+  test_2d_composite_globalAlpha_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_invalid");
+ }
+ try {
+  test_2d_composite_globalAlpha_range();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_globalAlpha_range");
+ }
+ try {
+  test_2d_composite_image_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_copy");
+ }
+ try {
+  test_2d_composite_image_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_destination_out");
+ }
+ try {
+  test_2d_composite_image_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_destination_over");
+ }
+ try {
+  test_2d_composite_image_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_source_atop");
+ }
+ try {
+  test_2d_composite_image_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_image_source_over");
+ }
+ try {
+  test_2d_composite_operation_casesensitive();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_casesensitive");
+ }
+ try {
+  test_2d_composite_operation_clear();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_clear");
+ }
+ try {
+  test_2d_composite_operation_darker();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_darker");
+ }
+ try {
+  test_2d_composite_operation_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_default");
+ }
+ try {
+  test_2d_composite_operation_get();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_get");
+ }
+ try {
+  test_2d_composite_operation_highlight();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_highlight");
+ }
+ try {
+  test_2d_composite_operation_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_nullsuffix");
+ }
+ try {
+  test_2d_composite_operation_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_over");
+ }
+ try {
+  test_2d_composite_operation_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_operation_unrecognised");
+ }
+ try {
+  test_2d_composite_solid_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_copy");
+ }
+ try {
+  test_2d_composite_solid_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_atop");
+ }
+ try {
+  test_2d_composite_solid_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_in");
+ }
+ try {
+  test_2d_composite_solid_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_out");
+ }
+ try {
+  test_2d_composite_solid_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_destination_over");
+ }
+ try {
+  test_2d_composite_solid_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_atop");
+ }
+ try {
+  test_2d_composite_solid_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_in");
+ }
+ try {
+  test_2d_composite_solid_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_out");
+ }
+ try {
+  test_2d_composite_solid_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_solid_source_over");
+ }
+ try {
+  test_2d_composite_transparent_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_copy");
+ }
+ try {
+  test_2d_composite_transparent_destination_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_atop");
+ }
+ try {
+  test_2d_composite_transparent_destination_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_in");
+ }
+ try {
+  test_2d_composite_transparent_destination_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_out");
+ }
+ try {
+  test_2d_composite_transparent_destination_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_destination_over");
+ }
+ try {
+  test_2d_composite_transparent_source_atop();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_atop");
+ }
+ try {
+  test_2d_composite_transparent_source_in();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_in");
+ }
+ try {
+  test_2d_composite_transparent_source_out();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_out");
+ }
+ try {
+  test_2d_composite_transparent_source_over();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_transparent_source_over");
+ }
+ try {
+  test_2d_composite_uncovered_fill_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_fill_copy");
+ }
+ try {
+  test_2d_composite_uncovered_image_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_image_copy");
+ }
+ try {
+  test_2d_composite_uncovered_pattern_copy();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_composite_uncovered_pattern_copy");
+ }
+ try {
+  test_2d_drawImage_3arg();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_3arg");
+ }
+ try {
+  test_2d_drawImage_5arg();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_5arg");
+ }
+ try {
+  test_2d_drawImage_9arg_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_basic");
+ }
+ try {
+  test_2d_drawImage_9arg_destpos();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_destpos");
+ }
+ try {
+  test_2d_drawImage_9arg_destsize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_destsize");
+ }
+ try {
+  test_2d_drawImage_9arg_sourcepos();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_sourcepos");
+ }
+ try {
+  test_2d_drawImage_9arg_sourcesize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_9arg_sourcesize");
+ }
+ try {
+  test_2d_drawImage_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_alpha");
+ }
+ try {
+  test_2d_drawImage_animated_poster();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_poster");
+ }
+ try {
+  test_2d_drawImage_broken();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_broken");
+ }
+ try {
+  test_2d_drawImage_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_canvas");
+ }
+ try {
+  test_2d_drawImage_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_clip");
+ }
+ try {
+  test_2d_drawImage_composite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_composite");
+ }
+ try {
+  test_2d_drawImage_floatsource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_floatsource");
+ }
+ try {
+  test_2d_drawImage_incomplete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_incomplete");
+ }
+ try {
+  test_2d_drawImage_negativedest();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_negativedest");
+ }
+ try {
+  test_2d_drawImage_negativesource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_negativesource");
+ }
+ try {
+  test_2d_drawImage_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_nonfinite");
+ }
+ try {
+  test_2d_drawImage_nowrap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_nowrap");
+ }
+ try {
+  test_2d_drawImage_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_null");
+ }
+ try {
+  test_2d_drawImage_outsidesource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_outsidesource");
+ }
+ try {
+  test_2d_drawImage_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_path");
+ }
+ try {
+  test_2d_drawImage_self_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_self_1");
+ }
+ try {
+  test_2d_drawImage_self_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_self_2");
+ }
+ try {
+  test_2d_drawImage_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_transform");
+ }
+ try {
+  test_2d_drawImage_wrongtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_wrongtype");
+ }
+ try {
+  test_2d_drawImage_zerosource();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_zerosource");
+ }
+ try {
+  test_2d_fillRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_basic");
+ }
+ try {
+  test_2d_fillRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_clip");
+ }
+ try {
+  test_2d_fillRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_negative");
+ }
+ try {
+  test_2d_fillRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_nonfinite");
+ }
+ try {
+  test_2d_fillRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_path");
+ }
+ try {
+  test_2d_fillRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_shadow");
+ }
+ try {
+  test_2d_fillRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_transform");
+ }
+ try {
+  test_2d_fillRect_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillRect_zero");
+ }
+ try {
+  test_2d_fillStyle_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_default");
+ }
+ try {
+  test_2d_fillStyle_get_semitransparent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_semitransparent");
+ }
+ try {
+  test_2d_fillStyle_get_solid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_solid");
+ }
+ try {
+  test_2d_fillStyle_get_transparent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_get_transparent");
+ }
+ try {
+  test_2d_fillStyle_invalidstring();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_invalidstring");
+ }
+ try {
+  test_2d_fillStyle_invalidtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_invalidtype");
+ }
+ try {
+  test_2d_fillStyle_parse_current_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_basic");
+ }
+ try {
+  test_2d_fillStyle_parse_current_changed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_changed");
+ }
+ try {
+  test_2d_fillStyle_parse_current_removed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_current_removed");
+ }
+ try {
+  test_2d_fillStyle_parse_hex3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hex3");
+ }
+ try {
+  test_2d_fillStyle_parse_hex6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hex6");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_5");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsl_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsl_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_5");
+ }
+ try {
+  test_2d_fillStyle_parse_hsla_clamp_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_hsla_clamp_6");
+ }
+ try {
+  test_2d_fillStyle_parse_html4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_html4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hex3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hex3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hex6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hex6");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsl_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsl_5");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsla_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsla_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_hsla_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsla_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_5");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_6");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgb_7();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgb_7");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_1");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_2");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_3");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_4");
+ }
+ try {
+  test_2d_fillStyle_parse_invalid_rgba_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_rgba_5");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_3");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_4");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_clamp_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_clamp_5");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_num();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_num");
+ }
+ try {
+  test_2d_fillStyle_parse_rgb_percent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgb_percent");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_clamp_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_clamp_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_clamp_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_clamp_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_num_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_num_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_num_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_num_2");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_percent();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_percent");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_solid_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_solid_1");
+ }
+ try {
+  test_2d_fillStyle_parse_rgba_solid_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_rgba_solid_2");
+ }
+ try {
+  test_2d_fillStyle_parse_svg_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_svg_1");
+ }
+ try {
+  test_2d_fillStyle_parse_svg_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_svg_2");
+ }
+ try {
+  test_2d_fillStyle_parse_system();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_system");
+ }
+ try {
+  test_2d_fillStyle_parse_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_transparent_1");
+ }
+ try {
+  test_2d_fillStyle_parse_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_transparent_2");
+ }
+ try {
+  test_2d_getcontext_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_exists");
+ }
+ try {
+  test_2d_getcontext_shared();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_shared");
+ }
+ try {
+  test_2d_getcontext_unique();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_getcontext_unique");
+ }
+ try {
+  test_2d_gradient_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_empty");
+ }
+ try {
+  test_2d_gradient_interpolate_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_alpha");
+ }
+ try {
+  test_2d_gradient_interpolate_colour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_colour");
+ }
+ try {
+  test_2d_gradient_interpolate_colouralpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_colouralpha");
+ }
+ try {
+  test_2d_gradient_interpolate_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_multiple");
+ }
+ try {
+  test_2d_gradient_interpolate_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_outside");
+ }
+ try {
+  test_2d_gradient_interpolate_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_overlap");
+ }
+ try {
+  test_2d_gradient_interpolate_overlap2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_overlap2");
+ }
+ try {
+  test_2d_gradient_interpolate_solid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_solid");
+ }
+ try {
+  test_2d_gradient_interpolate_vertical();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_vertical");
+ }
+ try {
+  test_2d_gradient_interpolate_zerosize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_interpolate_zerosize");
+ }
+ try {
+  test_2d_gradient_linear_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_nonfinite");
+ }
+ try {
+  test_2d_gradient_linear_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_1");
+ }
+ try {
+  test_2d_gradient_linear_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_2");
+ }
+ try {
+  test_2d_gradient_linear_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_linear_transform_3");
+ }
+ try {
+  test_2d_gradient_object_compare();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_compare");
+ }
+ try {
+  test_2d_gradient_object_crosscanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_crosscanvas");
+ }
+ try {
+  test_2d_gradient_object_invalidcolour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_invalidcolour");
+ }
+ try {
+  test_2d_gradient_object_invalidoffset();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_invalidoffset");
+ }
+ try {
+  test_2d_gradient_object_return();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_return");
+ }
+ try {
+  test_2d_gradient_object_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_type");
+ }
+ try {
+  test_2d_gradient_object_update();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_object_update");
+ }
+ try {
+  test_2d_gradient_radial_cone_bottom();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_bottom");
+ }
+ try {
+  test_2d_gradient_radial_cone_cylinder();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_cylinder");
+ }
+ try {
+  test_2d_gradient_radial_cone_shape1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_cone_shape1");
+ }
+ try {
+  test_2d_gradient_radial_inside1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_inside1");
+ }
+ try {
+  test_2d_gradient_radial_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_negative");
+ }
+ try {
+  test_2d_gradient_radial_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_nonfinite");
+ }
+ try {
+  test_2d_gradient_radial_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_1");
+ }
+ try {
+  test_2d_gradient_radial_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_2");
+ }
+ try {
+  test_2d_gradient_radial_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_gradient_radial_transform_3");
+ }
+ try {
+  test_2d_imageData_create_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_basic");
+ }
+ try {
+  test_2d_imageData_create_initial();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_initial");
+ }
+ try {
+  test_2d_imageData_create_large();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_large");
+ }
+ try {
+  test_2d_imageData_create_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_negative");
+ }
+ try {
+  test_2d_imageData_create_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_nonfinite");
+ }
+ try {
+  test_2d_imageData_create_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_round");
+ }
+ try {
+  test_2d_imageData_create_tiny();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_tiny");
+ }
+ try {
+  test_2d_imageData_create_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_type");
+ }
+ try {
+  test_2d_imageData_create_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_create_zero");
+ }
+ try {
+  test_2d_imageData_get_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_basic");
+ }
+ try {
+  test_2d_imageData_get_clamp();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_clamp");
+ }
+ try {
+  test_2d_imageData_get_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_nonfinite");
+ }
+ try {
+  test_2d_imageData_get_nonpremul();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_nonpremul");
+ }
+ try {
+  test_2d_imageData_get_order_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_alpha");
+ }
+ try {
+  test_2d_imageData_get_order_cols();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_cols");
+ }
+ try {
+  test_2d_imageData_get_order_rgb();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_rgb");
+ }
+ try {
+  test_2d_imageData_get_order_rows();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_order_rows");
+ }
+ try {
+  test_2d_imageData_get_range();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_range");
+ }
+ try {
+  test_2d_imageData_get_source_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_negative");
+ }
+ try {
+  test_2d_imageData_get_source_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_outside");
+ }
+ try {
+  test_2d_imageData_get_source_size();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_source_size");
+ }
+ try {
+  test_2d_imageData_get_tiny();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_tiny");
+ }
+ try {
+  test_2d_imageData_get_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_type");
+ }
+ try {
+  test_2d_imageData_get_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_unaffected");
+ }
+ try {
+  test_2d_imageData_get_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_get_zero");
+ }
+ try {
+  test_2d_imageData_object_clamp();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_clamp");
+ }
+ try {
+  test_2d_imageData_object_ctor();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_ctor");
+ }
+ try {
+  test_2d_imageData_object_nan();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_nan");
+ }
+ try {
+  test_2d_imageData_object_properties();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_properties");
+ }
+ try {
+  test_2d_imageData_object_readonly();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_readonly");
+ }
+ try {
+  test_2d_imageData_object_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_round");
+ }
+ try {
+  test_2d_imageData_object_set();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_set");
+ }
+ try {
+  test_2d_imageData_object_string();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_string");
+ }
+ try {
+  test_2d_imageData_object_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_object_undefined");
+ }
+ try {
+  test_2d_imageData_put_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_alpha");
+ }
+ try {
+  test_2d_imageData_put_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_basic");
+ }
+ try {
+  test_2d_imageData_put_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_clip");
+ }
+ try {
+  test_2d_imageData_put_created();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_created");
+ }
+ try {
+  test_2d_imageData_put_cross();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_cross");
+ }
+ try {
+  test_2d_imageData_put_dirty_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_negative");
+ }
+ try {
+  test_2d_imageData_put_dirty_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_outside");
+ }
+ try {
+  test_2d_imageData_put_dirty_rect1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_rect1");
+ }
+ try {
+  test_2d_imageData_put_dirty_rect2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_rect2");
+ }
+ try {
+  test_2d_imageData_put_dirty_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_dirty_zero");
+ }
+ try {
+  test_2d_imageData_put_modified();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_modified");
+ }
+ try {
+  test_2d_imageData_put_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_nonfinite");
+ }
+ try {
+  test_2d_imageData_put_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_null");
+ }
+ try {
+  test_2d_imageData_put_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_path");
+ }
+ try {
+  test_2d_imageData_put_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_unaffected");
+ }
+ try {
+  test_2d_imageData_put_unchanged();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_unchanged");
+ }
+ try {
+  test_2d_imageData_put_wrongtype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageData_put_wrongtype");
+ }
+ try {
+  test_2d_line_cap_butt();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_butt");
+ }
+ try {
+  test_2d_line_cap_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_invalid");
+ }
+ try {
+  test_2d_line_cap_open();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_open");
+ }
+ try {
+  test_2d_line_cap_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_round");
+ }
+ try {
+  test_2d_line_cap_square();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cap_square");
+ }
+ try {
+  test_2d_line_cross();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_cross");
+ }
+ try {
+  test_2d_line_defaults();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_defaults");
+ }
+ try {
+  test_2d_line_join_bevel();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_bevel");
+ }
+ try {
+  test_2d_line_join_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_closed");
+ }
+ try {
+  test_2d_line_join_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_invalid");
+ }
+ try {
+  test_2d_line_join_miter();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_miter");
+ }
+ try {
+  test_2d_line_join_open();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_open");
+ }
+ try {
+  test_2d_line_join_round();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_join_round");
+ }
+ try {
+  test_2d_line_miter_acute();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_acute");
+ }
+ try {
+  test_2d_line_miter_exceeded();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_exceeded");
+ }
+ try {
+  test_2d_line_miter_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_invalid");
+ }
+ try {
+  test_2d_line_miter_lineedge();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_lineedge");
+ }
+ try {
+  test_2d_line_miter_obtuse();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_obtuse");
+ }
+ try {
+  test_2d_line_miter_rightangle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_rightangle");
+ }
+ try {
+  test_2d_line_miter_within();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_miter_within");
+ }
+ try {
+  test_2d_line_union();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_union");
+ }
+ try {
+  test_2d_line_width_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_basic");
+ }
+ try {
+  test_2d_line_width_invalid();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_invalid");
+ }
+ try {
+  test_2d_line_width_transformed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_line_width_transformed");
+ }
+ try {
+  test_2d_missingargs();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_missingargs");
+ }
+ try {
+  test_2d_path_arc_angle_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_1");
+ }
+ try {
+  test_2d_path_arc_angle_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_2");
+ }
+ try {
+  test_2d_path_arc_angle_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_3");
+ }
+ try {
+  test_2d_path_arc_angle_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_4");
+ }
+ try {
+  test_2d_path_arc_angle_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_5");
+ }
+ try {
+  test_2d_path_arc_angle_6();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_angle_6");
+ }
+ try {
+  test_2d_path_arc_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_empty");
+ }
+ try {
+  test_2d_path_arc_end();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_end");
+ }
+ try {
+  test_2d_path_arc_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_negative");
+ }
+ try {
+  test_2d_path_arc_nonempty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_nonempty");
+ }
+ try {
+  test_2d_path_arc_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_nonfinite");
+ }
+ try {
+  test_2d_path_arc_scale_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_scale_1");
+ }
+ try {
+  test_2d_path_arc_scale_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_scale_2");
+ }
+ try {
+  test_2d_path_arc_selfintersect_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_selfintersect_1");
+ }
+ try {
+  test_2d_path_arc_selfintersect_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_selfintersect_2");
+ }
+ try {
+  test_2d_path_arc_shape_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_1");
+ }
+ try {
+  test_2d_path_arc_shape_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_2");
+ }
+ try {
+  test_2d_path_arc_shape_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_4");
+ }
+ try {
+  test_2d_path_arc_shape_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_shape_5");
+ }
+ try {
+  test_2d_path_arc_twopie_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_1");
+ }
+ try {
+  test_2d_path_arc_twopie_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_2");
+ }
+ try {
+  test_2d_path_arc_twopie_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_3");
+ }
+ try {
+  test_2d_path_arc_twopie_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_twopie_4");
+ }
+ try {
+  test_2d_path_arc_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zero_1");
+ }
+ try {
+  test_2d_path_arc_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zero_2");
+ }
+ try {
+  test_2d_path_arc_zeroradius();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arc_zeroradius");
+ }
+ try {
+  test_2d_path_arcTo_coincide_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_coincide_1");
+ }
+ try {
+  test_2d_path_arcTo_coincide_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_coincide_2");
+ }
+ try {
+  test_2d_path_arcTo_collinear_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_1");
+ }
+ try {
+  test_2d_path_arcTo_collinear_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_2");
+ }
+ try {
+  test_2d_path_arcTo_collinear_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_collinear_3");
+ }
+ try {
+  test_2d_path_arcTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_emptysubpath");
+ }
+ try {
+  test_2d_path_arcTo_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_negative");
+ }
+ try {
+  test_2d_path_arcTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_nonfinite");
+ }
+ try {
+  test_2d_path_arcTo_scale();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_scale");
+ }
+ try {
+  test_2d_path_arcTo_shape_curve1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_curve1");
+ }
+ try {
+  test_2d_path_arcTo_shape_curve2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_curve2");
+ }
+ try {
+  test_2d_path_arcTo_shape_end();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_end");
+ }
+ try {
+  test_2d_path_arcTo_shape_start();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_shape_start");
+ }
+ try {
+  test_2d_path_arcTo_transformation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_transformation");
+ }
+ try {
+  test_2d_path_arcTo_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_zero_1");
+ }
+ try {
+  test_2d_path_arcTo_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_arcTo_zero_2");
+ }
+ try {
+  test_2d_path_beginPath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_beginPath");
+ }
+ try {
+  test_2d_path_bezierCurveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_basic");
+ }
+ try {
+  test_2d_path_bezierCurveTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_emptysubpath");
+ }
+ try {
+  test_2d_path_bezierCurveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_nonfinite");
+ }
+ try {
+  test_2d_path_bezierCurveTo_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_scaled");
+ }
+ try {
+  test_2d_path_bezierCurveTo_shape();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_bezierCurveTo_shape");
+ }
+ try {
+  test_2d_path_clip_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_basic_1");
+ }
+ try {
+  test_2d_path_clip_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_basic_2");
+ }
+ try {
+  test_2d_path_clip_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_empty");
+ }
+ try {
+  test_2d_path_clip_intersect();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_intersect");
+ }
+ try {
+  test_2d_path_clip_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_unaffected");
+ }
+ try {
+  test_2d_path_clip_winding_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_winding_1");
+ }
+ try {
+  test_2d_path_clip_winding_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_clip_winding_2");
+ }
+ try {
+  test_2d_path_closePath_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_empty");
+ }
+ try {
+  test_2d_path_closePath_newline();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_newline");
+ }
+ try {
+  test_2d_path_closePath_nextpoint();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_closePath_nextpoint");
+ }
+ try {
+  test_2d_path_fill_closed_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_closed_basic");
+ }
+ try {
+  test_2d_path_fill_closed_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_closed_unaffected");
+ }
+ try {
+  test_2d_path_fill_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_overlap");
+ }
+ try {
+  test_2d_path_fill_winding_add();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_add");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_1");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_2");
+ }
+ try {
+  test_2d_path_fill_winding_subtract_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_fill_winding_subtract_3");
+ }
+ try {
+  test_2d_path_initial();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_initial");
+ }
+ try {
+  test_2d_path_isPointInPath_arc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_arc");
+ }
+ try {
+  test_2d_path_isPointInPath_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_basic_1");
+ }
+ try {
+  test_2d_path_isPointInPath_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_basic_2");
+ }
+ try {
+  test_2d_path_isPointInPath_bezier();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_bezier");
+ }
+ try {
+  test_2d_path_isPointInPath_bigarc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_bigarc");
+ }
+ try {
+  test_2d_path_isPointInPath_edge();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_edge");
+ }
+ try {
+  test_2d_path_isPointInPath_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_empty");
+ }
+ try {
+  test_2d_path_isPointInPath_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_nonfinite");
+ }
+ try {
+  test_2d_path_isPointInPath_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_outside");
+ }
+ try {
+  test_2d_path_isPointInPath_subpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_subpath");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_1");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_2");
+ }
+ try {
+  test_2d_path_isPointInPath_transform_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_transform_3");
+ }
+ try {
+  test_2d_path_isPointInPath_unclosed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_unclosed");
+ }
+ try {
+  test_2d_path_isPointInPath_winding();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_isPointInPath_winding");
+ }
+ try {
+  test_2d_path_lineTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_basic");
+ }
+ try {
+  test_2d_path_lineTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_emptysubpath");
+ }
+ try {
+  test_2d_path_lineTo_nextpoint();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_nextpoint");
+ }
+ try {
+  test_2d_path_lineTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_lineTo_nonfinite");
+ }
+ try {
+  test_2d_path_moveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_basic");
+ }
+ try {
+  test_2d_path_moveTo_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_multiple");
+ }
+ try {
+  test_2d_path_moveTo_newsubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_newsubpath");
+ }
+ try {
+  test_2d_path_moveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_moveTo_nonfinite");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_basic");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_emptysubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_emptysubpath");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_nonfinite");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_scaled");
+ }
+ try {
+  test_2d_path_quadraticCurveTo_shape();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_quadraticCurveTo_shape");
+ }
+ try {
+  test_2d_path_rect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_basic");
+ }
+ try {
+  test_2d_path_rect_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_closed");
+ }
+ try {
+  test_2d_path_rect_end_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_end_1");
+ }
+ try {
+  test_2d_path_rect_end_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_end_2");
+ }
+ try {
+  test_2d_path_rect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_negative");
+ }
+ try {
+  test_2d_path_rect_newsubpath();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_newsubpath");
+ }
+ try {
+  test_2d_path_rect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_nonfinite");
+ }
+ try {
+  test_2d_path_rect_winding();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_winding");
+ }
+ try {
+  test_2d_path_rect_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_1");
+ }
+ try {
+  test_2d_path_rect_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_2");
+ }
+ try {
+  test_2d_path_rect_zero_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_3");
+ }
+ try {
+  test_2d_path_rect_zero_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_4");
+ }
+ try {
+  test_2d_path_rect_zero_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_rect_zero_5");
+ }
+ try {
+  test_2d_path_stroke_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_empty");
+ }
+ try {
+  test_2d_path_stroke_overlap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_overlap");
+ }
+ try {
+  test_2d_path_stroke_prune_arc();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_arc");
+ }
+ try {
+  test_2d_path_stroke_prune_closed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_closed");
+ }
+ try {
+  test_2d_path_stroke_prune_corner();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_corner");
+ }
+ try {
+  test_2d_path_stroke_prune_curve();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_curve");
+ }
+ try {
+  test_2d_path_stroke_prune_line();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_line");
+ }
+ try {
+  test_2d_path_stroke_prune_rect();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_prune_rect");
+ }
+ try {
+  test_2d_path_stroke_scale1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_scale1");
+ }
+ try {
+  test_2d_path_stroke_scale2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_scale2");
+ }
+ try {
+  test_2d_path_stroke_skew();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_skew");
+ }
+ try {
+  test_2d_path_stroke_unaffected();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_unaffected");
+ }
+ try {
+  test_2d_path_stroke_union();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_stroke_union");
+ }
+ try {
+  test_2d_path_transformation_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_basic");
+ }
+ try {
+  test_2d_path_transformation_changing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_changing");
+ }
+ try {
+  test_2d_path_transformation_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_path_transformation_multiple");
+ }
+ try {
+  test_2d_pattern_animated_gif();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_animated_gif");
+ }
+ try {
+  test_2d_pattern_basic_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_canvas");
+ }
+ try {
+  test_2d_pattern_basic_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_image");
+ }
+ try {
+  test_2d_pattern_basic_nocontext();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_nocontext");
+ }
+ try {
+  test_2d_pattern_basic_type();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_type");
+ }
+ try {
+  test_2d_pattern_basic_zerocanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_basic_zerocanvas");
+ }
+ try {
+  test_2d_pattern_crosscanvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_crosscanvas");
+ }
+ try {
+  test_2d_pattern_image_broken();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_broken");
+ }
+ try {
+  test_2d_pattern_image_incomplete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_incomplete");
+ }
+ try {
+  test_2d_pattern_image_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_null");
+ }
+ try {
+  test_2d_pattern_image_string();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_string");
+ }
+ try {
+  test_2d_pattern_image_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_image_undefined");
+ }
+ try {
+  test_2d_pattern_modify_canvas1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_canvas1");
+ }
+ try {
+  test_2d_pattern_modify_canvas2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_canvas2");
+ }
+ try {
+  test_2d_pattern_modify_image1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_image1");
+ }
+ try {
+  test_2d_pattern_modify_image2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_modify_image2");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_basic");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord1");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord2");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_coord3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_coord3");
+ }
+ try {
+  test_2d_pattern_paint_norepeat_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_norepeat_outside");
+ }
+ try {
+  test_2d_pattern_paint_orientation_canvas();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_orientation_canvas");
+ }
+ try {
+  test_2d_pattern_paint_orientation_image();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_orientation_image");
+ }
+ try {
+  test_2d_pattern_paint_repeat_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord2");
+ }
+ try {
+  test_2d_pattern_paint_repeat_coord3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_coord3");
+ }
+ try {
+  test_2d_pattern_paint_repeat_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeat_outside");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeatx_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeatx_outside");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_basic");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_coord1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_coord1");
+ }
+ try {
+  test_2d_pattern_paint_repeaty_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_paint_repeaty_outside");
+ }
+ try {
+  test_2d_pattern_repeat_case();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_case");
+ }
+ try {
+  test_2d_pattern_repeat_empty();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_empty");
+ }
+ try {
+  test_2d_pattern_repeat_null();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_null");
+ }
+ try {
+  test_2d_pattern_repeat_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_nullsuffix");
+ }
+ try {
+  test_2d_pattern_repeat_undefined();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_undefined");
+ }
+ try {
+  test_2d_pattern_repeat_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_pattern_repeat_unrecognised");
+ }
+ try {
+  test_2d_scaled();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_scaled");
+ }
+ try {
+  test_2d_shadow_alpha_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_1");
+ }
+ try {
+  test_2d_shadow_alpha_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_2");
+ }
+ try {
+  test_2d_shadow_alpha_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_3");
+ }
+ try {
+  test_2d_shadow_alpha_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_4");
+ }
+ try {
+  test_2d_shadow_alpha_5();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_alpha_5");
+ }
+ try {
+  test_2d_shadow_attributes_shadowBlur_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowBlur_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowBlur_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowBlur_2");
+ }
+ try {
+  test_2d_shadow_attributes_shadowColor_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowColor_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowColor_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowColor_2");
+ }
+ try {
+  test_2d_shadow_attributes_shadowOffset_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowOffset_1");
+ }
+ try {
+  test_2d_shadow_attributes_shadowOffset_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_attributes_shadowOffset_2");
+ }
+ try {
+  test_2d_shadow_basic_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_basic_1");
+ }
+ try {
+  test_2d_shadow_basic_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_basic_2");
+ }
+ try {
+  test_2d_shadow_blur_high();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_blur_high");
+ }
+ try {
+  test_2d_shadow_blur_low();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_blur_low");
+ }
+ try {
+  test_2d_shadow_canvas_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_alpha");
+ }
+ try {
+  test_2d_shadow_canvas_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_basic");
+ }
+ try {
+  test_2d_shadow_canvas_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_transparent_1");
+ }
+ try {
+  test_2d_shadow_canvas_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_canvas_transparent_2");
+ }
+ try {
+  test_2d_shadow_clip_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_1");
+ }
+ try {
+  test_2d_shadow_clip_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_2");
+ }
+ try {
+  test_2d_shadow_clip_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_clip_3");
+ }
+ try {
+  test_2d_shadow_composite_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_1");
+ }
+ try {
+  test_2d_shadow_composite_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_2");
+ }
+ try {
+  test_2d_shadow_composite_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_3");
+ }
+ try {
+  test_2d_shadow_composite_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_composite_4");
+ }
+ try {
+  test_2d_shadow_gradient_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_alpha");
+ }
+ try {
+  test_2d_shadow_gradient_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_basic");
+ }
+ try {
+  test_2d_shadow_gradient_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_transparent_1");
+ }
+ try {
+  test_2d_shadow_gradient_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_gradient_transparent_2");
+ }
+ try {
+  test_2d_shadow_image_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_alpha");
+ }
+ try {
+  test_2d_shadow_image_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_basic");
+ }
+ try {
+  test_2d_shadow_image_scale();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_scale");
+ }
+ try {
+  test_2d_shadow_image_section();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_section");
+ }
+ try {
+  test_2d_shadow_image_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_transparent_1");
+ }
+ try {
+  test_2d_shadow_image_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_image_transparent_2");
+ }
+ try {
+  test_2d_shadow_offset_negativeX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_negativeX");
+ }
+ try {
+  test_2d_shadow_offset_negativeY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_negativeY");
+ }
+ try {
+  test_2d_shadow_offset_positiveX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_positiveX");
+ }
+ try {
+  test_2d_shadow_offset_positiveY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_offset_positiveY");
+ }
+ try {
+  test_2d_shadow_outside();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_outside");
+ }
+ try {
+  test_2d_shadow_pattern_alpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_alpha");
+ }
+ try {
+  test_2d_shadow_pattern_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_basic");
+ }
+ try {
+  test_2d_shadow_pattern_transparent_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_transparent_1");
+ }
+ try {
+  test_2d_shadow_pattern_transparent_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_pattern_transparent_2");
+ }
+ try {
+  test_2d_shadow_stroke_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_basic");
+ }
+ try {
+  test_2d_shadow_stroke_cap_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_cap_1");
+ }
+ try {
+  test_2d_shadow_stroke_cap_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_cap_2");
+ }
+ try {
+  test_2d_shadow_stroke_join_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_1");
+ }
+ try {
+  test_2d_shadow_stroke_join_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_2");
+ }
+ try {
+  test_2d_shadow_stroke_join_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_stroke_join_3");
+ }
+ try {
+  test_2d_shadow_transform_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_transform_1");
+ }
+ try {
+  test_2d_shadow_transform_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_shadow_transform_2");
+ }
+ try {
+  test_2d_state_saverestore_bitmap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_bitmap");
+ }
+ try {
+  test_2d_state_saverestore_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_clip");
+ }
+ try {
+  test_2d_state_saverestore_fillStyle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_fillStyle");
+ }
+ try {
+  test_2d_state_saverestore_globalAlpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_globalAlpha");
+ }
+ try {
+  test_2d_state_saverestore_globalCompositeOperation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_globalCompositeOperation");
+ }
+ try {
+  test_2d_state_saverestore_lineCap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineCap");
+ }
+ try {
+  test_2d_state_saverestore_lineJoin();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineJoin");
+ }
+ try {
+  test_2d_state_saverestore_lineWidth();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_lineWidth");
+ }
+ try {
+  test_2d_state_saverestore_miterLimit();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_miterLimit");
+ }
+ try {
+  test_2d_state_saverestore_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_path");
+ }
+ try {
+  test_2d_state_saverestore_shadowBlur();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowBlur");
+ }
+ try {
+  test_2d_state_saverestore_shadowColor();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowColor");
+ }
+ try {
+  test_2d_state_saverestore_shadowOffsetX();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowOffsetX");
+ }
+ try {
+  test_2d_state_saverestore_shadowOffsetY();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_shadowOffsetY");
+ }
+ try {
+  test_2d_state_saverestore_stack();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_stack");
+ }
+ try {
+  test_2d_state_saverestore_stackdepth();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_stackdepth");
+ }
+ try {
+  test_2d_state_saverestore_strokeStyle();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_strokeStyle");
+ }
+ try {
+  test_2d_state_saverestore_transformation();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_transformation");
+ }
+ try {
+  test_2d_state_saverestore_underflow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_state_saverestore_underflow");
+ }
+ try {
+  test_2d_strokeRect_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_basic");
+ }
+ try {
+  test_2d_strokeRect_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_clip");
+ }
+ try {
+  test_2d_strokeRect_globalalpha();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_globalalpha");
+ }
+ try {
+  test_2d_strokeRect_globalcomposite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_globalcomposite");
+ }
+ try {
+  test_2d_strokeRect_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_negative");
+ }
+ try {
+  test_2d_strokeRect_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_nonfinite");
+ }
+ try {
+  test_2d_strokeRect_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_path");
+ }
+ try {
+  test_2d_strokeRect_shadow();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_shadow");
+ }
+ try {
+  test_2d_strokeRect_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_transform");
+ }
+ try {
+  test_2d_strokeRect_zero_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_1");
+ }
+ try {
+  test_2d_strokeRect_zero_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_2");
+ }
+ try {
+  test_2d_strokeRect_zero_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_3");
+ }
+ try {
+  test_2d_strokeRect_zero_4();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeRect_zero_4");
+ }
+ try {
+  test_2d_strokeStyle_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_strokeStyle_default");
+ }
+ try {
+  test_2d_transformation_order();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_order");
+ }
+ try {
+  test_2d_transformation_rotate_direction();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_direction");
+ }
+ try {
+  test_2d_transformation_rotate_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_nonfinite");
+ }
+ try {
+  test_2d_transformation_rotate_radians();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_radians");
+ }
+ try {
+  test_2d_transformation_rotate_wrap();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_wrap");
+ }
+ try {
+  test_2d_transformation_rotate_wrapnegative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_wrapnegative");
+ }
+ try {
+  test_2d_transformation_rotate_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_rotate_zero");
+ }
+ try {
+  test_2d_transformation_scale_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_basic");
+ }
+ try {
+  test_2d_transformation_scale_large();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_large");
+ }
+ try {
+  test_2d_transformation_scale_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_multiple");
+ }
+ try {
+  test_2d_transformation_scale_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_negative");
+ }
+ try {
+  test_2d_transformation_scale_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_nonfinite");
+ }
+ try {
+  test_2d_transformation_scale_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_scale_zero");
+ }
+ try {
+  test_2d_transformation_setTransform_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_multiple");
+ }
+ try {
+  test_2d_transformation_setTransform_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_nonfinite");
+ }
+ try {
+  test_2d_transformation_setTransform_skewed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_setTransform_skewed");
+ }
+ try {
+  test_2d_transformation_transform_identity();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_identity");
+ }
+ try {
+  test_2d_transformation_transform_multiply();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_multiply");
+ }
+ try {
+  test_2d_transformation_transform_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_nonfinite");
+ }
+ try {
+  test_2d_transformation_transform_skewed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_transform_skewed");
+ }
+ try {
+  test_2d_transformation_translate_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_translate_basic");
+ }
+ try {
+  test_2d_transformation_translate_nonfinite();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_transformation_translate_nonfinite");
+ }
+ try {
+  test_2d_type_delete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_delete");
+ }
+ try {
+  test_2d_type_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_exists");
+ }
+ try {
+  test_2d_type_extend();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_extend");
+ }
+ try {
+  test_2d_type_prototype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_prototype");
+ }
+ try {
+  test_2d_type_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_type_replace");
+ }
+ try {
+  test_2d_voidreturn();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_voidreturn");
+ }
+ try {
+  test_bug397524();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_bug397524");
+ }
+ try {
+  test_bug405982();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_bug405982");
+ }
+ try {
+  test_context_arguments_extra();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_arguments_extra");
+ }
+ try {
+  test_context_arguments_missing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_arguments_missing");
+ }
+ try {
+  test_context_casesensitive();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_casesensitive");
+ }
+ try {
+  test_context_emptystring();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_emptystring");
+ }
+ try {
+  test_context_unrecognised_badname();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_badname");
+ }
+ try {
+  test_context_unrecognised_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_badsuffix");
+ }
+ try {
+  test_context_unrecognised_nullsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_nullsuffix");
+ }
+ try {
+  test_context_unrecognised_unicode();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_context_unrecognised_unicode");
+ }
+ try {
+  test_fallback_basic();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_basic");
+ }
+ try {
+  test_fallback_multiple();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_multiple");
+ }
+ try {
+  test_fallback_nested();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_fallback_nested");
+ }
+ try {
+  test_initial_colour();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_colour");
+ }
+ try {
+  test_initial_reset_2dstate();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_2dstate");
+ }
+ try {
+  test_initial_reset_clip();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_clip");
+ }
+ try {
+  test_initial_reset_different();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_different");
+ }
+ try {
+  test_initial_reset_gradient();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_gradient");
+ }
+ try {
+  test_initial_reset_path();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_path");
+ }
+ try {
+  test_initial_reset_pattern();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_pattern");
+ }
+ try {
+  test_initial_reset_same();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_same");
+ }
+ try {
+  test_initial_reset_transform();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_initial_reset_transform");
+ }
+ try {
+  test_size_attributes_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_default");
+ }
+ try {
+  test_size_attributes();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes");
+ }
+ try {
+  test_size_attributes_parse_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_badsuffix");
+ }
+ try {
+  test_size_attributes_parse_floatsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_floatsuffix");
+ }
+ try {
+  test_size_attributes_parse_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_negative");
+ }
+ try {
+  test_size_attributes_parse_nonnumber();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_nonnumber");
+ }
+ try {
+  test_size_attributes_parse_percentsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_percentsuffix");
+ }
+ try {
+  test_size_attributes_parse_whitespace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_whitespace");
+ }
+ try {
+  test_size_attributes_parse_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_zero");
+ }
+ try {
+  test_size_attributes_parse_zerosuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_parse_zerosuffix");
+ }
+ try {
+  test_size_attributes_reflect_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_reflect_1");
+ }
+ try {
+  test_size_attributes_reflect_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_reflect_2");
+ }
+ try {
+  test_size_attributes_removed();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_removed");
+ }
+ try {
+  test_size_attributes_setAttribute_badsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_badsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_floatsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_floatsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_negative();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_negative");
+ }
+ try {
+  test_size_attributes_setAttribute_nonnumber();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_nonnumber");
+ }
+ try {
+  test_size_attributes_setAttribute_percentsuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_percentsuffix");
+ }
+ try {
+  test_size_attributes_setAttribute_whitespace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_whitespace");
+ }
+ try {
+  test_size_attributes_setAttribute_zero();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_zero");
+ }
+ try {
+  test_size_attributes_setAttribute_zerosuffix();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_setAttribute_zerosuffix");
+ }
+ try {
+  test_size_attributes_style();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_style");
+ }
+ try {
+  test_size_attributes_type_get();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_type_get");
+ }
+ try {
+  test_size_attributes_type_set();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_size_attributes_type_set");
+ }
+ try {
+  test_text_font();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_font");
+ }
+ try {
+  test_text_measure();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_measure");
+ }
+ try {
+  test_text_space_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_space_replace");
+ }
+ try {
+  test_text_textAlign();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_textAlign");
+ }
+ try {
+  test_text_textBaseline();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_text_textBaseline");
+ }
+ try {
+  test_toDataURL_arguments_1();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_1");
+ }
+ try {
+  test_toDataURL_arguments_2();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_2");
+ }
+ try {
+  test_toDataURL_arguments_3();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_arguments_3");
+ }
+ try {
+  test_toDataURL_complexcolours();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_complexcolours");
+ }
+ try {
+  test_toDataURL_default();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_default");
+ }
+ try {
+  test_toDataURL_lowercase();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_lowercase");
+ }
+ try {
+  test_toDataURL_nocontext();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_nocontext");
+ }
+ try {
+  test_toDataURL_png();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_png");
+ }
+ try {
+  test_toDataURL_primarycolours();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_primarycolours");
+ }
+ try {
+  test_toDataURL_unrecognised();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_unrecognised");
+ }
+ try {
+  test_toDataURL_zerosize();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_toDataURL_zerosize");
+ }
+ try {
+  test_type_delete();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_delete");
+ }
+ try {
+  test_type_exists();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_exists");
+ }
+ try {
+  test_type_extend();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_extend");
+ }
+ try {
+  test_type_name();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_name");
+ }
+ try {
+  test_type_prototype();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_prototype");
+ }
+ try {
+  test_2d_imagedata_coercion();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imagedata_coercion");
+ }
+ try {
+  test_2d_imageSmoothing();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_imageSmoothing");
+ }
+ try {
+  // run this test last since it replaces the getContext method
+  test_type_replace();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_type_replace");
+ }
+ 
+ //run the asynchronous tests
+ try {
+  test_2d_drawImage_animated_apng();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_apng");
+ }
+ try {
+  test_2d_drawImage_animated_gif();
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_drawImage_animated_gif");
+ }
+ 
+ setTimeout(asyncTestsDone, 500);
+}
+
+MochiKit.DOM.addLoadEvent(runTests);
+
+</script>

From e9f662e5fbf1b558f24844ec66c30d0ea0de2ca8 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 15:16:44 +1200
Subject: [PATCH 05/61] Bug 486200. Add window.mozInnerScreenX/Y APIs to return
 usable screen coordinate APIs (as opposed to window.screenX/Y which return
 window frame coordinates and are unusable). Also adds
 window.mozScreenPixelsPerCSSPixel which chrome-prileged code can use to
 convert CSS pixels to actual screen pixels. r=dbaron,sr=jst

--HG--
extra : rebase_source : 30f4c953f3e3866da042b935953ba239ac0a93c4
---
 dom/base/nsGlobalWindow.cpp                   | 66 +++++++++++++++
 dom/base/nsGlobalWindow.h                     |  2 +
 dom/interfaces/base/nsIDOMWindowInternal.idl  |  5 +-
 dom/tests/mochitest/general/Makefile.in       |  4 +-
 .../mochitest/general/test_innerScreen.xul    | 83 +++++++++++++++++++
 5 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 dom/tests/mochitest/general/test_innerScreen.xul

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index ac280f57dc6e..4123377d56cf 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3347,6 +3347,72 @@ nsGlobalWindow::GetScreenX(PRInt32* aScreenX)
   return NS_OK;
 }
 
+nsRect
+nsGlobalWindow::GetInnerScreenRect()
+{
+  if (!mDocShell)
+    return nsRect();
+
+  nsGlobalWindow* rootWindow =
+    static_cast<nsGlobalWindow*>(GetPrivateRoot());
+  if (rootWindow) {
+    rootWindow->FlushPendingNotifications(Flush_Layout);
+  }
+
+  nsCOMPtr<nsIPresShell> presShell;
+  mDocShell->GetPresShell(getter_AddRefs(presShell));
+  if (!presShell)
+    return nsRect();
+  nsIFrame* rootFrame = presShell->GetRootFrame();
+  if (!rootFrame)
+    return nsRect();
+
+  return rootFrame->GetScreenRectInAppUnits();
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozInnerScreenX(float* aScreenX)
+{
+  FORWARD_TO_OUTER(GetMozInnerScreenX, (aScreenX), NS_ERROR_NOT_INITIALIZED);
+
+  nsRect r = GetInnerScreenRect();
+  *aScreenX = nsPresContext::AppUnitsToFloatCSSPixels(r.x);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozInnerScreenY(float* aScreenY)
+{
+  FORWARD_TO_OUTER(GetMozInnerScreenY, (aScreenY), NS_ERROR_NOT_INITIALIZED);
+
+  nsRect r = GetInnerScreenRect();
+  *aScreenY = nsPresContext::AppUnitsToFloatCSSPixels(r.y);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGlobalWindow::GetMozScreenPixelsPerCSSPixel(float* aScreenPixels)
+{
+  FORWARD_TO_OUTER(GetMozScreenPixelsPerCSSPixel,
+      (aScreenPixels), NS_ERROR_NOT_INITIALIZED);
+
+  *aScreenPixels = 1;
+
+  if (!nsContentUtils::IsCallerTrustedForRead())
+    return NS_ERROR_DOM_SECURITY_ERR;
+  if (!mDocShell)
+    return NS_OK;
+  nsCOMPtr<nsPresContext> presContext;
+  mDocShell->GetPresContext(getter_AddRefs(presContext));
+  if (!presContext)
+    return NS_OK;
+
+  *aScreenPixels = float(nsPresContext::AppUnitsPerCSSPixel())/
+      presContext->AppUnitsPerDevPixel();
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsGlobalWindow::SetScreenX(PRInt32 aScreenX)
 {
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index e568c7279fcc..7cd9814780a5 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -90,6 +90,7 @@
 #include "nsIXPCScriptable.h"
 #include "nsPoint.h"
 #include "nsSize.h"
+#include "nsRect.h"
 #include "mozFlushType.h"
 #include "prclist.h"
 #include "nsIDOMStorageObsolete.h"
@@ -594,6 +595,7 @@ protected:
   
   nsresult GetOuterSize(nsIntSize* aSizeCSSPixels);
   nsresult SetOuterSize(PRInt32 aLengthCSSPixels, PRBool aIsWidth);
+  nsRect GetInnerScreenRect();
 
   PRBool IsFrame()
   {
diff --git a/dom/interfaces/base/nsIDOMWindowInternal.idl b/dom/interfaces/base/nsIDOMWindowInternal.idl
index ceeedf678e5c..9cff9a929a33 100644
--- a/dom/interfaces/base/nsIDOMWindowInternal.idl
+++ b/dom/interfaces/base/nsIDOMWindowInternal.idl
@@ -44,7 +44,7 @@ interface nsIControllers;
 interface nsIDOMLocation;
 interface nsIVariant;
 
-[scriptable, uuid(3414EBC7-731F-4697-9F43-ACA6F5050875)]
+[scriptable, uuid(62579239-b619-4bf2-8d39-0b73e8663a85)]
 interface nsIDOMWindowInternal : nsIDOMWindow2
 {
   readonly attribute nsIDOMWindowInternal        window;
@@ -104,6 +104,9 @@ interface nsIDOMWindowInternal : nsIDOMWindow2
            attribute long                        outerHeight;
            attribute long                        screenX;
            attribute long                        screenY;
+  readonly attribute float                       mozInnerScreenX;
+  readonly attribute float                       mozInnerScreenY;
+  readonly attribute float                       mozScreenPixelsPerCSSPixel;
 
   /* The offset in pixels by which the window is scrolled */
   readonly attribute long                        pageXOffset;
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 36b8d81c2891..120abbd0df6c 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -44,7 +44,9 @@ relativesrcdir  = dom/tests/mochitest/general
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-_TEST_FILES = test_offsets.html \
+_TEST_FILES = \
+		test_innerScreen.xul \
+		test_offsets.html \
 		test_offsets.xul \
 		test_offsets.js \
 		test_domWindowUtils.html \
diff --git a/dom/tests/mochitest/general/test_innerScreen.xul b/dom/tests/mochitest/general/test_innerScreen.xul
new file mode 100644
index 000000000000..46fdabffd826
--- /dev/null
+++ b/dom/tests/mochitest/general/test_innerScreen.xul
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<!--
+  Tests for mozInnerScreenX/Y properties
+  -->
+<window title="Test mozInnerScreenX/Y Properties"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="text/javascript" src="/MochiKit/packed.js"/>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test resuls are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml"
+        style="height: 400px; position:relative; overflow: auto;">
+    <iframe id="f"
+            style="position:absolute; left:100px;
+                   top:200px; width:200px; height:200px; border:none;"></iframe>
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript"><![CDATA[
+
+function isRounded(a, b, msg) {
+  ok(Math.round(a) == Math.round(b),
+     msg + " (rounded), got " + a + ", expected " + b);
+}
+
+function doTests()
+{
+  var readable = false;
+  try
+  {
+    mozScreenPixelsPerCSSPixel;
+    readable = true;
+  }
+  catch(ex) { }
+  ok(!readable, "window pixels per css pixel shouldn't be readable to content");
+
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+
+  var devPxPerCSSPx = window.mozScreenPixelsPerCSSPixel;
+  var windowBO = document.documentElement.boxObject;
+ // isRounded(window.mozInnerScreenX*devPxPerCSSPx, windowBO.screenX,
+ //           "window screen X");
+  isRounded(window.mozInnerScreenY*devPxPerCSSPx, windowBO.screenY,
+            "window screen Y");
+
+  var f = document.getElementById("f");
+  var fBounds = f.getBoundingClientRect();
+
+  const CI = Components.interfaces;
+  var fshell = f.contentWindow.QueryInterface(CI.nsIInterfaceRequestor).getInterface(CI.nsIWebNavigation).QueryInterface(CI.nsIDocShell);
+  var fmudv = fshell.contentViewer.QueryInterface(CI.nsIMarkupDocumentViewer);
+
+  isRounded(f.contentWindow.mozInnerScreenX,
+            window.mozInnerScreenX + fBounds.left,
+            "frame screen X");
+  isRounded(f.contentWindow.mozInnerScreenY,
+            window.mozInnerScreenY + fBounds.top,
+            "frame screen Y");
+
+  fmudv.fullZoom *= 2;
+  is(f.contentWindow.mozScreenPixelsPerCSSPixel, 2*devPxPerCSSPx,
+     "frame screen pixels per CSS pixel");
+
+  isRounded(f.contentWindow.mozInnerScreenX*2,
+            window.mozInnerScreenX + fBounds.left,
+            "zoomed frame screen X");
+  isRounded(f.contentWindow.mozInnerScreenY*2,
+            window.mozInnerScreenY + fBounds.top,
+            "zoomed frame screen Y");
+  fmudv.fullZoom = 1.0;
+
+  SimpleTest.finish();
+}
+
+addLoadEvent(doTests);
+SimpleTest.waitForExplicitFinish();
+
+]]>
+</script>
+
+</window>

From 7ebe7c87bd3ce0d0f9333363cfae332daf87910c Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 30 Jul 2009 15:26:59 +1200
Subject: [PATCH 06/61] Bug 505988. Don't unwrap when we shouldn't. r=bz

--HG--
extra : rebase_source : d251c442ba2fae0f9ffcae99c2c84d780c99ea52
---
 js/src/xpconnect/src/xpcprivate.h             |  9 +--
 js/src/xpconnect/src/xpcvariant.cpp           | 69 +++++++++----------
 js/src/xpconnect/tests/mochitest/Makefile.in  |  1 +
 .../tests/mochitest/test_bug384632.html       | 32 +++++++++
 4 files changed, 70 insertions(+), 41 deletions(-)
 create mode 100644 js/src/xpconnect/tests/mochitest/test_bug384632.html

diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 2ce45487d1b5..59db7a8afccf 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -4007,7 +4007,7 @@ public:
 
     jsval GetJSVal() const {return mJSVal;}
 
-    XPCVariant(jsval aJSVal);
+    XPCVariant(XPCCallContext& ccx, jsval aJSVal);
 
     /**
      * Convert a variant into a jsval.
@@ -4032,6 +4032,7 @@ protected:
 protected:
     nsDiscriminatedUnion mData;
     jsval                mJSVal;
+    JSBool               mReturnRawObject;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(XPCVariant, XPCVARIANT_IID)
@@ -4040,10 +4041,10 @@ class XPCTraceableVariant: public XPCVariant,
                            public XPCRootSetElem
 {
 public:
-    XPCTraceableVariant(XPCJSRuntime *runtime, jsval aJSVal)
-        : XPCVariant(aJSVal)
+    XPCTraceableVariant(XPCCallContext& ccx, jsval aJSVal)
+        : XPCVariant(ccx, aJSVal)
     {
-        runtime->AddVariantRoot(this);
+        ccx.GetRuntime()->AddVariantRoot(this);
     }
 
     virtual ~XPCTraceableVariant();
diff --git a/js/src/xpconnect/src/xpcvariant.cpp b/js/src/xpconnect/src/xpcvariant.cpp
index 9ce012e82e19..6a5f0f6955c4 100644
--- a/js/src/xpconnect/src/xpcvariant.cpp
+++ b/js/src/xpconnect/src/xpcvariant.cpp
@@ -55,10 +55,26 @@ NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(XPCVariant)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(XPCVariant)
 
-XPCVariant::XPCVariant(jsval aJSVal)
+XPCVariant::XPCVariant(XPCCallContext& ccx, jsval aJSVal)
     : mJSVal(aJSVal)
 {
     nsVariant::Initialize(&mData);
+    if(!JSVAL_IS_PRIMITIVE(mJSVal))
+    {
+        // If the incoming object is an XPCWrappedNative, then it could be a
+        // double-wrapped object, and we should return the double-wrapped
+        // object back out to script.
+
+        JSObject* proto;
+        XPCWrappedNative* wn =
+            XPCWrappedNative::GetWrappedNativeOfJSObject(ccx,
+                                                         JSVAL_TO_OBJECT(mJSVal),
+                                                         nsnull,
+                                                         &proto);
+        mReturnRawObject = !wn && !proto;
+    }
+    else
+        mReturnRawObject = JS_FALSE;
 }
 
 XPCTraceableVariant::~XPCTraceableVariant()
@@ -119,9 +135,9 @@ XPCVariant* XPCVariant::newVariant(XPCCallContext& ccx, jsval aJSVal)
     XPCVariant* variant;
 
     if(!JSVAL_IS_TRACEABLE(aJSVal))
-        variant = new XPCVariant(aJSVal);
+        variant = new XPCVariant(ccx, aJSVal);
     else
-        variant = new XPCTraceableVariant(ccx.GetRuntime(), aJSVal);
+        variant = new XPCTraceableVariant(ccx, aJSVal);
 
     if(!variant)
         return nsnull;
@@ -401,6 +417,15 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             return JS_TRUE;
         }
 
+        if(xpcvariant->mReturnRawObject)
+        {
+            NS_ASSERTION(type == nsIDataType::VTYPE_INTERFACE ||
+                         type == nsIDataType::VTYPE_INTERFACE_IS,
+                         "Weird variant");
+            *pJSVal = realVal;
+            return JS_TRUE;
+        }
+
         // else, it's an object and we really need to double wrap it if we've 
         // already decided that its 'natural' type is as some sort of interface.
         
@@ -641,40 +666,10 @@ VARIANT_DONE:
     }
     else
     {
-        // Last ditch check to prevent us from double-wrapping a regular JS
-        // object. This allows us to unwrap regular JS objects (since we
-        // normally can't double wrap them). See bug 384632.
-        *pJSVal = JSVAL_VOID;
-        if(type == nsIDataType::VTYPE_INTERFACE ||
-           type == nsIDataType::VTYPE_INTERFACE_IS)
-        {
-            nsISupports *src = reinterpret_cast<nsISupports *>(xpctvar.val.p);
-            if(nsXPCWrappedJSClass::IsWrappedJS(src))
-            {
-                // First QI the wrapper to the right interface.
-                nsCOMPtr<nsISupports> wrapper;
-                nsresult rv = src->QueryInterface(iid, getter_AddRefs(wrapper));
-                NS_ENSURE_SUCCESS(rv, JS_FALSE);
-
-                // Now, get the actual JS object out of the wrapper.
-                nsCOMPtr<nsIXPConnectJSObjectHolder> holder =
-                    do_QueryInterface(wrapper);
-                NS_ENSURE_TRUE(holder, JS_FALSE);
-
-                JSObject *obj;
-                holder->GetJSObject(&obj);
-                NS_ASSERTION(obj, "No JS object but the QIs above succeeded?");
-                *pJSVal = OBJECT_TO_JSVAL(obj);
-                success = JS_TRUE;
-            }
-        }
-        if(!JSVAL_IS_OBJECT(*pJSVal))
-        {
-            success = XPCConvert::NativeData2JS(ccx, pJSVal,
-                                                (const void*)&xpctvar.val,
-                                                xpctvar.type,
-                                                &iid, scope, pErr);
-        }
+        success = XPCConvert::NativeData2JS(ccx, pJSVal,
+                                            (const void*)&xpctvar.val,
+                                            xpctvar.type,
+                                            &iid, scope, pErr);
     }
 
     if(xpctvar.IsValAllocated())
diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in
index 3ff1465c03e3..90ed8ade38b8 100644
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/src/xpconnect/tests/mochitest/Makefile.in
@@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES =	bug500931_helper.html \
 		inner.html \
 		test_bug361111.xul \
+		test_bug384632.html \
 		test_bug390488.html \
 		test_bug393269.html \
 		test_bug396851.html \
diff --git a/js/src/xpconnect/tests/mochitest/test_bug384632.html b/js/src/xpconnect/tests/mochitest/test_bug384632.html
new file mode 100644
index 000000000000..7cdc397adb4e
--- /dev/null
+++ b/js/src/xpconnect/tests/mochitest/test_bug384632.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=384632
+-->
+<head>
+  <title>Test for Bug 384632</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/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=384632">Mozilla Bug 384632</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 384632 **/
+var div = $('content');
+var obj = {};
+div.setUserData("foopy", obj, function() {});
+ok(div.getUserData("foopy") === obj, "getUserData works with regular objects");
+div.setUserData("foopy1", sidebar, function() {});
+ok(div.getUserData("foopy1") === sidebar, "getUserData works with bizarre objects");
+
+</script>
+</pre>
+</body>
+</html>

From ecce4039959156cc784d8d2868177fac1ea5461f Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Thu, 30 Jul 2009 15:27:24 +1200
Subject: [PATCH 07/61] Bug 506552. Fix testcase doctype. r=dbaron

--HG--
extra : rebase_source : ee371dbb3106880b1609e0d69d1824a3edb7a91e
---
 layout/reftests/css-mediaqueries/mq_print_orientation.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml b/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
index 418f0787f184..151686e72f33 100644
--- a/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
+++ b/layout/reftests/css-mediaqueries/mq_print_orientation.xhtml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD landscapeHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" class="reftest-print">
 <head>
   <title>Media Query - Print mode test - orientation</title>

From a9abb503c141066cea2c805ae6a9ebf340fa746b Mon Sep 17 00:00:00 2001
From: Mook <mook.moz+mozbz@gmail.com>
Date: Thu, 30 Jul 2009 15:41:03 +1200
Subject: [PATCH 08/61] Bug 502188. Implement xptcall for mingw-Windows64.
 r=timeless

--HG--
extra : rebase_source : 2c03e2ae8d491059b9c3759e7e5082a20c1b715a
---
 .../reflect/xptcall/src/md/win32/Makefile.in  |   5 +
 .../src/md/win32/xptcinvoke_asm_x86_64_gnu.s  | 158 +++++++++
 .../src/md/win32/xptcstubs_x86_64_gnu.cpp     | 331 ++++++++++++++++++
 3 files changed, 494 insertions(+)
 create mode 100644 xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
 create mode 100644 xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp

diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index b08d2e5f7e61..4ab8dbae3e81 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -82,8 +82,13 @@ ASFLAGS		+= /I../../..public
 endif
 
 ifeq ($(TARGET_CPU),x86_64)
+ifndef GNU_CXX
 CPPSRCS 	:= xptcinvoke_x86_64.cpp xptcstubs_x86_64.cpp
 ASFILES		:= xptcinvoke_asm_x86_64.asm xptcstubs_asm_x86_64.asm
+else #!GNU_CXX
+CPPSRCS		:= xptcinvoke_x86_64.cpp  xptcstubs_x86_64_gnu.cpp
+ASFILES		:= xptcinvoke_asm_x86_64_gnu.s
+endif #!GNU_CXX
 endif
 
 ifeq ($(OS_ARCH),WINCE)
diff --git a/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s b/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
new file mode 100644
index 000000000000..dfd9ecc20011
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
@@ -0,0 +1,158 @@
+# ***** 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 
+# Makoto Kato <m_kato@ga2.so-net.ne.jp>.
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+.extern _invoke_copy_to_stack
+
+
+.text
+.intel_syntax
+
+#
+#_XPTC__InvokebyIndex(nsISupports* that, PRUint32 methodIndex,
+#                    PRUint32 paramCount, nsXPTCVariant* params)
+#
+
+.globl _XPTC__InvokebyIndex
+.def _XPTC__InvokebyIndex
+   .scl 3
+   .type 46
+.endef
+_XPTC__InvokebyIndex:
+
+   #
+   # store register parameters
+   #
+
+    mov     qword ptr [rsp+32], r9        # params
+    mov     dword ptr [rsp+24], r8d       # paramCount
+    mov     dword ptr [rsp+16], edx       # methodIndex
+    mov     qword ptr [rsp+8], rcx        # that
+
+    #
+    # store RBX/RBP register for backup
+    #
+
+    mov     qword ptr [rsp-16], rbp
+
+    mov     rbp, rsp            # store current RSP to RBP
+    # .SETFRAME rbp, 0
+    # .ENDPROLOG
+
+    sub     rsp, 32
+
+    #
+    # maybe we don't have any parameters to copy
+    #
+
+    test    r8d, r8d
+    jz      noparams
+
+    #
+    # make space for 1st parameter
+
+    mov     eax, r8d
+    and     eax, 1              # AMD64 must be alignment to 16 bytes
+    add     eax, r8d
+    shl     rax, 3              # *= 8
+    sub     rsp, rax
+    mov     rcx, rsp
+
+    #
+    # 2nd parameter is parameter count
+    #
+
+    mov     edx, r8d
+
+    #
+    # 3rd parameter is params
+    #
+
+    mov     r8, r9
+
+    sub     rsp, 32
+
+    call    _invoke_copy_to_stack # rcx = d
+                                  # edx = paramCount
+                                  # r8  = s
+
+    add     rsp, 32
+
+    #
+    # Build parameters
+    #
+
+    mov     rdx, qword ptr [rsp] # 1st parameter
+    movsd   xmm1, qword ptr [rsp] # for double
+
+    mov     r8, qword ptr [rsp+8] # 2nd parameter
+    movsd   xmm2, qword ptr [rsp+8] # for double
+
+    mov     r9, qword ptr [rsp+16] # 3rd parameter
+    movsd   xmm3, qword ptr [rsp+16] # for double
+
+    #
+    # 1st parameter (this)
+    #
+
+    mov     rcx, qword ptr [rbp+8] # that
+
+noparams:
+
+    #
+    # calculate call address
+    #
+
+    mov     r11, qword ptr [rcx]
+    mov     eax, dword ptr [rbp+16] # methodIndex
+
+    #
+    # Now current stack has parameter list
+    # But, since callee function backups parameters, make space into stack.
+
+    sub     rsp, 8
+
+    call    qword ptr [r11+rax*8]      # stdcall, i.e. callee cleans up stack.
+
+    #
+    # restore registers
+    #
+
+    mov     rsp, rbp
+    mov     rbp, qword ptr [rsp-16]
+
+    ret
+
+
diff --git a/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
new file mode 100644
index 000000000000..c55cba3ffde0
--- /dev/null
+++ b/xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
@@ -0,0 +1,331 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** 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) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#include "xptcprivate.h"
+#include "xptiprivate.h"
+#include "../unix/xptc_gcc_x86_unix.h"
+
+/*
+ * This is for Windows 64 bit (x86_64) using GCC syntax
+ * Code was copied from the MSVC version.
+ */
+
+#if !defined(_AMD64_) || !defined(__GNUC__)
+#  error xptcstubs_x86_64_gnu.cpp being used unexpectedly
+#endif
+
+extern "C" nsresult
+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
+                   PRUint64 * args, PRUint64 * gprData, double *fprData)
+{
+#define PARAM_BUFFER_COUNT  16
+//
+// "this" pointer is first parameter, so parameter count is 3.
+//
+#define PARAM_GPR_COUNT   3
+#define PARAM_FPR_COUNT   3
+
+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
+    nsXPTCMiniVariant* dispatchParams = NULL;
+    const nsXPTMethodInfo* info = NULL;
+    PRUint8 paramCount;
+    PRUint8 i;
+    nsresult result = NS_ERROR_FAILURE;
+
+    NS_ASSERTION(self, "no self");
+
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info, "no method info");
+
+    paramCount = info->GetParamCount();
+
+    //
+    // setup variant array pointer
+    //
+
+    if(paramCount > PARAM_BUFFER_COUNT)
+        dispatchParams = new nsXPTCMiniVariant[paramCount];
+    else
+        dispatchParams = paramBuffer;
+
+    NS_ASSERTION(dispatchParams,"no place for params");
+
+    PRUint64* ap = args;
+    PRUint32 iCount = 0;
+
+    for(i = 0; i < paramCount; i++)
+    {
+        const nsXPTParamInfo& param = info->GetParam(i);
+        const nsXPTType& type = param.GetType();
+        nsXPTCMiniVariant* dp = &dispatchParams[i];
+
+        if(param.IsOut() || !type.IsArithmetic())
+        {
+            if (iCount < PARAM_GPR_COUNT)
+                dp->val.p = (void*)gprData[iCount++];
+            else
+                dp->val.p = (void*)*ap++;
+
+            continue;
+        }
+        // else
+        switch(type)
+        {
+        case nsXPTType::T_I8:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.i8  = (PRInt8)gprData[iCount++];
+           else
+              dp->val.i8  = *((PRInt8*)ap++);
+           break;
+
+        case nsXPTType::T_I16:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i16  = (PRInt16)gprData[iCount++];
+            else
+               dp->val.i16  = *((PRInt16*)ap++);
+            break;
+
+        case nsXPTType::T_I32:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i32  = (PRInt32)gprData[iCount++];
+            else
+               dp->val.i32  = *((PRInt32*)ap++);
+            break;
+
+        case nsXPTType::T_I64:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.i64  = (PRInt64)gprData[iCount++];
+            else
+               dp->val.i64  = *((PRInt64*)ap++);
+            break;
+
+        case nsXPTType::T_U8:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u8  = (PRUint8)gprData[iCount++];
+            else
+               dp->val.u8  = *((PRUint8*)ap++);
+            break;
+
+        case nsXPTType::T_U16:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u16  = (PRUint16)gprData[iCount++];
+            else
+                dp->val.u16  = *((PRUint16*)ap++);
+            break;
+
+        case nsXPTType::T_U32:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u32  = (PRUint32)gprData[iCount++];
+            else
+               dp->val.u32  = *((PRUint32*)ap++);
+            break;
+
+        case nsXPTType::T_U64:
+            if (iCount < PARAM_GPR_COUNT)
+               dp->val.u64  = (PRUint64)gprData[iCount++];
+            else
+               dp->val.u64  = *((PRUint64*)ap++);
+            break;
+
+        case nsXPTType::T_FLOAT:
+             if (iCount < PARAM_FPR_COUNT)
+                dp->val.f  = (float)fprData[iCount++];
+             else
+                dp->val.f  = *((float*)ap++);
+             break;
+
+        case nsXPTType::T_DOUBLE:
+              if (iCount < PARAM_FPR_COUNT)
+                 dp->val.d  = (double)fprData[iCount++];
+              else
+                 dp->val.d  = *((double*)ap++);
+              break;
+
+        case nsXPTType::T_BOOL:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.b  = (PRBool)gprData[iCount++];
+           else
+              dp->val.b  = *((PRBool*)ap++);
+           break;
+
+        case nsXPTType::T_CHAR:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.c  = (char)gprData[iCount++];
+           else
+              dp->val.c  = *((char*)ap++);
+           break;
+
+        case nsXPTType::T_WCHAR:
+           if (iCount < PARAM_GPR_COUNT)
+              dp->val.wc  = (wchar_t)gprData[iCount++];
+           else
+              dp->val.wc  = *((wchar_t*)ap++);
+           break;
+
+        default:
+            NS_ASSERTION(0, "bad type");
+            break;
+        }
+    }
+
+    result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams);
+
+    if(dispatchParams != paramBuffer)
+        delete [] dispatchParams;
+
+    return result;
+}
+
+__asm__ (
+  ".text\n"
+  ".intel_syntax\n"                     /* switch to Intel syntax to look like the MSVC assembly */
+  ".globl SharedStub\n"
+  ".def SharedStub ; .scl 3 ; .type 46 ; .endef \n"
+  "SharedStub:\n"
+
+  /* rcx is this pointer.  Need backup for optimized build */
+
+  "mov      qword ptr [rsp+88], rcx\n"
+
+  /*
+   * fist 4 parameters (1st is "this" pointer) are passed in registers.
+   */
+
+  /* for floating value */
+
+  "movsd   qword ptr [rsp+64], xmm1\n"
+  "movsd   qword ptr [rsp+72], xmm2\n"
+  "movsd   qword ptr [rsp+80], xmm3\n"
+
+  /* for integer value */
+
+  "mov     qword ptr [rsp+40], rdx\n"
+  "mov     qword ptr [rsp+48], r8\n"
+  "mov     qword ptr [rsp+56], r9\n"
+
+  /*
+   * Call PrepareAndDispatch function
+   */
+
+  /* 5th parameter (floating parameters) of PrepareAndDispatch */
+
+  "lea     r9, qword ptr [rsp+64]\n"
+  "mov     qword ptr [rsp+32], r9\n"
+
+  /* 4th parameter (normal parameters) of PrepareAndDispatch */
+
+  "lea     r9, qword ptr [rsp+40]\n"
+
+  /* 3rd parameter (pointer to args on stack) */
+
+  "lea     r8, qword ptr [rsp+40+104]\n"
+
+  /* 2nd parameter (vtbl_index) */
+
+  "mov     rdx, r11\n"
+
+  /* 1st parameter (this) (rcx) */
+
+  "call    _PrepareAndDispatch\n"
+
+  /* restore rcx */
+
+  "mov     rcx, qword ptr [rsp+88]\n"
+
+  /*
+   * clean up register
+   */
+
+  "add     rsp, 104+8\n"
+
+  /* set return address */
+
+  "mov     rdx, qword ptr [rsp-8]\n"
+
+  /* simulate __stdcall return */
+
+  "jmp     rdx\n"
+
+  /* back to AT&T syntax */
+  ".att_syntax\n"
+
+);
+
+#define STUB_ENTRY(n) \
+asm(".intel_syntax\n" /* this is in intel syntax */ \
+    ".text\n" \
+    ".align 2\n" \
+    ".if        " #n " < 10\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */ \
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase5Stub" #n "Ev@4:\n" \
+    ".elseif    " #n " < 100\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */\
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase6Stub" #n "Ev@4:\n" \
+    ".elseif    " #n " < 1000\n" \
+    ".globl     " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4\n" \
+    ".def       " SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4\n" \
+    ".scl         3\n" /* private */ \
+    ".type        46\n" /* function returning unsigned int */ \
+    ".endef\n" \
+    SYMBOL_UNDERSCORE "_ZN14nsXPTCStubBase7Stub" #n "Ev@4:\n" \
+    ".else\n" \
+    ".err       \"stub number " #n " >= 1000 not yet supported\"\n" \
+    ".endif\n" \
+    "push         rbx\n" \
+    "mov          rbx, " #n "\n" \
+    "jmp          SharedStub\n" \
+    ".att_syntax\n" /* back to AT&T syntax */ \
+    "");
+
+#define SENTINEL_ENTRY(n) \
+nsresult nsXPTCStubBase::Sentinel##n() \
+{ \
+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
+    return NS_ERROR_NOT_IMPLEMENTED; \
+}
+
+#include "xptcstubsdef.inc"
+

From d859d678dec49e92ee8bc791e745736f574ba94b Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zweinberg@mozilla.com>
Date: Thu, 30 Jul 2009 15:43:22 +1200
Subject: [PATCH 09/61] Bug 486065. Hack nsCSSOffsetState::InitOffsets to zero
 out computed padding and borders when the scrollbar size is zero. r=dbaron

--HG--
extra : rebase_source : 92bcaee46ded00722e3fc86b4ca538e5f90f16ef
---
 layout/generic/nsHTMLReflowState.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 7bdde4a9c4c5..2a207e4da193 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1925,7 +1925,8 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
   }
   mComputedBorderPadding += mComputedPadding;
 
-  if (frame->GetType() == nsGkAtoms::tableFrame) {
+  nsIAtom* frameType = frame->GetType();
+  if (frameType == nsGkAtoms::tableFrame) {
     nsTableFrame *tableFrame = static_cast<nsTableFrame*>(frame);
 
     if (tableFrame->IsBorderCollapse()) {
@@ -1936,6 +1937,23 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
       mComputedPadding.SizeTo(0,0,0,0);
       mComputedBorderPadding = tableFrame->GetIncludedOuterBCBorder();
     }
+  } else if (frameType == nsGkAtoms::scrollbarFrame) {
+    // scrollbars may have had their width or height smashed to zero
+    // by the associated scrollframe, in which case we must not report
+    // any padding or border on that axis.
+    nsSize size(frame->GetSize());
+    if (size.width == 0) {
+      mComputedPadding.left = 0;
+      mComputedPadding.right = 0;
+      mComputedBorderPadding.left = 0;
+      mComputedBorderPadding.right = 0;
+    }
+    if (size.height == 0) {
+      mComputedPadding.top = 0;
+      mComputedPadding.bottom = 0;
+      mComputedBorderPadding.top = 0;
+      mComputedBorderPadding.bottom = 0;
+    }
   }
 }
 

From 3e38caa3b3d4e2feadd3fd9d81d74981694345c4 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 30 Jul 2009 15:28:53 +1200
Subject: [PATCH 10/61] Bug 500311 - Count tracks as active during
 initialization.  r=chris.double

--HG--
extra : rebase_source : 25e5d3aa9661a95e1a623a9fe15f5c12f31d13f3
---
 media/liboggplay/README_MOZILLA               |  2 +
 media/liboggplay/bug500311.patch              | 99 +++++++++++++++++++
 media/liboggplay/src/liboggplay/oggplay.c     |  3 +-
 .../src/liboggplay/oggplay_callback.c         |  4 +-
 media/liboggplay/update.sh                    |  1 +
 5 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 media/liboggplay/bug500311.patch

diff --git a/media/liboggplay/README_MOZILLA b/media/liboggplay/README_MOZILLA
index 2171af1dd1a5..87b7fccd38c5 100644
--- a/media/liboggplay/README_MOZILLA
+++ b/media/liboggplay/README_MOZILLA
@@ -45,3 +45,5 @@ oggplay_os2.patch: Bug 448918 - add OS/2 support (this patch should be
 
 bug498815.patch: Fix for bug 498815.
 bug498824.patch: Fix for bug 498824.
+bug500311.patch: Fix crash during decoder initialization.
+
diff --git a/media/liboggplay/bug500311.patch b/media/liboggplay/bug500311.patch
new file mode 100644
index 000000000000..c0ba0fb492a8
--- /dev/null
+++ b/media/liboggplay/bug500311.patch
@@ -0,0 +1,99 @@
+diff --git a/media/liboggplay/src/liboggplay/oggplay.c b/media/liboggplay/src/liboggplay/oggplay.c
+--- a/media/liboggplay/src/liboggplay/oggplay.c
++++ b/media/liboggplay/src/liboggplay/oggplay.c
+@@ -129,16 +129,17 @@ oggplay_initialise(OggPlay *me, int bloc
+   }
+ 
+   /*
+    * set all the tracks to inactive
+    */
+   for (i = 0; i < me->num_tracks; i++) {
+     me->decode_data[i]->active = 0;
+   }
++  me->active_tracks = 0;
+ 
+   /*
+    * if the buffer was set up before initialisation, prepare it now
+    */
+   if (me->buffer != NULL) {
+     oggplay_buffer_prepare(me);
+   }
+ 
+@@ -693,18 +694,18 @@ read_more_data:
+     /* end-of-file */
+     if (r == 0) {
+       num_records = oggplay_callback_info_prepare(me, &info);
+      /*
+        * set all of the tracks to inactive
+        */
+       for (i = 0; i < me->num_tracks; i++) {
+         me->decode_data[i]->active = 0;
+-        me->active_tracks = 0;
+       }
++      me->active_tracks = 0;
+ 
+       if (info != NULL) {
+         me->callback (me, num_records, info, me->callback_user_ptr);
+         oggplay_callback_info_destroy(me, info);
+       }
+ 
+       /*
+        * ensure all tracks have their final data packet set to end_of_stream
+diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
+--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
++++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
+@@ -54,16 +54,17 @@ oggplay_init_theora(void *user_data) {
+   theora_info_init(&(decoder->video_info));
+   theora_comment_init(&(decoder->video_comment));
+   decoder->remaining_header_packets = 3;
+   decoder->granulepos_seen = 0;
+   decoder->frame_delta = 0;
+   decoder->y_width = 0;
+   decoder->convert_to_rgb = 0;
+   decoder->decoder.decoded_type = OGGPLAY_YUV_VIDEO;
++  decoder->decoder.player->active_tracks++;
+ }
+ 
+ void
+ oggplay_shutdown_theora(void *user_data) {
+ 
+   OggPlayTheoraDecode   * decoder = (OggPlayTheoraDecode *)user_data;
+ 
+   if (decoder->remaining_header_packets == 0) {
+@@ -366,16 +367,17 @@ oggplay_init_audio (void * user_data) {
+ 
+   decoder->sound_info.channels = 0;
+   fish_sound_set_interleave(decoder->sound_handle, 1);
+   fish_sound_set_decoded_float_ilv(decoder->sound_handle,
+                                       oggplay_fish_sound_callback_floats,
+                                       (void *)decoder);
+ 
+   decoder->decoder.decoded_type = OGGPLAY_FLOATS_AUDIO;
++  decoder->decoder.player->active_tracks++;
+ }
+ 
+ void
+ oggplay_shutdown_audio(void *user_data) {
+ 
+   OggPlayAudioDecode   * decoder = (OggPlayAudioDecode *)user_data;
+ 
+   fish_sound_delete(decoder->sound_handle);
+@@ -566,17 +568,17 @@ oggplay_initialise_decoder(OggPlay *me, 
+ 
+   if (decoder == NULL)
+     return NULL;
+ 
+   decoder->serialno = serialno;
+   decoder->content_type = content_type;
+   decoder->content_type_name =
+           oggz_stream_get_content_type (me->oggz, serialno);
+-  decoder->active = 0;
++  decoder->active = 1;
+   decoder->final_granulepos = -1;
+   decoder->player = me;
+   decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN;
+ 
+   /*
+    * set the StreamInfo to unitialised until we get some real data in
+    */
+   decoder->stream_info = OGGPLAY_STREAM_UNINITIALISED;
diff --git a/media/liboggplay/src/liboggplay/oggplay.c b/media/liboggplay/src/liboggplay/oggplay.c
index ef822f8558dd..98dd6a4b8f97 100644
--- a/media/liboggplay/src/liboggplay/oggplay.c
+++ b/media/liboggplay/src/liboggplay/oggplay.c
@@ -134,6 +134,7 @@ oggplay_initialise(OggPlay *me, int block) {
   for (i = 0; i < me->num_tracks; i++) {
     me->decode_data[i]->active = 0;
   }
+  me->active_tracks = 0;
 
   /*
    * if the buffer was set up before initialisation, prepare it now
@@ -698,8 +699,8 @@ read_more_data:
        */
       for (i = 0; i < me->num_tracks; i++) {
         me->decode_data[i]->active = 0;
-        me->active_tracks = 0;
       }
+      me->active_tracks = 0;
 
       if (info != NULL) {
         me->callback (me, num_records, info, me->callback_user_ptr);
diff --git a/media/liboggplay/src/liboggplay/oggplay_callback.c b/media/liboggplay/src/liboggplay/oggplay_callback.c
index a98aef6bc8ef..b0b21412c0da 100644
--- a/media/liboggplay/src/liboggplay/oggplay_callback.c
+++ b/media/liboggplay/src/liboggplay/oggplay_callback.c
@@ -59,6 +59,7 @@ oggplay_init_theora(void *user_data) {
   decoder->y_width = 0;
   decoder->convert_to_rgb = 0;
   decoder->decoder.decoded_type = OGGPLAY_YUV_VIDEO;
+  decoder->decoder.player->active_tracks++;
 }
 
 void
@@ -371,6 +372,7 @@ oggplay_init_audio (void * user_data) {
                                       (void *)decoder);
 
   decoder->decoder.decoded_type = OGGPLAY_FLOATS_AUDIO;
+  decoder->decoder.player->active_tracks++;
 }
 
 void
@@ -571,7 +573,7 @@ oggplay_initialise_decoder(OggPlay *me, int content_type, int serialno) {
   decoder->content_type = content_type;
   decoder->content_type_name =
           oggz_stream_get_content_type (me->oggz, serialno);
-  decoder->active = 0;
+  decoder->active = 1;
   decoder->final_granulepos = -1;
   decoder->player = me;
   decoder->decoded_type = OGGPLAY_TYPE_UNKNOWN;
diff --git a/media/liboggplay/update.sh b/media/liboggplay/update.sh
index d0c9e239ffb2..1d4788edd6b4 100644
--- a/media/liboggplay/update.sh
+++ b/media/liboggplay/update.sh
@@ -64,3 +64,4 @@ patch -p3 < bug498815.patch
 patch -p3 < bug498824.patch
 patch -p3 < bug496529.patch
 patch -p3 < bug499519.patch
+patch -p3 < bug500311.patch

From c8d8fdf19e10a2af65a1ffefd6aebf0f1bef03a2 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Jul 2009 21:27:46 -0700
Subject: [PATCH 11/61] Bug 332173 - Followup followup fix for trunk-only
 necessary-for-templatization changes (not needed for any branches, that is).

--HG--
extra : rebase_source : 767c90867afbbe7bf52e29820c987e45c9e60d03
---
 xpcom/io/nsWildCard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index 90f3d7181781..2f788ba9ae75 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -222,7 +222,7 @@ _handle_union(const T *str, const T *expr, PRBool case_insensitive,
     if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
         return ABORTED;
     ++cp;                /* now index of char after closing parenthesis */
-    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    e2 = (T *) NS_Alloc((1 + nsCharTraits<T>::length(expr)) * sizeof(T));
     if (!e2)
         return ABORTED;
     for (sx = 1; ; ++sx) {
@@ -386,7 +386,7 @@ ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
     if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
         return _shexp_match(str, xp, case_insensitive, 0);
 
-    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
+    expr = (T *) NS_Alloc((nsCharTraits<T>::length(xp) + 1) * sizeof(T));
     if(!expr)
         return NOMATCH;
 

From 46910e2c37c54742f1a5a8209ad23de4c47922e9 Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Thu, 30 Jul 2009 00:47:06 -0400
Subject: [PATCH 12/61] Cache UTF-8 POSIX path in Mac OS X nsIFile impl.
 b=505792 r=mstange sr=bsmedberg

---
 xpcom/io/nsLocalFileOSX.h  |  10 +--
 xpcom/io/nsLocalFileOSX.mm | 172 +++++++++++--------------------------
 2 files changed, 53 insertions(+), 129 deletions(-)

diff --git a/xpcom/io/nsLocalFileOSX.h b/xpcom/io/nsLocalFileOSX.h
index f818e7428983..957e2d3abfa9 100644
--- a/xpcom/io/nsLocalFileOSX.h
+++ b/xpcom/io/nsLocalFileOSX.h
@@ -95,21 +95,17 @@ private:
 
 protected:
   nsLocalFile(const nsLocalFile& src);
-
   nsresult SetBaseURL(CFURLRef aCFURLRef); // retains aCFURLRef
-
   nsresult GetFSRefInternal(FSRef& aFSRef);
-  nsresult GetPathInternal(nsACString& path); // Returns path WRT mFollowLinks
+  nsresult GetPathInternal(nsACString& path); // Returns path respecting mFollowLinks
   nsresult CopyInternal(nsIFile* newParentDir,
                         const nsAString& newName,
                         PRBool followLinks);
   nsresult FillStatBufferInternal(struct STAT *statBuffer);
 
-  static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
-
 protected:
-  CFURLRef mBaseURL; // The FS object we represent
-
+  CFURLRef     mBaseURL; // The FS object we represent
+  char         mPath[PATH_MAX]; // POSIX path, UTF-8, NULL terminated
   PRPackedBool mFollowLinks;
 };
 
diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
index 8f6a4fea2564..14e13d89b584 100644
--- a/xpcom/io/nsLocalFileOSX.mm
+++ b/xpcom/io/nsLocalFileOSX.mm
@@ -76,6 +76,7 @@
 
 static nsresult MacErrorMapper(OSErr inErr);
 static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult);
+static nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr);
 
 #pragma mark -
 #pragma mark [FSRef operator==]
@@ -281,30 +282,23 @@ class nsDirEnumerator : public nsISimpleEnumerator,
 
 NS_IMPL_ISUPPORTS2(nsDirEnumerator, nsISimpleEnumerator, nsIDirectoryEnumerator)
 
-#define FILENAME_BUFFER_SIZE 512
-
 const char kPathSepChar = '/';
 
 #pragma mark -
 #pragma mark [CTORs/DTOR]
 
 nsLocalFile::nsLocalFile() :
-  mBaseURL(nsnull),
+  mBaseURL(NULL),
   mFollowLinks(PR_TRUE)
 {
+  mPath[0] = '\0';
 }
 
 nsLocalFile::nsLocalFile(const nsLocalFile& src) :
-  mBaseURL(src.mBaseURL),
+  mBaseURL(NULL),
   mFollowLinks(src.mFollowLinks)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // CFURL objects are immutable so no need to copy, just retain.
-  if (mBaseURL)
-    ::CFRetain(mBaseURL);
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
+  SetBaseURL(src.mBaseURL);
 }
 
 nsLocalFile::~nsLocalFile()
@@ -388,14 +382,8 @@ NS_IMETHODIMP nsLocalFile::Normalize()
 
   CHECK_INIT();
 
-  // CFURL doesn't doesn't seem to resolve paths containing relative
-  // components, so we'll nick the stdlib code from nsLocalFileUnix
-  UInt8 path[PATH_MAX] = "";
-  if (!::CFURLGetFileSystemRepresentation(mBaseURL, true, path, PATH_MAX))
-    return NS_ERROR_FAILURE;
-
   char resolved_path[PATH_MAX] = "";
-  if (!realpath((char*)path, resolved_path))
+  if (!realpath(mPath, resolved_path))
       return NSRESULT_FOR_ERRNO();
 
   // Need to know whether we're a directory to create a new CFURLRef
@@ -437,7 +425,7 @@ NS_IMETHODIMP nsLocalFile::Create(PRUint32 type, PRUint32 permissions)
   CFURLRef pathURLRef = mBaseURL;
   FSRef pathFSRef;
   CFStringRef leafStrRef = nsnull;
-  nsAutoTArray<UniChar, FILENAME_BUFFER_SIZE> buffer;
+  nsAutoTArray<UniChar, NAME_MAX> buffer;
   Boolean success;
   
   // Work backwards through the path to find the last node which
@@ -607,12 +595,6 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
   if (NS_FAILED(rv))
     return rv;
 
-  // Get the source path.
-  nsCAutoString srcPath;
-  rv = GetNativePath(srcPath);
-  if (NS_FAILED(rv))
-    return rv;
-
   // Build the destination path.
   nsCOMPtr<nsIFile> parentDir = newParentDir;
   if (!parentDir) {
@@ -650,7 +632,7 @@ NS_IMETHODIMP nsLocalFile::MoveToNative(nsIFile *newParentDir, const nsACString&
   }
 
   // Perform the move.
-  if (rename(srcPath.get(), destPath.get()) != 0) {
+  if (rename(mPath, destPath.get()) != 0) {
     if (errno == EXDEV) {
       // Can't move across volume (device) boundaries.  Copy and remove.
       rv = CopyToNative(parentDir, newName);
@@ -706,17 +688,11 @@ NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive)
     }
   }
   else {
-    nsCAutoString path;
-    rv = GetNativePath(path);
-    if (NS_FAILED(rv))
-      return rv;
-
-    const char* pathPtr = path.get();
     int status;
     if (isDirectory)
-      status = rmdir(pathPtr);
+      status = rmdir(mPath);
     else
-      status = unlink(pathPtr);
+      status = unlink(mPath);
 
     if (status != 0)
       rv = NSRESULT_FOR_ERRNO();
@@ -750,12 +726,7 @@ NS_IMETHODIMP nsLocalFile::SetPermissions(PRUint32 aPermissions)
 {
   CHECK_INIT();
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
-  if (chmod(path.get(), aPermissions) < 0)
+  if (chmod(mPath, aPermissions) < 0)
     return NSRESULT_FOR_ERRNO();
 
   return NS_OK;
@@ -847,15 +818,11 @@ NS_IMETHODIMP nsLocalFile::GetFileSize(PRInt64 *aFileSize)
   NS_ENSURE_ARG_POINTER(aFileSize);
   *aFileSize = 0;
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
+  struct STAT buf;
+  nsresult rv = FillStatBufferInternal(&buf);
   if (NS_FAILED(rv))
     return rv;
 
-  struct STAT buf;
-  if (STAT(path.get(), &buf) != 0)
-    return NSRESULT_FOR_ERRNO();
-
   if (!S_ISDIR(buf.st_mode))
     *aFileSize = (PRInt64)buf.st_size;
 
@@ -866,13 +833,8 @@ NS_IMETHODIMP nsLocalFile::SetFileSize(PRInt64 aFileSize)
 {
   CHECK_INIT();
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
   off_t size = (off_t)aFileSize;
-  if (truncate(path.get(), size) == -1)
+  if (truncate(mPath, size) == -1)
     return NSRESULT_FOR_ERRNO();
 
   return NS_OK;
@@ -910,13 +872,8 @@ NS_IMETHODIMP nsLocalFile::GetNativeTarget(nsACString& aNativeTarget)
   if (!isSymLink)
     return NS_ERROR_FILE_INVALID_PATH;
 
-  nsCAutoString nativeString;
-  rv = GetNativePath(nativeString);
-  if (NS_FAILED(rv))
-    return rv;
-
   char resolvedPathBuf[PATH_MAX];
-  if (!realpath(nativeString.get(), resolvedPathBuf))
+  if (!realpath(mPath, resolvedPathBuf))
     return NS_ERROR_FILE_INVALID_PATH;
 
   unsigned int resolvedPathLength = strlen(resolvedPathBuf);
@@ -940,32 +897,19 @@ NS_IMETHODIMP nsLocalFile::GetPath(nsAString& aPath)
 
 NS_IMETHODIMP nsLocalFile::GetNativePath(nsACString& aNativePath)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   CHECK_INIT();
 
-  nsresult rv = NS_ERROR_FAILURE;
-  CFStringRef pathStrRef = ::CFURLCopyFileSystemPath(mBaseURL, kCFURLPOSIXPathStyle);
-  if (pathStrRef) {
-    rv = CFStringReftoUTF8(pathStrRef, aNativePath);
-    ::CFRelease(pathStrRef);
-  }
-  return rv;
+  aNativePath.Assign(mPath);
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+  return NS_OK;
 }
 
 NS_IMETHODIMP nsLocalFile::Exists(PRBool *_retval)
 {
   NS_ENSURE_ARG_POINTER(_retval);
 
-  nsCAutoString path;
-  nsresult rv = GetPathInternal(path);
-  if (NS_FAILED(rv))
-    return rv;
-
   struct STAT buf;
-  *_retval = (STAT(path.get(), &buf) == 0);
+  *_retval = (STAT(mPath, &buf) == 0);
 
   return NS_OK;
 }
@@ -1098,26 +1042,17 @@ NS_IMETHODIMP nsLocalFile::IsFile(PRBool *_retval)
 
 NS_IMETHODIMP nsLocalFile::IsSymlink(PRBool *_retval)
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
   CHECK_INIT();
 
   NS_ENSURE_ARG(_retval);
   *_retval = PR_FALSE;
 
-  // First see if we are an actual symlink
-  nsCAutoString path;
-  nsresult rv = GetNativePath(path);
-  if (NS_FAILED(rv))
-    return rv;
   struct stat symStat;
-  if (lstat(path.get(), &symStat) < 0)
+  if (lstat(mPath, &symStat) < 0)
     return NSRESULT_FOR_ERRNO();
   *_retval = S_ISLNK(symStat.st_mode);
 
   return NS_OK;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
 
 NS_IMETHODIMP nsLocalFile::IsSpecial(PRBool *_retval)
@@ -1149,12 +1084,7 @@ NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
   if (NS_FAILED(rv))
     return rv;
 
-  nsCAutoString thisPath;
-  rv = GetNativePath(thisPath);
-  if (NS_FAILED(rv))
-    return rv;
-
-  *_retval = !strcmp(inPath.get(), thisPath.get());
+  *_retval = !strcmp(mPath, inPath.get());
   return NS_OK;
 }
 
@@ -1976,6 +1906,9 @@ nsresult nsLocalFile::SetBaseURL(CFURLRef aCFURLRef)
     ::CFRelease(mBaseURL);
   mBaseURL = aCFURLRef;
 
+  if (!::CFURLGetFileSystemRepresentation(mBaseURL, NO, (UInt8*)mPath, PATH_MAX))
+    return NS_ERROR_FAILURE;
+
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -2082,43 +2015,14 @@ nsresult nsLocalFile::FillStatBufferInternal(struct STAT *statBuffer)
 {
   CHECK_INIT();
 
-  char path[PATH_MAX] = "";
-  Boolean gotPath = ::CFURLGetFileSystemRepresentation(mBaseURL, true, (UInt8*)path, PATH_MAX);
-  if (!gotPath)
-    return NS_ERROR_FAILURE;
-
-  if (STAT(path, statBuffer) == -1) {
-    if (LSTAT(path, statBuffer) == -1)
+  if (STAT(mPath, statBuffer) == -1) {
+    if (LSTAT(mPath, statBuffer) == -1)
       return NSRESULT_FOR_ERRNO();
   }
 
   return NS_OK;
 }
 
-nsresult nsLocalFile::CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
-
-  // first see if the conversion would succeed and find the length of the result
-  CFIndex usedBufLen, inStrLen = ::CFStringGetLength(aInStrRef);
-  CFIndex charsConverted = ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen),
-                                              kCFStringEncodingUTF8, 0, PR_FALSE,
-                                              NULL, 0, &usedBufLen);
-  if (charsConverted == inStrLen) {
-    // all characters converted, do the actual conversion
-    aOutStr.SetLength(usedBufLen);
-    if (aOutStr.Length() != (unsigned int)usedBufLen)
-      return NS_ERROR_OUT_OF_MEMORY;
-    UInt8 *buffer = (UInt8*)aOutStr.BeginWriting();
-    ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen), kCFStringEncodingUTF8,
-                       0, false, buffer, usedBufLen, &usedBufLen);
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
-}
-
 // nsIHashable
 
 NS_IMETHODIMP
@@ -2304,7 +2208,7 @@ static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult)
     aResult.Assign(chars, length);
   }
   else {
-    nsAutoTArray<UniChar, FILENAME_BUFFER_SIZE> buffer;
+    nsAutoTArray<UniChar, PATH_MAX> buffer;
     if (!buffer.SetLength(length)) {
       CopyUTF8toUTF16(aSrc, aResult);
     }
@@ -2317,3 +2221,27 @@ static void CopyUTF8toUTF16NFC(const nsACString& aSrc, nsAString& aResult)
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
+
+nsresult CFStringReftoUTF8(CFStringRef aInStrRef, nsACString& aOutStr)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
+
+  // first see if the conversion would succeed and find the length of the result
+  CFIndex usedBufLen, inStrLen = ::CFStringGetLength(aInStrRef);
+  CFIndex charsConverted = ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen),
+                                              kCFStringEncodingUTF8, 0, PR_FALSE,
+                                              NULL, 0, &usedBufLen);
+  if (charsConverted == inStrLen) {
+    // all characters converted, do the actual conversion
+    aOutStr.SetLength(usedBufLen);
+    if (aOutStr.Length() != (unsigned int)usedBufLen)
+      return NS_ERROR_OUT_OF_MEMORY;
+    UInt8 *buffer = (UInt8*)aOutStr.BeginWriting();
+    ::CFStringGetBytes(aInStrRef, CFRangeMake(0, inStrLen), kCFStringEncodingUTF8,
+                       0, false, buffer, usedBufLen, &usedBufLen);
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
+}

From 7170799d2d468cf533903c55e273a2d18b9416d8 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Wed, 29 Jul 2009 23:01:27 -0700
Subject: [PATCH 13/61] Bug 492152 - Scrollable menus should support panning on
 Win7. r=jmathies, sr=vlad

---
 widget/src/windows/nsWinGesture.cpp |  8 ++++----
 widget/src/windows/nsWinGesture.h   |  4 ++--
 widget/src/windows/nsWindow.cpp     | 19 ++++++++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp
index 887812a1025c..24cf2b23fb15 100644
--- a/widget/src/windows/nsWinGesture.cpp
+++ b/widget/src/windows/nsWinGesture.cpp
@@ -461,11 +461,11 @@ inline PRBool TestTransition(PRInt32 a, PRInt32 b)
 }
 
 void
-nsWinGesture::UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback)
+nsWinGesture::UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback)
 {
   // If scroll overflow was returned indicating we panned past the bounds of
   // the scrollable view port, start feeback.
-  if (evt.scrollOverflow != 0) {
+  if (scrollOverflow != 0) {
     if (!mFeedbackActive) {
       BeginPanningFeedback(hWnd);
       mFeedbackActive = PR_TRUE;
@@ -490,11 +490,11 @@ nsWinGesture::UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& end
 }
 
 void
-nsWinGesture::UpdatePanFeedbackY(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback)
+nsWinGesture::UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback)
 {
   // If scroll overflow was returned indicating we panned past the bounds of
   // the scrollable view port, start feeback.
-  if (evt.scrollOverflow != 0) {
+  if (scrollOverflow != 0) {
     if (!mFeedbackActive) {
       BeginPanningFeedback(hWnd);
       mFeedbackActive = PR_TRUE;
diff --git a/widget/src/windows/nsWinGesture.h b/widget/src/windows/nsWinGesture.h
index a21b26d5a724..c8b3c9d4786e 100644
--- a/widget/src/windows/nsWinGesture.h
+++ b/widget/src/windows/nsWinGesture.h
@@ -206,8 +206,8 @@ public:
   PRBool ProcessPanMessage(HWND hWnd, WPARAM wParam, LPARAM lParam);
   PRBool PanDeltaToPixelScrollX(nsMouseScrollEvent& evt);
   PRBool PanDeltaToPixelScrollY(nsMouseScrollEvent& evt);
-  void UpdatePanFeedbackX(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback);
-  void UpdatePanFeedbackY(HWND hWnd, nsMouseScrollEvent& evt, PRBool& endFeedback);
+  void UpdatePanFeedbackX(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback);
+  void UpdatePanFeedbackY(HWND hWnd, PRInt32 scrollOverflow, PRBool& endFeedback);
   void PanFeedbackFinalize(HWND hWnd, PRBool endFeedback);
   
 public:
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index d6976c8f08de..3bd7c73bd864 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -4620,17 +4620,26 @@ PRBool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam)
     event.time      = ::GetMessageTime();
 
     PRBool endFeedback = PR_TRUE;
-    
+
+    PRInt32 scrollOverflowX = 0;
+    PRInt32 scrollOverflowY = 0;
+
     if (mGesture.PanDeltaToPixelScrollX(event)) {
       DispatchEvent(&event, status);
+      scrollOverflowX = event.scrollOverflow;
     }
-    mGesture.UpdatePanFeedbackX(mWnd, event, endFeedback);
-    
+
     if (mGesture.PanDeltaToPixelScrollY(event)) {
       DispatchEvent(&event, status);
+      scrollOverflowY = event.scrollOverflow;
     }
-    mGesture.UpdatePanFeedbackY(mWnd, event, endFeedback);
-    mGesture.PanFeedbackFinalize(mWnd, endFeedback);
+
+    if (mWindowType != eWindowType_popup) {
+      mGesture.UpdatePanFeedbackX(mWnd, scrollOverflowX, endFeedback);
+      mGesture.UpdatePanFeedbackY(mWnd, scrollOverflowY, endFeedback);
+      mGesture.PanFeedbackFinalize(mWnd, endFeedback);
+    }
+
     mGesture.CloseGestureInfoHandle((HGESTUREINFO)lParam);
 
     return PR_TRUE;

From bb34f661d59929e2557220ac2c3bb9d03518b2cf Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:36 -0700
Subject: [PATCH 14/61] Bug 506696 - [WinCE] updater.exe doesn't use the
 working directory when applying the update. r=bsmedberg, r=blassey

---
 .../update/src/updater/archivereader.cpp      |  10 +-
 .../update/src/updater/archivereader.h        |  15 +-
 .../mozapps/update/src/updater/updater.cpp    | 233 ++++++++++++------
 .../update/src/updater/updater_wince.cpp      |  94 +++----
 .../update/src/updater/updater_wince.h        |   6 +-
 5 files changed, 208 insertions(+), 150 deletions(-)

diff --git a/toolkit/mozapps/update/src/updater/archivereader.cpp b/toolkit/mozapps/update/src/updater/archivereader.cpp
index a2686a990693..10f81ea2f6e1 100644
--- a/toolkit/mozapps/update/src/updater/archivereader.cpp
+++ b/toolkit/mozapps/update/src/updater/archivereader.cpp
@@ -53,11 +53,7 @@
 #endif
 
 int
-#ifdef XP_WIN
-ArchiveReader::Open(const WCHAR *path)
-#else
-ArchiveReader::Open(const char *path)
-#endif
+ArchiveReader::Open(const NS_tchar *path)
 {
   if (mArchive)
     Close();
@@ -83,14 +79,14 @@ ArchiveReader::Close()
 }
 
 int
-ArchiveReader::ExtractFile(const char *name, const char *dest)
+ArchiveReader::ExtractFile(const char *name, const NS_tchar *dest)
 {
   const MarItem *item = mar_find_item(mArchive, name);
   if (!item)
     return READ_ERROR;
 
 #ifdef XP_WIN
-  FILE* fp = fopen(dest, "wb+");
+  FILE* fp = _wfopen(dest, L"wb+");
 #else
   int fd = creat(dest, item->flags);
   if (fd == -1)
diff --git a/toolkit/mozapps/update/src/updater/archivereader.h b/toolkit/mozapps/update/src/updater/archivereader.h
index 2421faedee93..ce3fc6a9a39c 100644
--- a/toolkit/mozapps/update/src/updater/archivereader.h
+++ b/toolkit/mozapps/update/src/updater/archivereader.h
@@ -42,6 +42,12 @@
 #include <stdio.h>
 #include "mar.h"
 
+#ifdef XP_WIN
+# define NS_tchar WCHAR
+#else
+# define NS_tchar char
+#endif
+
 // This class provides an API to extract files from an update archive.
 class ArchiveReader
 {
@@ -49,15 +55,10 @@ public:
   ArchiveReader() : mArchive(NULL) {}
   ~ArchiveReader() { Close(); }
 
-#ifdef XP_WIN
-  int Open(const WCHAR *path);
-#else
-  int Open(const char *path);
-#endif
-
+  int Open(const NS_tchar *path);
   void Close();
 
-  int ExtractFile(const char *item, const char *destination);
+  int ExtractFile(const char *item, const NS_tchar *destination);
   int ExtractFileToStream(const char *item, FILE *fp);
 
 private:
diff --git a/toolkit/mozapps/update/src/updater/updater.cpp b/toolkit/mozapps/update/src/updater/updater.cpp
index b41bff278dcc..f41a06dd14f3 100644
--- a/toolkit/mozapps/update/src/updater/updater.cpp
+++ b/toolkit/mozapps/update/src/updater/updater.cpp
@@ -59,15 +59,23 @@
 # define putenv _putenv
 # define snprintf _snprintf
 # define fchmod(a,b)
-# define mkdir(path, perms) _mkdir(path)
 
 # define NS_T(str) L ## str
 # define NS_tsnprintf _snwprintf
 # define NS_tstrrchr wcsrchr
+# define NS_taccess _waccess
 # define NS_tchdir _wchdir
+# define NS_tchmod _wchmod
+# define NS_tmkdir(path, perms) _wmkdir(path)
 # define NS_tremove _wremove
 # define NS_tfopen _wfopen
 # define NS_tatoi _wtoi64
+#ifndef WINCE
+# define stat _stat
+#endif
+# define NS_tstat _wstat
+# define BACKUP_EXT L".moz-backup"
+# define LOG_S "%S"
 #else
 # include <sys/wait.h>
 # include <unistd.h>
@@ -75,10 +83,16 @@
 # define NS_T(str) str
 # define NS_tsnprintf snprintf
 # define NS_tstrrchr strrchr
+# define NS_taccess access
 # define NS_tchdir chdir
+# define NS_tchmod chmod
+# define NS_tmkdir mkdir
 # define NS_tremove remove
 # define NS_tfopen fopen
 # define NS_tatoi atoi
+# define NS_tstat stat
+# define BACKUP_EXT ".moz-backup"
+# define LOG_S "%s"
 #endif
 
 #include "bspatch.h"
@@ -297,6 +311,11 @@ private:
 
 //-----------------------------------------------------------------------------
 
+#ifdef WINCE
+// Since WinCE doesn't have a current working directory store the current
+// working directory specified in the command line arguments 
+static NS_tchar* gDestPath;
+#endif
 static NS_tchar* gSourcePath;
 static ArchiveReader gArchiveReader;
 #ifdef XP_WIN
@@ -392,10 +411,38 @@ mstrtok(const char *delims, char **str)
   return ret;
 }
 
-static void ensure_write_permissions(const char *path)
+#ifdef XP_WIN
+// Returns a wchar path. The path returned will be absolute on Windows CE /
+// Windows Mobile and relative on all other versions of Windows.
+static NS_tchar*
+get_wide_path(const char *path)
+{
+  WCHAR *s = (WCHAR*) malloc(MAXPATHLEN * sizeof(WCHAR));
+  if (!s)
+    return NULL;
+
+  WCHAR *c = s;
+  WCHAR wpath[MAXPATHLEN];
+  MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAXPATHLEN);
+#ifndef WINCE
+  wcscpy(c, wpath);
+  c += wcslen(wpath);
+#else
+  wcscpy(c, gDestPath);
+  c += wcslen(gDestPath);
+  wcscat(c, wpath);
+  c += wcslen(wpath);
+#endif
+  *c = NS_T('\0');
+  c++;
+  return s;
+}
+#endif
+
+static void ensure_write_permissions(const NS_tchar *path)
 {
 #ifdef XP_WIN
-  (void) chmod(path, _S_IREAD | _S_IWRITE);
+  (void) _wchmod(path, _S_IREAD | _S_IWRITE);
 #else
   struct stat fs;
   if (!stat(path, &fs) && !(fs.st_mode & S_IWUSR)) {
@@ -404,25 +451,25 @@ static void ensure_write_permissions(const char *path)
 #endif
 }
 
-static int ensure_remove(const char *path)
+static int ensure_remove(const NS_tchar *path)
 {
   ensure_write_permissions(path);
-  int rv = remove(path);
+  int rv = NS_tremove(path);
   if (rv)
-    LOG(("remove failed: %d,%d (%s)\n", rv, errno, path));
+    LOG(("remove failed: %d,%d (" LOG_S ")\n", rv, errno, path));
   return rv;
 }
 
-static FILE* ensure_open(const char *path, const char* flags, unsigned int options)
+static FILE* ensure_open(const NS_tchar *path, const NS_tchar* flags, unsigned int options)
 {
   ensure_write_permissions(path);
-  FILE* f = fopen(path, flags);
-  if (chmod(path, options) != 0) {
+  FILE* f = NS_tfopen(path, flags);
+  if (NS_tchmod(path, options) != 0) {
     fclose(f);
     return NULL;
   }
   struct stat ss;
-  if (stat(path, &ss) != 0 || ss.st_mode != options) {
+  if (NS_tstat(path, &ss) != 0 || ss.st_mode != options) {
     fclose(f);
     return NULL;
   }
@@ -430,30 +477,30 @@ static FILE* ensure_open(const char *path, const char* flags, unsigned int optio
 }
 
 // Ensure that the directory containing this file exists.
-static int ensure_parent_dir(const char *path)
+static int ensure_parent_dir(const NS_tchar *path)
 {
   int rv = OK;
 
-  char *slash = (char *) strrchr(path, '/');
-  if (slash)
-  {
-    *slash = '\0';
+  NS_tchar *slash = (NS_tchar *) NS_tstrrchr(path, NS_T('/'));
+  if (slash) {
+    *slash = NS_T('\0');
     rv = ensure_parent_dir(path);
     if (rv == OK) {
-      rv = mkdir(path, 0755);
-      // If the directory already exists, then ignore the error.
+      rv = NS_tmkdir(path, 0755);
+      // If the directory already exists, then ignore the error. On WinCE rv
+      // will equal 0 if the directory already exists.
       if (rv < 0 && errno != EEXIST) {
         rv = WRITE_ERROR;
       } else {
         rv = OK;
       }
     }
-    *slash = '/';
+    *slash = NS_T('/');
   }
   return rv;
 }
 
-static int copy_file(const char *spath, const char *dpath)
+static int copy_file(const NS_tchar *spath, const NS_tchar *dpath)
 {
   int rv = ensure_parent_dir(dpath);
   if (rv)
@@ -461,15 +508,15 @@ static int copy_file(const char *spath, const char *dpath)
 
   struct stat ss;
 
-  AutoFile sfile = fopen(spath, "rb");
+  AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
   if (sfile == NULL || fstat(fileno(sfile), &ss)) {
-    LOG(("copy_file: failed to open or stat: %p,%s,%d\n", sfile.get(), spath, errno));
+    LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile, spath, errno));
     return READ_ERROR;
   }
 
-  AutoFile dfile = ensure_open(dpath, "wb+", ss.st_mode); 
+  AutoFile dfile = ensure_open(dpath, NS_T("wb+"), ss.st_mode); 
   if (dfile == NULL) {
-    LOG(("copy_file: failed to open: %s,%d\n", dpath, errno));
+    LOG(("copy_file: failed to open: " LOG_S ",%d\n", dpath, errno));
     return WRITE_ERROR;
   }
 
@@ -498,13 +545,11 @@ static int copy_file(const char *spath, const char *dpath)
 
 //-----------------------------------------------------------------------------
 
-#define BACKUP_EXT ".moz-backup"
-
 // Create a backup copy of the specified file alongside it.
-static int backup_create(const char *path)
+static int backup_create(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   return copy_file(path, backup);
 }
@@ -512,10 +557,10 @@ static int backup_create(const char *path)
 // Copy the backup copy of the specified file back overtop
 // the specified file.
 // XXX should be a file move instead
-static int backup_restore(const char *path)
+static int backup_restore(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   int rv = copy_file(backup, path);
   if (rv)
@@ -529,10 +574,10 @@ static int backup_restore(const char *path)
 }
 
 // Discard the backup copy of the specified file.
-static int backup_discard(const char *path)
+static int backup_discard(const NS_tchar *path)
 {
-  char backup[MAXPATHLEN];
-  snprintf(backup, sizeof(backup), "%s" BACKUP_EXT, path);
+  NS_tchar backup[MAXPATHLEN];
+  NS_tsnprintf(backup, sizeof(backup), NS_T("%s" BACKUP_EXT), path);
 
   int rv = ensure_remove(backup);
   if (rv)
@@ -542,7 +587,7 @@ static int backup_discard(const char *path)
 }
 
 // Helper function for post-processing a temporary backup.
-static void backup_finish(const char *path, int status)
+static void backup_finish(const NS_tchar *path, int status)
 {
   if (status == OK)
     backup_discard(path);
@@ -586,7 +631,7 @@ private:
 class RemoveFile : public Action
 {
 public:
-  RemoveFile() : mFile(NULL), mSkip(0) { }
+  RemoveFile() : mFile(NULL), mDestFile(NULL), mSkip(0) { }
 
   int Parse(char *line);
   int Prepare();
@@ -595,6 +640,7 @@ public:
 
 private:
   const char* mFile;
+  const NS_tchar* mDestFile;
   int mSkip;
 };
 
@@ -607,35 +653,45 @@ RemoveFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 RemoveFile::Prepare()
 {
-  LOG(("PREPARE REMOVE %s\n", mFile));
+  LOG(("PREPARE REMOVE " LOG_S "\n", mDestFile));
 
   // We expect the file to exist if we are to remove it.
-  int rv = access(mFile, F_OK);
+  int rv = NS_taccess(mDestFile, F_OK);
   if (rv) {
     LOG(("file cannot be removed because it does not exist; skipping\n"));
     mSkip = 1;
     return OK;
   }
 
-  char *slash = (char *) strrchr(mFile, '/');
+#ifndef WINCE
+  NS_tchar *slash = (NS_tchar *) NS_tstrrchr(mDestFile, NS_T('/'));
   if (slash) {
-    *slash = '\0';
-    rv = access(mFile, W_OK);
-    *slash = '/';
+    *slash = NS_T('\0');
+    rv = NS_taccess(mDestFile, W_OK);
+    *slash = NS_T('/');
   } else {
-    rv = access(".", W_OK);
+    rv = NS_taccess(NS_T("."), W_OK);
   }
 
   if (rv) {
     LOG(("access failed: %d\n", errno));
     return WRITE_ERROR;
   }
+#endif
 
   return OK;
 }
@@ -643,7 +699,7 @@ RemoveFile::Prepare()
 int
 RemoveFile::Execute()
 {
-  LOG(("EXECUTE REMOVE %s\n", mFile));
+  LOG(("EXECUTE REMOVE " LOG_S "\n", mDestFile));
 
   if (mSkip)
     return OK;
@@ -651,7 +707,7 @@ RemoveFile::Execute()
   // We expect the file to exist if we are to remove it.  We check here as well
   // as in PREPARE since we might have been asked to remove the same file more
   // than once: bug 311099.
-  int rv = access(mFile, F_OK);
+  int rv = NS_taccess(mDestFile, F_OK);
   if (rv) {
     LOG(("file cannot be removed because it does not exist; skipping\n"));
     mSkip = 1;
@@ -661,13 +717,13 @@ RemoveFile::Execute()
   // save a complete copy of the old file, and then remove the
   // old file.  we'll clean up the copy in Finish.
 
-  rv = backup_create(mFile);
+  rv = backup_create(mDestFile);
   if (rv) {
     LOG(("backup_create failed: %d\n", rv));
     return rv;
   }
 
-  rv = ensure_remove(mFile);
+  rv = ensure_remove(mDestFile);
   if (rv)
     return WRITE_ERROR;
 
@@ -677,18 +733,18 @@ RemoveFile::Execute()
 void
 RemoveFile::Finish(int status)
 {
-  LOG(("FINISH REMOVE %s\n", mFile));
+  LOG(("FINISH REMOVE " LOG_S "\n", mDestFile));
 
   if (mSkip)
     return;
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class AddFile : public Action
 {
 public:
-  AddFile() : mFile(NULL) { }
+  AddFile() : mFile(NULL), mDestFile(NULL) { }
 
   virtual int Parse(char *line);
   virtual int Prepare(); // check that the source file exists
@@ -697,6 +753,7 @@ public:
 
 private:
   const char *mFile;
+  const NS_tchar *mDestFile;
 };
 
 int
@@ -708,13 +765,21 @@ AddFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 AddFile::Prepare()
 {
-  LOG(("PREPARE ADD %s\n", mFile));
+  LOG(("PREPARE ADD " LOG_S "\n", mDestFile));
 
   return OK;
 }
@@ -722,37 +787,35 @@ AddFile::Prepare()
 int
 AddFile::Execute()
 {
-  LOG(("EXECUTE ADD %s\n", mFile));
+  LOG(("EXECUTE ADD " LOG_S "\n", mDestFile));
 
   int rv;
 
   // First make sure that we can actually get rid of any existing file.
-  if (access(mFile, F_OK) == 0)
-  {
-    rv = backup_create(mFile);
+  rv = NS_taccess(mDestFile, F_OK);
+  if (rv == 0) {
+    rv = backup_create(mDestFile);
     if (rv)
       return rv;
 
-    rv = ensure_remove(mFile);
+    rv = ensure_remove(mDestFile);
     if (rv)
       return WRITE_ERROR;
-  }
-  else
-  {
-    rv = ensure_parent_dir(mFile);
+  } else {
+    rv = ensure_parent_dir(mDestFile);
     if (rv)
       return rv;
   }
-    
-  return gArchiveReader.ExtractFile(mFile, mFile);
+
+  return gArchiveReader.ExtractFile(mFile, mDestFile);
 }
 
 void
 AddFile::Finish(int status)
 {
-  LOG(("FINISH ADD %s\n", mFile));
+  LOG(("FINISH ADD " LOG_S "\n", mDestFile));
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class PatchFile : public Action
@@ -773,6 +836,7 @@ private:
 
   const char *mPatchFile;
   const char *mFile;
+  const NS_tchar *mDestFile;
   int mPatchIndex;
   MBSPatchHeader header;
   FILE* pfile;
@@ -855,13 +919,21 @@ PatchFile::Parse(char *line)
   if (!mFile)
     return PARSE_ERROR;
 
+#ifdef XP_WIN
+  mDestFile = get_wide_path(mFile);
+  if (!mDestFile)
+    return PARSE_ERROR;
+#else
+  mDestFile = mFile;
+#endif
+
   return OK;
 }
 
 int
 PatchFile::Prepare()
 {
-  LOG(("PREPARE PATCH %s\n", mFile));
+  LOG(("PREPARE PATCH " LOG_S "\n", mDestFile));
 
   // extract the patch to a temporary file
   mPatchIndex = sPatchIndex++;
@@ -893,7 +965,7 @@ PatchFile::Prepare()
   if (rv)
     return rv;
 
-  AutoFile ofile = fopen(mFile, "rb");
+  AutoFile ofile = NS_tfopen(mDestFile, NS_T("rb"));
   if (ofile == NULL)
     return READ_ERROR;
 
@@ -906,23 +978,23 @@ PatchFile::Prepare()
 int
 PatchFile::Execute()
 {
-  LOG(("EXECUTE PATCH %s\n", mFile));
+  LOG(("EXECUTE PATCH %s\n", mDestFile));
 
   // Create backup copy of the destination file before proceeding.
 
   struct stat ss;
-  if (stat(mFile, &ss))
+  if (NS_tstat(mDestFile, &ss))
     return READ_ERROR;
 
-  int rv = backup_create(mFile);
+  int rv = backup_create(mDestFile);
   if (rv)
     return rv;
 
-  rv = ensure_remove(mFile);
+  rv = ensure_remove(mDestFile);
   if (rv)
     return WRITE_ERROR;
 
-  AutoFile ofile = ensure_open(mFile, "wb+", ss.st_mode);
+  AutoFile ofile = ensure_open(mDestFile, NS_T("wb+"), ss.st_mode);
   if (ofile == NULL)
     return WRITE_ERROR;
 
@@ -932,9 +1004,9 @@ PatchFile::Execute()
 void
 PatchFile::Finish(int status)
 {
-  LOG(("FINISH PATCH %s\n", mFile));
+  LOG(("FINISH PATCH %s\n", mDestFile));
 
-  backup_finish(mFile, status);
+  backup_finish(mDestFile, status);
 }
 
 class AddIfFile : public AddFile
@@ -1177,7 +1249,7 @@ LaunchCallbackApp(const NS_tchar *workingDir, int argc, NS_tchar **argv)
 
   // Run from the specified working directory (see bug 312360).
   if(NS_tchdir(workingDir) != 0)
-    LOG(("Warning: chdir failed"));
+    LOG(("Warning: chdir failed\n"));
 
 #if defined(USE_EXECV)
   execv(argv[0], argv);
@@ -1250,10 +1322,17 @@ int NS_main(int argc, NS_tchar **argv)
   // necessary for the parent process to exit before its executable image may
   // be altered.
 
+#ifndef WINCE
   if (argc < 2) {
     fprintf(stderr, "Usage: updater <dir-path> [parent-pid [working-dir callback args...]]\n");
     return 1;
   }
+#else
+  if (argc < 4) {
+    fprintf(stderr, "Usage: updater <dir-path> parent-pid <working-dir> [callback args...]]\n");
+    return 1;
+  }
+#endif
 
   if (argc > 2 ) {
     int pid = NS_tatoi(argv[2]);
@@ -1366,6 +1445,9 @@ int NS_main(int argc, NS_tchar **argv)
 #endif
 
   gSourcePath = argv[1];
+#ifdef WINCE
+  gDestPath = argv[3];
+#endif
 
   LogInit();
 
@@ -1477,8 +1559,7 @@ ActionList::Execute()
     UpdateProgressUI(1.0f + float(i++) / divisor);
 
     int rv = a->Execute();
-    if (rv)
-    {
+    if (rv) {
       LOG(("### execution failed\n"));
       return rv;
     }
diff --git a/toolkit/mozapps/update/src/updater/updater_wince.cpp b/toolkit/mozapps/update/src/updater/updater_wince.cpp
index 3f6ea35712b0..04ca864ca242 100644
--- a/toolkit/mozapps/update/src/updater/updater_wince.cpp
+++ b/toolkit/mozapps/update/src/updater/updater_wince.cpp
@@ -42,55 +42,39 @@
 # define W_OK 02
 # define R_OK 04
 
-int remove(const char* path) 
+int chmod(const char* path, unsigned int mode) 
 {
-  if (!_unlink(path)) {
-    return 0;
-  } 
-  else if (GetLastError() == ERROR_ACCESS_DENIED) {
-    WCHAR wpath[MAX_PATH];
-  
-    MultiByteToWideChar(CP_ACP,
-			0,
-			path,
-			-1,
-			wpath,
-			MAX_PATH );
-    return RemoveDirectoryW(wpath) ? 0:-1;
-  } 
-  else {
-    return -1;
-  }
+  return 0;
 }
 
-int chmod(const char* path, unsigned int mode) 
+int _wchmod(const WCHAR* path, unsigned int mode) 
 {
   return 0;
 }
 
 int fstat(FILE* handle, struct stat* buff)
 {
-    int position = ftell(handle);
-    if (position < 0)
-        return -1;
+  int position = ftell(handle);
+  if (position < 0)
+    return -1;
 
-    if (fseek(handle, 0, SEEK_END) < 0)
-        return -1;
+  if (fseek(handle, 0, SEEK_END) < 0)
+    return -1;
 
-    buff->st_size = ftell(handle);
+  buff->st_size = ftell(handle);
 
-    if (fseek(handle, position, SEEK_SET) < 0)
-        return -1;
+  if (fseek(handle, position, SEEK_SET) < 0)
+    return -1;
 
-    if (buff->st_size < 0)
-        return -1;
+  if (buff->st_size < 0)
+    return -1;
 
-    buff->st_mode = _S_IFREG | _S_IREAD | _S_IWRITE | _S_IEXEC;
-    /* can't get time from a file handle on wince */
-    buff->st_ctime = 0;
-    buff->st_atime = 0;
-    buff->st_mtime = 0;
-    return 0;
+  buff->st_mode = _S_IFREG | _S_IREAD | _S_IWRITE | _S_IEXEC;
+  /* can't get time from a file handle on wince */
+  buff->st_ctime = 0;
+  buff->st_atime = 0;
+  buff->st_mtime = 0;
+  return 0;
 }
 
 int stat(const char* path, struct stat* buf) 
@@ -101,16 +85,20 @@ int stat(const char* path, struct stat* buf)
   return rv;
 }
 
-int _mkdir(const char* path) 
+int _wstat(const WCHAR* path, struct stat* buf) 
 {
-  WCHAR wpath[MAX_PATH];
-  MultiByteToWideChar(CP_ACP,
-		      0,
-		      path,
-		      -1,
-		      wpath,
-		      MAX_PATH );
-  return CreateDirectoryW(wpath, NULL) ? 0 : -1;
+  FILE* f = _wfopen(path, L"r");
+  int rv = fstat(f, buf);
+  fclose(f);
+  return rv;
+}
+
+int _wmkdir(const WCHAR* path) 
+{
+  DWORD dwAttr = GetFileAttributesW(path);
+  if (dwAttr != INVALID_FILE_ATTRIBUTES)
+    return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ? 0 : -1;
+  return CreateDirectoryW(path, NULL) ? 0 : -1;
 }
 
 FILE* fileno(FILE* f) 
@@ -127,22 +115,14 @@ int _access(const char* path, int amode)
 		      -1,
 		      wpath,
 		      MAX_PATH );
-   switch (amode) {
-    case R_OK:
-      return (GetFileAttributesW(wpath) != INVALID_FILE_ATTRIBUTES);
-    default:
-      return 0;
-  }
+  return _waccess(wpath, amode);
 }
+
 int _waccess(const WCHAR* path, int amode)
 {
-  switch (amode) {
-    case R_OK:
-      return (GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES);
-    default:
-      return 0;
-  }
-
+  if (amode == F_OK)
+    return (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) ? -1 : 0;
+  return -1;
 }
 
 int _wremove(const WCHAR* wpath) 
diff --git a/toolkit/mozapps/update/src/updater/updater_wince.h b/toolkit/mozapps/update/src/updater/updater_wince.h
index 11e300f72da2..a32d6a69087e 100644
--- a/toolkit/mozapps/update/src/updater/updater_wince.h
+++ b/toolkit/mozapps/update/src/updater/updater_wince.h
@@ -54,11 +54,11 @@ struct stat {
   time_t st_atime;
   time_t st_mtime;
 };
-int remove(const char* path);
-int chmod(const char* path, unsigned int mode);
+int _wchmod(const WCHAR* path, unsigned int mode);
 int fstat(FILE* handle, struct stat* buff);
 int stat(const char* path, struct stat* buf);
-int _mkdir(const char* path);
+int _wstat(const WCHAR* path, struct stat* buf);
+int _wmkdir(const WCHAR* path);
 int access(const char* path, int amode);
 int _waccess(const WCHAR* path, int amode);
 int _wremove(const WCHAR* wpath);

From eddcc72376b83222b36a6e09f5a46e129d7b3e7e Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:43 -0700
Subject: [PATCH 15/61] Updated tests for Bug 506696. r=me

---
 .../test/unit/data/aus-0110_general.mar       | Bin 1444 -> 1577 bytes
 .../test/unit/data/aus-0111_general.mar       | Bin 1255 -> 1392 bytes
 .../update/test/unit/test_0110_general.js     |  46 ++--
 .../update/test/unit/test_0111_general.js     |  63 +++---
 .../update/test/unit/test_0112_general.js     | 199 ++++++++++++++++++
 5 files changed, 258 insertions(+), 50 deletions(-)
 create mode 100644 toolkit/mozapps/update/test/unit/test_0112_general.js

diff --git a/toolkit/mozapps/update/test/unit/data/aus-0110_general.mar b/toolkit/mozapps/update/test/unit/data/aus-0110_general.mar
index f24dfd4fc9c532b4ba405b17346ff814a625f754..9642ff94e25a0842136a381bbb341f823eff4540 100644
GIT binary patch
delta 302
zcmZ3&y^<%>*D=VDfq}KaDJsL#&@oaiI5KVRDH#R^rP~b*0s)L07#J9qEsk+eU<g<y
z?8~@JVWJ4Ht+PPGhFt&NCR-oBB)**?JU(h--C?&*m^zjORLDl^_$ED^^Gbr>`RSpc
z{o+Ng76B7LMsAF~$TIl{i)H;*pphIvoXEhyxUIAxC9xz`FE=qSGcC2a1Srgq$-uyp
z4wB1FEQ&7y3hEo`8^(iid}eN9da9vbK^{;61Iq;<VS+<tNoqw2&|?g&EI`5xNs&3S
ac_39rAXQdqs!H^Y^o@X)0x{4HAfo`cAXpgy

delta 221
zcmZ3<vxGa=*D=VDfq_-eDJsL#&@oaiI5OPsP#OaRcXR`TKmg+g1_p*@i(?!V7#wab
z$z1$Z@l}<;GGSlFWom~l->()q6&K8G=Q+WetGu&W_~6UQ-p--%-8+@$Xn1JPPc&xO
zn0b+<3}`|T5OV-=C<6oIw$g%>#FA9K+{C=hwAA7fpfE!$0|QGsNG><AD82+JsGpge
kn4W5=SC9u3W?(r2Bur4`OHwOJfbM2s`2i%%Fr<ta0EE#(bpQYW

diff --git a/toolkit/mozapps/update/test/unit/data/aus-0111_general.mar b/toolkit/mozapps/update/test/unit/data/aus-0111_general.mar
index 68a8983ed1d9dc7f3ef21347a4084f0163078894..ccad6aab4fa66c64161db68fa71f1f2b23d6989e 100644
GIT binary patch
delta 323
zcmaFP`GKq6*D=VDfq`YCQ&fhfp<|?4aOD0-gKZ29G0_bS0s)LW7#JAVJ-+Lpz>s0E
zvg1GlL)WZc;VWqimwokjRu|jlExbx}%E=z~76qs7qMR2xt|uK@b~<}mE}P{j$f@me
z_aUc^c-;=Yh!sX5PriAc`jC?s7p)^2qwhKMiCow6q<0=1%ejQaU#p27*qHa1d9odg
zfz589jT}H+&%nUAt+XH|u_RS5H!&|WEw#7=D9q5#z`(o^B$u056kh@q)Hl>Oj0fZR
v$qQISax{R7^l>OCNv$XWdY6GE97yQmQDh8K)PkYNSl<|E6%Ye$2AKo^l?i7E

delta 228
zcmeys^_;Wb*D=VDfq^C4DJsL#&@oaiIC7G%i3tOP*6jucfdIxG3=9nG9^Z9PVDRwt
zIB_|{p~}HEAcM_u;$)S$ZLKfPE;}(Tjn#;GVc(=8RX_g>KL<;umh+xVb|`CEE&brN
zbdJ}ux0~w4i(D-NCV<RE*kb<LCX9ihWaErC%sfClDu9>+h|?zTWf2$3V_;xj$iTq3
pEjO_!z9hA{M1S%J77=59paOjq;gZyf5}@-LSnPm=E{2pb0{}LsNPYkS

diff --git a/toolkit/mozapps/update/test/unit/test_0110_general.js b/toolkit/mozapps/update/test/unit/test_0110_general.js
index 372bea97050a..fa77b9d1af06 100644
--- a/toolkit/mozapps/update/test/unit/test_0110_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0110_general.js
@@ -36,15 +36,14 @@
  * ***** END LICENSE BLOCK *****
  */
 
-/* General Complete MAR File Patch Apply Tests */
+/* General Complete MAR File Patch Apply Test */
 
 function run_test() {
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.
-  var testDir = do_get_cwd();
+  var testDir = do_get_file("mar_test", true);
   // The mar files were created with all files in a subdirectory named
   // mar_test... clear it out of the way if it exists and then create it.
-  testDir.append("mar_test");
   try {
     if (testDir.exists())
       testDir.remove(true);
@@ -55,12 +54,12 @@ function run_test() {
   }
   dump("Testing: successful removal of the directory used to apply the mar file\n");
   do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
   testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
 
   // Create an empty test file to test the complete mar's ability to replace an
   // existing file.
-  var testFile = testDir.clone();
-  testFile.append("text1");
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
   testFile.create(AUS_Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
 
   var binDir = getGREDir();
@@ -81,9 +80,7 @@ function run_test() {
   }
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
-  var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("0110_complete_mar");
-
+  var updatesSubDir = do_get_file("0110_complete_mar", true);
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -104,14 +101,24 @@ function run_test() {
        "a complete mar\n");
   do_check_eq(exitValue, 0);
 
+  dump("Testing: update.status should be set to STATE_SUCCEEDED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  do_check_eq(readFile(testFile).split("\n")[0], STATE_SUCCEEDED);
+
   dump("Testing: contents of files added by a complete mar\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text1")), "ToBeModified\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text2")), "ToBeDeleted\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "ToBeModified\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ToBeDeleted\n");
 
   var refImage = do_get_file("data/aus-0110_general_ref_image.png");
-  var srcImage = getTestFile(testDir, "image1.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
+  do_check_eq(getFileBytes(do_get_file("mar_test/2/2_1/2_1_text1", true)),
+              "ToBeDeleted\n");
+
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -146,25 +153,18 @@ function runUpdate(aUpdatesSubDir, aUpdater) {
   if (/ /.test(updatesSubDirPath))
     updatesSubDirPath = '"' + updatesSubDirPath + '"';
 
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
   var process = AUS_Cc["@mozilla.org/process/util;1"].
                 createInstance(AUS_Ci.nsIProcess);
   process.init(updateBin);
-  var args = [updatesSubDirPath];
+  var args = [updatesSubDirPath, 0, cwdPath];
   process.run(true, args, args.length);
   return process.exitValue;
 }
 
-// Gets a file in the mar_test subdirectory of the current working directory
-// which is where the mar will be applied.
-function getTestFile(aDir, aLeafName) {
-  var file = aDir.clone();
-  file.append(aLeafName);
-  if (!(file instanceof AUS_Ci.nsILocalFile))
-    do_throw("File must be a nsILocalFile for this test! File: " + aLeafName);
-
-  return file;
-}
-
 // Returns the binary contents of a file
 function getFileBytes(aFile) {
   var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
diff --git a/toolkit/mozapps/update/test/unit/test_0111_general.js b/toolkit/mozapps/update/test/unit/test_0111_general.js
index 6639ef5b9132..17dcb54dbacc 100644
--- a/toolkit/mozapps/update/test/unit/test_0111_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0111_general.js
@@ -36,15 +36,14 @@
  * ***** END LICENSE BLOCK *****
  */
 
-/* General Partial MAR File Patch Apply Tests */
+/* General Partial MAR File Patch Apply Test */
 
 function run_test() {
   // The directory the updates will be applied to is the current working
   // directory and not dist/bin.
-  var testDir = do_get_cwd();
+  var testDir = do_get_file("mar_test", true);
   // The mar files were created with all files in a subdirectory named
   // mar_test... clear it out of the way if it exists and then create it.
-  testDir.append("mar_test");
   try {
     if (testDir.exists())
       testDir.remove(true);
@@ -55,20 +54,22 @@ function run_test() {
   }
   dump("Testing: successful removal of the directory used to apply the mar file\n");
   do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
   testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
 
   // Create the files to test the partial mar's ability to modify and delete
   // files.
-  var testFile = testDir.clone();
-  testFile.append("text1");
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
   writeFile(testFile, "ToBeModified\n");
 
-  testFile = testDir.clone();
-  testFile.append("text2");
+  testFile = do_get_file("mar_test/1/1_1/1_1_text2", true);
   writeFile(testFile, "ToBeDeleted\n");
 
   testFile = do_get_file("data/aus-0110_general_ref_image.png");
-  testFile.copyTo(testDir, "image1.png");
+  testFile.copyTo(testDir, "1_1_image1.png");
+
+  testFile = do_get_file("mar_test/2/2_1/2_1_text1", true);
+  writeFile(testFile, "ToBeDeleted\n");
 
   var binDir = getGREDir();
 
@@ -88,9 +89,7 @@ function run_test() {
   }
 
   // Use a directory outside of dist/bin to lessen the garbage in dist/bin
-  var updatesSubDir = do_get_cwd();
-  updatesSubDir.append("0111_partial_mar");
-
+  var updatesSubDir = do_get_file("0111_complete_mar", true);
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -111,16 +110,33 @@ function run_test() {
        "a partial mar\n");
   do_check_eq(exitValue, 0);
 
+  dump("Testing: update.status should be set to STATE_SUCCEEDED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  do_check_eq(readFile(testFile).split("\n")[0], STATE_SUCCEEDED);
+
   dump("Testing: removal of a file and contents of added / modified files by " +
        "a partial mar\n");
-  do_check_eq(getFileBytes(getTestFile(testDir, "text1")), "Modified\n");
-  do_check_false(getTestFile(testDir, "text2").exists()); // file removed
-  do_check_eq(getFileBytes(getTestFile(testDir, "text3")), "Added\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "Modified\n");
+  do_check_false(do_get_file("mar_test/1/1_1/1_1_text2", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text3", true)),
+              "Added\n");
 
   var refImage = do_get_file("data/aus-0111_general_ref_image.png");
-  var srcImage = getTestFile(testDir, "image1.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
   do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
 
+  dump("Testing: removal of a file by a partial mar\n");
+  do_check_false(do_get_file("mar_test/2/2_1/2_1_text1", true).exists());
+
+  do_check_eq(getFileBytes(do_get_file("mar_test/3/3_1/3_1_text1", true)),
+              "Added\n");
+
+  dump("Testing: directory still exists after removal of the last file in " +
+       "the directory (bug 386760)\n");
+  do_check_true(do_get_file("mar_test/2/2_1/", true).exists());
+
   try {
     // Mac OS X intermittently fails when removing the dir where the updater
     // binary was launched.
@@ -155,25 +171,18 @@ function runUpdate(aUpdatesSubDir, aUpdater) {
   if (/ /.test(updatesSubDirPath))
     updatesSubDirPath = '"' + updatesSubDirPath + '"';
 
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
   var process = AUS_Cc["@mozilla.org/process/util;1"].
                 createInstance(AUS_Ci.nsIProcess);
   process.init(updateBin);
-  var args = [updatesSubDirPath];
+  var args = [updatesSubDirPath, 0, cwdPath];
   process.run(true, args, args.length);
   return process.exitValue;
 }
 
-// Gets a file in the mar_test subdirectory of the current working directory
-// which is where the mar will be applied.
-function getTestFile(aDir, aLeafName) {
-  var file = aDir.clone();
-  file.append(aLeafName);
-  if (!(file instanceof AUS_Ci.nsILocalFile))
-    do_throw("File must be a nsILocalFile for this test! File: " + aLeafName);
-
-  return file;
-}
-
 // Returns the binary contents of a file
 function getFileBytes(aFile) {
   var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
diff --git a/toolkit/mozapps/update/test/unit/test_0112_general.js b/toolkit/mozapps/update/test/unit/test_0112_general.js
new file mode 100644
index 000000000000..1672ca99aba1
--- /dev/null
+++ b/toolkit/mozapps/update/test/unit/test_0112_general.js
@@ -0,0 +1,199 @@
+/* ***** 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 the Application Update Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Robert Strong <robert.bugzilla@gmail.com>.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 *****
+ */
+
+/* General Partial MAR File Patch Apply Failure Test */
+
+function run_test() {
+  // The directory the updates will be applied to is the current working
+  // directory and not dist/bin.
+  var testDir = do_get_file("mar_test", true);
+  // The mar files were created with all files in a subdirectory named
+  // mar_test... clear it out of the way if it exists and then create it.
+  try {
+    if (testDir.exists())
+      testDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + testDir.path +
+         "\nException: " + e + "\n");
+  }
+  dump("Testing: successful removal of the directory used to apply the mar file\n");
+  do_check_false(testDir.exists());
+  testDir = do_get_file("mar_test/1/1_1/", true);
+  testDir.create(AUS_Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY);
+
+  // Create the files to test the partial mar's ability to modify and delete
+  // files.
+  var testFile = do_get_file("mar_test/1/1_1/1_1_text1", true);
+  writeFile(testFile, "ShouldNotBeModified\n");
+
+  testFile = do_get_file("mar_test/1/1_1/1_1_text2", true);
+  writeFile(testFile, "ShouldNotBeDeleted\n");
+
+  testFile = do_get_file("data/aus-0111_general_ref_image.png");
+  testFile.copyTo(testDir, "1_1_image1.png");
+
+  testFile = do_get_file("mar_test/2/2_1/2_1_text1", true);
+  writeFile(testFile, "ShouldNotBeDeleted\n");
+
+  var binDir = getGREDir();
+
+  // The updater binary file
+  var updater = binDir.clone();
+  updater.append("updater.app");
+  if (!updater.exists()) {
+    updater = binDir.clone();
+    updater.append("updater.exe");
+    if (!updater.exists()) {
+      updater = binDir.clone();
+      updater.append("updater");
+      if (!updater.exists()) {
+        do_throw("Unable to find updater binary!");
+      }
+    }
+  }
+
+  // Use a directory outside of dist/bin to lessen the garbage in dist/bin
+  var updatesSubDir = do_get_file("0112_complete_mar", true);
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
+
+  var mar = do_get_file("data/aus-0111_general.mar");
+  mar.copyTo(updatesSubDir, "update.mar");
+
+  // apply the partial mar and check the innards of the files
+  var exitValue = runUpdate(updatesSubDir, updater);
+  dump("Testing: updater binary process exitValue for success when applying " +
+       "a partial mar\n");
+  do_check_eq(exitValue, 0);
+
+  dump("Testing: update.status should be set to STATE_FAILED\n");
+  testFile = updatesSubDir.clone();
+  testFile.append("update.status");
+  // The update status format for a failure is failed: # where # is the error
+  // code for the failure.
+  do_check_eq(readFile(testFile).split(": ")[0], STATE_FAILED);
+
+  dump("Testing: files should not be modified or deleted when an update " +
+       "fails\n");
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text1", true)),
+              "ShouldNotBeModified\n");
+  do_check_true(do_get_file("mar_test/1/1_1/1_1_text2", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  var refImage = do_get_file("data/aus-0111_general_ref_image.png");
+  var srcImage = do_get_file("mar_test/1/1_1/1_1_image1.png", true);
+  do_check_eq(getFileBytes(srcImage), getFileBytes(refImage));
+
+  dump("Testing: removal of a file by a partial mar\n");
+  do_check_true(do_get_file("mar_test/2/2_1/2_1_text1", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  do_check_false(do_get_file("mar_test/3/3_1/3_1_text1", true).exists());
+  do_check_eq(getFileBytes(do_get_file("mar_test/1/1_1/1_1_text2", true)),
+              "ShouldNotBeDeleted\n");
+
+  try {
+    // Mac OS X intermittently fails when removing the dir where the updater
+    // binary was launched.
+    if (updatesSubDir.exists())
+      updatesSubDir.remove(true);
+  }
+  catch (e) {
+    dump("Unable to remove directory\npath: " + updatesSubDir.path +
+         "\nException: " + e + "\n");
+  }
+
+  cleanUp();
+}
+
+// Launches the updater binary to apply a mar file
+function runUpdate(aUpdatesSubDir, aUpdater) {
+  // Copy the updater binary to the update directory so the updater.ini is not
+  // in the same directory as it is. This prevents ui from displaying and the
+  // PostUpdate executable which is defined in the updater.ini from launching.
+  aUpdater.copyTo(aUpdatesSubDir, aUpdater.leafName);
+  var updateBin = aUpdatesSubDir.clone();
+  updateBin.append(aUpdater.leafName);
+  if (updateBin.leafName == "updater.app") {
+    updateBin.append("Contents");
+    updateBin.append("MacOS");
+    updateBin.append("updater");
+    if (!updateBin.exists())
+      do_throw("Unable to find the updater executable!");
+  }
+
+  var updatesSubDirPath = aUpdatesSubDir.path;
+  if (/ /.test(updatesSubDirPath))
+    updatesSubDirPath = '"' + updatesSubDirPath + '"';
+
+  var cwdPath = do_get_file("/", true).path;
+  if (/ /.test(cwdPath))
+    cwdPath = '"' + cwdPath + '"';
+
+  var process = AUS_Cc["@mozilla.org/process/util;1"].
+                createInstance(AUS_Ci.nsIProcess);
+  process.init(updateBin);
+  var args = [updatesSubDirPath, 0, cwdPath];
+  process.run(true, args, args.length);
+  return process.exitValue;
+}
+
+// Returns the binary contents of a file
+function getFileBytes(aFile) {
+  var fis = AUS_Cc["@mozilla.org/network/file-input-stream;1"].
+            createInstance(AUS_Ci.nsIFileInputStream);
+  fis.init(aFile, -1, -1, false);
+  var bis = AUS_Cc["@mozilla.org/binaryinputstream;1"].
+            createInstance(AUS_Ci.nsIBinaryInputStream);
+  bis.setInputStream(fis);
+  var data = bis.readBytes(bis.available());
+  bis.close();
+  fis.close();
+  return data;
+}

From c02a6b6c3ffefb443bfa7eec2b74a3b343e57e9e Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Wed, 29 Jul 2009 23:01:50 -0700
Subject: [PATCH 16/61] Bug 504432 - [WinCE] updater.exe not launched when
 there is an update during startup. r=vlad

---
 toolkit/xre/nsUpdateDriver.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index ba6f94ff055d..6d981e3865d8 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -125,12 +125,11 @@ GetCurrentWorkingDir(char *buf, size_t size)
   if (DosQueryPathInfo( ".", FIL_QUERYFULLNAME, buf, size))
     return NS_ERROR_FAILURE;
 #elif defined(XP_WIN)
-  wchar_t *wpath = _wgetcwd(NULL, size);
-  if (!wpath)
+  wchar_t wpath[MAX_PATH];
+  if (!_wgetcwd(wpath, size))
     return NS_ERROR_FAILURE;
   NS_ConvertUTF16toUTF8 path(wpath);
   strncpy(buf, path.get(), size);
-  free(wpath);
 #else
   if(!getcwd(buf, size))
     return NS_ERROR_FAILURE;

From 1fb19be474f9a0956531391a03e1ed90b44d244f Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 28 May 2009 11:09:05 -0700
Subject: [PATCH 17/61] Bug 189519 - Implement CSS3 (-moz- for
 now)background-size.  r=dbaron, other useful review comments from roc/bz

---
 dom/interfaces/css/nsIDOMNSCSS2Properties.idl |   5 +-
 gfx/public/nsCoord.h                          |  23 +-
 layout/base/nsCSSRendering.cpp                | 216 ++++++++++++++----
 layout/base/nsStyleConsts.h                   |   5 +
 .../background-size-auto-auto.html            |  20 ++
 .../background-size-auto-length-ref.html      |  23 ++
 .../background-size-auto-length.html          |  25 ++
 .../background-size-auto-percent.html         |  25 ++
 .../backgrounds/background-size-auto-ref.html |  24 ++
 .../backgrounds/background-size-auto.html     |  20 ++
 ...ackground-size-body-contain-no-repeat.html |  17 ++
 ...ackground-size-body-contain-not-fixed.html |  17 ++
 .../background-size-body-contain.html         |  16 ++
 .../background-size-body-cover-no-repeat.html |  17 ++
 .../background-size-body-cover-not-fixed.html |  17 ++
 .../background-size-body-cover-ref.html       |  14 ++
 .../background-size-body-cover.html           |  16 ++
 ...d-size-body-percent-percent-no-repeat.html |  17 ++
 ...d-size-body-percent-percent-not-fixed.html |  16 ++
 ...ize-body-percent-percent-overflow-ref.html |  14 ++
 ...nd-size-body-percent-percent-overflow.html |  31 +++
 ...kground-size-body-percent-percent-ref.html |  14 ++
 .../background-size-body-percent-percent.html |  16 ++
 ...background-size-body-single-not-fixed.html |  16 ++
 .../background-size-bounding-box.html         |  36 +++
 ...ckground-size-contain-clip-border-ref.html |  29 +++
 .../background-size-contain-clip-border.html  |  27 +++
 ...lip-padding-origin-border-padding-ref.html |  40 ++++
 ...in-clip-padding-origin-border-padding.html |  30 +++
 ...ontain-clip-padding-origin-border-ref.html |  29 +++
 ...ze-contain-clip-padding-origin-border.html |  28 +++
 ...kground-size-contain-clip-padding-ref.html |  29 +++
 .../background-size-contain-clip-padding.html |  27 +++
 ...size-contain-position-fifty-fifty-ref.html |  28 +++
 ...und-size-contain-position-fifty-fifty.html |  26 +++
 .../background-size-contain-ref.html          |  23 ++
 .../backgrounds/background-size-contain.html  |  25 ++
 .../background-size-continuous.html           |  36 +++
 .../background-size-cover-bounding-box.html   |  37 +++
 .../background-size-cover-continuous.html     |  37 +++
 .../background-size-cover-each-box.html       |  37 +++
 .../background-size-cover-ref.html            |  18 ++
 .../backgrounds/background-size-cover.html    |  20 ++
 .../backgrounds/background-size-each-box.html |  36 +++
 .../background-size-length-auto.html          |  25 ++
 .../background-size-length-length-ref.html    |  23 ++
 .../background-size-length-length.html        |  25 ++
 .../background-size-length-percent-ref.html   |  23 ++
 .../background-size-length-percent.html       |  25 ++
 .../backgrounds/background-size-length.html   |  25 ++
 ...nd-size-no-intrinsic-height-image-ref.html |  23 ++
 ...ground-size-no-intrinsic-height-image.html |  25 ++
 ...und-size-no-intrinsic-width-image-ref.html |  23 ++
 ...kground-size-no-intrinsic-width-image.html |  25 ++
 .../background-size-percent-auto.html         |  25 ++
 .../background-size-percent-length.html       |  25 ++
 .../background-size-percent-percent-ref.html  |  23 ++
 ...ound-size-percent-percent-stretch-ref.html |  39 ++++
 ...ckground-size-percent-percent-stretch.html |  33 +++
 .../background-size-percent-percent.html      |  25 ++
 .../backgrounds/background-size-percent.html  |  25 ++
 .../background-size-zoom-no-repeat-ref.html   |  34 +++
 .../background-size-zoom-no-repeat.html       |  35 +++
 .../background-size-zoom-repeat-ref.html      |  60 +++++
 .../background-size-zoom-repeat.html          |  61 +++++
 .../green-8x20-blue-8x20-vertical.png         | Bin 0 -> 107 bytes
 .../backgrounds/no-intrinsic-size.svg         |   8 +
 layout/reftests/backgrounds/reftest.list      |  69 ++++++
 layout/style/nsCSSDeclaration.cpp             |  22 +-
 layout/style/nsCSSKeywordList.h               |   2 +
 layout/style/nsCSSParser.cpp                  | 123 +++++++++-
 layout/style/nsCSSPropList.h                  |  10 +
 layout/style/nsCSSProps.cpp                   |   7 +
 layout/style/nsCSSProps.h                     |   1 +
 layout/style/nsCSSStruct.cpp                  |   2 +
 layout/style/nsCSSStruct.h                    |   1 +
 layout/style/nsComputedDOMStyle.cpp           |  79 ++++++-
 layout/style/nsComputedDOMStyle.h             |   1 +
 layout/style/nsRuleNode.cpp                   |  98 ++++++++
 layout/style/nsStyleStruct.cpp                |  45 ++++
 layout/style/nsStyleStruct.h                  |  40 +++-
 layout/style/test/property_database.js        |  12 +-
 82 files changed, 2302 insertions(+), 67 deletions(-)
 create mode 100644 layout/reftests/backgrounds/background-size-auto-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-length-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-contain.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-cover.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-percent-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-body-single-not-fixed.html
 create mode 100644 layout/reftests/backgrounds/background-size-bounding-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-border.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-clip-padding.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-contain.html
 create mode 100644 layout/reftests/backgrounds/background-size-continuous.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-bounding-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-continuous.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-each-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-cover.html
 create mode 100644 layout/reftests/backgrounds/background-size-each-box.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-length-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-length-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-auto.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-length.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent-stretch.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-percent.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-no-repeat.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
 create mode 100644 layout/reftests/backgrounds/background-size-zoom-repeat.html
 create mode 100644 layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png
 create mode 100644 layout/reftests/backgrounds/no-intrinsic-size.svg

diff --git a/dom/interfaces/css/nsIDOMNSCSS2Properties.idl b/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
index f8c5ebb3a41a..c7929428e4e4 100644
--- a/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMNSCSS2Properties.idl
@@ -39,7 +39,7 @@
 
 #include "nsIDOMCSS2Properties.idl"
 
-[scriptable, uuid(e7245a21-3f46-4e67-82bf-a9b326fe74ee)]
+[scriptable, uuid(643f64d3-6b95-4d9a-ac75-c01a6f4c88cb)]
 interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 {
            /* Non-DOM 2 extensions */
@@ -256,5 +256,8 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 
            attribute DOMString        MozWindowShadow;
                                         // raises(DOMException) on setting
+
+           attribute DOMString        MozBackgroundSize;
+                                        // raises(DOMException) on setting
 	
 };
diff --git a/gfx/public/nsCoord.h b/gfx/public/nsCoord.h
index eb28a240eb65..baee38e4af86 100644
--- a/gfx/public/nsCoord.h
+++ b/gfx/public/nsCoord.h
@@ -88,12 +88,29 @@ inline void VERIFY_COORD(nscoord aCoord) {
 #endif
 }
 
-inline nscoord NSCoordMultiply(nscoord aCoord, float aVal) {
+/**
+ * Returns aCoord * aVal, capping the product to nscoord_MAX.
+ *
+ * Note: If/when we start using floats for nscoords, this function won't be
+ * necessary.  Normal float multiplication correctly handles overflowing
+ * multiplications, automatically saturating to infinity.
+ */
+inline nscoord NSCoordSaturatingMultiply(nscoord aCoord, float aVal) {
   VERIFY_COORD(aCoord);
+  NS_ABORT_IF_FALSE(aVal >= 0.0f,
+                    "negative scaling factors must be handled manually");
 #ifdef NS_COORD_IS_FLOAT
-  return floorf(aCoord*aVal);
+  return floorf(aCoord * aVal);
 #else
-  return (PRInt32)(aCoord*aVal);
+  // This one's only a warning because it's possible to trigger
+  NS_WARN_IF_FALSE(aCoord > 0
+                   ? floorf(aCoord * aVal) < nscoord_MAX
+                   : ceilf(aCoord * aVal) > nscoord_MIN,
+                   "nscoord multiplication capped");
+
+  if (aCoord > 0)
+    return PRInt32(PR_MIN(nscoord_MAX, aCoord * aVal));
+  return PRInt32(PR_MAX(nscoord_MIN, aCoord * aVal));
 #endif
 }
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index e6bbc6cc0305..ded69d922116 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -27,6 +27,7 @@
  *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
  *   Michael Ventnor <m.ventnor@gmail.com>
  *   Rob Arnold <robarnold@mozilla.com>
+ *   Jeff Walden <jwalden+code@mit.edu>
  *
  * 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"),
@@ -1395,8 +1396,12 @@ IsSolidBorder(const nsStyleBorder& aBorder)
   return PR_TRUE;
 }
 
+/**
+ * Returns true if the given request is for a background image (that is, it is
+ * non-null) and that image is fully loaded and its size calculated.
+ */
 static PRBool
-UseImageRequestForBackground(imgIRequest *aRequest)
+HaveCompleteBackgroundImage(imgIRequest *aRequest)
 {
   if (!aRequest)
     return PR_FALSE;
@@ -1496,37 +1501,37 @@ static nscolor
 DetermineBackgroundColorInternal(nsPresContext* aPresContext,
                                  const nsStyleBackground& aBackground,
                                  nsIFrame* aFrame,
-                                 PRBool* aDrawBackgroundImage,
-                                 PRBool* aDrawBackgroundColor,
+                                 PRBool& aDrawBackgroundImage,
+                                 PRBool& aDrawBackgroundColor,
                                  nsCOMPtr<imgIRequest>& aBottomImage)
 {
-  *aDrawBackgroundImage = PR_TRUE;
-  *aDrawBackgroundColor = PR_TRUE;
+  aDrawBackgroundImage = PR_TRUE;
+  aDrawBackgroundColor = PR_TRUE;
 
   if (aFrame->HonorPrintBackgroundSettings()) {
-    *aDrawBackgroundImage = aPresContext->GetBackgroundImageDraw();
-    *aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
+    aDrawBackgroundImage = aPresContext->GetBackgroundImageDraw();
+    aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }
 
   aBottomImage = aBackground.BottomLayer().mImage;
 
-  if (!aDrawBackgroundImage || !UseImageRequestForBackground(aBottomImage)) {
+  if (!aDrawBackgroundImage || !HaveCompleteBackgroundImage(aBottomImage)) {
     aBottomImage = nsnull;
   }
 
   nscolor bgColor;
-  if (*aDrawBackgroundColor) {
+  if (aDrawBackgroundColor) {
     bgColor = aBackground.mBackgroundColor;
     if (NS_GET_A(bgColor) == 0)
-      *aDrawBackgroundColor = PR_FALSE;
+      aDrawBackgroundColor = PR_FALSE;
   } else {
     // If GetBackgroundColorDraw() is false, we are still expected to
     // draw color in the background of any frame that's not completely
     // transparent, but we are expected to use white instead of whatever
     // color was specified.
     bgColor = NS_RGB(255, 255, 255);
-    if (*aDrawBackgroundImage || !aBackground.IsTransparent())
-      *aDrawBackgroundColor = PR_TRUE;
+    if (aDrawBackgroundImage || !aBackground.IsTransparent())
+      aDrawBackgroundColor = PR_TRUE;
     else
       bgColor = NS_RGBA(0,0,0,0);
   }
@@ -1545,8 +1550,8 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
   return DetermineBackgroundColorInternal(aPresContext,
                                           aBackground,
                                           aFrame,
-                                          &drawBackgroundImage,
-                                          &drawBackgroundColor,
+                                          drawBackgroundImage,
+                                          drawBackgroundColor,
                                           bottomImage);
 }
 
@@ -1596,8 +1601,8 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   nscolor bgColor = DetermineBackgroundColorInternal(aPresContext,
                                                      aBackground,
                                                      aForFrame,
-                                                     &drawBackgroundImage,
-                                                     &drawBackgroundColor,
+                                                     drawBackgroundImage,
+                                                     drawBackgroundColor,
                                                      bottomImage);
 
   // At this point, drawBackgroundImage and drawBackgroundColor are
@@ -1628,7 +1633,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   // determined by the value of 'background-clip' in
   // SetupCurrentBackgroundClip.  (Arguably it should be the
   // intersection, but that breaks the table painter -- in particular,
-  // taking the intersection breaks reftests/bugs/403429-1[ab].)
+  // taking the intersection breaks reftests/bugs/403249-1[ab].)
   nsRect bgClipArea, dirtyRect;
   gfxRect dirtyRectGfx;
   PRUint8 currentBackgroundClip;
@@ -1722,6 +1727,25 @@ nsCSSRendering::PaintBackgroundWithSC(nsPresContext* aPresContext,
   }
 }
 
+static inline float
+ScaleDimension(nsStyleBackground::Size::Dimension aDimension,
+               PRUint8 aType,
+               nscoord aLength, nscoord aAvailLength)
+{
+  switch (aType) {
+    case nsStyleBackground::Size::ePercentage:
+      return double(aDimension.mFloat) * (double(aAvailLength) / double(aLength));
+    case nsStyleBackground::Size::eLength:
+      return double(aDimension.mCoord) / double(aLength);
+    default:
+      NS_ABORT_IF_FALSE(PR_FALSE, "bad aDimension.mType");
+      return 1.0f;
+    case nsStyleBackground::Size::eAuto:
+      NS_ABORT_IF_FALSE(PR_FALSE, "aDimension.mType == eAuto isn't handled");
+      return 1.0f;
+  }
+}
+
 static void
 PaintBackgroundLayer(nsPresContext* aPresContext,
                      nsIRenderingContext& aRenderingContext,
@@ -1732,15 +1756,69 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
                      const nsStyleBackground& aBackground,
                      const nsStyleBackground::Layer& aLayer)
 {
+  /*
+   * The background properties we need to keep in mind when drawing background
+   * layers are:
+   *
+   *   background-image
+   *   background-repeat
+   *   background-attachment
+   *   background-position
+   *   background-clip (-moz-background-clip)
+   *   background-origin (-moz-background-origin)
+   *   background-size (-moz-background-size)
+   *   background-break (-moz-background-inline-policy)
+   *
+   * (background-color applies to the entire element and not to individual
+   * layers, so it is irrelevant to this method.)
+   *
+   * These properties have the following dependencies upon each other when
+   * determining rendering:
+   *
+   *   background-image
+   *     no dependencies
+   *   background-repeat
+   *     no dependencies
+   *   background-attachment
+   *     no dependencies
+   *   background-position
+   *     depends upon background-size (for the image's scaled size) and
+   *     background-break (for the background positioning area)
+   *   background-clip
+   *     no dependencies
+   *   background-origin
+   *     depends upon background-attachment (only in the case where that value
+   *     is 'fixed')
+   *   background-size
+   *     depends upon background-break (for the background positioning area for
+   *     resolving percentages), background-image (for the image's intrinsic
+   *     size), background-repeat (if that value is 'round'), and
+   *     background-origin (for the background painting area, when
+   *     background-repeat is 'round')
+   *   background-break
+   *     depends upon background-origin (specifying how the boxes making up the
+   *     background positioning area are determined)
+   *
+   * As a result of only-if dependencies we don't strictly do a topological
+   * sort of the above properties when processing, but it's pretty close to one:
+   *
+   *   background-clip (by caller)
+   *   background-image
+   *   background-break, background-origin
+   *   background-attachment (postfix for background-{origin,break} if 'fixed')
+   *   background-size
+   *   background-position
+   *   background-repeat
+   */
+
   // Lookup the image
   imgIRequest *req = aLayer.mImage;
-  if (!UseImageRequestForBackground(req)) {
-    // There's no image or it's not ready to be painted.
+  if (!HaveCompleteBackgroundImage(req))
     return;
-  }
 
   nsCOMPtr<imgIContainer> image;
   req->GetImage(getter_AddRefs(image));
+  req = nsnull;
 
   nsIntSize imageIntSize;
   image->GetWidth(&imageIntSize.width);
@@ -1750,27 +1828,33 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   imageSize.width = nsPresContext::CSSPixelsToAppUnits(imageIntSize.width);
   imageSize.height = nsPresContext::CSSPixelsToAppUnits(imageIntSize.height);
 
-  req = nsnull;
+  if (imageSize.width == 0 || imageSize.height == 0)
+    return;
 
   // relative to aBorderArea
-  nsRect bgOriginRect(0, 0, 0, 0);
+  nsRect bgPositioningArea(0, 0, 0, 0);
 
   nsIAtom* frameType = aForFrame->GetType();
   nsIFrame* geometryFrame = aForFrame;
   if (frameType == nsGkAtoms::inlineFrame ||
       frameType == nsGkAtoms::positionedInlineFrame) {
+    // XXXjwalden Strictly speaking this is not quite faithful to how
+    // background-break is supposed to interact with background-origin values,
+    // but it's a non-trivial amount of work to make it fully conformant, and
+    // until the specification is more finalized (and assuming background-break
+    // even makes the cut) it doesn't make sense to hammer out exact behavior.
     switch (aBackground.mBackgroundInlinePolicy) {
     case NS_STYLE_BG_INLINE_POLICY_EACH_BOX:
-      bgOriginRect = nsRect(nsPoint(0,0), aBorderArea.Size());
+      bgPositioningArea = nsRect(nsPoint(0,0), aBorderArea.Size());
       break;
     case NS_STYLE_BG_INLINE_POLICY_BOUNDING_BOX:
-      bgOriginRect = gInlineBGData->GetBoundingRect(aForFrame);
+      bgPositioningArea = gInlineBGData->GetBoundingRect(aForFrame);
       break;
     default:
       NS_ERROR("Unknown background-inline-policy value!  "
                "Please, teach me what to do.");
     case NS_STYLE_BG_INLINE_POLICY_CONTINUOUS:
-      bgOriginRect = gInlineBGData->GetContinuousRect(aForFrame);
+      bgPositioningArea = gInlineBGData->GetContinuousRect(aForFrame);
       break;
     }
   } else if (frameType == nsGkAtoms::canvasFrame) {
@@ -1780,10 +1864,10 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
     // finished and this page only displays the continuations of
     // absolutely positioned content).
     if (geometryFrame) {
-      bgOriginRect = geometryFrame->GetRect();
+      bgPositioningArea = geometryFrame->GetRect();
     }
   } else {
-    bgOriginRect = nsRect(nsPoint(0,0), aBorderArea.Size());
+    bgPositioningArea = nsRect(nsPoint(0,0), aBorderArea.Size());
   }
 
   // Background images are tiled over the 'background-clip' area
@@ -1791,11 +1875,11 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   if (aLayer.mOrigin != NS_STYLE_BG_ORIGIN_BORDER && geometryFrame) {
     nsMargin border = geometryFrame->GetUsedBorder();
     geometryFrame->ApplySkipSides(border);
-    bgOriginRect.Deflate(border);
+    bgPositioningArea.Deflate(border);
     if (aLayer.mOrigin != NS_STYLE_BG_ORIGIN_PADDING) {
       nsMargin padding = geometryFrame->GetUsedPadding();
       geometryFrame->ApplySkipSides(padding);
-      bgOriginRect.Deflate(padding);
+      bgPositioningArea.Deflate(padding);
       NS_ASSERTION(aLayer.mOrigin == NS_STYLE_BG_ORIGIN_CONTENT,
                    "unknown background-origin value");
     }
@@ -1805,7 +1889,7 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
   //
   // relative to aBorderArea.TopLeft() (which is where the top-left
   // of aForFrame's border-box will be rendered)
-  nsPoint imageTopLeft, anchor;
+  nsPoint imageTopLeft, anchor, offset;
   if (NS_STYLE_BG_ATTACHMENT_FIXED == aLayer.mAttachment) {
     // If it's a fixed background attachment, then the image is placed
     // relative to the viewport, which is the area of the root frame
@@ -1827,7 +1911,8 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
       // else this is an embedded shell and its root frame is what we want
     }
 
-    nsRect viewportArea(nsPoint(0, 0), topFrame->GetSize());
+    // Set the background positioning area to the viewport's area.
+    bgPositioningArea.SetRect(nsPoint(0, 0), topFrame->GetSize());
 
     if (!pageContentFrame) {
       // Subtract the size of scrollbars.
@@ -1835,29 +1920,70 @@ PaintBackgroundLayer(nsPresContext* aPresContext,
         aPresContext->PresShell()->GetRootScrollFrameAsScrollable();
       if (scrollableFrame) {
         nsMargin scrollbars = scrollableFrame->GetActualScrollbarSizes();
-        viewportArea.Deflate(scrollbars);
+        bgPositioningArea.Deflate(scrollbars);
       }
     }
-     
-    // Get the anchor point, relative to the viewport.
-    ComputeBackgroundAnchorPoint(aLayer, viewportArea.Size(), imageSize,
-                                 &imageTopLeft, &anchor);
 
-    // Convert the anchor point from viewport coordinates to aForFrame
-    // coordinates.
-    nsPoint offset = viewportArea.TopLeft() - aForFrame->GetOffsetTo(topFrame);
-    imageTopLeft += offset;
-    anchor += offset;
+    offset = bgPositioningArea.TopLeft() - aForFrame->GetOffsetTo(topFrame);
   } else {
-    ComputeBackgroundAnchorPoint(aLayer, bgOriginRect.Size(), imageSize,
-                                 &imageTopLeft, &anchor);
-    imageTopLeft += bgOriginRect.TopLeft();
-    anchor += bgOriginRect.TopLeft();
+    offset = bgPositioningArea.TopLeft();
   }
+     
+  // Scale the image as specified for background-size and as required for
+  // proper background positioning when background-position is defined with
+  // percentages.
+  float scaleX, scaleY;
+  switch (aLayer.mSize.mWidthType) {
+    case nsStyleBackground::Size::eContain:
+    case nsStyleBackground::Size::eCover: {
+      float scaleFitX = double(bgPositioningArea.width) / imageSize.width;
+      float scaleFitY = double(bgPositioningArea.height) / imageSize.height;
+      if (aLayer.mSize.mWidthType == nsStyleBackground::Size::eCover) {
+        scaleX = scaleY = PR_MAX(scaleFitX, scaleFitY);
+      } else {
+        scaleX = scaleY = PR_MIN(scaleFitX, scaleFitY);
+      }
+      break;
+    }
+    default: {
+      if (aLayer.mSize.mWidthType == nsStyleBackground::Size::eAuto) {
+        if (aLayer.mSize.mHeightType == nsStyleBackground::Size::eAuto) {
+          scaleX = scaleY = 1.0f;
+        } else {
+          scaleX = scaleY =
+            ScaleDimension(aLayer.mSize.mHeight, aLayer.mSize.mHeightType,
+                           imageSize.height, bgPositioningArea.height);
+        }
+      } else {
+        if (aLayer.mSize.mHeightType == nsStyleBackground::Size::eAuto) {
+          scaleX = scaleY =
+            ScaleDimension(aLayer.mSize.mWidth, aLayer.mSize.mWidthType,
+                           imageSize.width, bgPositioningArea.width);
+        } else {
+          scaleX = ScaleDimension(aLayer.mSize.mWidth, aLayer.mSize.mWidthType,
+                                  imageSize.width, bgPositioningArea.width);
+          scaleY = ScaleDimension(aLayer.mSize.mHeight, aLayer.mSize.mHeightType,
+                                  imageSize.height, bgPositioningArea.height);
+        }
+      }
+      break;
+    }
+  }
+  imageSize.width = NSCoordSaturatingMultiply(imageSize.width, scaleX);
+  imageSize.height = NSCoordSaturatingMultiply(imageSize.height, scaleY);
+
+  // Compute the position of the background now that the background's size is
+  // determined.
+  ComputeBackgroundAnchorPoint(aLayer, bgPositioningArea.Size(), imageSize,
+                               &imageTopLeft, &anchor);
+  imageTopLeft += offset;
+  anchor += offset;
 
   nsRect destArea(imageTopLeft + aBorderArea.TopLeft(), imageSize);
   nsRect fillArea = destArea;
   PRIntn repeat = aLayer.mRepeat;
+  PR_STATIC_ASSERT(NS_STYLE_BG_REPEAT_XY ==
+                   (NS_STYLE_BG_REPEAT_X | NS_STYLE_BG_REPEAT_Y));
   if (repeat & NS_STYLE_BG_REPEAT_X) {
     fillArea.x = aBGClipRect.x;
     fillArea.width = aBGClipRect.width;
diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index 6926a24b01ae..ee1f3a73e05a 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -269,11 +269,16 @@
 #define NS_STYLE_BG_POSITION_RIGHT   (1<<4)
 
 // See nsStyleBackground
+// Code depends on (BG_REPEAT_X | BG_REPEAT_Y) == BG_REPEAT_XY
 #define NS_STYLE_BG_REPEAT_OFF                  0x00
 #define NS_STYLE_BG_REPEAT_X                    0x01
 #define NS_STYLE_BG_REPEAT_Y                    0x02
 #define NS_STYLE_BG_REPEAT_XY                   0x03
 
+// See nsStyleBackground
+#define NS_STYLE_BG_SIZE_CONTAIN  0
+#define NS_STYLE_BG_SIZE_COVER    1
+
 // See nsStyleTable
 #define NS_STYLE_BORDER_COLLAPSE                0
 #define NS_STYLE_BORDER_SEPARATE                1
diff --git a/layout/reftests/backgrounds/background-size-auto-auto.html b/layout/reftests/backgrounds/background-size-auto-auto.html
new file mode 100644
index 000000000000..22108f013d32
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-auto.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-length-ref.html b/layout/reftests/backgrounds/background-size-auto-length-ref.html
new file mode 100644
index 000000000000..ae7535a84bf5
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-length-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 16px; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 16px;
+  height: 16px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-length.html b/layout/reftests/backgrounds/background-size-auto-length.html
new file mode 100644
index 000000000000..5d54b5c75795
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 16px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 16px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-percent.html b/layout/reftests/backgrounds/background-size-auto-percent.html
new file mode 100644
index 000000000000..b1bed853eeca
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 12.5%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 12.5%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto-ref.html b/layout/reftests/backgrounds/background-size-auto-ref.html
new file mode 100644
index 000000000000..8b2bd45d518a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-auto.html b/layout/reftests/backgrounds/background-size-auto.html
new file mode 100644
index 000000000000..14a4bc9575af
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-auto.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html b/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
new file mode 100644
index 000000000000..1afe70ea039d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; on body, no-repeat, fixed</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html b/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
new file mode 100644
index 000000000000..371e08be1dfa
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain-not-fixed.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; not fixed, no-repeat on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-contain.html b/layout/reftests/backgrounds/background-size-body-contain.html
new file mode 100644
index 000000000000..851a582f981f
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-contain.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; fixed, repeat on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html b/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
new file mode 100644
index 000000000000..b758d7a2f4dc
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body, no-repeat, fixed</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html b/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
new file mode 100644
index 000000000000..16e79583f31c
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-not-fixed.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; no-repeat, not-fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover-ref.html b/layout/reftests/backgrounds/background-size-body-cover-ref.html
new file mode 100644
index 000000000000..3dfe4ea6b7d0
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body reference</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-cover.html b/layout/reftests/backgrounds/background-size-body-cover.html
new file mode 100644
index 000000000000..09b4a83376c0
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-cover.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html b/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
new file mode 100644
index 000000000000..aba071be3246
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-no-repeat.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; no-repeat/fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html b/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
new file mode 100644
index 000000000000..1d1153177387
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-not-fixed.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; no-repeat/not fixed on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
new file mode 100644
index 000000000000..c9bfd99819af
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(green-16x20.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
new file mode 100644
index 000000000000..46085a906032
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-overflow.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(green-8x20-blue-8x20-vertical.png);
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  overflow: hidden;
+
+  /*
+   * This should not affect how the background paints, that is, how the
+   * background image is sized:
+   *
+   *   If the ‘background-attachment’ value for this image is ‘fixed’ [...] the
+   *   background positioning area is the initial containing block [CSS21].
+   *
+   * Thus '100% 100%' below is relative to the viewport size, so we expect to
+   * see a background which, modulo aliasing, is half green and half blue.
+   */
+  height: 10000px;
+
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html b/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
new file mode 100644
index 000000000000..3f03f74afaa9
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body reference</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-percent-percent.html b/layout/reftests/backgrounds/background-size-body-percent-percent.html
new file mode 100644
index 000000000000..e5722bd7ba59
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-percent-percent.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: fixed;
+  -moz-background-size: 100% 100%;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-body-single-not-fixed.html b/layout/reftests/backgrounds/background-size-body-single-not-fixed.html
new file mode 100644
index 000000000000..e901abad6217
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-body-single-not-fixed.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; on body</title>
+  <style type="text/css">
+body
+{
+  background-image: url(aqua-32x32.png);
+  background-attachment: scroll;
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-bounding-box.html b/layout/reftests/backgrounds/background-size-bounding-box.html
new file mode 100644
index 000000000000..6136a3729cf9
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-bounding-box.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: bounding-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: bounding-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
new file mode 100644
index 000000000000..a061b39dd058
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-border-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: border reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 24px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-border.html b/layout/reftests/backgrounds/background-size-contain-clip-border.html
new file mode 100644
index 000000000000..76b209a17361
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-border.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
new file mode 100644
index 000000000000..f3bb19eb168c
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost1
+{
+  width: 24px;
+  height: 44px;
+  background-image: url(aqua-32x32.png);
+}
+#innermost2
+{
+  width: 24px;
+  height: 44px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  id="inner"><div
+    id="innermost1"></div><div
+    id="innermost2"></div
+    ></div
+  ></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
new file mode 100644
index 000000000000..12cdbc5a95d1
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-padding.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  padding: 10px;
+  width: 4px;
+  height: 68px;
+  background-image: url(aqua-32x32.png);
+  background-color: lime;
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+  -moz-background-origin: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
new file mode 100644
index 000000000000..7a3b9f7beb21
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 44px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
new file mode 100644
index 000000000000..ab36021fb871
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-origin-border.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding, -moz-background-origin: border</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+  -moz-background-origin: border;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html b/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
new file mode 100644
index 000000000000..3e2af30b9039
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid white;
+  width: 24px;
+  height: 88px;
+}
+#innermost
+{
+  width: 24px;
+  height: 24px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-clip-padding.html b/layout/reftests/backgrounds/background-size-contain-clip-padding.html
new file mode 100644
index 000000000000..36408f785c74
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-clip-padding.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; -moz-background-clip: padding</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  border: 20px solid transparent;
+  width: 24px;
+  height: 88px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  -moz-background-clip: padding;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
new file mode 100644
index 000000000000..811f4c047cdc
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; background-position: 50% 50% reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner1
+{
+  width: 64px;
+  height: 32px;
+}
+#inner2
+{
+  width: 64px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner1"></div><div id="inner2"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
new file mode 100644
index 000000000000..7e3dab555e84
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-position-fifty-fifty.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; background-position: 50% 50%</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+  background-position: 50% 50%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain-ref.html b/layout/reftests/backgrounds/background-size-contain-ref.html
new file mode 100644
index 000000000000..53c346cc74fc
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-contain.html b/layout/reftests/backgrounds/background-size-contain.html
new file mode 100644
index 000000000000..654a94c122ce
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-contain.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: contain;</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: contain;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-continuous.html b/layout/reftests/backgrounds/background-size-continuous.html
new file mode 100644
index 000000000000..4373cdcd238a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-continuous.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: continuous</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: continuous;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-bounding-box.html b/layout/reftests/backgrounds/background-size-cover-bounding-box.html
new file mode 100644
index 000000000000..ca12800e0ab7
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-bounding-box.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: bounding-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: bounding-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-continuous.html b/layout/reftests/backgrounds/background-size-cover-continuous.html
new file mode 100644
index 000000000000..3f81d372b4b8
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-continuous.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: continuous</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: continuous;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-each-box.html b/layout/reftests/backgrounds/background-size-cover-each-box.html
new file mode 100644
index 000000000000..a53333fc6449
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-each-box.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; background-break: each-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+  -moz-background-inline-policy: each-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover-ref.html b/layout/reftests/backgrounds/background-size-cover-ref.html
new file mode 100644
index 000000000000..7d74f7b3c247
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-cover.html b/layout/reftests/backgrounds/background-size-cover.html
new file mode 100644
index 000000000000..20e23eb24241
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-cover.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: cover;</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: cover;
+}
+  </style>
+</head>
+<body>
+<div id="outer"></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-each-box.html b/layout/reftests/backgrounds/background-size-each-box.html
new file mode 100644
index 000000000000..35c1a205a77c
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-each-box.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-break: each-box</title>
+  <style type="text/css">
+@font-face
+{
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+
+#outer
+{
+  border: 1px solid black;
+  width: 10em;
+}
+#ahem-lines
+{
+  font-family: Ahem;
+  font-size: 32px;
+  white-space: pre;
+  background-image: url(blue-8x20-green-8x20.png);
+  background-repeat: no-repeat;
+  -moz-background-inline-policy: each-box;
+}
+</style>
+</head>
+<body>
+<div id="outer">
+<span id="ahem-lines">      <!-- EOL -->
+        <!-- mix it up for each-box and bounding-box --><!-- EOL -->
+      <!-- EOL -->
+      <!-- EOL -->
+      </span></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-auto.html b/layout/reftests/backgrounds/background-size-length-auto.html
new file mode 100644
index 000000000000..9ef400915dd3
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-auto.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-length-ref.html b/layout/reftests/backgrounds/background-size-length-length-ref.html
new file mode 100644
index 000000000000..05b5c6758791
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-length-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px 64px; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 64px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-length.html b/layout/reftests/backgrounds/background-size-length-length.html
new file mode 100644
index 000000000000..dca9c8bd834a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px 64px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 32px 64px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-percent-ref.html b/layout/reftests/backgrounds/background-size-length-percent-ref.html
new file mode 100644
index 000000000000..9c95873190e2
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-percent-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 16px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length-percent.html b/layout/reftests/backgrounds/background-size-length-percent.html
new file mode 100644
index 000000000000..ae630d53f531
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-length.html b/layout/reftests/backgrounds/background-size-length.html
new file mode 100644
index 000000000000..362c601541dc
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 16px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 16px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
new file mode 100644
index 000000000000..c453fed751d1
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic height reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 128px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
new file mode 100644
index 000000000000..7b01c98465ab
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-height-image.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic height</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(no-intrinsic-size.svg);
+  background-repeat: no-repeat;
+  -moz-background-size: 32px auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
new file mode 100644
index 000000000000..a01539de7411
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 32px auto; for image with no intrinsic size reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 32px;
+  background-color: lime;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
new file mode 100644
index 000000000000..501085f45287
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-no-intrinsic-width-image.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: auto 32px; for image with no intrinsic width</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(no-intrinsic-size.svg);
+  background-repeat: no-repeat;
+  -moz-background-size: auto 32px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-auto.html b/layout/reftests/backgrounds/background-size-percent-auto.html
new file mode 100644
index 000000000000..266619549b1d
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-auto.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25% auto;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25% auto;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-length.html b/layout/reftests/backgrounds/background-size-percent-length.html
new file mode 100644
index 000000000000..695a7a506c22
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-length.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25% 32px;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25% 32px;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-ref.html b/layout/reftests/backgrounds/background-size-percent-percent-ref.html
new file mode 100644
index 000000000000..a30b75c6b03e
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 50% 25%; reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html b/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
new file mode 100644
index 000000000000..65c999d6d990
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-stretch-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; stretch reference</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 60px;
+  height: 120px;
+}
+#inner1
+{
+  background: blue;
+  width: 15px;
+  height: 120px;
+  display: inline-block;
+  background-image: url(blue-16x20.png);
+
+  /* obscure sampling artifacts at the color boundary */
+  border-right: 5px solid black;
+}
+#inner2
+{
+  background: lime;
+  width: 35px;
+  height: 120px;
+  display: inline-block;
+  background-image: url(green-16x20.png);
+
+  /* obscure sampling artifacts at the color boundary */
+  border-left: 5px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner1"></div><div id="inner2"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent-stretch.html b/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
new file mode 100644
index 000000000000..baf3e8e6c40a
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent-stretch.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 100% 100%; stretch</title>
+  <style type="text/css">
+#outer
+{
+  border: 10px solid black;
+  width: 60px;
+  height: 120px;
+}
+#inner
+{
+  width: 60px;
+  height: 120px;
+  background-image: url(blue-8x20-green-16x20.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 100% 100%;
+}
+#innermost
+{
+  width: 15px;
+  height: 120px;
+
+  /* obscure sampling artifacts at the color boundary */
+  border-right: 10px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"><div id="innermost"></div></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent-percent.html b/layout/reftests/backgrounds/background-size-percent-percent.html
new file mode 100644
index 000000000000..64ce972c531e
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 50% 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 50% 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-percent.html b/layout/reftests/backgrounds/background-size-percent.html
new file mode 100644
index 000000000000..76f26c2b8398
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-percent.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 25%;</title>
+  <style type="text/css">
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html b/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
new file mode 100644
index 000000000000..dd05ee386aff
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-no-repeat-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size + zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 10px;
+}
+body
+{
+  margin: 0;
+  padding: 0;
+}
+#outer
+{
+  border: 2px solid black;
+  width: 128px;
+  height: 256px;
+}
+#inner
+{
+  width: 32px;
+  height: 32px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-no-repeat.html b/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
new file mode 100644
index 000000000000..f89ff92dda4e
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-no-repeat.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html reftest-zoom="2">
+<head>
+  <title>background-size + zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 5px;
+}
+body
+{
+  margin: 0;
+  padding: 0;
+}
+#outer
+{
+  border: 1px solid black;
+  width: 64px;
+  height: 128px;
+}
+#inner
+{
+  width: 64px;
+  height: 128px;
+  background-image: url(aqua-32x32.png);
+  background-repeat: no-repeat;
+  -moz-background-size: 25%;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html b/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
new file mode 100644
index 000000000000..1a5a1fd0af39
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-repeat-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>background-size: 64px 40px; repeat, zoom reference</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 0;
+}
+body
+{
+  margin: 0;
+  padding: 20px;
+}
+#outer
+{
+  width: 512px;
+  height: 320px;
+}
+  /*
+   * PRE-ZOOM:
+   *   2x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   32px horizontal offset, then every 64px for the full height of the div.
+   * POST-ZOOM:
+   *   4x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   64px horizontal offset, then every 128px for the full height of the div.
+   */
+
+/* Aargh, sampling artifacts, we hates them, precioussss. */
+#outer > div
+{
+  display: inline-block;
+  width: 56px;
+  height: 320px;
+}
+.blue
+{
+  background: url(blue-16x20.png);
+  border-right: 8px solid black;
+}
+.green
+{
+  background: url(green-16x20.png);
+  border-left: 8px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/background-size-zoom-repeat.html b/layout/reftests/backgrounds/background-size-zoom-repeat.html
new file mode 100644
index 000000000000..26581e57aff7
--- /dev/null
+++ b/layout/reftests/backgrounds/background-size-zoom-repeat.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html reftest-zoom="2">
+<head>
+  <title>background-size: 64px 40px; repeat, zoom</title>
+  <style type="text/css">
+html
+{
+  margin: 0;
+  padding: 0;
+}
+body
+{
+  margin: 0;
+  padding: 10px;
+}
+#outer
+{
+  /*
+   * PRE-ZOOM:
+   *   2x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   32px horizontal offset, then every 64px for the full height of the div.
+   * POST-ZOOM:
+   *   4x size the image, then tile it 4x4 across the div; sampling artifacts at
+   *   64px horizontal offset, then every 128px for the full height of the div.
+   */
+  width: 256px;
+  height: 160px;
+  background-image: url(blue-16x20-green-16x20.png);
+  background-repeat: repeat;
+  -moz-background-size: 64px 40px;
+}
+
+/* Aargh, sampling artifacts, we hates them, precioussss. */
+#outer > div
+{
+  display: inline-block;
+  width: 28px;
+  height: 160px;
+}
+.blue
+{
+  border-right: 4px solid black;
+}
+.green
+{
+  border-left: 4px solid black;
+}
+  </style>
+</head>
+<body>
+<div id="outer"><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div><div
+  class="blue"></div><div
+  class="green"></div></div>
+</body>
+</html>
diff --git a/layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png b/layout/reftests/backgrounds/green-8x20-blue-8x20-vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..4236f5b1cebc8c9d6d22545135cf35425bfed836
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy_!3HG7B;uuk6k~CayA#8@b22Z1992&j#}JFt
z$yaKXf6j00YUpe{m2l<2!~})K4F`T-EV0OX;2_PxFljSOTti0iRG<b1Pgg&ebxsLQ
E0B+VG761SM

literal 0
HcmV?d00001

diff --git a/layout/reftests/backgrounds/no-intrinsic-size.svg b/layout/reftests/backgrounds/no-intrinsic-size.svg
new file mode 100644
index 000000000000..584de90778a2
--- /dev/null
+++ b/layout/reftests/backgrounds/no-intrinsic-size.svg
@@ -0,0 +1,8 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <title>Image with no intrinsic size</title>
+  <rect width="100%" height="100%" fill="lime"/>
+</svg>
diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index eada98ee65c7..c037d0a0803a 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -24,3 +24,72 @@
 == continuous-inline-4b.html continuous-inline-4-ref.html
 == continuous-inline-5a.html continuous-inline-5-ref.html
 == continuous-inline-5b.html continuous-inline-5-ref.html
+
+== background-size-auto-auto.html background-size-auto-ref.html
+== background-size-auto.html background-size-auto-ref.html
+== background-size-contain.html background-size-contain-ref.html
+== background-size-cover.html background-size-cover-ref.html
+== background-size-auto-length.html background-size-auto-length-ref.html
+== background-size-length-auto.html background-size-auto-length-ref.html
+== background-size-length.html background-size-auto-length-ref.html
+== background-size-auto-percent.html background-size-auto-length-ref.html
+== background-size-percent-auto.html background-size-auto-length-ref.html
+== background-size-percent.html background-size-auto-length-ref.html
+== background-size-length-percent.html background-size-length-percent-ref.html
+== background-size-percent-length.html background-size-length-percent-ref.html
+== background-size-percent-percent.html background-size-percent-percent-ref.html
+== background-size-length-length.html background-size-length-length-ref.html
+== background-size-percent-percent-stretch.html background-size-percent-percent-stretch-ref.html
+
+== background-size-body-percent-percent.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-no-repeat.html background-size-body-percent-percent-ref.html
+== background-size-body-percent-percent-not-fixed.html background-size-body-percent-percent-ref.html
+== background-size-body-cover.html background-size-body-cover-ref.html
+== background-size-body-cover-no-repeat.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-single-not-fixed.html
+
+# relies on reftest window having greater height than width
+== background-size-body-contain.html background-size-body-cover-ref.html
+!= background-size-body-contain-no-repeat.html background-size-body-cover-ref.html
+!= background-size-body-contain-not-fixed.html background-size-body-cover-ref.html
+!= background-size-body-cover-not-fixed.html background-size-body-contain-not-fixed.html
+
+!= background-size-body-percent-percent-overflow.html background-size-body-percent-percent-overflow-ref.html
+
+== background-size-zoom-no-repeat.html background-size-zoom-no-repeat-ref.html
+
+== background-size-contain-clip-padding.html background-size-contain-clip-padding-ref.html
+== background-size-contain-clip-border.html background-size-contain-clip-border-ref.html
+== background-size-contain-position-fifty-fifty.html background-size-contain-position-fifty-fifty-ref.html
+== background-size-contain-clip-padding-origin-border.html background-size-contain-clip-padding-origin-border-ref.html
+== background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding-ref.html
+
+# -moz-background-inline-policy is touchy and hard to test due to stretching
+# artifacts and the difficulty of covering exact lines, and its CSS3 analog is
+# on the chopping block at the moment, so just make sure background-size results
+# in a different rendering when present.
+!= background-size-cover-continuous.html background-size-continuous.html
+!= background-size-cover-each-box.html background-size-each-box.html
+!= background-size-cover-bounding-box.html background-size-bounding-box.html
+
+# ...and make sure each rendering with background-size is different from the
+# others
+!= background-size-cover-continuous.html background-size-cover-each-box.html
+!= background-size-cover-continuous.html background-size-cover-bounding-box.html
+!= background-size-cover-each-box.html background-size-cover-bounding-box.html
+
+
+# There seems to be a pixel-snapping problem here, where the repeated background
+# image isn't being snapped at its boundaries.  Note that the boundaries within
+# the image aren't the issue, because they're being obscured to avoid sampling
+# algorithm dependencies (at least assuming the sampling algorithm in use
+# doesn't sample too far astray from the boundaries).
+fails == background-size-zoom-repeat.html background-size-zoom-repeat-ref.html
+
+# background-size affects images without intrinsic dimensions specially; we may
+# not support such image formats right now, but when we do, we want
+# background-size to be changed accordingly, and hopefully these tests should
+# start failing when we do.
+fails == background-size-no-intrinsic-width-image.html background-size-no-intrinsic-width-image-ref.html
+fails == background-size-no-intrinsic-height-image.html background-size-no-intrinsic-height-image-ref.html
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 315fab2307e3..4eebd5bf3368 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -174,11 +174,16 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
             ((aProperty == eCSSProperty_background_position ||
               aProperty == eCSSProperty__moz_transform_origin) &&
              pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
-             pair->mXValue.GetUnit() != eCSSUnit_Initial)) {
-          // Only output a Y value if it's different from the X value
+             pair->mXValue.GetUnit() != eCSSUnit_Initial) ||
+            (aProperty == eCSSProperty__moz_background_size &&
+             pair->mXValue.GetUnit() != eCSSUnit_Inherit &&
+             pair->mXValue.GetUnit() != eCSSUnit_Initial &&
+             pair->mXValue.GetUnit() != eCSSUnit_Enumerated)) {
+          // Only output a Y value if it's different from the X value,
           // or if it's a background-position value other than 'initial'
-          // or 'inherit' or if it's a -moz-transform-origin value other
-          // than 'initial' or 'inherit'.
+          // or 'inherit', or if it's a -moz-transform-origin value other
+          // than 'initial' or 'inherit', or if it's a -moz-background-size
+          // value other than 'initial' or 'inherit' or 'contain' or 'cover'.
           aResult.Append(PRUnichar(' '));
           AppendCSSValueToString(aProperty, pair->mYValue, aResult);
         }
@@ -772,6 +777,8 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
         * data->ValueListStorageFor(eCSSProperty__moz_background_clip);
       const nsCSSValueList *origin =
         * data->ValueListStorageFor(eCSSProperty__moz_background_origin);
+      const nsCSSValuePairList *size =
+        * data->ValuePairListStorageFor(eCSSProperty__moz_background_size);
       for (;;) {
         AppendCSSValueToString(eCSSProperty_background_image,
                                image->mValue, aValue);
@@ -800,7 +807,7 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
     // support for content-box on background-clip.
           PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_BORDER ==
                            NS_STYLE_BG_ORIGIN_BORDER);
-          PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_PADDING == 
+          PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_PADDING ==
                            NS_STYLE_BG_ORIGIN_PADDING);
           // PR_STATIC_ASSERT(NS_STYLE_BG_CLIP_CONTENT == /* does not exist */
           //                  NS_STYLE_BG_ORIGIN_CONTENT);
@@ -824,16 +831,17 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
         position = position->mNext;
         clip = clip->mNext;
         origin = origin->mNext;
+        size = size->mNext;
 
         if (!image) {
-          if (repeat || attachment || position || clip || origin) {
+          if (repeat || attachment || position || clip || origin || size) {
             // Uneven length lists, so can't be serialized as shorthand.
             aValue.Truncate();
             return NS_OK;
           }
           break;
         }
-        if (!repeat || !attachment || !position || !clip || !origin) {
+        if (!repeat || !attachment || !position || !clip || !origin || !size) {
           // Uneven length lists, so can't be serialized as shorthand.
           aValue.Truncate();
           return NS_OK;
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index 082933ccfc55..85e26b6cef79 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -241,11 +241,13 @@ CSS_KEY(code, code)
 CSS_KEY(col-resize, col_resize)
 CSS_KEY(collapse, collapse)
 CSS_KEY(condensed, condensed)
+CSS_KEY(contain, contain)
 CSS_KEY(content, content)
 CSS_KEY(content-box, content_box)
 CSS_KEY(context-menu, context_menu)
 CSS_KEY(continuous, continuous)
 CSS_KEY(copy, copy)
+CSS_KEY(cover, cover)
 CSS_KEY(crop, crop)
 CSS_KEY(cross, cross)
 CSS_KEY(crosshair, crosshair)
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index e30a329af8b7..6ac64e3691d2 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -26,6 +26,7 @@
  *   Boris Zbarsky <bzbarsky@mit.edu>
  *   Mats Palmgren <mats.palmgren@bredband.net>
  *   Christian Biesinger <cbiesinger@web.de>
+ *   Jeff Walden <jwalden+code@mit.edu>
  *
  * 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"),
@@ -407,6 +408,7 @@ protected:
     nsCSSValuePair mPosition;
     nsCSSValue mClip;
     nsCSSValue mOrigin;
+    nsCSSValuePair mSize;
     // The background-color is set as a side-effect, and if so, mLastItem
     // is set to true.
     PRBool mLastItem;
@@ -421,6 +423,8 @@ protected:
   PRBool ParseBackgroundList(nsCSSProperty aPropID); // a single value prop-id
   PRBool ParseBackgroundPosition();
   PRBool ParseBoxPositionValues(nsCSSValuePair& aOut);
+  PRBool ParseBackgroundSize();
+  PRBool ParseBackgroundSizeValues(nsCSSValuePair& aOut);
   PRBool ParseBorderColor();
   PRBool ParseBorderColors(nsCSSValueList** aResult,
                            nsCSSProperty aProperty);
@@ -5061,6 +5065,8 @@ CSSParserImpl::ParseProperty(nsCSSProperty aPropID)
   case eCSSProperty__moz_background_origin:
   case eCSSProperty_background_repeat:
     return ParseBackgroundList(aPropID);
+  case eCSSProperty__moz_background_size:
+    return ParseBackgroundSize();
   case eCSSProperty_border:
     return ParseBorderSide(kBorderTopIDs, PR_TRUE);
   case eCSSProperty_border_color:
@@ -5341,6 +5347,7 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
   case eCSSProperty_border_start:
   case eCSSProperty_border_top:
   case eCSSProperty_border_width:
+  case eCSSProperty__moz_background_size:
   case eCSSProperty__moz_border_radius:
   case eCSSProperty__moz_border_radius_topLeft:
   case eCSSProperty__moz_border_radius_topRight:
@@ -5986,6 +5993,7 @@ CSSParserImpl::ParseBackground()
 
   BackgroundItem bgitem;
   nsCSSValuePairList *positionHead = nsnull, **positionTail = &positionHead;
+  nsCSSValuePairList *sizeHead = nsnull, **sizeTail = &sizeHead;
   static const BackgroundItemSimpleValueInfo simpleValues[] = {
     { &BackgroundItem::mImage,      eCSSProperty_background_image },
     { &BackgroundItem::mRepeat,     eCSSProperty_background_repeat },
@@ -6003,6 +6011,7 @@ CSSParserImpl::ParseBackground()
     if (!ParseBackgroundItem(bgitem, !positionHead)) {
       break;
     }
+
     nsCSSValuePairList *positionItem = new nsCSSValuePairList;
     if (!positionItem) {
       mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
@@ -6013,6 +6022,16 @@ CSSParserImpl::ParseBackground()
     *positionTail = positionItem;
     positionTail = &positionItem->mNext;
 
+    nsCSSValuePairList *sizeItem = new nsCSSValuePairList;
+    if (!sizeItem) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      break;
+    }
+    sizeItem->mXValue = bgitem.mSize.mXValue;
+    sizeItem->mYValue = bgitem.mSize.mYValue;
+    *sizeTail = sizeItem;
+    sizeTail = &sizeItem->mNext;
+
     PRBool fail = PR_FALSE;
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
       nsCSSValueList *item = new nsCSSValueList;
@@ -6037,6 +6056,7 @@ CSSParserImpl::ParseBackground()
     }
 
     mTempData.mColor.mBackPosition = positionHead;
+    mTempData.mColor.mBackSize = sizeHead;
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
       nsCSSValueList **source = static_cast<nsCSSValueList**>(
         mTempData.PropertyAt(simpleValues[i].propID));
@@ -6049,9 +6069,11 @@ CSSParserImpl::ParseBackground()
     mTempData.SetPropertyBit(eCSSProperty_background_position);
     mTempData.SetPropertyBit(eCSSProperty__moz_background_clip);
     mTempData.SetPropertyBit(eCSSProperty__moz_background_origin);
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
     return PR_TRUE;
   }
   delete positionHead;
+  delete sizeHead;
   for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(simpleValues); ++i) {
     delete simpleHeads[i];
   }
@@ -6073,6 +6095,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
   aItem.mPosition.mYValue.SetPercentValue(0.0f);
   aItem.mClip.SetIntValue(NS_STYLE_BG_CLIP_BORDER, eCSSUnit_Enumerated);
   aItem.mOrigin.SetIntValue(NS_STYLE_BG_ORIGIN_PADDING, eCSSUnit_Enumerated);
+  aItem.mSize.mXValue.SetAutoValue();
+  aItem.mSize.mYValue.SetAutoValue();
   aItem.mLastItem = PR_FALSE;
 
   PRBool haveColor = PR_FALSE,
@@ -6113,6 +6137,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
         aItem.mPosition.SetBothValuesTo(val);
         aItem.mClip = val;
         aItem.mOrigin = val;
+        aItem.mSize.mXValue = val;
+        aItem.mSize.mYValue = val;
         aItem.mLastItem = PR_TRUE;
         haveSomething = PR_TRUE;
         break;
@@ -6160,9 +6186,9 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
     // support for content-box on background-clip.
       } else if (nsCSSProps::FindKeyword(keyword,
                    nsCSSProps::kBackgroundClipKTable, dummy)) {
-        // For now, we use the background-clip table, because we don't
-        // support 'content' on background-clip.  But that's dangerous
-        // if we eventually support no-clip.
+        // For now, we use the background-clip table rather than have a special
+        // background-origin table, because we don't support 'content-box' on
+        // background-origin.
         NS_ASSERTION(
           nsCSSProps::kBackgroundClipKTable[0] == eCSSKeyword_border &&
           nsCSSProps::kBackgroundClipKTable[2] == eCSSKeyword_padding &&
@@ -6230,7 +6256,8 @@ CSSParserImpl::ParseBackgroundItem(CSSParserImpl::BackgroundItem& aItem,
   return haveSomething;
 }
 
-// This function is very similar to ParseBackgroundPosition.
+// This function is very similar to ParseBackgroundPosition and
+// ParseBackgroundSize.
 PRBool
 CSSParserImpl::ParseBackgroundList(nsCSSProperty aPropID)
 {
@@ -6271,7 +6298,7 @@ CSSParserImpl::ParseBackgroundList(nsCSSProperty aPropID)
   return PR_FALSE;
 }
 
-// This function is very similar to ParseBackgroundList.
+// This function is very similar to ParseBackgroundList and ParseBackgroundSize.
 PRBool
 CSSParserImpl::ParseBackgroundPosition()
 {
@@ -6316,7 +6343,7 @@ CSSParserImpl::ParseBackgroundPosition()
  * values corresponding to percentages of the box, raw offsets, or keywords
  * like "top," "left center," etc.
  *
- * @param aOut The nsCSSValuePair where to place the result.
+ * @param aOut The nsCSSValuePair in which to place the result.
  * @return Whether or not the operation succeeded.
  */
 PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
@@ -6398,6 +6425,90 @@ PRBool CSSParserImpl::ParseBoxPositionValues(nsCSSValuePair &aOut)
   return PR_TRUE;
 }
 
+// This function is very similar to ParseBackgroundList and
+// ParseBackgroundPosition.
+PRBool
+CSSParserImpl::ParseBackgroundSize()
+{
+  nsCSSValuePair valuePair;
+  nsCSSValuePairList *head = nsnull, **tail = &head;
+  if (ParseVariant(valuePair.mXValue, VARIANT_INHERIT, nsnull)) {
+    // 'initial' and 'inherit' stand alone, no second value.
+    head = new nsCSSValuePairList;
+    if (!head) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      return PR_FALSE;
+    }
+    head->mXValue = valuePair.mXValue;
+    head->mYValue.Reset();
+    mTempData.mColor.mBackSize = head;
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    return ExpectEndProperty();
+  }
+
+  for (;;) {
+    if (!ParseBackgroundSizeValues(valuePair)) {
+      break;
+    }
+    nsCSSValuePairList *item = new nsCSSValuePairList;
+    if (!item) {
+      mScanner.SetLowLevelError(NS_ERROR_OUT_OF_MEMORY);
+      break;
+    }
+    item->mXValue = valuePair.mXValue;
+    item->mYValue = valuePair.mYValue;
+    *tail = item;
+    tail = &item->mNext;
+    if (ExpectSymbol(',', PR_TRUE)) {
+      continue;
+    }
+    if (!ExpectEndProperty()) {
+      break;
+    }
+    mTempData.mColor.mBackSize = head;
+    mTempData.SetPropertyBit(eCSSProperty__moz_background_size);
+    return PR_TRUE;
+  }
+  delete head;
+  return PR_FALSE;
+}
+
+/**
+ * Parses two values that correspond to lengths for the -moz-background-size
+ * property.  These can be one or two lengths (or the 'auto' keyword) or
+ * percentages corresponding to the element's dimensions or the single keywords
+ * 'contain' or 'cover'.  'initial' and 'inherit' must be handled by the caller
+ * if desired.
+ *
+ * @param aOut The nsCSSValuePair in which to place the result.
+ * @return Whether or not the operation succeeded.
+ */
+PRBool CSSParserImpl::ParseBackgroundSizeValues(nsCSSValuePair &aOut)
+{
+  // First try a percentage or a length value
+  nsCSSValue &xValue = aOut.mXValue,
+             &yValue = aOut.mYValue;
+  if (ParseNonNegativeVariant(xValue, VARIANT_LP | VARIANT_AUTO, nsnull)) {
+    // We have one percentage/length/auto. Get the optional second
+    // percentage/length/keyword.
+    if (ParseNonNegativeVariant(yValue, VARIANT_LP | VARIANT_AUTO, nsnull)) {
+      // We have a second percentage/length/auto.
+      return PR_TRUE;
+    }
+
+    // If only one percentage or length value is given, it sets the
+    // horizontal size only, and the vertical size will be as if by 'auto'.
+    yValue.SetAutoValue();
+    return PR_TRUE;
+  }
+
+  // Now address 'contain' and 'cover'.
+  if (!ParseEnum(xValue, nsCSSProps::kBackgroundSizeKTable))
+    return PR_FALSE;
+  yValue.Reset();
+  return PR_TRUE;
+}
+
 PRBool
 CSSParserImpl::ParseBorderColor()
 {
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index baccdb9522a5..32da6d747e6a 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -470,6 +470,16 @@ CSS_PROP_BACKGROUND(
     mBackRepeat,
     eCSSType_ValueList,
     kBackgroundRepeatKTable)
+CSS_PROP_BACKGROUND(
+    -moz-background-size,
+    _moz_background_size,
+    MozBackgroundSize,
+    CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
+        CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
+    Color,
+    mBackSize,
+    eCSSType_ValuePairList,
+    kBackgroundSizeKTable)
 CSS_PROP_DISPLAY(
     -moz-binding,
     binding,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 71aca561afd5..161aefc6e8d3 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -527,6 +527,12 @@ const PRInt32 nsCSSProps::kBackgroundRepeatKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
+const PRInt32 nsCSSProps::kBackgroundSizeKTable[] = {
+  eCSSKeyword_contain, NS_STYLE_BG_SIZE_CONTAIN,
+  eCSSKeyword_cover,   NS_STYLE_BG_SIZE_COVER,
+  eCSSKeyword_UNKNOWN,-1
+};
+
 const PRInt32 nsCSSProps::kBorderCollapseKTable[] = {
   eCSSKeyword_collapse,  NS_STYLE_BORDER_COLLAPSE,
   eCSSKeyword_separate,  NS_STYLE_BORDER_SEPARATE,
@@ -1502,6 +1508,7 @@ static const nsCSSProperty gBackgroundSubpropTable[] = {
   eCSSProperty_background_position,
   eCSSProperty__moz_background_clip,
   eCSSProperty__moz_background_origin,
+  eCSSProperty__moz_background_size,
   eCSSProperty_UNKNOWN
 };
 
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 4a4a04c96a57..7bd5836cc6f7 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -170,6 +170,7 @@ public:
   static const PRInt32 kBackgroundOriginKTable[];
   static const PRInt32 kBackgroundPositionKTable[];
   static const PRInt32 kBackgroundRepeatKTable[];
+  static const PRInt32 kBackgroundSizeKTable[];
   static const PRInt32 kBorderCollapseKTable[];
   static const PRInt32 kBorderColorKTable[];
   static const PRInt32 kBorderImageKTable[];
diff --git a/layout/style/nsCSSStruct.cpp b/layout/style/nsCSSStruct.cpp
index 71805fa2f916..05e413b518b3 100644
--- a/layout/style/nsCSSStruct.cpp
+++ b/layout/style/nsCSSStruct.cpp
@@ -110,6 +110,7 @@ nsCSSColor::nsCSSColor(void)
   , mBackRepeat(nsnull)
   , mBackAttachment(nsnull)
   , mBackPosition(nsnull)
+  , mBackSize(nsnull)
   , mBackClip(nsnull)
   , mBackOrigin(nsnull)
 {
@@ -124,6 +125,7 @@ nsCSSColor::~nsCSSColor(void)
   delete mBackRepeat;
   delete mBackAttachment;
   delete mBackPosition;
+  delete mBackSize;
   delete mBackClip;
   delete mBackOrigin;
 }
diff --git a/layout/style/nsCSSStruct.h b/layout/style/nsCSSStruct.h
index a928cdd325c5..cb617f35e9c8 100644
--- a/layout/style/nsCSSStruct.h
+++ b/layout/style/nsCSSStruct.h
@@ -312,6 +312,7 @@ struct nsCSSColor : public nsCSSStruct  {
   nsCSSValueList* mBackRepeat;
   nsCSSValueList* mBackAttachment;
   nsCSSValuePairList* mBackPosition;
+  nsCSSValuePairList* mBackSize;
   nsCSSValueList* mBackClip;
   nsCSSValueList* mBackOrigin;
   nsCSSValue      mBackInlinePolicy;
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index b63091e582f6..c299ffa80d59 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1209,7 +1209,7 @@ nsComputedDOMStyle::GetBackgroundList(PRUint8 nsStyleBackground::Layer::* aMembe
       delete valueList;
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    val->SetIdent(nsCSSProps::ValueToKeywordEnum(bg->mLayers[i].*aMember, 
+    val->SetIdent(nsCSSProps::ValueToKeywordEnum(bg->mLayers[i].*aMember,
                                                  aTable));
   }
 
@@ -1358,6 +1358,82 @@ nsComputedDOMStyle::GetBackgroundRepeat(nsIDOMCSSValue** aValue)
                            aValue);
 }
 
+nsresult
+nsComputedDOMStyle::GetMozBackgroundSize(nsIDOMCSSValue** aValue)
+{
+  const nsStyleBackground* bg = GetStyleBackground();
+
+  nsDOMCSSValueList *valueList = GetROCSSValueList(PR_TRUE);
+  NS_ENSURE_TRUE(valueList, NS_ERROR_OUT_OF_MEMORY);
+
+  for (PRUint32 i = 0, i_end = bg->mSizeCount; i < i_end; ++i) {
+    const nsStyleBackground::Size &size = bg->mLayers[i].mSize;
+
+    switch (size.mWidthType) {
+      case nsStyleBackground::Size::eContain:
+      case nsStyleBackground::Size::eCover: {
+        NS_ABORT_IF_FALSE(size.mWidthType == size.mHeightType,
+                          "unsynced types");
+        nsCSSKeyword keyword = size.mWidthType == nsStyleBackground::Size::eContain
+                             ? eCSSKeyword_contain
+                             : eCSSKeyword_cover;
+        nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
+        if (!val || !valueList->AppendCSSValue(val)) {
+          delete valueList;
+          delete val;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+        val->SetIdent(keyword);
+        break;
+      }
+      default: {
+        nsDOMCSSValueList *itemList = GetROCSSValueList(PR_FALSE);
+        if (!itemList || !valueList->AppendCSSValue(itemList)) {
+          delete valueList;
+          delete itemList;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        nsROCSSPrimitiveValue* valX = GetROCSSPrimitiveValue();
+        nsROCSSPrimitiveValue* valY = GetROCSSPrimitiveValue();
+        if (!valX || !itemList->AppendCSSValue(valX)) {
+          delete valueList;
+          delete valX;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+        if (!valY || !itemList->AppendCSSValue(valY)) {
+          delete valueList;
+          delete valY;
+          return NS_ERROR_OUT_OF_MEMORY;
+        }
+
+        if (size.mWidthType == nsStyleBackground::Size::eAuto) {
+          valX->SetIdent(eCSSKeyword_auto);
+        } else if (size.mWidthType == nsStyleBackground::Size::ePercentage) {
+          valX->SetPercent(size.mWidth.mFloat);
+        } else {
+          NS_ABORT_IF_FALSE(size.mWidthType == nsStyleBackground::Size::eLength,
+                            "bad mWidthType");
+          valX->SetAppUnits(size.mWidth.mCoord);
+        }
+
+        if (size.mHeightType == nsStyleBackground::Size::eAuto) {
+          valY->SetIdent(eCSSKeyword_auto);
+        } else if (size.mHeightType == nsStyleBackground::Size::ePercentage) {
+          valY->SetPercent(size.mHeight.mFloat);
+        } else {
+          NS_ABORT_IF_FALSE(size.mHeightType == nsStyleBackground::Size::eLength,
+                            "bad mHeightType");
+          valY->SetAppUnits(size.mHeight.mCoord);
+        }
+        break;
+      }
+    }
+  }
+
+  return CallQueryInterface(valueList, aValue);
+}
+
 nsresult
 nsComputedDOMStyle::GetPadding(nsIDOMCSSValue** aValue)
 {
@@ -4216,6 +4292,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_clip,          BackgroundClip),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
     COMPUTED_STYLE_MAP_ENTRY(_moz_background_origin,        BackgroundOrigin),
+    COMPUTED_STYLE_MAP_ENTRY(_moz_background_size,          MozBackgroundSize),
     COMPUTED_STYLE_MAP_ENTRY(binding,                       Binding),
     COMPUTED_STYLE_MAP_ENTRY(border_bottom_colors,          BorderBottomColors),
     COMPUTED_STYLE_MAP_ENTRY(border_image,                  BorderImage),
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 178d7594ae4c..7e8bf8fc7106 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -175,6 +175,7 @@ private:
   nsresult GetBackgroundClip(nsIDOMCSSValue** aValue);
   nsresult GetBackgroundInlinePolicy(nsIDOMCSSValue** aValue);
   nsresult GetBackgroundOrigin(nsIDOMCSSValue** aValue);
+  nsresult GetMozBackgroundSize(nsIDOMCSSValue** aValue);
 
   /* Padding properties */
   nsresult GetPadding(nsIDOMCSSValue** aValue);
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index b02f42382a25..47625d13eab1 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1446,6 +1446,7 @@ nsRuleNode::GetBackgroundData(nsStyleContext* aContext)
   colorData.mBackRepeat = nsnull;
   colorData.mBackAttachment = nsnull;
   colorData.mBackPosition = nsnull;
+  colorData.mBackSize = nsnull;
   colorData.mBackClip = nsnull;
   colorData.mBackOrigin = nsnull;
 
@@ -3871,6 +3872,91 @@ struct BackgroundItemComputer<nsCSSValuePairList, nsStyleBackground::Position>
 };
 
 
+struct BackgroundSizeAxis {
+  nsCSSValue nsCSSValuePairList::* specified;
+  nsStyleBackground::Size::Dimension nsStyleBackground::Size::* result;
+  PRUint8 nsStyleBackground::Size::* type;
+};
+
+static const BackgroundSizeAxis gBGSizeAxes[] = {
+  { &nsCSSValuePairList::mXValue,
+    &nsStyleBackground::Size::mWidth,
+    &nsStyleBackground::Size::mWidthType },
+  { &nsCSSValuePairList::mYValue,
+    &nsStyleBackground::Size::mHeight,
+    &nsStyleBackground::Size::mHeightType }
+};
+
+NS_SPECIALIZE_TEMPLATE
+struct BackgroundItemComputer<nsCSSValuePairList, nsStyleBackground::Size>
+{
+  static void ComputeValue(nsStyleContext* aStyleContext,
+                           const nsCSSValuePairList* aSpecifiedValue,
+                           nsStyleBackground::Size& aComputedValue,
+                           PRBool& aCanStoreInRuleTree)
+  {
+    nsStyleBackground::Size &size = aComputedValue;
+    for (const BackgroundSizeAxis *axis = gBGSizeAxes,
+                        *axis_end = gBGSizeAxes + NS_ARRAY_LENGTH(gBGSizeAxes);
+         axis != axis_end; ++axis) {
+      const nsCSSValue &specified = aSpecifiedValue->*(axis->specified);
+      if (eCSSUnit_Auto == specified.GetUnit()) {
+        size.*(axis->type) = nsStyleBackground::Size::eAuto;
+      }
+      else if (eCSSUnit_Enumerated == specified.GetUnit()) {
+        PR_STATIC_ASSERT(nsStyleBackground::Size::eContain ==
+                         NS_STYLE_BG_SIZE_CONTAIN);
+        PR_STATIC_ASSERT(nsStyleBackground::Size::eCover ==
+                         NS_STYLE_BG_SIZE_COVER);
+        NS_ABORT_IF_FALSE(specified.GetIntValue() == NS_STYLE_BG_SIZE_CONTAIN ||
+                          specified.GetIntValue() == NS_STYLE_BG_SIZE_COVER,
+                          "invalid enumerated value for size coordinate");
+        size.*(axis->type) = specified.GetIntValue();
+      }
+      else if (eCSSUnit_Null == specified.GetUnit()) {
+        NS_ABORT_IF_FALSE(axis == gBGSizeAxes + 1,
+                          "null allowed only as height value, and only "
+                          "for contain/cover/initial/inherit");
+#ifdef DEBUG
+        {
+          const nsCSSValue &widthValue = aSpecifiedValue->mXValue;
+          NS_ABORT_IF_FALSE(widthValue.GetUnit() != eCSSUnit_Inherit &&
+                            widthValue.GetUnit() != eCSSUnit_Initial,
+                            "initial/inherit should already have been handled");
+          NS_ABORT_IF_FALSE(widthValue.GetUnit() == eCSSUnit_Enumerated &&
+                            (widthValue.GetIntValue() == NS_STYLE_BG_SIZE_CONTAIN ||
+                             widthValue.GetIntValue() == NS_STYLE_BG_SIZE_COVER),
+                            "null height value not corresponding to allowable "
+                            "non-null width value");
+        }
+#endif
+        size.*(axis->type) = size.mWidthType;
+      }
+      else if (eCSSUnit_Percent == specified.GetUnit()) {
+        (size.*(axis->result)).mFloat = specified.GetPercentValue();
+        size.*(axis->type) = nsStyleBackground::Size::ePercentage;
+      }
+      else {
+        NS_ABORT_IF_FALSE(specified.IsLengthUnit(), "unexpected unit");
+        (size.*(axis->result)).mCoord =
+          CalcLength(specified, aStyleContext, aStyleContext->PresContext(),
+                     aCanStoreInRuleTree);
+        size.*(axis->type) = nsStyleBackground::Size::eLength;
+      }
+    }
+
+    NS_ABORT_IF_FALSE(size.mWidthType < nsStyleBackground::Size::eDimensionType_COUNT,
+                      "bad width type");
+    NS_ABORT_IF_FALSE(size.mHeightType < nsStyleBackground::Size::eDimensionType_COUNT,
+                      "bad height type");
+    NS_ABORT_IF_FALSE((size.mWidthType != nsStyleBackground::Size::eContain &&
+                       size.mWidthType != nsStyleBackground::Size::eCover) ||
+                      size.mWidthType == size.mHeightType,
+                      "contain/cover apply to both dimensions or to neither");
+  }
+};
+
+
 template <class SpecifiedValueItem, class ComputedValueItem>
 static void
 SetBackgroundList(nsStyleContext* aStyleContext,
@@ -4018,6 +4104,15 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
                     bg->mPositionCount, maxItemCount, rebuild,
                     canStoreInRuleTree);
 
+  // background-size: enum, length, auto, inherit, initial [pair list]
+  nsStyleBackground::Size initialSize;
+  initialSize.SetInitialValues();
+  SetBackgroundList(aContext, colorData.mBackSize, bg->mLayers,
+                    parentBG->mLayers, &nsStyleBackground::Layer::mSize,
+                    initialSize, parentBG->mSizeCount,
+                    bg->mSizeCount, maxItemCount, rebuild,
+                    canStoreInRuleTree);
+
   if (rebuild) {
     // Delete any extra items.  We need to keep layers in which any
     // property was specified.
@@ -4036,6 +4131,8 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct,
                        bg->mOriginCount, fillCount);
     FillBackgroundList(bg->mLayers, &nsStyleBackground::Layer::mPosition,
                        bg->mPositionCount, fillCount);
+    FillBackgroundList(bg->mLayers, &nsStyleBackground::Layer::mSize,
+                       bg->mSizeCount, fillCount);
   }
 
   COMPUTE_END_RESET(Background, bg)
@@ -5750,6 +5847,7 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
         colorData.mBackPosition = nsnull;
         colorData.mBackClip = nsnull;
         colorData.mBackOrigin = nsnull;
+        colorData.mBackSize = nsnull;
 
         if (ruleData.mLevel == nsStyleSet::eAgentSheet ||
             ruleData.mLevel == nsStyleSet::eUserSheet) {
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 49eb59a0043b..20ee637a5215 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1217,6 +1217,7 @@ nsStyleBackground::nsStyleBackground()
   , mRepeatCount(1)
   , mPositionCount(1)
   , mImageCount(1)
+  , mSizeCount(1)
   , mBackgroundColor(NS_RGBA(0, 0, 0, 0))
   , mBackgroundInlinePolicy(NS_STYLE_BG_INLINE_POLICY_CONTINUOUS)
 {
@@ -1232,6 +1233,7 @@ nsStyleBackground::nsStyleBackground(const nsStyleBackground& aSource)
   , mRepeatCount(aSource.mRepeatCount)
   , mPositionCount(aSource.mPositionCount)
   , mImageCount(aSource.mImageCount)
+  , mSizeCount(aSource.mSizeCount)
   , mLayers(aSource.mLayers) // deep copy
   , mBackgroundColor(aSource.mBackgroundColor)
   , mBackgroundInlinePolicy(aSource.mBackgroundInlinePolicy)
@@ -1246,6 +1248,7 @@ nsStyleBackground::nsStyleBackground(const nsStyleBackground& aSource)
     mRepeatCount = PR_MAX(mRepeatCount, count);
     mPositionCount = PR_MAX(mPositionCount, count);
     mImageCount = PR_MAX(mImageCount, count);
+    mSizeCount = PR_MAX(mSizeCount, count);
   }
 }
 
@@ -1303,6 +1306,46 @@ nsStyleBackground::Position::SetInitialValues()
   mYIsPercent = PR_TRUE;
 }
 
+void
+nsStyleBackground::Size::SetInitialValues()
+{
+  mWidthType = mHeightType = eAuto;
+}
+
+PRBool
+nsStyleBackground::Size::operator==(const Size& aOther) const
+{
+  NS_ABORT_IF_FALSE(mWidthType < eDimensionType_COUNT,
+                    "bad mWidthType for this");
+  NS_ABORT_IF_FALSE(mHeightType < eDimensionType_COUNT,
+                    "bad mHeightType for this");
+  NS_ABORT_IF_FALSE(aOther.mWidthType < eDimensionType_COUNT,
+                    "bad mWidthType for aOther");
+  NS_ABORT_IF_FALSE(aOther.mHeightType < eDimensionType_COUNT,
+                    "bad mHeightType for aOther");
+
+  if (mWidthType != aOther.mWidthType || mHeightType != aOther.mHeightType)
+    return PR_FALSE;
+
+  if (mWidthType == ePercentage) {
+    if (mWidth.mFloat != aOther.mWidth.mFloat)
+      return PR_FALSE;
+  } else if (mWidthType == eLength) {
+    if (mWidth.mCoord != aOther.mWidth.mCoord)
+      return PR_FALSE;
+  }
+
+  if (mHeightType == ePercentage) {
+    if (mHeight.mFloat != aOther.mHeight.mFloat)
+      return PR_FALSE;
+  } else if (mHeightType == eLength) {
+    if (mHeight.mCoord != aOther.mHeight.mCoord)
+      return PR_FALSE;
+  }
+
+  return PR_TRUE;
+}
+
 nsStyleBackground::Layer::Layer()
 {
 }
@@ -1319,6 +1362,7 @@ nsStyleBackground::Layer::SetInitialValues()
   mOrigin = NS_STYLE_BG_ORIGIN_PADDING;
   mRepeat = NS_STYLE_BG_REPEAT_XY;
   mPosition.SetInitialValues();
+  mSize.SetInitialValues();
   mImage = nsnull;
 }
 
@@ -1329,6 +1373,7 @@ PRBool nsStyleBackground::Layer::operator==(const Layer& aOther) const
          mOrigin == aOther.mOrigin &&
          mRepeat == aOther.mRepeat &&
          mPosition == aOther.mPosition &&
+         mSize == aOther.mSize &&
          EqualImages(mImage, aOther.mImage);
 }
 
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 13a1fd3179bb..c8fff5e98ee0 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -194,6 +194,40 @@ struct nsStyleBackground {
     }
   };
 
+  struct Size;
+  friend struct Size;
+  struct Size {
+    typedef union {
+      nscoord mCoord; // for lengths
+      float mFloat; // for percents
+    } Dimension;
+    Dimension mWidth, mHeight;
+
+    enum DimensionType {
+      // If one of mWidth and mHeight is eContain or eCover, then both are.
+      // Also, these two values must equal the corresponding values in
+      // kBackgroundSizeKTable.
+      eContain, eCover,
+
+      eAuto,
+      ePercentage,
+      eLength,
+      eDimensionType_COUNT
+    };
+    PRUint8 mWidthType, mHeightType;
+
+    // Initialize nothing
+    Size() {}
+
+    // Initialize to initial values
+    void SetInitialValues();
+
+    PRBool operator==(const Size& aOther) const;
+    PRBool operator!=(const Size& aOther) const {
+      return !(*this == aOther);
+    }
+  };
+
   struct Layer;
   friend struct Layer;
   struct Layer {
@@ -203,6 +237,7 @@ struct nsStyleBackground {
     PRUint8 mRepeat;                    // [reset] See nsStyleConsts.h
     Position mPosition;                 // [reset]
     nsCOMPtr<imgIRequest> mImage;       // [reset]
+    Size mSize;                         // [reset]
 
     // Initializes only mImage
     Layer();
@@ -225,7 +260,8 @@ struct nsStyleBackground {
            mOriginCount,
            mRepeatCount,
            mPositionCount,
-           mImageCount;
+           mImageCount,
+           mSizeCount;
   // Layers are stored in an array, matching the top-to-bottom order in
   // which they are specified in CSS.  The number of layers to be used
   // should come from the background-image property.  We create
@@ -234,7 +270,7 @@ struct nsStyleBackground {
   // callers in layout care about (which is also the one whose
   // background-clip applies to the background-color) may not be last
   // layer.  In layers below the bottom layer, properties will be
-  // unitialized unless their count, above, indicates that they are
+  // uninitialized unless their count, above, indicates that they are
   // present.
   nsAutoTArray<Layer, 1> mLayers;
 
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 684cf658c361..420b0955676b 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -100,6 +100,14 @@ var gCSSProperties = {
 		other_values: [ "border", "content", "border, padding", "padding, padding, padding", "border, border" ],
 		invalid_values: [ "margin", "padding padding" ]
 	},
+	"-moz-background-size": {
+		domProp: "MozBackgroundSize",
+		inherited: false,
+		type: CSS_TYPE_LONGHAND,
+		initial_values: [ "auto", "auto auto" ],
+		other_values: [ "contain", "cover", "100px auto", "auto 100px", "100% auto", "auto 100%", "25% 50px", "3em 40%" ],
+		invalid_values: [ "contain contain", "cover cover", "cover auto", "auto cover", "contain cover", "cover contain", "-5px 3px", "3px -5px", "auto -5px", "-5px auto" ]
+	},
 	"-moz-binding": {
 		domProp: "MozBinding",
 		inherited: false,
@@ -613,8 +621,8 @@ var gCSSProperties = {
 		domProp: "background",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "-moz-background-clip", "-moz-background-origin" ],
-		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent"],
+		subproperties: [ "background-attachment", "background-color", "background-image", "background-position", "background-repeat", "-moz-background-clip", "-moz-background-origin", "-moz-background-size" ],
+		initial_values: [ "transparent", "none", "repeat", "scroll", "0% 0%", "top left", "left top", "transparent none", "top left none", "left top none", "none left top", "none top left", "none 0% 0%", "transparent none repeat scroll top left", "left top repeat none scroll transparent" ],
 		other_values: [
 		        /* without multiple backgrounds */
 		        "green", "none green repeat scroll left top", "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==)", "repeat url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAKElEQVR42u3NQQ0AAAgEoNP+nTWFDzcoQE1udQQCgUAgEAgEAsGTYAGjxAE/G/Q2tQAAAABJRU5ErkJggg==') transparent left top scroll", "repeat-x", "repeat-y", "no-repeat", "none repeat-y transparent scroll 0% 0%", "fixed", "0% top transparent fixed repeat none", "top", "left", "50% 50%", "center", "bottom right scroll none transparent repeat", "50% transparent", "transparent 50%", "50%",

From 215848eb9b96d3af170bda049ec37d9f78e9a06d Mon Sep 17 00:00:00 2001
From: Leon Sha <leon.sha@sun.com>
Date: Mon, 27 Jul 2009 11:30:57 +0800
Subject: [PATCH 18/61] Bug 506201 -  regexp.cpp fails to compile on
 opensolaris: goto bypasses variable init. r=gal

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

diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp
index 91a41e49da76..960593e235a1 100644
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@@ -3166,10 +3166,6 @@ CompileRegExpToNative(JSContext* cx, JSRegExp* re, Fragment* fragment)
         goto out;
     }
     rv = rc.compile(cx);
-    static int fail = 0;  // TODO: remove
-    if (!rv)
-        ++fail;
-    debug_only_printf(LC_TMRegexp, "## Fail? %d, Total %d\n", (int)!rv, fail);
  out:
     JS_ARENA_RELEASE(&cx->tempPool, mark);
     return rv;

From 1d5548f39bd0f52f865c54f4803a2efcfc80e960 Mon Sep 17 00:00:00 2001
From: "wes@page.ca" <wes@page.ca>
Date: Mon, 27 Jul 2009 12:40:59 +0800
Subject: [PATCH 19/61] Bug 504594 -  Addresses in nanojit-debug output are
 wrong on SPARC. r=graydon.

---
 js/src/nanojit/NativeSparc.h | 184 +++++++++++++++++------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/js/src/nanojit/NativeSparc.h b/js/src/nanojit/NativeSparc.h
index 13e0b8dee323..7c7b43866b90 100644
--- a/js/src/nanojit/NativeSparc.h
+++ b/js/src/nanojit/NativeSparc.h
@@ -214,7 +214,7 @@ namespace nanojit
     int offset = (c->_address) - ((int)_nIns) + 4; \
     int i = 0x40000000 | ((offset >> 2) & 0x3FFFFFFF); \
     IMM32(i);    \
-    verbose_only(asm_output("call %s",(c->_name));) \
+    asm_output("call %s",(c->_name)); \
     } while (0)
 
 #define Format_2_1(rd, op2, imm22) do { \
@@ -292,548 +292,548 @@ namespace nanojit
 
 #define ADDCC(rs1, rs2, rd) \
     do { \
-    asm_output("addcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x10, rs1, 0, rs2); \
+    asm_output("addcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define ADD(rs1, rs2, rd) \
     do { \
-    asm_output("add %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0, rs1, 0, rs2); \
+    asm_output("add %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define AND(rs1, rs2, rd) \
     do { \
-    asm_output("and %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x1, rs1, 0, rs2); \
+    asm_output("and %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define BA(a, dsp22) \
     do { \
-    asm_output("ba %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x8, 0x2, dsp22); \
+    asm_output("ba %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BE(a, dsp22) \
     do { \
-    asm_output("be %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x1, 0x2, dsp22); \
+    asm_output("be %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BG(a, dsp22) \
     do { \
-    asm_output("bg %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xA, 0x2, dsp22); \
+    asm_output("bg %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BGU(a, dsp22) \
     do { \
-    asm_output("bgu %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xC, 0x2, dsp22); \
+    asm_output("bgu %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BGE(a, dsp22) \
     do { \
-    asm_output("bge %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xB, 0x2, dsp22); \
+    asm_output("bge %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BL(a, dsp22) \
     do { \
-    asm_output("bl %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x3, 0x2, dsp22); \
+    asm_output("bl %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BLE(a, dsp22) \
     do { \
-    asm_output("ble %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x2, 0x2, dsp22); \
+    asm_output("ble %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BLEU(a, dsp22) \
     do { \
-    asm_output("bleu %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x4, 0x2, dsp22); \
+    asm_output("bleu %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BCC(a, dsp22) \
     do { \
-    asm_output("bcc %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xd, 0x2, dsp22); \
+    asm_output("bcc %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BCS(a, dsp22) \
     do { \
-    asm_output("bcs %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x5, 0x2, dsp22); \
+    asm_output("bcs %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BVC(a, dsp22) \
     do { \
-    asm_output("bvc %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xf, 0x2, dsp22); \
+    asm_output("bvc %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BVS(a, dsp22) \
     do { \
-    asm_output("bvc %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x7, 0x2, dsp22); \
+    asm_output("bvc %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define BNE(a, dsp22) \
     do { \
-    asm_output("bne %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x9, 0x2, dsp22); \
+    asm_output("bne %p", _nIns + dsp22 - 1); \
     } while (0)
 
 #define FABSS(rs2, rd) \
     do { \
-    asm_output("fabs %s, %s", gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, 0, 0x9, rs2); \
+    asm_output("fabs %s, %s", gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FADDD(rs1, rs2, rd) \
     do { \
-    asm_output("faddd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, rs1, 0x42, rs2); \
+    asm_output("faddd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FBE(a, dsp22) \
     do { \
-    asm_output("fbe %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x9, 0x6, dsp22); \
+    asm_output("fbe %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBNE(a, dsp22) \
     do { \
-    asm_output("fbne %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x1, 0x6, dsp22); \
+    asm_output("fbne %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBUE(a, dsp22) \
     do { \
-    asm_output("fbue %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xA, 0x6, dsp22); \
+    asm_output("fbue %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBG(a, dsp22) \
     do { \
-    asm_output("fng %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x6, 0x6, dsp22); \
+    asm_output("fng %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBUG(a, dsp22) \
     do { \
-    asm_output("fbug %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x5, 0x6, dsp22); \
+    asm_output("fbug %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBGE(a, dsp22) \
     do { \
-    asm_output("fbge %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xB, 0x6, dsp22); \
+    asm_output("fbge %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBUGE(a, dsp22) \
     do { \
-    asm_output("fbuge %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xC, 0x6, dsp22); \
+    asm_output("fbuge %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBL(a, dsp22) \
     do { \
-    asm_output("fbl %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0x4, 0x6, dsp22); \
+    asm_output("fbl %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FBLE(a, dsp22) \
     do { \
-    asm_output("fble %p", _nIns + dsp22 - 1); \
     Format_2_2(a, 0xD, 0x6, dsp22); \
+    asm_output("fble %p", _nIns + dsp22 - 1); \
     } while(0)
 
 #define FCMPD(rs1, rs2) \
     do { \
-    asm_output("fcmpd %s, %s", gpn(rs1+32), gpn(rs2+32)); \
     Format_3_9(2, 0, 0, 0x35, rs1, 0x52, rs2); \
+    asm_output("fcmpd %s, %s", gpn(rs1+32), gpn(rs2+32)); \
     } while (0)
 
 #define FSUBD(rs1, rs2, rd) \
     do { \
-    asm_output("fsubd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, rs1, 0x46, rs2); \
+    asm_output("fsubd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FMULD(rs1, rs2, rd) \
     do { \
-    asm_output("fmuld %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, rs1, 0x4a, rs2); \
+    asm_output("fmuld %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FDIVD(rs1, rs2, rd) \
     do { \
-    asm_output("fdivd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, rs1, 0x4e, rs2); \
+    asm_output("fdivd %s, %s, %s", gpn(rs1+32), gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FMOVD(rs2, rd) \
     do { \
-    asm_output("fmovd %s, %s", gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, 0, 0x2, rs2); \
+    asm_output("fmovd %s, %s", gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FNEGD(rs2, rd) \
     do { \
-    asm_output("fnegd %s, %s", gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, 0, 0x6, rs2); \
+    asm_output("fnegd %s, %s", gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define FITOD(rs2, rd) \
     do { \
-    asm_output("fitod %s, %s", gpn(rs2+32), gpn(rd+32)); \
     Format_3_8(2, rd, 0x34, 0, 0xc8, rs2); \
+    asm_output("fitod %s, %s", gpn(rs2+32), gpn(rd+32)); \
     } while (0)
 
 #define JMPL(rs1, rs2, rd) \
     do { \
-    asm_output("jmpl [%s + %s]", gpn(rs1), gpn(rs2)); \
     Format_3_1(2, rd, 0x38, rs1, 0, rs2); \
+    asm_output("jmpl [%s + %s]", gpn(rs1), gpn(rs2)); \
     } while (0)
 
 #define JMPLI(rs1, simm13, rd) \
     do { \
-    asm_output("jmpl [%s + %d]", gpn(rs1), simm13); \
     Format_3_1I(2, rd, 0x38, rs1, simm13); \
+    asm_output("jmpl [%s + %d]", gpn(rs1), simm13); \
     } while (0)
 
 #define LDF(rs1, rs2, rd) \
     do { \
-    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd+32)); \
     Format_3_1(3, rd, 0x20, rs1, 0, rs2); \
+    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd+32)); \
     } while (0)
 
 #define LDFI(rs1, simm13, rd) \
     do { \
-    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd+32)); \
     Format_3_1I(3, rd, 0x20, rs1, simm13); \
+    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd+32)); \
     } while (0)
 
 #define LDUB(rs1, rs2, rd) \
     do { \
-    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(3, rd, 0x1, rs1, 0, rs2); \
+    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define LDUBI(rs1, simm13, rd) \
     do { \
-    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(3, rd, 0x1, rs1, simm13); \
+    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define LDUH(rs1, rs2, rd) \
     do { \
-    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(3, rd, 0x2, rs1, 0, rs2); \
+    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define LDUHI(rs1, simm13, rd) \
     do { \
-    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(3, rd, 0x2, rs1, simm13); \
+    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define LDSW(rs1, rs2, rd) \
     do { \
-    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(3, rd, 0x8, rs1, 0, rs2); \
+    asm_output("ld [%s + %s], %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define LDSWI(rs1, simm13, rd) \
     do { \
-    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(3, rd, 0x8, rs1, simm13); \
+    asm_output("ld [%s + %d], %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define MOVE(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 1, cc1, cc0, rs); \
+    asm_output("move %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVNE(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movne %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 9, cc1, cc0, rs); \
+    asm_output("movne %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVL(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movl %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 3, cc1, cc0, rs); \
+    asm_output("movl %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVLE(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movle %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 2, cc1, cc0, rs); \
+    asm_output("movle %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVG(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movg %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 0xa, cc1, cc0, rs); \
+    asm_output("movg %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVGE(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movge %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 0xb, cc1, cc0, rs); \
+    asm_output("movge %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVCS(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movcs %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 5, cc1, cc0, rs); \
+    asm_output("movcs %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVLEU(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movleu %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 4, cc1, cc0, rs); \
+    asm_output("movleu %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVGU(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movgu %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 0xc, cc1, cc0, rs); \
+    asm_output("movgu %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVCC(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movcc %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 0xd, cc1, cc0, rs); \
+    asm_output("movcc %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVVC(rs, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movvc %s, %s", gpn(rs), gpn(rd)); \
     Format_4_2(rd, 0x2c, cc2, 0xf, cc1, cc0, rs); \
+    asm_output("movvc %s, %s", gpn(rs), gpn(rd)); \
     } while (0)
 
 #define MOVEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 1, cc1, cc0, simm11); \
+    asm_output("move %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVFEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 9, cc1, cc0, simm11); \
+    asm_output("move %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVNEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 9, cc1, cc0, simm11); \
+    asm_output("move %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVLI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 3, cc1, cc0, simm11); \
+    asm_output("move %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVFLI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("move %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 4, cc1, cc0, simm11); \
+    asm_output("move %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVLEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movle %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 2, cc1, cc0, simm11); \
+    asm_output("movle %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVFLEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movle %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xd, cc1, cc0, simm11); \
+    asm_output("movle %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVGI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movg %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xa, cc1, cc0, simm11); \
+    asm_output("movg %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVFGI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movg %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 6, cc1, cc0, simm11); \
+    asm_output("movg %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVGEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movge %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xb, cc1, cc0, simm11); \
+    asm_output("movge %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVFGEI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movge %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xb, cc1, cc0, simm11); \
+    asm_output("movge %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVLEUI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movleu %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 4, cc1, cc0, simm11); \
+    asm_output("movleu %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVGUI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movgu %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xc, cc1, cc0, simm11); \
+    asm_output("movgu %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVCCI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movcc %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 0xd, cc1, cc0, simm11); \
+    asm_output("movcc %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MOVVSI(simm11, cc2, cc1, cc0, rd) \
     do { \
-    asm_output("movvs %d, %s", simm11, gpn(rd)); \
     Format_4_2I(rd, 0x2c, cc2, 7, cc1, cc0, simm11); \
+    asm_output("movvs %d, %s", simm11, gpn(rd)); \
     } while (0)
 
 #define MULX(rs1, rs2, rd) \
     do { \
-    asm_output("mul %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x9, rs1, 0, rs2); \
+    asm_output("mul %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define NOP() \
     do { \
-    asm_output("nop"); \
     Format_2_1(0, 0x4, 0); \
+    asm_output("nop"); \
     } while (0)
 
 #define ORI(rs1, simm13, rd) \
     do { \
-    asm_output("or %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(2, rd, 0x2, rs1, simm13); \
+    asm_output("or %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define OR(rs1, rs2, rd) \
     do { \
-    asm_output("or %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x2, rs1, 0, rs2); \
+    asm_output("or %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define ORN(rs1, rs2, rd) \
     do { \
-    asm_output("orn %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x6, rs1, 0, rs2); \
+    asm_output("orn %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define ANDCC(rs1, rs2, rd) \
     do { \
-    asm_output("andcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x11, rs1, 0, rs2); \
+    asm_output("andcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define RESTORE(rs1, rs2, rd) \
     do { \
-    asm_output("restore"); \
     Format_3_1(2, rd, 0x3D, rs1, 0, rs2); \
+    asm_output("restore"); \
     } while (0)
 
 #define SAVEI(rs1, simm13, rd) \
     do { \
-    asm_output("save %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(2, rd, 0x3C, rs1, simm13); \
+    asm_output("save %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define SAVE(rs1, rs2, rd) \
     do { \
-    asm_output("save %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x3C, rs1, 0, rs2); \
+    asm_output("save %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define SETHI(imm22, rd) \
     do { \
-    asm_output("sethi %p, %s", imm22,  gpn(rd)); \
     Format_2_1(rd, 0x4, (imm22 >> 10)); \
+    asm_output("sethi %p, %s", imm22,  gpn(rd)); \
     } while (0)
 
 #define SLL(rs1, rs2, rd) \
     do { \
-    asm_output("sll %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_5(2, rd, 0x25, rs1, 0, rs2); \
+    asm_output("sll %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define SRA(rs1, rs2, rd) \
     do { \
-    asm_output("sra %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_5(2, rd, 0x27, rs1, 0, rs2); \
+    asm_output("sra %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define SRL(rs1, rs2, rd) \
     do { \
-    asm_output("srl %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_5(2, rd, 0x26, rs1, 0, rs2); \
+    asm_output("srl %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define STF(rd, rs1, rs2) \
     do { \
-    asm_output("st %s, [%s + %s]", gpn(rd+32), gpn(rs1), gpn(rs2)); \
     Format_3_1(3, rd, 0x24, rs1, 0, rs2); \
+    asm_output("st %s, [%s + %s]", gpn(rd+32), gpn(rs1), gpn(rs2)); \
     } while (0)
 
 #define STFI(rd, simm13, rs1) \
     do { \
-    asm_output("st %s, [%s + %d]", gpn(rd+32), gpn(rs1), simm13); \
     Format_3_1I(3, rd, 0x24, rs1, simm13); \
+    asm_output("st %s, [%s + %d]", gpn(rd+32), gpn(rs1), simm13); \
     } while (0)
 
 #define STW(rd, rs2, rs1) \
     do { \
-    asm_output("st %s, [%s + %s]", gpn(rd), gpn(rs1), gpn(rs2)); \
     Format_3_1(3, rd, 0x4, rs1, 0, rs2); \
+    asm_output("st %s, [%s + %s]", gpn(rd), gpn(rs1), gpn(rs2)); \
     } while (0)
 
 #define STWI(rd, simm13, rs1) \
     do { \
-    asm_output("st %s, [%s + %d]", gpn(rd), gpn(rs1), simm13); \
     Format_3_1I(3, rd, 0x4, rs1, simm13); \
+    asm_output("st %s, [%s + %d]", gpn(rd), gpn(rs1), simm13); \
     } while (0)
 
 #define SUBCC(rs1, rs2, rd) \
     do { \
-    asm_output("subcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x14, rs1, 0, rs2); \
+    asm_output("subcc %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define SUB(rs1, rs2, rd) \
     do { \
-    asm_output("sub %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x4, rs1, 0, rs2); \
+    asm_output("sub %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
 #define SUBI(rs1, simm13, rd) \
     do { \
-    asm_output("sub %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     Format_3_1I(2, rd, 0x4, rs1, simm13); \
+    asm_output("sub %s, %d, %s", gpn(rs1), simm13, gpn(rd)); \
     } while (0)
 
 #define XOR(rs1, rs2, rd) \
     do { \
-    asm_output("xor %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     Format_3_1(2, rd, 0x3, rs1, 0, rs2); \
+    asm_output("xor %s, %s, %s", gpn(rs1), gpn(rs2), gpn(rd)); \
     } while (0)
 
         // Returns true if imm below 13-bit unsigned immediate)

From 1f1e1452e4a60c55cef0bca7f558b4a2488f6080 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Fri, 17 Jul 2009 00:48:39 -0500
Subject: [PATCH 20/61] Bug 505249 - lirasm - Style cleanup and new tokenizer.
 r=graydon.

---
 js/src/lirasm/lirasm.cpp | 1067 ++++++++++++++++++++------------------
 1 file changed, 575 insertions(+), 492 deletions(-)

diff --git a/js/src/lirasm/lirasm.cpp b/js/src/lirasm/lirasm.cpp
index 060460898f68..f3c22fc77ed5 100644
--- a/js/src/lirasm/lirasm.cpp
+++ b/js/src/lirasm/lirasm.cpp
@@ -44,7 +44,6 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
-#include <cassert>
 
 #ifdef AVMPLUS_UNIX
 #include <sys/types.h>
@@ -54,6 +53,8 @@
 
 #include <stdlib.h>
 #include <math.h>
+#include <ctype.h>
+#include <assert.h>
 
 #include "nanojit/nanojit.h"
 #include "jstracer.h"
@@ -106,6 +107,88 @@ const int PTRRET =
 #endif
     ;
 
+enum LirTokenType {
+    NAME, NUMBER, PUNCT, NEWLINE
+};
+
+struct LirToken {
+    LirTokenType type;
+    string data;
+    int lineno;
+};
+
+inline bool
+startsWith(const string &s, const string &prefix)
+{
+    return s.size() >= prefix.size() && s.compare(0, prefix.length(), prefix) == 0;
+}
+
+// LIR files must be ASCII, for simplicity.
+class LirTokenStream {
+public:
+    LirTokenStream(istream &in) : mIn(in), mLineno(0) {}
+
+    bool get(LirToken &token) {
+        if (mLine.empty()) {
+            if (!getline(mIn, mLine))
+                return false;
+            mLine += '\n';
+            mLineno++;
+        }
+        mLine.erase(0, mLine.find_first_not_of(" \t\v\r"));
+        char c = mLine[0];
+        size_t e = mLine.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_$.+-");
+        if (startsWith(mLine, "->")) {
+            mLine.erase(0, 2);
+            token.type = PUNCT;
+            token.data = "->";
+        } else if (e > 0) {
+            string s = mLine.substr(0, e);
+            mLine.erase(0, e);
+            if (e > 1 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X'))
+                token.type = NUMBER;
+            else if (isdigit(s[0]) || (e > 1 && s[0] == '.' && isdigit(s[1])))
+                token.type = NUMBER;
+            else
+                token.type = NAME;
+            token.data = s;
+        } else if (strchr(":,=[]()", c)) {
+            token.type = PUNCT;
+            token.data = c;
+            mLine.erase(0, 1);
+        } else if (c == ';' || c == '\n') {
+            token.type = NEWLINE;
+            token.data.clear();
+            mLine.clear();
+        } else {
+            cerr << mLineno << ": error: Unrecognized character in file." << endl;
+            return false;
+        }
+
+        token.lineno = mLineno;
+        return true;
+    }
+
+    bool eat(LirTokenType type, const char *exact = NULL) {
+        LirToken token;
+        return (get(token) && token.type == type && (exact == NULL || token.data == exact));
+    }
+
+    bool getName(string &name) {
+        LirToken t;
+        if (get(t) && t.type == NAME) {
+            name = t.data;
+            return true;
+        }
+        return false;
+    }
+
+private:
+    istream &mIn;
+    string mLine;
+    int mLineno;
+};
+
 class LirasmFragment {
 public:
     union {
@@ -122,23 +205,46 @@ typedef map<string, LirasmFragment> Fragments;
 
 class Lirasm {
 public:
+    Lirasm(bool verbose);
+    ~Lirasm();
+
+    void assemble(istream &in);
+    void lookupFunction(const string &name, CallInfo *&ci);
+
     Fragmento *mFragmento;
     LirBuffer *mLirbuf;
     LogControl mLogc;
     bool mVerbose;
-    avmplus::AvmCore s_core;
     Fragments mFragments;
-    vector<CallInfo*> mCallInfos;
+    map<string, pair<LOpcode, size_t> > mOpMap;
 
-    Lirasm(bool verbose);
-    ~Lirasm();
+    void bad(const string &msg) {
+        cerr << "error: " << msg << endl;
+        exit(1);
+    }
+
+private:
+    void handlePatch(LirTokenStream &in);
+
+    avmplus::AvmCore mCore;
 };
 
-class LirasmAssembler {
+class FragmentAssembler {
+public:
+    FragmentAssembler(Lirasm &parent, const string &fragmentName);
+    ~FragmentAssembler();
+
+    void assembleFragment(LirTokenStream &in, bool implied, const LirToken *firstToken);
+
 private:
+    // Prohibit copying.
+    FragmentAssembler(const FragmentAssembler &);
+    FragmentAssembler & operator=(const FragmentAssembler &);
+
     Lirasm *mParent;
+    const string mFragName;
     Fragment *mFragment;
-    string mFragName;
+    vector<CallInfo*> mCallInfos;
     map<string, LIns*> mLabels;
     LirWriter *mLir;
     LirBufWriter *mBufWriter;
@@ -146,37 +252,26 @@ private:
     LirWriter *mExprFilter;
     LirWriter *mVerboseWriter;
     multimap<string, LIns *> mFwdJumps;
-    map<string,pair<LOpcode,size_t> > op_map;
 
     size_t mLineno;
     LOpcode mOpcode;
     size_t mOpcount;
 
-    bool mInFrag;
-
     char mReturnTypeBits;
     vector<string> mTokens;
 
-    void lookupFunction(const char*, CallInfo *&);
+    void tokenizeLine(LirTokenStream &in, LirToken &token);
     void need(size_t);
-    istream& read_and_tokenize_line(istream&);
-    void tokenize(string const &tok_sep);
-    LIns *ref(string const &);
+    LIns *ref(const string &);
     LIns *do_skip(size_t);
-    LIns *assemble_call(string &);
+    LIns *assemble_call(const string &);
     LIns *assemble_general();
     LIns *assemble_guard();
     LIns *assemble_jump();
     LIns *assemble_load();
-    void bad(string const &msg);
-    void beginFragment();
+    void bad(const string &msg);
+    void extract_any_label(string &lab, char lab_delim);
     void endFragment();
-    void extract_any_label(string &op, string &lab, char lab_delim);
-    void patch();
-
-public:
-    LirasmAssembler(Lirasm &);
-    void assemble(istream &);
 };
 
 Function functions[] = {
@@ -186,66 +281,6 @@ Function functions[] = {
     FN(free, I32 | (PTRARG<<2))
 };
 
-void
-LirasmAssembler::lookupFunction(const char *name, CallInfo *&ci)
-{
-    const size_t nfuns = sizeof(functions) / sizeof(functions[0]);
-    for (size_t i = 0; i < nfuns; i++)
-        if (strcmp(name, functions[i].name) == 0) {
-            *ci = functions[i].callInfo;
-            return;
-        }
-
-    Fragments::const_iterator func = mParent->mFragments.find(name);
-    if (func != mParent->mFragments.end()) {
-        if (func->second.mReturnType == RT_FLOAT) {
-            CallInfo target = {(uintptr_t) func->second.rfloat, ARGSIZE_F, 0,
-                               0, nanojit::ABI_FASTCALL, func->first.c_str()};
-            *ci = target;
-
-        } else {
-            CallInfo target = {(uintptr_t) func->second.rint, ARGSIZE_LO, 0,
-                               0, nanojit::ABI_FASTCALL, func->first.c_str()};
-            *ci = target;
-        }
-    } else {
-    ci = NULL;
-    }
-}
-
-istream &
-LirasmAssembler::read_and_tokenize_line(istream &in)
-{
-    char buf[1024];
-    string tok_sep(" \n\t");
-
-    mTokens.clear();
-
-    if (in.getline(buf,sizeof(buf))) {
-        ++mLineno;
-        string line(buf);
-
-        size_t comment = line.find("//");
-        if (comment != string::npos)
-            line.resize(comment);
-
-        line += '\n';
-
-        size_t start = 0;
-        size_t end = 0;
-        while((start = line.find_first_not_of(tok_sep, end)) != string::npos &&
-              (end = line.find_first_of(tok_sep, start)) != string::npos) {
-            string ss = line.substr(start, (end-start));
-            if (ss == "=") {
-                mTokens[mTokens.size()-1] += ss;
-                continue;
-            }
-            mTokens.push_back(ss);
-        }
-    }
-    return in;
-}
-
 template<typename out, typename in> out
 lexical_cast(in arg)
 {
@@ -258,18 +293,19 @@ lexical_cast(in arg)
 }
 
 int32_t
-imm(string const &s)
+imm(const string &s)
 {
     stringstream tmp(s);
     int32_t ret;
     if ((s.find("0x") == 0 || s.find("0X") == 0) &&
-        (tmp >> hex >> ret && tmp.eof()))
+        (tmp >> hex >> ret && tmp.eof())) {
         return ret;
+    }
     return lexical_cast<int32_t>(s);
 }
 
 uint64_t
-quad(string const &s)
+quad(const string &s)
 {
     stringstream tmp1(s), tmp2(s);
     union {
@@ -292,223 +328,9 @@ pop_front(vector<t> &vec)
         cerr << "pop_front of empty vector" << endl;
         exit(1);
     }
-    t tmp = vec[0];
-    vec.erase(vec.begin());
-    return tmp;
-}
-
-void
-LirasmAssembler::bad(string const &msg)
-{
-    cerr << "instruction " << mLineno << ": " <<  msg << endl;
-    exit(1);
-}
-
-void
-LirasmAssembler::need(size_t n)
-{
-    if (mTokens.size() != n)
-        bad("need " + lexical_cast<string>(n)
-            + " tokens, have " + lexical_cast<string>(mTokens.size()));
-}
-
-LIns*
-LirasmAssembler::ref(string const &lab)
-{
-    if (mLabels.find(lab) == mLabels.end())
-        bad("unknown label '" + lab + "'");
-    return mLabels.find(lab)->second;
-}
-
-LIns*
-LirasmAssembler::do_skip(size_t i)
-{
-    LIns *s = mLir->insSkip(i);
-    memset(s->payload(), 0xba, i);
-    return s;
-}
-
-LIns*
-LirasmAssembler::assemble_jump()
-{
-    LIns *target = NULL;
-    LIns *condition = NULL;
-
-    if (mOpcode == LIR_j) {
-        need(1);
-    } else {
-        need(2);
-        string cond = pop_front(mTokens);
-        condition = ref(cond);
-    }
-    string name = pop_front(mTokens);
-    if (mLabels.find(name) != mLabels.end()) {
-        target = ref(name);
-        return mLir->insBranch(mOpcode, condition, target);
-    } else {
-        LIns *ins = mLir->insBranch(mOpcode, condition, target);
-        mFwdJumps.insert(make_pair(name, ins));
-        return ins;
-    }
-}
-
-LIns*
-LirasmAssembler::assemble_load()
-{
-    // Support implicit immediate-as-second-operand modes
-    // since, unlike sti/stqi, no immediate-displacement
-    // load opcodes were defined in LIR.
-    need(2);
-    if (mTokens[1].find("0x") == 0 ||
-        mTokens[1].find("0x") == 0 ||
-        mTokens[1].find_first_of("0123456789") == 0) {
-        return mLir->insLoad(mOpcode,
-                            ref(mTokens[0]),
-                            imm(mTokens[1]));
-    }
-    bad("immediate offset required for load");
-    return NULL;  // not reached
-}
-
-LIns*
-LirasmAssembler::assemble_call(string &op)
-{
-    CallInfo *ci = new CallInfo();
-    mParent->mCallInfos.push_back(ci);
-    LIns* args[MAXARGS];
-
-    // Assembler syntax for a call:
-    //
-    //   call 0x1234 fastcall a b c
-    //
-    // requires at least 2 args,
-    // fn address immediate and ABI token.
-
-    if (mTokens.size() < 2)
-        bad("need at least address and ABI code for " + op);
-
-    string func = pop_front(mTokens);
-    string abi = pop_front(mTokens);
-
-    AbiKind _abi;
-    if (abi == "fastcall")
-        _abi = ABI_FASTCALL;
-    else if (abi == "stdcall")
-        _abi = ABI_STDCALL;
-    else if (abi == "thiscall")
-        _abi = ABI_THISCALL;
-    else if (abi == "cdecl")
-        _abi = ABI_CDECL;
-    else
-        bad("call abi name '" + abi + "'");
-    ci->_abi = _abi;
-
-    if (mTokens.size() > MAXARGS)
-    bad("too many args to " + op);
-
-    if (func.find("0x") == 0) {
-        ci->_address = imm(func);
-
-        ci->_cse = 0;
-        ci->_fold = 0;
-
-#ifdef DEBUG
-        ci->_name = "fn";
-#endif
-
-    } else {
-        lookupFunction(func.c_str(), ci);
-        if (ci == NULL)
-            bad("invalid function reference " + func);
-        if (_abi != ci->_abi)
-            bad("invalid calling convention for " + func);
-    }
-
-    ci->_argtypes = 0;
-
-    for (size_t i = 0; i < mTokens.size(); ++i) {
-        args[i] = ref(mTokens[mTokens.size() - (i+1)]);
-        ci->_argtypes |= args[i]->isQuad() ? ARGSIZE_F : ARGSIZE_LO;
-        ci->_argtypes <<= 2;
-    }
-
-    // Select return type from opcode.
-    // FIXME: callh needs special treatment currently
-    // missing from here.
-    if (mOpcode == LIR_call)
-        ci->_argtypes |= ARGSIZE_LO;
-    else
-        ci->_argtypes |= ARGSIZE_F;
-
-    return mLir->insCall(ci, args);
-}
-
-LIns*
-LirasmAssembler::assemble_guard()
-{
-    LIns *exitIns = do_skip(sizeof(LasmSideExit));
-    LasmSideExit* exit = (LasmSideExit*) exitIns->payload();
-    memset(exit, 0, sizeof(LasmSideExit));
-    exit->from = mFragment;
-    exit->target = NULL;
-    exit->line = mLineno;
-
-    LIns *guardRec = do_skip(sizeof(GuardRecord));
-    GuardRecord *rec = (GuardRecord*) guardRec->payload();
-    memset(rec, 0, sizeof(GuardRecord));
-    rec->exit = exit;
-    exit->addGuard(rec);
-
-    need(mOpcount);
-
-    if (mOpcode != LIR_loop)
-        mReturnTypeBits |= RT_GUARD;
-
-    LIns *ins_cond;
-    if (mOpcode == LIR_xt || mOpcode == LIR_xf)
-        ins_cond = ref(pop_front(mTokens));
-    else
-        ins_cond = NULL;
-
-    if (!mTokens.empty())
-        bad("too many arguments");
-
-    return mLir->insGuard(mOpcode, ins_cond, guardRec);
-}
-
-LIns*
-LirasmAssembler::assemble_general()
-{
-    if (mOpcount == 0) {
-        // 0-ary ops may, or may not, have an immediate
-        // thing wedged in them; depends on the op. We
-        // are lax and set it if it's provided.
-        LIns *ins = mLir->ins0(mOpcode);
-        if (mTokens.size() > 0) {
-            assert(mTokens.size() == 1);
-            ins->initLInsI(mOpcode, imm(mTokens[0]));
-        }
-        return ins;
-    } else {
-        need(mOpcount);
-        if (mOpcount == 1) {
-            if (mOpcode == LIR_ret)
-                mReturnTypeBits |= RT_INT32;
-            if (mOpcode == LIR_fret)
-                mReturnTypeBits |= RT_FLOAT;
-
-            return mLir->ins1(mOpcode,
-                             ref(mTokens[0]));
-        } else if (mOpcount == 2) {
-            return mLir->ins2(mOpcode,
-                             ref(mTokens[0]),
-                             ref(mTokens[1]));
-        } else {
-            bad("too many operands");
-        }
-    }
-    // Never get here.
-    return NULL;
+   t tmp = vec[0];
+   vec.erase(vec.begin());
+   return tmp;
 }
 
 void
@@ -575,26 +397,8 @@ dump_srecords(ostream &out, Fragment *frag)
     }
 }
 
-void
-LirasmAssembler::extract_any_label(string &op,
-                                   string &lab,
-                                   char lab_delim)
-{
-    if (op.size() > 1 &&
-        op[op.size()-1] == lab_delim &&
-        !mTokens.empty()) {
-
-        lab = op;
-        op = pop_front(mTokens);
-        lab.erase(lab.size()-1);
-
-        if (mLabels.find(lab) != mLabels.end())
-            bad("duplicate label");
-    }
-}
-
-void
-LirasmAssembler::beginFragment()
+FragmentAssembler::FragmentAssembler(Lirasm &parent, const string &fragmentName)
+    : mParent(&parent), mFragName(fragmentName)
 {
     mFragment = new (&gc) Fragment(NULL);
     mFragment->lirbuf = mParent->mLirbuf;
@@ -615,24 +419,249 @@ LirasmAssembler::beginFragment()
     }
 #endif
 
-    mInFrag = true;
     mReturnTypeBits = 0;
     mLir->ins0(LIR_start);
+
+    mLineno = 0;
+}
+
+FragmentAssembler::~FragmentAssembler()
+{
+    delete mVerboseWriter;
+    delete mExprFilter;
+    delete mCseFilter;
+    delete mBufWriter;
+
+    for (size_t i = 0; i < mCallInfos.size(); ++i)
+        delete mCallInfos[i];
 }
 
 void
-LirasmAssembler::endFragment()
+FragmentAssembler::bad(const string &msg)
 {
-    mInFrag = false;
+    cerr << "instruction " << mLineno << ": " <<  msg << endl;
+    exit(1);
+}
 
-    if (mReturnTypeBits == 0)
+void
+FragmentAssembler::need(size_t n)
+{
+    if (mTokens.size() != n) {
+        bad("need " + lexical_cast<string>(n)
+            + " tokens, have " + lexical_cast<string>(mTokens.size()));
+    }
+}
+
+LIns *
+FragmentAssembler::ref(const string &lab)
+{
+    if (mLabels.find(lab) == mLabels.end())
+        bad("unknown label '" + lab + "'");
+    return mLabels.find(lab)->second;
+}
+
+LIns *
+FragmentAssembler::do_skip(size_t i)
+{
+    LIns *s = mLir->insSkip(i);
+    memset(s->payload(), 0xba, i);
+    return s;
+}
+
+LIns *
+FragmentAssembler::assemble_jump()
+{
+    LIns *target = NULL;
+    LIns *condition = NULL;
+
+    if (mOpcode == LIR_j) {
+        need(1);
+    } else {
+        need(2);
+        string cond = pop_front(mTokens);
+        condition = ref(cond);
+    }
+    string name = pop_front(mTokens);
+    if (mLabels.find(name) != mLabels.end()) {
+        target = ref(name);
+        return mLir->insBranch(mOpcode, condition, target);
+    } else {
+        LIns *ins = mLir->insBranch(mOpcode, condition, target);
+        mFwdJumps.insert(make_pair(name, ins));
+        return ins;
+    }
+}
+
+LIns *
+FragmentAssembler::assemble_load()
+{
+    // Support implicit immediate-as-second-operand modes
+    // since, unlike sti/stqi, no immediate-displacement
+    // load opcodes were defined in LIR.
+    need(2);
+    if (mTokens[1].find("0x") == 0 ||
+        mTokens[1].find("0x") == 0 ||
+        mTokens[1].find_first_of("0123456789") == 0) {
+        return mLir->insLoad(mOpcode,
+                             ref(mTokens[0]),
+                             imm(mTokens[1]));
+    }
+    bad("immediate offset required for load");
+    return NULL;  // not reached
+}
+
+LIns *
+FragmentAssembler::assemble_call(const string &op)
+{
+    CallInfo *ci = new CallInfo();
+    mCallInfos.push_back(ci);
+    LIns *args[MAXARGS];
+
+    // Assembler syntax for a call:
+    //
+    //   call 0x1234 fastcall a b c
+    //
+    // requires at least 2 args,
+    // fn address immediate and ABI token.
+
+    if (mTokens.size() < 2)
+        bad("need at least address and ABI code for " + op);
+
+    string func = pop_front(mTokens);
+    string abi = pop_front(mTokens);
+
+    AbiKind _abi;
+    if (abi == "fastcall")
+        _abi = ABI_FASTCALL;
+    else if (abi == "stdcall")
+        _abi = ABI_STDCALL;
+    else if (abi == "thiscall")
+        _abi = ABI_THISCALL;
+    else if (abi == "cdecl")
+        _abi = ABI_CDECL;
+    else
+        bad("call abi name '" + abi + "'");
+    ci->_abi = _abi;
+
+    if (mTokens.size() > MAXARGS)
+    bad("too many args to " + op);
+
+    if (func.find("0x") == 0) {
+        ci->_address = imm(func);
+
+        ci->_cse = 0;
+        ci->_fold = 0;
+
+#ifdef DEBUG
+        ci->_name = "fn";
+#endif
+    } else {
+        mParent->lookupFunction(func, ci);
+        if (ci == NULL)
+            bad("invalid function reference " + func);
+        if (_abi != ci->_abi)
+            bad("invalid calling convention for " + func);
+    }
+
+    ci->_argtypes = 0;
+
+    for (size_t i = 0; i < mTokens.size(); ++i) {
+        args[i] = ref(mTokens[mTokens.size() - (i+1)]);
+        ci->_argtypes |= args[i]->isQuad() ? ARGSIZE_F : ARGSIZE_LO;
+        ci->_argtypes <<= 2;
+    }
+
+    // Select return type from opcode.
+    // FIXME: callh needs special treatment currently
+    // missing from here.
+    if (mOpcode == LIR_call)
+        ci->_argtypes |= ARGSIZE_LO;
+    else
+        ci->_argtypes |= ARGSIZE_F;
+
+    return mLir->insCall(ci, args);
+}
+
+LIns *
+FragmentAssembler::assemble_guard()
+{
+    LIns *exitIns = do_skip(sizeof(LasmSideExit));
+    LasmSideExit* exit = (LasmSideExit*) exitIns->payload();
+    memset(exit, 0, sizeof(LasmSideExit));
+    exit->from = mFragment;
+    exit->target = NULL;
+    exit->line = mLineno;
+
+    LIns *guardRec = do_skip(sizeof(GuardRecord));
+    GuardRecord *rec = (GuardRecord*) guardRec->payload();
+    memset(rec, 0, sizeof(GuardRecord));
+    rec->exit = exit;
+    exit->addGuard(rec);
+
+    need(mOpcount);
+
+    if (mOpcode != LIR_loop)
+        mReturnTypeBits |= RT_GUARD;
+
+    LIns *ins_cond;
+    if (mOpcode == LIR_xt || mOpcode == LIR_xf)
+        ins_cond = ref(pop_front(mTokens));
+    else
+        ins_cond = NULL;
+
+    if (!mTokens.empty())
+        bad("too many arguments");
+
+    return mLir->insGuard(mOpcode, ins_cond, guardRec);
+}
+
+LIns *
+FragmentAssembler::assemble_general()
+{
+    if (mOpcount == 0) {
+        // 0-ary ops may, or may not, have an immediate
+        // thing wedged in them; depends on the op. We
+        // are lax and set it if it's provided.
+        LIns *ins = mLir->ins0(mOpcode);
+        if (mTokens.size() > 0) {
+            assert(mTokens.size() == 1);
+            ins->initLInsI(mOpcode, imm(mTokens[0]));
+        }
+        return ins;
+    } else {
+        need(mOpcount);
+        if (mOpcount == 1) {
+            if (mOpcode == LIR_ret)
+                mReturnTypeBits |= RT_INT32;
+            if (mOpcode == LIR_fret)
+                mReturnTypeBits |= RT_FLOAT;
+
+            return mLir->ins1(mOpcode,
+                              ref(mTokens[0]));
+        } else if (mOpcount == 2) {
+            return mLir->ins2(mOpcode,
+                              ref(mTokens[0]),
+                              ref(mTokens[1]));
+        } else {
+            bad("too many operands");
+        }
+    }
+    // Never get here.
+    return NULL;
+}
+
+void
+FragmentAssembler::endFragment()
+{
+    if (mReturnTypeBits == 0) {
         cerr << "warning: no return type in fragment '"
              << mFragName << "'" << endl;
-    if (mReturnTypeBits != RT_INT32 && mReturnTypeBits != RT_FLOAT
-        && mReturnTypeBits != RT_GUARD)
+    }
+    if (mReturnTypeBits != RT_INT32 && mReturnTypeBits != RT_FLOAT &&
+        mReturnTypeBits != RT_GUARD) {
         cerr << "warning: multiple return types in fragment '"
              << mFragName << "'" << endl;
-
+    }
     LIns *exitIns = do_skip(sizeof(SideExit));
     SideExit* exit = (SideExit*) exitIns->payload();
     memset(exit, 0, sizeof(SideExit));
@@ -645,15 +674,15 @@ LirasmAssembler::endFragment()
     if (mParent->mFragmento->assm()->error() != nanojit::None) {
         cerr << "error during assembly: ";
         switch (mParent->mFragmento->assm()->error()) {
-        case nanojit::OutOMem: cerr << "OutOMem"; break;
-        case nanojit::StackFull: cerr << "StackFull"; break;
-        case nanojit::RegionFull: cerr << "RegionFull"; break;
-        case nanojit::MaxLength: cerr << "MaxLength"; break;
-        case nanojit::MaxExit: cerr << "MaxExit"; break;
-        case nanojit::MaxXJump: cerr << "MaxXJump"; break;
-        case nanojit::UnknownPrim: cerr << "UnknownPrim"; break;
-        case nanojit::UnknownBranch: cerr << "UnknownBranch"; break;
-        case nanojit::None: cerr << "None"; break;
+          case nanojit::OutOMem: cerr << "OutOMem"; break;
+          case nanojit::StackFull: cerr << "StackFull"; break;
+          case nanojit::RegionFull: cerr << "RegionFull"; break;
+          case nanojit::MaxLength: cerr << "MaxLength"; break;
+          case nanojit::MaxExit: cerr << "MaxExit"; break;
+          case nanojit::MaxXJump: cerr << "MaxXJump"; break;
+          case nanojit::UnknownPrim: cerr << "UnknownPrim"; break;
+          case nanojit::UnknownBranch: cerr << "UnknownBranch"; break;
+          case nanojit::None: cerr << "None"; break;
         }
         cerr << endl;
         std::exit(1);
@@ -663,170 +692,156 @@ LirasmAssembler::endFragment()
     f = &mParent->mFragments[mFragName];
 
     switch (mReturnTypeBits) {
-      case RT_FLOAT:
-      default:
-        f->rfloat = reinterpret_cast<RetFloat>(mFragment->code());
-        f->mReturnType = RT_FLOAT;
-        break;
-      case RT_INT32:
-        f->rint = reinterpret_cast<RetInt>(mFragment->code());
-        f->mReturnType = RT_INT32;
-        break;
       case RT_GUARD:
         f->rguard = reinterpret_cast<RetGuard>(mFragment->code());
         f->mReturnType = RT_GUARD;
         break;
+      case RT_FLOAT:
+        f->rfloat = reinterpret_cast<RetFloat>(mFragment->code());
+        f->mReturnType = RT_FLOAT;
+        break;
+      default:
+        f->rint = reinterpret_cast<RetInt>(mFragment->code());
+        f->mReturnType = RT_INT32;
+        break;
     }
 
-    delete mVerboseWriter;
-    delete mExprFilter;
-    delete mCseFilter;
-    delete mBufWriter;
-    for (size_t i = 0; i < mParent->mCallInfos.size(); ++i)
-        delete mParent->mCallInfos[i];
-    mParent->mCallInfos.clear();
-
     mParent->mFragments[mFragName].mLabels = mLabels;
-    mLabels.clear();
 }
 
 void
-LirasmAssembler::assemble(istream &in)
+FragmentAssembler::tokenizeLine(LirTokenStream &in, LirToken &token)
 {
-#define OPDEF(op, number, args, repkind) \
-    op_map[#op] = make_pair(LIR_##op, args);
-#define OPDEF64(op, number, args, repkind) \
-    op_map[#op] = make_pair(LIR_##op, args);
-#include "nanojit/LIRopcode.tbl"
-#undef OPDEF
-#undef OPDEF64
+    mTokens.clear();
+    mTokens.push_back(token.data);
 
-    op_map["alloc"] = op_map["ialloc"];
-    op_map["param"] = op_map["iparam"];
+    while (in.get(token)) {
+        if (token.type == NEWLINE)
+            break;
+        mTokens.push_back(token.data);
+    }
+}
 
-        bool singleFrag = false;
-        bool first = true;
-        while(read_and_tokenize_line(in)) {
+void
+FragmentAssembler::extract_any_label(string &lab, char lab_delim)
+{
+    if (mTokens.size() > 2 && mTokens[1].size() == 1 && mTokens[1][0] == lab_delim) {
+        lab = pop_front(mTokens);
+        pop_front(mTokens);  // remove punctuation
 
-        if (mParent->mLirbuf->outOMem()) {
-            cerr << "lirbuf out of memory" << endl;
-            exit(1);
+        if (mLabels.find(lab) != mLabels.end())
+            bad("duplicate label");
+    }            
+}
+
+void
+FragmentAssembler::assembleFragment(LirTokenStream &in, bool implied, const LirToken *firstToken)
+{
+    LirToken token;
+    while (true) {
+        if (firstToken) {
+            token = *firstToken;
+            firstToken = NULL;
+        } else if (!in.get(token)) {
+            if (!implied)
+                bad("unexpected end of file in fragment '" + mFragName + "'");
+            break;
         }
-
-        if (mTokens.empty())
+        if (token.type == NEWLINE)
             continue;
+        if (token.type != NAME)
+            bad("unexpected token '" + token.data + "'");
 
-        string op = pop_front(mTokens);
-
-        if (op == ".patch") {
-            tokenize(".");
-            patch();
-            continue;
+        string op = token.data;
+        if (op == ".begin")
+            bad("nested fragments are not supported");
+        if (op == ".end") {
+            if (implied)
+                bad(".end without .begin");
+            if (!in.eat(NEWLINE))
+                bad("extra junk after .end");
+            break;
         }
 
-        if (!singleFrag) {
-            if (op == ".begin") {
-                if (mTokens.size() != 1)
-                    bad("missing fragment name");
-                if (mInFrag)
-                    bad("nested fragments are not supported");
-
-                mFragName = pop_front(mTokens);
-
-                beginFragment();
-                first = false;
-                continue;
-            } else if (op == ".end") {
-                if (!mInFrag)
-                    bad("expecting .begin before .end");
-                if (!mTokens.empty())
-                    bad("too many tokens");
-                endFragment();
-                continue;
-            }
-        }
-        if (first) {
-            first = false;
-            singleFrag = true;
-            mFragName = "main";
-
-            beginFragment();
-        }
+        mLineno = token.lineno;
+        tokenizeLine(in, token);
 
         string lab;
         LIns *ins = NULL;
-        extract_any_label(op, lab, ':');
+        extract_any_label(lab, ':');
 
         /* Save label and do any back-patching of deferred forward-jumps. */
         if (!lab.empty()) {
             ins = mLir->ins0(LIR_label);
-            typedef multimap<string,LIns*> mulmap;
+            typedef multimap<string, LIns *> mulmap;
             typedef mulmap::const_iterator ci;
-            pair<ci,ci> range = mFwdJumps.equal_range(lab);
+            pair<ci, ci> range = mFwdJumps.equal_range(lab);
             for (ci i = range.first; i != range.second; ++i) {
                 i->second->setTarget(ins);
             }
             mFwdJumps.erase(lab);
             lab.clear();
         }
-        extract_any_label(op, lab, '=');
+        extract_any_label(lab, '=');
 
-        if (op_map.find(op) == op_map.end())
+        assert(!mTokens.empty());
+        op = pop_front(mTokens);
+        if (mParent->mOpMap.find(op) == mParent->mOpMap.end())
             bad("unknown instruction '" + op + "'");
 
-        pair<LOpcode,size_t> entry = op_map[op];
+        pair<LOpcode, size_t> entry = mParent->mOpMap[op];
         mOpcode = entry.first;
         mOpcount = entry.second;
 
         switch (mOpcode) {
         // A few special opcode cases.
 
-        case LIR_j:
-        case LIR_jt:
-        case LIR_jf:
-        case LIR_ji:
+          case LIR_j:
+          case LIR_jt:
+          case LIR_jf:
+          case LIR_ji:
             ins = assemble_jump();
             break;
 
-        case LIR_int:
+          case LIR_int:
             need(1);
             ins = mLir->insImm(imm(mTokens[0]));
             break;
 
-        case LIR_quad:
+          case LIR_quad:
             need(1);
             ins = mLir->insImmq(quad(mTokens[0]));
             break;
 
-        case LIR_sti:
-        case LIR_stqi:
+          case LIR_sti:
+          case LIR_stqi:
             need(3);
             ins = mLir->insStorei(ref(mTokens[0]),
                                   ref(mTokens[1]),
                                   imm(mTokens[2]));
             break;
 
-        case LIR_ld:
-        case LIR_ldc:
-        case LIR_ldq:
-        case LIR_ldqc:
-        case LIR_ldcb:
-        case LIR_ldcs:
+          case LIR_ld:
+          case LIR_ldc:
+          case LIR_ldq:
+          case LIR_ldqc:
+          case LIR_ldcb:
+          case LIR_ldcs:
             ins = assemble_load();
             break;
 
-        case LIR_iparam:
+          case LIR_iparam:
             need(2);
             ins = mLir->insParam(imm(mTokens[0]),
                                  imm(mTokens[1]));
             break;
 
-        case LIR_ialloc:
+          case LIR_ialloc:
             need(1);
             ins = mLir->insAlloc(imm(mTokens[0]));
             break;
 
-        case LIR_skip:
+          case LIR_skip:
             need(1);
             {
                 int32_t count = imm(mTokens[0]);
@@ -836,20 +851,21 @@ LirasmAssembler::assemble(istream &in)
             }
             break;
 
-        case LIR_xt:
-        case LIR_xf:
-        case LIR_x:
-        case LIR_xbarrier:
-        case LIR_loop:
+          case LIR_xt:
+          case LIR_xf:
+          case LIR_x:
+          case LIR_xbarrier:
+          case LIR_loop:
             ins = assemble_guard();
             break;
 
-        case LIR_call:
-        case LIR_callh:
-        case LIR_fcall:
+          case LIR_call:
+          case LIR_callh:
+          case LIR_fcall:
             ins = assemble_call(op);
             break;
-        default:
+
+          default:
             ins = assemble_general();
             break;
         }
@@ -857,47 +873,43 @@ LirasmAssembler::assemble(istream &in)
         assert(ins);
         if (!lab.empty())
             mLabels.insert(make_pair(lab, ins));
-    }
-    if (mInFrag && singleFrag)
-        endFragment();
 
-    if (mInFrag)
-        bad("unexpected EOF");
-    if (mParent->mLirbuf->outOMem()) {
-        cerr << "lirbuf out of memory" << endl;
-        exit(1);
-    }
-}
-
-bool
-has_flag(vector<string> &args, string const &flag)
-{
-    for (vector<string>::iterator i = args.begin();
-         i != args.end(); ++i) {
-        if (*i == flag) {
-            args.erase(i);
-            return true;
+        if (mParent->mLirbuf->outOMem()) {
+            cerr << "lirbuf out of memory" << endl;
+            exit(1);
         }
     }
-    return false;
+    endFragment();
 }
 
-
 Lirasm::Lirasm(bool verbose)
 {
     mVerbose = verbose;
     nanojit::AvmCore::config.tree_opt = true;
     mLogc.lcbits = 0;
-    mFragmento = new (&gc) Fragmento(&s_core, &mLogc, 32);
+    mFragmento = new (&gc) Fragmento(&mCore, &mLogc, 32);
     mFragmento->labels = NULL;
     mLirbuf = new (&gc) LirBuffer(mFragmento);
 #ifdef DEBUG
     if (mVerbose) {
         mLogc.lcbits = LC_Assembly;
-        mFragmento->labels = new (&gc) LabelMap(&s_core);
+        mFragmento->labels = new (&gc) LabelMap(&mCore);
         mLirbuf->names = new (&gc) LirNameMap(&gc, mFragmento->labels);
     }
 #endif
+
+    // Populate the mOpMap table.
+#define OPDEF(op, number, args, repkind) \
+    mOpMap[#op] = make_pair(LIR_##op, args);
+#define OPDEF64(op, number, args, repkind) \
+    mOpMap[#op] = make_pair(LIR_##op, args);
+#include "nanojit/LIRopcode.tbl"
+#undef OPDEF
+#undef OPDEF64
+
+    // TODO - These should alias to the appropriate platform-specific LIR opcode.
+    mOpMap["alloc"] = mOpMap["ialloc"];
+    mOpMap["param"] = mOpMap["iparam"];
 }
 
 Lirasm::~Lirasm()
@@ -912,49 +924,120 @@ Lirasm::~Lirasm()
     delete mFragmento;
 }
 
-LirasmAssembler::LirasmAssembler(Lirasm &lasm)
-{
-    mParent = &lasm;
-    mInFrag = false;
-    mLineno = 0;
-}
-
 void
-LirasmAssembler::tokenize(string const &tok_sep)
+Lirasm::lookupFunction(const string &name, CallInfo *&ci)
 {
-    vector<string>::iterator i;
-    for (i = mTokens.begin(); i < mTokens.end(); i++)
-    {
-        string line = *i;
-        size_t start = 0;
-        size_t end = 0;
-        while((start = line.find_first_not_of(tok_sep, end)) != string::npos &&
-              (end = line.find_first_of(tok_sep, start)) != string::npos) {
-            const string ss = line.substr(start, (end-start));
-            i->erase(start, end-start+1);
-            mTokens.insert(i++, ss);
-            mTokens.insert(i++, tok_sep);
+    const size_t nfuns = sizeof(functions) / sizeof(functions[0]);
+    for (size_t i = 0; i < nfuns; i++) {
+        if (name == functions[i].name) {
+            *ci = functions[i].callInfo;
+            return;
         }
     }
+
+    Fragments::const_iterator func = mFragments.find(name);
+    if (func != mFragments.end()) {
+        if (func->second.mReturnType == RT_FLOAT) {
+            CallInfo target = {(uintptr_t) func->second.rfloat, ARGSIZE_F, 0,
+                               0, nanojit::ABI_FASTCALL, func->first.c_str()};
+            *ci = target;
+
+        } else {
+            CallInfo target = {(uintptr_t) func->second.rint, ARGSIZE_LO, 0,
+                               0, nanojit::ABI_FASTCALL, func->first.c_str()};
+            *ci = target;
+        }
+    } else {
+        ci = NULL;
+    }
 }
 
 void
-LirasmAssembler::patch()
+Lirasm::assemble(istream &in)
 {
-    if (mTokens[1] != "." || mTokens[3] != "->")
+    LirTokenStream ts(in);
+    bool first = true;
+
+    LirToken token;
+    while (ts.get(token)) {
+        if (mLirbuf->outOMem()) {
+            cerr << "lirbuf out of memory" << endl;
+            exit(1);
+        }
+        if (token.type == NEWLINE)
+            continue;
+        if (token.type != NAME)
+            bad("unexpected token '" + token.data + "'");
+
+        const string &op = token.data;
+        if (op == ".patch") {
+            handlePatch(ts);
+        } else if (op == ".begin") {
+            string name;
+            if (!ts.getName(name))
+                bad("expected fragment name after .begin");
+            if (!ts.eat(NEWLINE))
+                bad("extra junk after .begin " + name);
+
+            FragmentAssembler assembler(*this, name);
+            assembler.assembleFragment(ts, false, NULL);
+            first = false;
+        } else if (op == ".end") {
+            bad(".end without .begin");
+        } else if (first) {
+            FragmentAssembler assembler(*this, "main");
+            assembler.assembleFragment(ts, true, &token);
+            break;
+        } else {
+            bad("unexpected stray opcode '" + op + "'");
+        }
+    }
+
+    if (mLirbuf->outOMem()) {
+        cerr << "lirbuf out of memory" << endl;
+        exit(1);
+    }
+}
+
+void
+Lirasm::handlePatch(LirTokenStream &in)
+{
+    string src, fragName, guardName, destName;
+
+    if (!in.getName(src) || !in.eat(PUNCT, "->") || !in.getName(destName))
         bad("incorrect syntax");
+
+    // Break the src at '.'. This is awkward but the syntax looks nice.
+    size_t j = src.find('.');
+    if (j == string::npos || j == 0 || j == src.size() - 1)
+        bad("incorrect syntax");
+    fragName = src.substr(0, j);
+    guardName = src.substr(j + 1);
+
     Fragments::iterator i;
-    if ((i=mParent->mFragments.find(mTokens[0])) == mParent->mFragments.end())
+    if ((i=mFragments.find(fragName)) == mFragments.end())
         bad("invalid fragment reference");
     LirasmFragment *frag = &i->second;
-    if (frag->mLabels.find(mTokens[2]) == frag->mLabels.end())
+    if (frag->mLabels.find(guardName) == frag->mLabels.end())
         bad("invalid guard reference");
-    LIns *ins = frag->mLabels.find(mTokens[2])->second;
-    if ((i=mParent->mFragments.find(mTokens[4])) == mParent->mFragments.end())
+    LIns *ins = frag->mLabels.find(guardName)->second;
+    if ((i=mFragments.find(destName)) == mFragments.end())
         bad("invalid guard reference");
     ins->record()->exit->target = i->second.fragptr;
 
-    mParent->mFragmento->assm()->patch(ins->record()->exit);
+    mFragmento->assm()->patch(ins->record()->exit);
+}
+
+bool
+has_flag(vector<string> &args, const string &flag)
+{
+    for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) {
+        if (*i == flag) {
+            args.erase(i);
+            return true;
+        }
+    }
+    return false;
 }
 
 int
@@ -996,7 +1079,7 @@ main(int argc, char **argv)
     }
 
     Lirasm lasm(verbose);
-    LirasmAssembler(lasm).assemble(in);
+    lasm.assemble(in);
 
     Fragments::const_iterator i;
     if (execute) {

From 58fc4b29f6fb0181e5185c009bb90e9969dc860b Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 27 Jul 2009 16:14:12 -0400
Subject: [PATCH 21/61] Bug 496908.  Make JSVAL_IS_* functions, not macros. 
 r=brendan,jwalden

---
 js/src/jsapi.h | 159 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 114 insertions(+), 45 deletions(-)

diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index d03b13d83a6e..8d6de69f2301 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -54,35 +54,122 @@ JS_BEGIN_EXTERN_C
 /*
  * Type tags stored in the low bits of a jsval.
  */
-#define JSVAL_OBJECT            0x0     /* untagged reference to object */
-#define JSVAL_INT               0x1     /* tagged 31-bit integer value */
-#define JSVAL_DOUBLE            0x2     /* tagged reference to double */
-#define JSVAL_STRING            0x4     /* tagged reference to string */
-#define JSVAL_BOOLEAN           0x6     /* tagged boolean value */
+typedef enum jsvaltag {
+    JSVAL_OBJECT  =         0x0,     /* untagged reference to object */
+    JSVAL_INT     =         0x1,     /* tagged 31-bit integer value */
+    JSVAL_DOUBLE  =         0x2,     /* tagged reference to double */
+    JSVAL_STRING  =         0x4,     /* tagged reference to string */
+    JSVAL_BOOLEAN =         0x6      /* tagged boolean value */
+} jsvaltag;
+
+#define JSVAL_OBJECT ((jsvaltag)0x0)
+#define JSVAL_INT ((jsvaltag)0x1)
+#define JSVAL_DOUBLE ((jsvaltag)0x2)
+#define JSVAL_STRING ((jsvaltag)0x4)
+#define JSVAL_BOOLEAN ((jsvaltag)0x6)
 
 /* Type tag bitfield length and derived macros. */
 #define JSVAL_TAGBITS           3
 #define JSVAL_TAGMASK           JS_BITMASK(JSVAL_TAGBITS)
-#define JSVAL_TAG(v)            ((v) & JSVAL_TAGMASK)
-#define JSVAL_SETTAG(v,t)       ((v) | (t))
-#define JSVAL_CLRTAG(v)         ((v) & ~(jsval)JSVAL_TAGMASK)
 #define JSVAL_ALIGN             JS_BIT(JSVAL_TAGBITS)
 
+/* Not a function, because we have static asserts that use it */
+#define JSVAL_TAG(v)            ((jsvaltag)((v) & JSVAL_TAGMASK))
+
+/* Not a function, because we have static asserts that use it */
+#define JSVAL_SETTAG(v, t) ((v) | (t))
+
+static JS_ALWAYS_INLINE jsval
+JSVAL_CLRTAG(jsval v)
+{
+    return v & ~(jsval)JSVAL_TAGMASK;
+}
+
+/*
+ * Well-known JS values.  The extern'd variables are initialized when the
+ * first JSContext is created by JS_NewContext (see below).
+ */
+#define JSVAL_NULL              ((jsval) 0)
+#define JSVAL_ZERO              INT_TO_JSVAL(0)
+#define JSVAL_ONE               INT_TO_JSVAL(1)
+#define JSVAL_FALSE             PSEUDO_BOOLEAN_TO_JSVAL(JS_FALSE)
+#define JSVAL_TRUE              PSEUDO_BOOLEAN_TO_JSVAL(JS_TRUE)
+#define JSVAL_VOID              PSEUDO_BOOLEAN_TO_JSVAL(2)
+
+/*
+ * A pseudo-boolean is a 29-bit (for 32-bit jsval) or 61-bit (for 64-bit jsval)
+ * value other than 0 or 1 encoded as a jsval whose tag is JSVAL_BOOLEAN.
+ *
+ * JSVAL_VOID happens to be defined as a jsval encoding a pseudo-boolean, but
+ * embedders MUST NOT rely on this. All other possible pseudo-boolean values
+ * are implementation-reserved and MUST NOT be constructed by any embedding of
+ * SpiderMonkey.
+ */
+#define JSVAL_TO_PSEUDO_BOOLEAN(v) ((JSBool) ((v) >> JSVAL_TAGBITS))
+#define PSEUDO_BOOLEAN_TO_JSVAL(b)                                            \
+    JSVAL_SETTAG((jsval) (b) << JSVAL_TAGBITS, JSVAL_BOOLEAN)
+
 /* Predicates for type testing. */
-#define JSVAL_IS_OBJECT(v)      (JSVAL_TAG(v) == JSVAL_OBJECT)
-#define JSVAL_IS_NUMBER(v)      (JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v))
-#define JSVAL_IS_INT(v)         ((v) & JSVAL_INT)
-#define JSVAL_IS_DOUBLE(v)      (JSVAL_TAG(v) == JSVAL_DOUBLE)
-#define JSVAL_IS_STRING(v)      (JSVAL_TAG(v) == JSVAL_STRING)
-#define JSVAL_IS_BOOLEAN(v)     (((v) & ~((jsval)1 << JSVAL_TAGBITS)) ==      \
-                                 JSVAL_BOOLEAN)
-#define JSVAL_IS_NULL(v)        ((v) == JSVAL_NULL)
-#define JSVAL_IS_VOID(v)        ((v) == JSVAL_VOID)
-#define JSVAL_IS_PRIMITIVE(v)   (!JSVAL_IS_OBJECT(v) || JSVAL_IS_NULL(v))
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_OBJECT(jsval v)
+{
+    return JSVAL_TAG(v) == JSVAL_OBJECT;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_INT(jsval v)
+{
+    return v & JSVAL_INT;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_DOUBLE(jsval v)
+{
+    return JSVAL_TAG(v) == JSVAL_DOUBLE;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_NUMBER(jsval v)
+{
+    return JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v);
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_STRING(jsval v)
+{
+    return JSVAL_TAG(v) == JSVAL_STRING;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_BOOLEAN(jsval v)
+{
+    return (v & ~((jsval)1 << JSVAL_TAGBITS)) == JSVAL_BOOLEAN;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_NULL(jsval v)
+{
+    return v == JSVAL_NULL;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_VOID(jsval v)
+{
+    return v == JSVAL_VOID;
+}
+
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_PRIMITIVE(jsval v)
+{
+    return !JSVAL_IS_OBJECT(v) || JSVAL_IS_NULL(v);
+}
 
 /* Objects, strings, and doubles are GC'ed. */
-#define JSVAL_IS_GCTHING(v)     (!((v) & JSVAL_INT) &&                        \
-                                 JSVAL_TAG(v) != JSVAL_BOOLEAN)
+static JS_ALWAYS_INLINE JSBool
+JSVAL_IS_GCTHING(jsval v)
+{
+    return !(v & JSVAL_INT) && JSVAL_TAG(v) != JSVAL_BOOLEAN;
+}
 
 static JS_ALWAYS_INLINE void *
 JSVAL_TO_GCTHING(jsval v)
@@ -145,36 +232,18 @@ STRING_TO_JSVAL(JSString *str)
 #define JSVAL_INT_POW2(n)       ((jsval)1 << (n))
 #define JSVAL_INT_MIN           (-JSVAL_INT_POW2(30))
 #define JSVAL_INT_MAX           (JSVAL_INT_POW2(30) - 1)
+
+/* Not a function, because we have static asserts that use it */
 #define INT_FITS_IN_JSVAL(i)    ((jsuint)(i) - (jsuint)JSVAL_INT_MIN <=      \
                                  (jsuint)(JSVAL_INT_MAX - JSVAL_INT_MIN))
+/* Not a function, because we have static asserts that use it */
+/* FIXME:  Bug 506721, since that means we can't assert JSVAL_IS_INT(v) */
 #define JSVAL_TO_INT(v)         ((jsint)(v) >> 1)
+
+/* Not a function, because we have static asserts that use it */
+/* FIXME:  Bug 506721, since that means we can't assert INT_FITS_IN_JSVAL(i) */
 #define INT_TO_JSVAL(i)         (((jsval)(i) << 1) | JSVAL_INT)
 
-/*
- * A pseudo-boolean is a 29-bit (for 32-bit jsval) or 61-bit (for 64-bit jsval)
- * value other than 0 or 1 encoded as a jsval whose tag is JSVAL_BOOLEAN.
- *
- * JSVAL_VOID happens to be defined as a jsval encoding a pseudo-boolean, but
- * embedders MUST NOT rely on this. All other possible pseudo-boolean values
- * are implementation-reserved and MUST NOT be constructed by any embedding of
- * SpiderMonkey.
- */
-#define JSVAL_TO_PSEUDO_BOOLEAN(v) ((JSBool) ((v) >> JSVAL_TAGBITS))
-#define PSEUDO_BOOLEAN_TO_JSVAL(b)                                            \
-    JSVAL_SETTAG((jsval) (b) << JSVAL_TAGBITS, JSVAL_BOOLEAN)
-
-/*
- * Well-known JS values.  The extern'd variables are initialized when the
- * first JSContext is created by JS_NewContext (see below).
- */
-#define JSVAL_NULL              ((jsval) 0)
-#define JSVAL_ZERO              INT_TO_JSVAL(0)
-#define JSVAL_ONE               INT_TO_JSVAL(1)
-#define JSVAL_FALSE             PSEUDO_BOOLEAN_TO_JSVAL(JS_FALSE)
-#define JSVAL_TRUE              PSEUDO_BOOLEAN_TO_JSVAL(JS_TRUE)
-#define JSVAL_VOID              PSEUDO_BOOLEAN_TO_JSVAL(2)
-
-
 /* Convert between boolean and jsval, asserting that inputs are valid. */
 static JS_ALWAYS_INLINE JSBool
 JSVAL_TO_BOOLEAN(jsval v)

From 10702b702ba6e36c8958e79946aa51ea5515750f Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Mon, 27 Jul 2009 16:29:02 -0500
Subject: [PATCH 22/61] Bug 505932 - Shape regeneration does not touch most
 empty scopes. r=brendan.

---
 js/src/jscntxt.h   | 13 ++++++++++++-
 js/src/jsgc.cpp    |  1 +
 js/src/jsobj.cpp   | 39 ++++++++++++++++++++++++++++-----------
 js/src/jsscope.cpp |  4 ++--
 js/src/jsscope.h   | 10 +++++++++-
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 091a2529a39d..b079cb014d19 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -391,7 +391,18 @@ struct JSRuntime {
     JSPackedBool        gcPoke;
     JSPackedBool        gcRunning;
     JSPackedBool        gcRegenShapes;
-    uint8               gcPadding;
+
+    /*
+     * During gc, if rt->gcRegenShapes &&
+     *   (scope->flags & JSScope::SHAPE_REGEN) == rt->gcRegenShapesScopeFlag,
+     * then the scope's shape has already been regenerated during this GC.
+     * To avoid having to sweep JSScopes, the bit's meaning toggles with each
+     * shape-regenerating GC.
+     *
+     * FIXME Once scopes are GC'd (bug 505004), this will be obsolete.
+     */
+    uint8              gcRegenShapesScopeFlag;
+
 #ifdef JS_GC_ZEAL
     jsrefcount          gcZeal;
 #endif
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index b2ee47f5a0c1..f6a76120c4d4 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3519,6 +3519,7 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
      */
     if (rt->shapeGen & SHAPE_OVERFLOW_BIT) {
         rt->gcRegenShapes = true;
+        rt->gcRegenShapesScopeFlag ^= JSScope::SHAPE_REGEN;
         rt->shapeGen = 0;
         rt->protoHazardShape = 0;
     }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index c14b66e837aa..9ca39003a927 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -5773,23 +5773,40 @@ js_TraceObject(JSTracer *trc, JSObject *obj)
 #endif
 
     sprop = scope->lastProp;
-    if (sprop) {
-        JS_ASSERT(scope->has(sprop));
+    uint8 regenFlag = cx->runtime->gcRegenShapesScopeFlag;
+    if (IS_GC_MARKING_TRACER(trc) &&
+        cx->runtime->gcRegenShapes &&
+        scope->hasRegenFlag(regenFlag)) {
+        /*
+         * Either scope has its own shape, which must be regenerated, or it
+         * must have the same shape as its lastProp.
+         */
+        uint32 shape;
 
-        /* Regenerate property cache shape ids if GC'ing. */
-        if (IS_GC_MARKING_TRACER(trc) && cx->runtime->gcRegenShapes) {
+        if (sprop) {
             if (!(sprop->flags & SPROP_FLAG_SHAPE_REGEN)) {
                 sprop->shape = js_RegenerateShapeForGC(cx);
                 sprop->flags |= SPROP_FLAG_SHAPE_REGEN;
             }
-
-            uint32 shape = sprop->shape;
-            if (scope->hasOwnShape()) {
-                shape = js_RegenerateShapeForGC(cx);
-                JS_ASSERT(shape != sprop->shape);
-            }
-            scope->shape = shape;
+            shape = sprop->shape;
         }
+        if (!sprop || scope->hasOwnShape()) {
+            shape = js_RegenerateShapeForGC(cx);
+            JS_ASSERT_IF(sprop, shape != sprop->shape);
+        }
+        scope->shape = shape;
+        scope->flags ^= JSScope::SHAPE_REGEN;
+
+        /* Also regenerate the shapes of empty scopes, in case they are not shared. */
+        for (JSScope *empty = scope->emptyScope;
+             empty && empty->hasRegenFlag(regenFlag);
+             empty = empty->emptyScope) {
+            empty->shape = js_RegenerateShapeForGC(cx);
+            empty->flags ^= JSScope::SHAPE_REGEN;
+        }
+    }
+    if (sprop) {
+        JS_ASSERT(scope->has(sprop));
 
         /* Trace scope's property tree ancestor line. */
         do {
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index c343533dde35..7da51cd43f71 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -196,7 +196,7 @@ JSScope::create(JSContext *cx, JSObjectOps *ops, JSClass *clasp, JSObject *obj)
     scope->object = obj;
     scope->nrefs = 1;
     scope->freeslot = JSSLOT_FREE(clasp);
-    scope->flags = 0;
+    scope->flags = cx->runtime->gcRegenShapesScopeFlag;
     js_LeaveTraceIfGlobalObject(cx, obj);
     scope->initMinimal(cx);
 
@@ -226,7 +226,7 @@ JSScope::createEmptyScope(JSContext *cx, JSClass *clasp)
      */
     scope->nrefs = 2;
     scope->freeslot = JSSLOT_FREE(clasp);
-    scope->flags = 0;
+    scope->flags = OWN_SHAPE | cx->runtime->gcRegenShapesScopeFlag;
     scope->initMinimal(cx);
 
 #ifdef JS_THREADSAFE
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 481da6a4a5b3..fe8b5798e4f1 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -283,7 +283,13 @@ struct JSScope {
         SEALED                  = 0x0002,
         BRANDED                 = 0x0004,
         INDEXED_PROPERTIES      = 0x0008,
-        OWN_SHAPE               = 0x0010
+        OWN_SHAPE               = 0x0010,
+
+        /*
+         * This flag toggles with each shape-regenerating GC cycle.
+         * See JSRuntime::gcRegenShapesScopeFlag.
+         */
+        SHAPE_REGEN             = 0x0020
     };
 
     bool hadMiddleDelete()      { return flags & MIDDLE_DELETE; }
@@ -312,6 +318,8 @@ struct JSScope {
     bool hasOwnShape()          { return flags & OWN_SHAPE; }
     void setOwnShape()          { flags |= OWN_SHAPE; }
 
+    bool hasRegenFlag(uint8 regenFlag) { return (flags & SHAPE_REGEN) == regenFlag; }
+
     bool owned()                { return object != NULL; }
 };
 

From fad2d36065c720615f020d189602247670f80ea8 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Mon, 27 Jul 2009 16:38:39 -0500
Subject: [PATCH 23/61] lirasm - Rename a parameter, as graydon requested in
 review for bug 505249.

---
 js/src/lirasm/lirasm.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/lirasm/lirasm.cpp b/js/src/lirasm/lirasm.cpp
index f3c22fc77ed5..84f73113f730 100644
--- a/js/src/lirasm/lirasm.cpp
+++ b/js/src/lirasm/lirasm.cpp
@@ -234,7 +234,7 @@ public:
     FragmentAssembler(Lirasm &parent, const string &fragmentName);
     ~FragmentAssembler();
 
-    void assembleFragment(LirTokenStream &in, bool implied, const LirToken *firstToken);
+    void assembleFragment(LirTokenStream &in, bool implicitBegin, const LirToken *firstToken);
 
 private:
     // Prohibit copying.
@@ -735,7 +735,7 @@ FragmentAssembler::extract_any_label(string &lab, char lab_delim)
 }
 
 void
-FragmentAssembler::assembleFragment(LirTokenStream &in, bool implied, const LirToken *firstToken)
+FragmentAssembler::assembleFragment(LirTokenStream &in, bool implicitBegin, const LirToken *firstToken)
 {
     LirToken token;
     while (true) {
@@ -743,7 +743,7 @@ FragmentAssembler::assembleFragment(LirTokenStream &in, bool implied, const LirT
             token = *firstToken;
             firstToken = NULL;
         } else if (!in.get(token)) {
-            if (!implied)
+            if (!implicitBegin)
                 bad("unexpected end of file in fragment '" + mFragName + "'");
             break;
         }
@@ -756,7 +756,7 @@ FragmentAssembler::assembleFragment(LirTokenStream &in, bool implied, const LirT
         if (op == ".begin")
             bad("nested fragments are not supported");
         if (op == ".end") {
-            if (implied)
+            if (implicitBegin)
                 bad(".end without .begin");
             if (!in.eat(NEWLINE))
                 bad("extra junk after .end");

From 04786e0f3d14dc471aa8eb7b3031c6616420dd5f Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Mon, 27 Jul 2009 16:47:34 -0500
Subject: [PATCH 24/61] Bug 503408 - Trace native setters. r=brendan.

---
 js/src/jsbuiltins.cpp |   2 -
 js/src/jsinterp.cpp   |   1 -
 js/src/jsinterp.h     |   4 +
 js/src/jstracer.cpp   | 423 ++++++++++++++++++++++++++++--------------
 js/src/jstracer.h     |  25 ++-
 js/src/trace-test.js  |  15 ++
 6 files changed, 327 insertions(+), 143 deletions(-)

diff --git a/js/src/jsbuiltins.cpp b/js/src/jsbuiltins.cpp
index 961e11331276..fe088a03aad8 100644
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -242,8 +242,6 @@ JSBool FASTCALL
 js_AddProperty(JSContext* cx, JSObject* obj, JSScopeProperty* sprop)
 {
     JS_ASSERT(OBJ_IS_NATIVE(obj));
-    JS_ASSERT(SPROP_HAS_STUB_SETTER(sprop));
-
     JS_LOCK_OBJ(cx, obj);
 
     JSScope* scope = OBJ_SCOPE(obj);
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 6f60b4b0821c..25506179975c 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4802,7 +4802,6 @@ js_Interpret(JSContext *cx)
                             }
                             JS_UNLOCK_SCOPE(cx, scope);
                             PCMETER(cache->setpcmisses++);
-                            atom = NULL;
                         }
                     }
 
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 3848d5498b1a..23e77a7171ef 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -243,6 +243,10 @@ struct JSPropCacheEntry {
     jsuword             kshape;         /* key shape if pc, else obj for atom */
     jsuword             vcap;           /* value capability, see above */
     jsuword             vword;          /* value word, see PCVAL_* below */
+
+    bool adding() const {
+        return PCVCAP_TAG(vcap) == 0 && kshape != PCVCAP_SHAPE(vcap);
+    }
 };
 
 /*
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 5d4da83d8742..dba2449d3bee 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2950,7 +2950,8 @@ TraceRecorder::snapshot(ExitType exitType)
     bool resumeAfter = (pendingTraceableNative &&
                         JSTN_ERRTYPE(pendingTraceableNative) == FAIL_STATUS);
     if (resumeAfter) {
-        JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEW);
+        JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEW ||
+                  *pc == JSOP_SETPROP || *pc == JSOP_SETNAME);
         pc += cs.length;
         regs->pc = pc;
         MUST_FLOW_THROUGH("restore_pc");
@@ -5410,11 +5411,11 @@ LeaveTree(InterpState& state, VMSideExit* lr)
              * js_ExecuteTree. We are about to return to the interpreter. Adjust
              * the top stack frame to resume on the next op.
              */
-            JS_ASSERT(*cx->fp->regs->pc == JSOP_CALL ||
-                      *cx->fp->regs->pc == JSOP_APPLY ||
-                      *cx->fp->regs->pc == JSOP_NEW);
-            uintN argc = GET_ARGC(cx->fp->regs->pc);
-            cx->fp->regs->pc += JSOP_CALL_LENGTH;
+            jsbytecode *pc = cx->fp->regs->pc;
+            JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEW ||
+                      *pc == JSOP_SETPROP || *pc == JSOP_SETNAME);
+            uintN argc = (js_CodeSpec[*pc].format & JOF_INVOKE) ? GET_ARGC(pc) : 0;
+            cx->fp->regs->pc += js_CodeSpec[*pc].length;
             cx->fp->regs->sp -= argc + 1;
             JS_ASSERT_IF(!cx->fp->imacpc,
                          cx->fp->slots + cx->fp->script->nfixed +
@@ -7581,6 +7582,41 @@ TraceRecorder::map_is_native(JSObjectMap* map, LIns* map_ins, LIns*& ops_ins, si
     return true;
 }
 
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::guardNativePropertyOp(JSObject* aobj, LIns* map_ins)
+{
+    /*
+     * Interpreter calls to PROPERTY_CACHE_TEST guard on native object ops
+     * which is required to use native objects (those whose maps are scopes),
+     * or even more narrow conditions required because the cache miss case
+     * will call a particular object-op (js_GetProperty, js_SetProperty).
+     *
+     * We parameterize using offsetof and guard on match against the hook at
+     * the given offset in js_ObjectOps. TraceRecorder::record_JSOP_SETPROP
+     * guards the js_SetProperty case.
+     */
+    uint32 format = js_CodeSpec[*cx->fp->regs->pc].format;
+    uint32 mode = JOF_MODE(format);
+
+    // No need to guard native-ness of global object.
+    JS_ASSERT(OBJ_IS_NATIVE(globalObj));
+    if (aobj != globalObj) {
+        size_t op_offset = offsetof(JSObjectOps, objectMap);
+        if (mode == JOF_PROP || mode == JOF_VARPROP) {
+            op_offset = (format & JOF_SET)
+                        ? offsetof(JSObjectOps, setProperty)
+                        : offsetof(JSObjectOps, getProperty);
+        } else {
+            JS_ASSERT(mode == JOF_NAME);
+        }
+
+        LIns* ops_ins;
+        if (!map_is_native(aobj->map, map_ins, ops_ins, op_offset))
+            ABORT_TRACE("non-native map");
+    }
+    return JSRS_CONTINUE;
+}
+
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2, jsuword& pcval)
 {
@@ -7598,33 +7634,8 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2
     }
 
     LIns* map_ins = map(obj_ins);
-    LIns* ops_ins;
 
-    // Interpreter calls to PROPERTY_CACHE_TEST guard on native object ops
-    // which is required to use native objects (those whose maps are scopes),
-    // or even more narrow conditions required because the cache miss case
-    // will call a particular object-op (js_GetProperty, js_SetProperty).
-    //
-    // We parameterize using offsetof and guard on match against the hook at
-    // the given offset in js_ObjectOps. TraceRecorder::record_JSOP_SETPROP
-    // guards the js_SetProperty case.
-    uint32 format = js_CodeSpec[*pc].format;
-    uint32 mode = JOF_MODE(format);
-
-    // No need to guard native-ness of global object.
-    JS_ASSERT(OBJ_IS_NATIVE(globalObj));
-    if (aobj != globalObj) {
-        size_t op_offset = offsetof(JSObjectOps, objectMap);
-        if (mode == JOF_PROP || mode == JOF_VARPROP) {
-            JS_ASSERT(!(format & JOF_SET));
-            op_offset = offsetof(JSObjectOps, getProperty);
-        } else {
-            JS_ASSERT(mode == JOF_NAME);
-        }
-
-        if (!map_is_native(aobj->map, map_ins, ops_ins, op_offset))
-            ABORT_TRACE("non-native map");
-    }
+    CHECK_STATUS(guardNativePropertyOp(aobj, map_ins));
 
     JSAtom* atom;
     JSPropCacheEntry* entry;
@@ -7692,31 +7703,60 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2
     JS_ASSERT(cx->requestDepth);
 #endif
 
-    // Emit guard(s), common code for both hit and miss cases.
+    return guardPropertyCacheHit(obj_ins, map_ins, aobj, obj2, entry, pcval);
+}
+
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::guardPropertyCacheHit(LIns* obj_ins,
+                                     LIns* map_ins,
+                                     JSObject* aobj,
+                                     JSObject* obj2,
+                                     JSPropCacheEntry* entry,
+                                     jsuword& pcval)
+{
+    uint32 vshape = PCVCAP_SHAPE(entry->vcap);
+
     // Check for first-level cache hit and guard on kshape if possible.
     // Otherwise guard on key object exact match.
     if (PCVCAP_TAG(entry->vcap) <= 1) {
         if (aobj != globalObj) {
             LIns* shape_ins = addName(lir->insLoad(LIR_ld, map_ins, offsetof(JSScope, shape)),
                                       "shape");
-            guard(true, addName(lir->ins2i(LIR_eq, shape_ins, entry->kshape), "guard(kshape)(test_property_cache)"),
+            guard(true,
+                  addName(lir->ins2i(LIR_eq, shape_ins, entry->kshape), "guard_kshape"),
                   BRANCH_EXIT);
         }
+
+        if (entry->adding()) {
+            if (aobj == globalObj)
+                ABORT_TRACE("adding a property to the global object");
+
+            LIns *vshape_ins = addName(
+                lir->insLoad(LIR_ld,
+                             addName(lir->insLoad(LIR_ldp, cx_ins, offsetof(JSContext, runtime)),
+                                     "runtime"),
+                             offsetof(JSRuntime, protoHazardShape)),
+                "protoHazardShape");
+            guard(true,
+                  addName(lir->ins2i(LIR_eq, vshape_ins, vshape), "guard_protoHazardShape"),
+                  MISMATCH_EXIT);
+        }
     } else {
 #ifdef DEBUG
-        JSOp op = js_GetOpcode(cx, cx->fp->script, pc);
+        JSOp op = js_GetOpcode(cx, cx->fp->script, cx->fp->regs->pc);
         JSAtom *pcatom;
         if (op == JSOP_LENGTH) {
             pcatom = cx->runtime->atomState.lengthAtom;
         } else {
             ptrdiff_t pcoff = (JOF_TYPE(js_CodeSpec[op].format) == JOF_SLOTATOM) ? SLOTNO_LEN : 0;
-            GET_ATOM_FROM_BYTECODE(cx->fp->script, pc, pcoff, pcatom);
+            GET_ATOM_FROM_BYTECODE(cx->fp->script, cx->fp->regs->pc, pcoff, pcatom);
         }
         JS_ASSERT(entry->kpc == (jsbytecode *) pcatom);
         JS_ASSERT(entry->kshape == jsuword(aobj));
 #endif
         if (aobj != globalObj && !obj_ins->isconstp()) {
-            guard(true, addName(lir->ins2i(LIR_eq, obj_ins, entry->kshape), "guard(kobj)"),
+            guard(true,
+                  addName(lir->ins2i(LIR_eq, obj_ins, entry->kshape), "guard_kobj"),
                   BRANCH_EXIT);
         }
     }
@@ -7724,26 +7764,25 @@ TraceRecorder::test_property_cache(JSObject* obj, LIns* obj_ins, JSObject*& obj2
     // For any hit that goes up the scope and/or proto chains, we will need to
     // guard on the shape of the object containing the property.
     if (PCVCAP_TAG(entry->vcap) >= 1) {
-        jsuword vcap = entry->vcap;
-        uint32 vshape = PCVCAP_SHAPE(vcap);
         JS_ASSERT(OBJ_SHAPE(obj2) == vshape);
 
         LIns* obj2_ins;
         if (PCVCAP_TAG(entry->vcap) == 1) {
             // Duplicate the special case in PROPERTY_CACHE_TEST.
-            obj2_ins = stobj_get_fslot(obj_ins, JSSLOT_PROTO);
+            obj2_ins = addName(stobj_get_fslot(obj_ins, JSSLOT_PROTO), "proto");
             guard(false, lir->ins_eq0(obj2_ins), BRANCH_EXIT);
         } else {
             obj2_ins = INS_CONSTPTR(obj2);
         }
         map_ins = map(obj2_ins);
+        LIns* ops_ins;
         if (!map_is_native(obj2->map, map_ins, ops_ins))
             ABORT_TRACE("non-native map");
 
         LIns* shape_ins = addName(lir->insLoad(LIR_ld, map_ins, offsetof(JSScope, shape)),
-                                  "shape");
+                                  "obj2_shape");
         guard(true,
-              addName(lir->ins2i(LIR_eq, shape_ins, vshape), "guard(vshape)(test_property_cache)"),
+              addName(lir->ins2i(LIR_eq, shape_ins, vshape), "guard_vshape"),
               BRANCH_EXIT);
     }
 
@@ -7801,16 +7840,6 @@ TraceRecorder::stobj_get_slot(LIns* obj_ins, unsigned slot, LIns*& dslots_ins)
     return stobj_get_dslot(obj_ins, slot - JS_INITIAL_NSLOTS, dslots_ins);
 }
 
-JSRecordingStatus
-TraceRecorder::native_set(LIns* obj_ins, JSScopeProperty* sprop, LIns*& dslots_ins, LIns* v_ins)
-{
-    if (SPROP_HAS_STUB_SETTER(sprop) && sprop->slot != SPROP_INVALID_SLOT) {
-        stobj_set_slot(obj_ins, sprop->slot, dslots_ins, v_ins);
-        return JSRS_CONTINUE;
-    }
-    ABORT_TRACE("unallocated or non-stub sprop");
-}
-
 JSRecordingStatus
 TraceRecorder::native_get(LIns* obj_ins, LIns* pobj_ins, JSScopeProperty* sprop,
                           LIns*& dslots_ins, LIns*& v_ins)
@@ -8703,6 +8732,83 @@ TraceRecorder::newArray(JSObject* ctor, uint32 argc, jsval* argv, jsval* rval)
     return JSRS_CONTINUE;
 }
 
+JS_REQUIRES_STACK void
+TraceRecorder::propagateFailureToBuiltinStatus(LIns* ok_ins, LIns*& status_ins)
+{
+    /*
+     * Check the boolean return value (ok_ins) of a native JSNative,
+     * JSFastNative, or JSPropertyOp hook for failure. On failure, set the
+     * JSBUILTIN_ERROR bit of cx->builtinStatus.
+     *
+     * If the return value (ok_ins) is true, status' == status. Otherwise
+     * status' = status | JSBUILTIN_ERROR. We calculate (rval&1)^1, which is 1
+     * if rval is JS_FALSE (error), and then shift that by 1, which is the log2
+     * of JSBUILTIN_ERROR.
+     */
+    JS_STATIC_ASSERT(((JS_TRUE & 1) ^ 1) << 1 == 0);
+    JS_STATIC_ASSERT(((JS_FALSE & 1) ^ 1) << 1 == JSBUILTIN_ERROR);
+    status_ins = lir->ins2(LIR_or,
+                           status_ins,
+                           lir->ins2i(LIR_lsh,
+                                      lir->ins2i(LIR_xor,
+                                                 lir->ins2i(LIR_and, ok_ins, 1),
+                                                 1),
+                                      1));
+    lir->insStorei(status_ins, lirbuf->state, (int) offsetof(InterpState, builtinStatus));
+}
+
+JS_REQUIRES_STACK void
+TraceRecorder::emitNativePropertyOp(JSScope* scope, JSScopeProperty* sprop, LIns* obj_ins,
+                                    bool setflag, LIns* boxed_ins)
+{
+    JS_ASSERT(!(sprop->attrs & (setflag ? JSPROP_SETTER : JSPROP_GETTER)));
+    JS_ASSERT(setflag ? !SPROP_HAS_STUB_SETTER(sprop) : !SPROP_HAS_STUB_GETTER(sprop));
+
+    // Take snapshot for js_DeepBail and store it in cx->bailExit.
+    VMSideExit* exit = snapshot(DEEP_BAIL_EXIT);
+    lir->insStorei(INS_CONSTPTR(exit), cx_ins, offsetof(JSContext, bailExit));
+
+    // Tell nanojit not to discard or defer stack writes before this call.
+    LIns* guardRec = createGuardRecord(exit);
+    lir->insGuard(LIR_xbarrier, guardRec, guardRec);
+
+    // It is unsafe to pass the address of an object slot as the out parameter,
+    // because the getter or setter could end up resizing the object's dslots.
+    // Instead, use a word of stack and root it in nativeVp.
+    LIns* vp_ins = lir->insAlloc(sizeof(jsval));
+    lir->insStorei(vp_ins, cx_ins, offsetof(JSContext, nativeVp));
+    lir->insStorei(INS_CONST(1), cx_ins, offsetof(JSContext, nativeVpLen));
+    if (setflag)
+        lir->insStorei(boxed_ins, vp_ins, 0);
+
+    CallInfo* ci = (CallInfo*) lir->insSkip(sizeof(struct CallInfo))->payload();
+    ci->_address = uintptr_t(setflag ? sprop->setter : sprop->getter);
+    ci->_argtypes = ARGSIZE_LO | ARGSIZE_LO << 2 | ARGSIZE_LO << 4 | ARGSIZE_LO << 6 | ARGSIZE_LO << 8;
+    ci->_cse = ci->_fold = 0;
+    ci->_abi = ABI_CDECL;
+#ifdef DEBUG
+    ci->_name = "JSPropertyOp";
+#endif
+    LIns* args[] = { vp_ins, INS_CONSTWORD(SPROP_USERID(sprop)), obj_ins, cx_ins };
+    LIns* ok_ins = lir->insCall(ci, args);
+
+    // Unroot the vp.
+    lir->insStorei(INS_CONSTPTR(NULL), cx_ins, offsetof(JSContext, nativeVp));
+
+    // Guard that the call succeeded and builtinStatus is still 0.
+    // If the native op succeeds but we deep-bail here, the result value is
+    // lost!  Therefore this can only be used for setters of shared properties.
+    // In that case we ignore the result value anyway.
+    LIns* status_ins = lir->insLoad(LIR_ld,
+                                    lirbuf->state,
+                                    (int) offsetof(InterpState, builtinStatus));
+    propagateFailureToBuiltinStatus(ok_ins, status_ins);
+    guard(true, lir->ins_eq0(status_ins), STATUS_EXIT);
+
+    // Re-load the value--but this is currently unused, so commented out.
+    //boxed_ins = lir->insLoad(LIR_ldp, vp_ins, 0);
+}
+
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::emitNativeCall(JSTraceableNative* known, uintN argc, LIns* args[])
 {
@@ -9261,30 +9367,90 @@ TraceRecorder::record_JSOP_SETPROP()
     return JSRS_CONTINUE;
 }
 
+/* Emit a specialized, inlined copy of js_NativeSet. */
 JS_REQUIRES_STACK JSRecordingStatus
-TraceRecorder::record_SetPropHit(JSPropCacheEntry* entry, JSScopeProperty* sprop)
+TraceRecorder::nativeSet(JSObject* obj, LIns* obj_ins, JSScopeProperty* sprop,
+                         jsval v, LIns* v_ins)
+{
+    JSScope* scope = OBJ_SCOPE(obj);
+    uint32 slot = sprop->slot;
+
+    /*
+     * We do not trace assignment to properties that have both a nonstub setter
+     * and a slot, for several reasons.
+     *
+     * First, that would require sampling rt->propertyRemovals before and after
+     * (see js_NativeSet), and even more code to handle the case where the two
+     * samples differ. A mere guard is not enough, because you can't just bail
+     * off trace in the middle of a property assignment without storing the
+     * value and making the stack right.
+     *
+     * If obj is the global object, there are two additional problems. We would
+     * have to emit still more code to store the result in the object (not the
+     * native global frame) if the setter returned successfully after
+     * deep-bailing.  And we would have to cope if the run-time type of the
+     * setter's return value differed from the record-time type of v, in which
+     * case unboxing would fail and, having called a native setter, we could
+     * not just retry the instruction in the interpreter.
+     */
+    JS_ASSERT(SPROP_HAS_STUB_SETTER(sprop) || slot == SPROP_INVALID_SLOT);
+
+    // Box the value to be stored, if necessary.
+    LIns* boxed_ins = NULL;
+    if (!SPROP_HAS_STUB_SETTER(sprop) || (slot != SPROP_INVALID_SLOT && obj != globalObj)) {
+        boxed_ins = v_ins;
+        box_jsval(v, boxed_ins);
+    }
+
+    // Call the setter, if any.
+    if (!SPROP_HAS_STUB_SETTER(sprop))
+        emitNativePropertyOp(scope, sprop, obj_ins, true, boxed_ins);
+
+    // Store the value, if this property has a slot.
+    if (slot != SPROP_INVALID_SLOT) {
+        JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, scope));
+        JS_ASSERT(!(sprop->attrs & JSPROP_SHARED));
+        if (obj == globalObj) {
+            if (!lazilyImportGlobalSlot(slot))
+                ABORT_TRACE("lazy import of global slot failed");
+
+            // If we called a native setter, unbox the result.
+            if (!SPROP_HAS_STUB_SETTER(sprop)) {
+                v_ins = boxed_ins;
+                unbox_jsval(STOBJ_GET_SLOT(obj, slot), v_ins, snapshot(BRANCH_EXIT));
+            }
+            set(&STOBJ_GET_SLOT(obj, slot), v_ins);
+        } else {
+            LIns* dslots_ins = NULL;
+            stobj_set_slot(obj_ins, slot, dslots_ins, boxed_ins);
+        }
+    }
+
+    return JSRS_CONTINUE;
+}
+
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::setProp(jsval &l, JSPropCacheEntry* entry, JSScopeProperty* sprop,
+                       jsval &v, LIns*& v_ins)
 {
     if (entry == JS_NO_PROP_CACHE_FILL)
         ABORT_TRACE("can't trace uncacheable property set");
-    if (PCVCAP_TAG(entry->vcap) >= 1)
-        ABORT_TRACE("can't trace inherited property set");
+    JS_ASSERT_IF(PCVCAP_TAG(entry->vcap) >= 1, sprop->attrs & JSPROP_SHARED);
+    if (!SPROP_HAS_STUB_SETTER(sprop) && sprop->slot != SPROP_INVALID_SLOT)
+        ABORT_TRACE("can't trace set of property with setter and slot");
+    if (sprop->attrs & JSPROP_SETTER)
+        ABORT_TRACE("can't trace JavaScript function setter");
 
-    jsbytecode* pc = cx->fp->regs->pc;
-    JS_ASSERT(entry->kpc == pc);
-
-    jsval& r = stackval(-1);
-    jsval& l = stackval(-2);
+    // These two cases are actually errors and can't be cached.
+    JS_ASSERT(!(sprop->attrs & JSPROP_GETTER));  // getter without setter
+    JS_ASSERT(!(sprop->attrs & JSPROP_READONLY));
 
     JS_ASSERT(!JSVAL_IS_PRIMITIVE(l));
     JSObject* obj = JSVAL_TO_OBJECT(l);
     LIns* obj_ins = get(&l);
     JSScope* scope = OBJ_SCOPE(obj);
 
-    JS_ASSERT(scope->owned());
-    JS_ASSERT(scope->has(sprop));
-
-    if (!isValidSlot(scope, sprop))
-        return JSRS_STOP;
+    JS_ASSERT_IF(entry->vcap == PCVCAP_MAKE(entry->kshape, 0, 0), scope->has(sprop));
 
     /*
      * Setting a function-valued property might need to rebrand the object; we
@@ -9292,57 +9458,54 @@ TraceRecorder::record_SetPropHit(JSPropCacheEntry* entry, JSScopeProperty* sprop
      * separating functions into the trace-time type TT_FUNCTION will save the
      * day!
      */
-    if (scope->branded() && VALUE_IS_FUNCTION(cx, r))
+    if (scope->branded() && VALUE_IS_FUNCTION(cx, v))
         ABORT_TRACE("can't trace function-valued property set in branded scope");
 
-    if (obj == globalObj) {
-        JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, scope));
-        uint32 slot = sprop->slot;
-        if (!lazilyImportGlobalSlot(slot))
-            ABORT_TRACE("lazy import of global slot failed");
+    // Find obj2.  If entry->adding(), the TAG bits are all 0.
+    JSObject* obj2 = obj;
+    for (jsuword i = PCVCAP_TAG(entry->vcap) >> PCVCAP_PROTOBITS; i; i--)
+        obj2 = OBJ_GET_PARENT(cx, obj2);
+    for (jsuword j = PCVCAP_TAG(entry->vcap) & PCVCAP_PROTOMASK; j; j--)
+        obj2 = OBJ_GET_PROTO(cx, obj2);
+    scope = OBJ_SCOPE(obj2);
+    JS_ASSERT_IF(entry->adding(), obj2 == obj);
 
-        LIns* r_ins = get(&r);
-        set(&STOBJ_GET_SLOT(obj, slot), r_ins);
-
-        JS_ASSERT(*pc != JSOP_INITPROP);
-        if (pc[JSOP_SETPROP_LENGTH] != JSOP_POP)
-            set(&l, r_ins);
-        return JSRS_CONTINUE;
-    }
-
-    // The global object's shape is guarded at trace entry, all others need a guard here.
+    // Guard before anything else.
     LIns* map_ins = map(obj_ins);
-    LIns* ops_ins;
-    if (!map_is_native(obj->map, map_ins, ops_ins, offsetof(JSObjectOps, setProperty)))
-        ABORT_TRACE("non-native map");
+    CHECK_STATUS(guardNativePropertyOp(obj, map_ins));
+    jsuword pcval;
+    CHECK_STATUS(guardPropertyCacheHit(obj_ins, map_ins, obj, obj2, entry, pcval));
+    JS_ASSERT(scope->object == obj2);
+    JS_ASSERT(scope->has(sprop));
+    JS_ASSERT_IF(obj2 != obj, sprop->attrs & JSPROP_SHARED);
 
-    LIns* shape_ins = addName(lir->insLoad(LIR_ld, map_ins, offsetof(JSScope, shape)), "shape");
-    guard(true,
-          addName(lir->ins2i(LIR_eq, shape_ins, entry->kshape), "guard(kshape)(record_SetPropHit)"),
-          BRANCH_EXIT);
-
-    uint32 vshape = PCVCAP_SHAPE(entry->vcap);
-    if (entry->kshape != vshape) {
-        LIns *vshape_ins = lir->insLoad(LIR_ld,
-                                        lir->insLoad(LIR_ldp, cx_ins, offsetof(JSContext, runtime)),
-                                        offsetof(JSRuntime, protoHazardShape));
-        guard(true,
-              addName(lir->ins2i(LIR_eq, vshape_ins, vshape), "guard(vshape)(record_SetPropHit)"),
-              MISMATCH_EXIT);
+    // Add a property to the object if necessary.
+    if (entry->adding()) {
+        JS_ASSERT(!(sprop->attrs & JSPROP_SHARED));
+        if (obj == globalObj)
+            ABORT_TRACE("adding a property to the global object");
 
         LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
         LIns* ok_ins = lir->insCall(&js_AddProperty_ci, args);
         guard(false, lir->ins_eq0(ok_ins), OOM_EXIT);
     }
 
-    LIns* dslots_ins = NULL;
-    LIns* v_ins = get(&r);
-    LIns* boxed_ins = v_ins;
-    box_jsval(r, boxed_ins);
-    CHECK_STATUS(native_set(obj_ins, sprop, dslots_ins, boxed_ins));
+    v_ins = get(&v);
+    return nativeSet(obj, obj_ins, sprop, v, v_ins);
+}
 
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::record_SetPropHit(JSPropCacheEntry* entry, JSScopeProperty* sprop)
+{
+    jsval& r = stackval(-1);
+    jsval& l = stackval(-2);
+    LIns* v_ins;
+    CHECK_STATUS(setProp(l, entry, sprop, r, v_ins));
+
+    jsbytecode* pc = cx->fp->regs->pc;
     if (*pc != JSOP_INITPROP && pc[JSOP_SETPROP_LENGTH] != JSOP_POP)
         set(&l, v_ins);
+
     return JSRS_CONTINUE;
 }
 
@@ -10097,22 +10260,24 @@ TraceRecorder::record_NativeCallComplete()
     jsbytecode* pc = cx->fp->regs->pc;
 
     JS_ASSERT(pendingTraceableNative);
-    JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEW);
+    JS_ASSERT(*pc == JSOP_CALL || *pc == JSOP_APPLY || *pc == JSOP_NEW || *pc == JSOP_SETPROP);
 
     jsval& v = stackval(-1);
     LIns* v_ins = get(&v);
 
-    /* At this point the generated code has already called the native function
-       and we can no longer fail back to the original pc location (JSOP_CALL)
-       because that would cause the interpreter to re-execute the native
-       function, which might have side effects.
-
-       Instead, the snapshot() call below sees that we are currently parked on
-       a traceable native's JSOP_CALL instruction, and it will advance the pc
-       to restore by the length of the current opcode.  If the native's return
-       type is jsval, snapshot() will also indicate in the type map that the
-       element on top of the stack is a boxed value which doesn't need to be
-       boxed if the type guard generated by unbox_jsval() fails. */
+    /*
+     * At this point the generated code has already called the native function
+     * and we can no longer fail back to the original pc location (JSOP_CALL)
+     * because that would cause the interpreter to re-execute the native
+     * function, which might have side effects.
+     *
+     * Instead, the snapshot() call below sees that we are currently parked on
+     * a traceable native's JSOP_CALL instruction, and it will advance the pc
+     * to restore by the length of the current opcode.  If the native's return
+     * type is jsval, snapshot() will also indicate in the type map that the
+     * element on top of the stack is a boxed value which doesn't need to be
+     * boxed if the type guard generated by unbox_jsval() fails.
+     */
 
     if (JSTN_ERRTYPE(pendingTraceableNative) == FAIL_STATUS) {
         // Keep cx->bailExit null when it's invalid.
@@ -10145,27 +10310,9 @@ TraceRecorder::record_NativeCallComplete()
             }
             set(&v, v_ins);
 
-            /*
-             * If this is a generic traceable native invocation, propagate the boolean return
-             * value of the native into builtinStatus. If the return value (v_ins)
-             * is true, status' == status. Otherwise status' = status | JSBUILTIN_ERROR.
-             * We calculate (rval&1)^1, which is 1 if rval is JS_FALSE (error), and then
-             * shift that by 1 which is JSBUILTIN_ERROR.
-             */
-            JS_STATIC_ASSERT((1 - JS_TRUE) << 1 == 0);
-            JS_STATIC_ASSERT((1 - JS_FALSE) << 1 == JSBUILTIN_ERROR);
-            status = lir->ins2(LIR_or,
-                               status,
-                               lir->ins2i(LIR_lsh,
-                                          lir->ins2i(LIR_xor,
-                                                     lir->ins2i(LIR_and, ok_ins, 1),
-                                                     1),
-                                          1));
-            lir->insStorei(status, lirbuf->state, (int) offsetof(InterpState, builtinStatus));
+            propagateFailureToBuiltinStatus(ok_ins, status);
         }
-        guard(true,
-              lir->ins_eq0(status),
-              STATUS_EXIT);
+        guard(true, lir->ins_eq0(status), STATUS_EXIT);
     }
 
     JSRecordingStatus ok = JSRS_CONTINUE;
@@ -10303,9 +10450,8 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
         return JSRS_CONTINUE;
     }
 
-    /* Insist if setting on obj being the directly addressed object. */
-    uint32 setflags = (cs.format & (JOF_SET | JOF_INCDEC | JOF_FOR));
-    LIns* dslots_ins = NULL;
+    uint32 setflags = (cs.format & (JOF_INCDEC | JOF_FOR));
+    JS_ASSERT(!(cs.format & JOF_SET));
 
     /* Don't trace getter or setter calls, our caller wants a direct slot. */
     if (PCVAL_IS_SPROP(pcval)) {
@@ -10364,11 +10510,12 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
          * obj_ins the last proto-load.
          */
         while (obj != obj2) {
-            obj_ins = stobj_get_slot(obj_ins, JSSLOT_PROTO, dslots_ins);
+            obj_ins = stobj_get_fslot(obj_ins, JSSLOT_PROTO);
             obj = STOBJ_GET_PROTO(obj);
         }
     }
 
+    LIns* dslots_ins = NULL;
     v_ins = stobj_get_slot(obj_ins, slot, dslots_ins);
     unbox_jsval(STOBJ_GET_SLOT(obj, slot), v_ins, snapshot(BRANCH_EXIT));
 
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 82a1b13cdb43..61dca54ecd8c 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -687,6 +687,15 @@ class TraceRecorder : public avmplus::GCObject {
                                          nanojit::LIns*& ops_ins, size_t op_offset = 0);
     JS_REQUIRES_STACK JSRecordingStatus test_property_cache(JSObject* obj, nanojit::LIns* obj_ins,
                                                             JSObject*& obj2, jsuword& pcval);
+    JS_REQUIRES_STACK JSRecordingStatus guardNativePropertyOp(JSObject* aobj,
+                                                              nanojit::LIns* map_ins);
+    JS_REQUIRES_STACK JSRecordingStatus guardPropertyCacheHit(nanojit::LIns* obj_ins,
+                                                              nanojit::LIns* map_ins,
+                                                              JSObject* aobj,
+                                                              JSObject* obj2,
+                                                              JSPropCacheEntry* entry,
+                                                              jsuword& pcval);
+
     void stobj_set_fslot(nanojit::LIns *obj_ins, unsigned slot,
                          nanojit::LIns* v_ins, const char *name);
     void stobj_set_dslot(nanojit::LIns *obj_ins, unsigned slot, nanojit::LIns*& dslots_ins,
@@ -704,8 +713,6 @@ class TraceRecorder : public avmplus::GCObject {
                          stobj_get_fslot(obj_ins, JSSLOT_PRIVATE),
                          lir->insImmPtr((void*) ~mask));
     }
-    JSRecordingStatus native_set(nanojit::LIns* obj_ins, JSScopeProperty* sprop,
-                                 nanojit::LIns*& dslots_ins, nanojit::LIns* v_ins);
     JSRecordingStatus native_get(nanojit::LIns* obj_ins, nanojit::LIns* pobj_ins,
                                  JSScopeProperty* sprop, nanojit::LIns*& dslots_ins,
                                  nanojit::LIns*& v_ins);
@@ -722,6 +729,13 @@ class TraceRecorder : public avmplus::GCObject {
     JS_REQUIRES_STACK JSRecordingStatus getProp(jsval& v);
     JS_REQUIRES_STACK JSRecordingStatus getThis(nanojit::LIns*& this_ins);
 
+    JS_REQUIRES_STACK JSRecordingStatus nativeSet(JSObject* obj, nanojit::LIns* obj_ins,
+                                                  JSScopeProperty* sprop,
+                                                  jsval v, nanojit::LIns* v_ins);
+    JS_REQUIRES_STACK JSRecordingStatus setProp(jsval &l, JSPropCacheEntry* entry,
+                                                JSScopeProperty* sprop,
+                                                jsval &v, nanojit::LIns*& v_ins);
+
     JS_REQUIRES_STACK void box_jsval(jsval v, nanojit::LIns*& v_ins);
     JS_REQUIRES_STACK void unbox_jsval(jsval v, nanojit::LIns*& v_ins, VMSideExit* exit);
     JS_REQUIRES_STACK bool guardClass(JSObject* obj, nanojit::LIns* obj_ins, JSClass* clasp,
@@ -748,8 +762,15 @@ class TraceRecorder : public avmplus::GCObject {
                                                   jsval* rval);
     JS_REQUIRES_STACK JSRecordingStatus interpretedFunctionCall(jsval& fval, JSFunction* fun,
                                                                 uintN argc, bool constructing);
+    JS_REQUIRES_STACK void propagateFailureToBuiltinStatus(nanojit::LIns *ok_ins,
+                                                           nanojit::LIns *&status_ins);
     JS_REQUIRES_STACK JSRecordingStatus emitNativeCall(JSTraceableNative* known, uintN argc,
                                                        nanojit::LIns* args[]);
+    JS_REQUIRES_STACK void emitNativePropertyOp(JSScope* scope,
+                                                JSScopeProperty* sprop,
+                                                nanojit::LIns* obj_ins,
+                                                bool setflag,
+                                                nanojit::LIns* boxed_ins);
     JS_REQUIRES_STACK JSRecordingStatus callTraceableNative(JSFunction* fun, uintN argc,
                                                             bool constructing);
     JS_REQUIRES_STACK JSRecordingStatus callNative(uintN argc, JSOp mode);
diff --git a/js/src/trace-test.js b/js/src/trace-test.js
index df5f7746560f..5525267faef4 100644
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -5497,6 +5497,21 @@ testOwnPropertyWithInOperator.jitstats = {
 };
 test(testEliminatedGuardWithinAnchor);
 
+function testNativeSetter() {
+    var re = /foo/;
+    var N = RUNLOOP + 10;
+    for (var i = 0; i < N; i++)
+        re.lastIndex = i;
+    assertEq(re.lastIndex, N - 1);
+}
+testNativeSetter.jitstats = {
+    recorderStarted: 1,
+    recorderAborted: 0,
+    traceTriggered: 1,
+    sideExitIntoInterpreter: 1
+};
+test(testNativeSetter);
+
 /*****************************************************************************
  *                                                                           *
  *  _____ _   _  _____ ______ _____ _______                                  *

From f9b40174d451439d0a38f8929ad12c7811f3c474 Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Mon, 27 Jul 2009 18:13:53 -0700
Subject: [PATCH 25/61] Bug 495329: Trace JSOP_BINDNAME/JSOP_SETNAME for
 closures, r=brendan

---
 js/src/jsbuiltins.h |  5 +++++
 js/src/jsfun.cpp    | 19 +++++++++++++++++--
 js/src/jsfun.h      | 20 +++++++++++++++++++-
 js/src/jstracer.cpp | 41 ++++++++++++++++++++++++++++++++++++-----
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/js/src/jsbuiltins.h b/js/src/jsbuiltins.h
index baef4f07be6e..d576e32424fc 100644
--- a/js/src/jsbuiltins.h
+++ b/js/src/jsbuiltins.h
@@ -187,6 +187,7 @@ struct JSTraceableNative {
 #define _JS_CTYPE_JSVAL             _JS_JSVAL_CTYPE(                  _JS_PTR, "","v", INFALLIBLE)
 #define _JS_CTYPE_JSVAL_RETRY       _JS_JSVAL_CTYPE(                  _JS_PTR, --, --, FAIL_COOKIE)
 #define _JS_CTYPE_JSVAL_FAIL        _JS_JSVAL_CTYPE(                  _JS_PTR, --, --, FAIL_STATUS)
+#define _JS_CTYPE_JSID              _JS_CTYPE(jsid,                   _JS_PTR, --, --, INFALLIBLE)
 #define _JS_CTYPE_BOOL              _JS_CTYPE(JSBool,                 _JS_I32, "","i", INFALLIBLE)
 #define _JS_CTYPE_BOOL_RETRY        _JS_CTYPE(JSBool,                 _JS_I32, --, --, FAIL_VOID)
 #define _JS_CTYPE_BOOL_FAIL         _JS_CTYPE(JSBool,                 _JS_I32, --, --, FAIL_STATUS)
@@ -444,6 +445,10 @@ JS_DECLARE_CALLINFO(js_ArrayCompPush)
 JS_DECLARE_CALLINFO(js_AllocFlatClosure)
 JS_DECLARE_CALLINFO(js_PutArguments)
 
+/* Defined in jsfun.cpp. */
+JS_DECLARE_CALLINFO(js_SetCallVar)
+JS_DECLARE_CALLINFO(js_SetCallArg)
+
 /* Defined in jsnum.cpp. */
 JS_DECLARE_CALLINFO(js_NumberToString)
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index c3076d055a0a..90fc581a95c0 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1133,7 +1133,7 @@ js_GetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
     return CallPropertyOp(cx, obj, id, vp, JSCPK_ARG, JS_FALSE);
 }
 
-static JSBool
+JSBool
 SetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
     return CallPropertyOp(cx, obj, id, vp, JSCPK_ARG, JS_TRUE);
@@ -1154,12 +1154,27 @@ js_GetCallVarChecked(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
     return CheckForEscapingClosure(cx, obj, vp);
 }
 
-static JSBool
+JSBool
 SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
     return CallPropertyOp(cx, obj, id, vp, JSCPK_VAR, JS_TRUE);
 }
 
+JSBool JS_FASTCALL
+js_SetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval v)
+{
+    return CallPropertyOp(cx, obj, id, &v, JSCPK_ARG, JS_TRUE);
+}
+
+JSBool JS_FASTCALL
+js_SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval v)
+{
+    return CallPropertyOp(cx, obj, id, &v, JSCPK_VAR, JS_TRUE);
+}
+
+JS_DEFINE_CALLINFO_4(extern, BOOL, js_SetCallArg, CONTEXT, OBJECT, JSID, JSVAL, 0, 0)
+JS_DEFINE_CALLINFO_4(extern, BOOL, js_SetCallVar, CONTEXT, OBJECT, JSID, JSVAL, 0, 0)
+
 static JSBool
 call_resolve(JSContext *cx, JSObject *obj, jsval idval, uintN flags,
              JSObject **objp)
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 6be8fb2a0976..9a651cf2958c 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -280,7 +280,25 @@ extern JSBool
 js_GetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 
 extern JSBool
-js_GetCallVar(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
+js_GetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+extern JSBool
+SetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+extern JSBool
+SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
+
+/*
+ * js_SetCallArg and js_SetCallVar are extern fastcall copies of the setter 
+ * functions. These versions are required in order to set call vars from traces.
+ * The normal versions must not be fastcall because they are stored in the
+ * property ops map.
+ */
+extern JSBool JS_FASTCALL
+js_SetCallArg(JSContext *cx, JSObject *obj, jsid id, jsval v);
+
+extern JSBool JS_FASTCALL
+js_SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval v);
 
 /*
  * Slower version of js_GetCallVar used when call_resolve detects an attempt to
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index dba2449d3bee..8ecbd8a80bcb 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -9452,6 +9452,29 @@ TraceRecorder::setProp(jsval &l, JSPropCacheEntry* entry, JSScopeProperty* sprop
 
     JS_ASSERT_IF(entry->vcap == PCVCAP_MAKE(entry->kshape, 0, 0), scope->has(sprop));
 
+    // Fast path for CallClass. This is about 20% faster than the general case.
+    if (OBJ_GET_CLASS(cx, obj) == &js_CallClass) {
+        const CallInfo* ci = NULL;
+        if (sprop->setter == SetCallArg)
+            ci = &js_SetCallArg_ci;
+        else if (sprop->setter == SetCallVar)
+            ci = &js_SetCallVar_ci;
+        else
+            ABORT_TRACE("can't trace special CallClass setter");
+
+        LIns* v_ins = get(&v);
+        box_jsval(v, v_ins);
+        LIns* args[] = {
+            v_ins,
+            INS_CONST(SPROP_USERID(sprop)),
+            obj_ins,
+            cx_ins
+        };
+        LIns* call_ins = lir->insCall(ci, args);
+        guard(false, addName(lir->ins_eq0(call_ins), "guard(set upvar)"), STATUS_EXIT);
+        return JSRS_CONTINUE;
+    }
+
     /*
      * Setting a function-valued property might need to rebrand the object; we
      * don't trace that case. There's no need to guard on that, though, because
@@ -11067,8 +11090,14 @@ TraceRecorder::record_JSOP_BINDNAME()
         }
     }
 
-    if (obj != globalObj)
-        ABORT_TRACE("JSOP_BINDNAME must return global object on trace");
+    /*
+     * If obj is a js_CallClass object, then we are tracing a reference to an
+     * upvar in a heavyweight function. We cannot reach this point of the trace
+     * with a different call object because of the guard on the function call, 
+     * so we can assume the result of the bindname is constant on this trace.
+     */
+    if (obj != globalObj && OBJ_GET_CLASS(cx, obj) != &js_CallClass)
+        ABORT_TRACE("Can only trace JSOP_BINDNAME with global or call object");
 
     // The trace is specialized to this global object.  Furthermore,
     // we know it is the sole 'global' object on the scope chain: we
@@ -11076,7 +11105,7 @@ TraceRecorder::record_JSOP_BINDNAME()
     // reached it starting from the function closure or the current
     // scopeChain, so there is nothing inner to it.  So this must be
     // the right base object.
-    stack(0, INS_CONSTPTR(globalObj));
+    stack(0, INS_CONSTPTR(obj));
     return JSRS_CONTINUE;
 }
 
@@ -11087,10 +11116,12 @@ TraceRecorder::record_JSOP_SETNAME()
     JS_ASSERT(!JSVAL_IS_PRIMITIVE(l));
 
     /*
-     * Trace cases that are global code or in lightweight functions scoped by
-     * the global object only.
+     * Trace only cases that are global code, in lightweight functions
+     * scoped by the global object only, or in call objects.
      */
     JSObject* obj = JSVAL_TO_OBJECT(l);
+    if (OBJ_GET_CLASS(cx, obj) == &js_CallClass)
+        return JSRS_CONTINUE;
     if (obj != cx->fp->scopeChain || obj != globalObj)
         ABORT_TRACE("JSOP_SETNAME left operand is not the global object");
 

From 5c1ca3e00a8aeee5671b21d479a76bbe8ba4ff55 Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Mon, 27 Jul 2009 18:40:12 -0700
Subject: [PATCH 26/61] Bug 506821: clean up trailing whitespace, r=brendan

---
 js/src/jsapi.cpp      | 12 ++++++------
 js/src/jsapi.h        |  6 +++---
 js/src/jsarray.cpp    |  4 ++--
 js/src/jsbuiltins.cpp |  2 +-
 js/src/jsbuiltins.h   |  6 +++---
 js/src/jscntxt.cpp    |  8 ++++----
 js/src/jsfun.h        |  2 +-
 js/src/jsinterp.cpp   |  8 ++++----
 js/src/jsinterp.h     |  6 +++---
 js/src/jsinttypes.h   |  2 +-
 js/src/jsmath.cpp     |  2 +-
 js/src/json.cpp       | 22 +++++++++++-----------
 js/src/jsparse.cpp    |  2 +-
 js/src/jspubtd.h      |  4 ++--
 js/src/jsregexp.cpp   |  6 +++---
 js/src/jsscan.cpp     | 14 +++++++-------
 js/src/jsscope.cpp    |  4 ++--
 js/src/jsstdint.h     |  2 +-
 js/src/jstracer.cpp   | 34 +++++++++++++++++-----------------
 js/src/jstracer.h     | 12 ++++++------
 js/src/prmjtime.cpp   | 12 ++++++------
 js/src/resource.h     |  2 +-
 22 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 93d3a2e542a6..f93cd95bf3c3 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1328,7 +1328,7 @@ JS_InitStandardClasses(JSContext *cx, JSObject *obj)
     /* Define a top-level property 'undefined' with the undefined value. */
     atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
     if (!OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                             JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, 
+                             JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
                              NULL)) {
         return JS_FALSE;
     }
@@ -1535,7 +1535,7 @@ JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id,
     if (idstr == ATOM_TO_STRING(atom)) {
         *resolved = JS_TRUE;
         return OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                                   JS_PropertyStub, JS_PropertyStub, 
+                                   JS_PropertyStub, JS_PropertyStub,
                                    JSPROP_PERMANENT, NULL);
     }
 
@@ -1630,7 +1630,7 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj)
     atom = rt->atomState.typeAtoms[JSTYPE_VOID];
     if (!AlreadyHasOwnProperty(cx, obj, atom) &&
         !OBJ_DEFINE_PROPERTY(cx, obj, ATOM_TO_JSID(atom), JSVAL_VOID,
-                             JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT, 
+                             JS_PropertyStub, JS_PropertyStub, JSPROP_PERMANENT,
                              NULL)) {
         return JS_FALSE;
     }
@@ -3001,7 +3001,7 @@ DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value,
                                          attrs, flags, tinyid, NULL);
     }
     return OBJ_DEFINE_PROPERTY(cx, obj, id, value, getter, setter, attrs,
-                               NULL);   
+                               NULL);
 }
 
 static JSBool
@@ -3720,7 +3720,7 @@ JS_HasUCProperty(JSContext *cx, JSObject *obj,
     JSProperty *prop;
 
     CHECK_REQUEST(cx);
-    ok = LookupUCProperty(cx, obj, name, namelen, 
+    ok = LookupUCProperty(cx, obj, name, namelen,
                           JSRESOLVE_QUALIFIED | JSRESOLVE_DETECTING,
                           &obj2, &prop);
     if (ok) {
@@ -5197,7 +5197,7 @@ JS_SetOperationCallback(JSContext *cx, JSOperationCallback callback)
 {
 #ifdef JS_THREADSAFE
     JS_ASSERT(CURRENT_THREAD_IS_ME(cx->thread));
-#endif    
+#endif
     JSOperationCallback old = cx->operationCallback;
     cx->operationCallback = callback;
     return old;
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 8d6de69f2301..2a6a422331d0 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2298,14 +2298,14 @@ JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
  * These functions allow setting an operation callback that will be called
  * from the thread the context is associated with some time after any thread
  * triggered the callback using JS_TriggerOperationCallback(cx).
- * 
+ *
  * In a threadsafe build the engine internally triggers operation callbacks
  * under certain circumstances (i.e. GC and title transfer) to force the
- * context to yield its current request, which the engine always 
+ * context to yield its current request, which the engine always
  * automatically does immediately prior to calling the callback function.
  * The embedding should thus not rely on callbacks being triggered through
  * the external API only.
- * 
+ *
  * Important note: Additional callbacks can occur inside the callback handler
  * if it re-enters the JS engine. The embedding must ensure that the callback
  * is disconnected before attempting such re-entry.
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 2d121e3ddc4b..d3bff3916b4d 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -1368,7 +1368,7 @@ array_toSource(JSContext *cx, uintN argc, jsval *vp)
     JSBool ok = JS_TRUE;
 
     /*
-     * This object will take responsibility for the jschar buffer until the 
+     * This object will take responsibility for the jschar buffer until the
      * buffer is transferred to the returned JSString.
      */
     JSTempVector<jschar> buf(cx);
@@ -1520,7 +1520,7 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
     }
 
     /*
-     * This object will take responsibility for the jschar buffer until the 
+     * This object will take responsibility for the jschar buffer until the
      * buffer is transferred to the returned JSString.
      */
     JSTempVector<jschar> buf(cx);
diff --git a/js/src/jsbuiltins.cpp b/js/src/jsbuiltins.cpp
index fe088a03aad8..1f1408bf460c 100644
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -129,7 +129,7 @@ js_BoxInt32(JSContext* cx, int32 i)
     if (!js_NewDoubleInRootedValue(cx, d, &v))
         return JSVAL_ERROR_COOKIE;
     return v;
-} 
+}
 JS_DEFINE_CALLINFO_2(extern, JSVAL, js_BoxInt32, CONTEXT, INT32, 1, 1)
 
 jsdouble FASTCALL
diff --git a/js/src/jsbuiltins.h b/js/src/jsbuiltins.h
index d576e32424fc..96a1c904f34f 100644
--- a/js/src/jsbuiltins.h
+++ b/js/src/jsbuiltins.h
@@ -86,7 +86,7 @@ struct JSTraceableNative {
     const nanojit::CallInfo *builtin;
     const char              *prefix;
     const char              *argtypes;
-    uintN                   flags;  /* JSTNErrType | JSTN_UNBOX_AFTER | JSTN_MORE | 
+    uintN                   flags;  /* JSTNErrType | JSTN_UNBOX_AFTER | JSTN_MORE |
                                        JSTN_CONSTRUCTOR */
 };
 
@@ -117,7 +117,7 @@ struct JSTraceableNative {
 #endif
 
 /*
- * Supported types for builtin functions. 
+ * Supported types for builtin functions.
  *
  * Types with -- for the two string fields are not permitted as argument types
  * in JS_DEFINE_TRCINFO.
@@ -165,7 +165,7 @@ struct JSTraceableNative {
  * trace.  If an exception is pending, it is thrown; otherwise, we assume the
  * builtin had no side effects and retry the current bytecode in the
  * interpreter.
- * 
+ *
  * So a builtin must not return a value indicating failure after causing side
  * effects (such as reporting an error), without setting an exception pending.
  * The operation would be retried, despite the first attempt's observable
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 9ce2db55eb7d..6bcd70f97f3f 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -819,7 +819,7 @@ js_NextActiveContext(JSRuntime *rt, JSContext *cx)
     return cx;
 #else
     return js_ContextIterator(rt, JS_FALSE, &iter);
-#endif           
+#endif
 }
 
 #ifdef JS_THREADSAFE
@@ -1738,10 +1738,10 @@ JSBool
 js_InvokeOperationCallback(JSContext *cx)
 {
     JS_ASSERT(cx->operationCallbackFlag);
-    
+
     /*
      * Reset the callback flag first, then yield. If another thread is racing
-     * us here we will accumulate another callback request which will be 
+     * us here we will accumulate another callback request which will be
      * serviced at the next opportunity.
      */
     cx->operationCallbackFlag = 0;
@@ -1755,7 +1755,7 @@ js_InvokeOperationCallback(JSContext *cx)
      */
     if (cx->runtime->gcIsNeeded)
         js_GC(cx, GC_NORMAL);
-#ifdef JS_THREADSAFE    
+#ifdef JS_THREADSAFE
     else
         JS_YieldRequest(cx);
 #endif
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index 9a651cf2958c..cbf76932d6c8 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -289,7 +289,7 @@ extern JSBool
 SetCallVar(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 
 /*
- * js_SetCallArg and js_SetCallVar are extern fastcall copies of the setter 
+ * js_SetCallArg and js_SetCallVar are extern fastcall copies of the setter
  * functions. These versions are required in order to set call vars from traces.
  * The normal versions must not be fastcall because they are stored in the
  * property ops map.
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 25506179975c..d77602e4782f 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1534,7 +1534,7 @@ js_Execute(JSContext *cx, JSObject *chain, JSScript *script,
     js_LeaveTrace(cx);
 
 #ifdef JS_TRACER
-    /* 
+    /*
      * The JIT requires that the scope chain here is equal to its global
      * object. Disable the JIT for this call if this condition is not true.
      */
@@ -2095,7 +2095,7 @@ js_GetUpvar(JSContext *cx, uintN level, uintN cookie)
     } else if (slot == CALLEE_UPVAR_SLOT) {
         vp = &fp->argv[-2];
         slot = 0;
-    } else { 
+    } else {
         slot -= fp->fun->nargs;
         JS_ASSERT(slot < fp->script->nslots);
         vp = fp->slots;
@@ -2132,7 +2132,7 @@ js_TraceOpcode(JSContext *cx)
                                 fp->script, cx->tracePrevPc);
 
         /*
-         * If there aren't that many elements on the stack, then 
+         * If there aren't that many elements on the stack, then
          * we have probably entered a new frame, and printing output
          * would just be misleading.
          */
@@ -2717,7 +2717,7 @@ js_Interpret(JSContext *cx)
      * 'op=x; DO_OP()' to let another opcode's implementation finish
      * their work, and many opcodes share entry points with a run of
      * consecutive BEGIN_CASEs.
-     * 
+     *
      * Take care to trace OP only when it is the opcode fetched from
      * the instruction stream, so the trace matches what one would
      * expect from looking at the code.  (We do omit POPs after SETs;
diff --git a/js/src/jsinterp.h b/js/src/jsinterp.h
index 23e77a7171ef..5190a06114a0 100644
--- a/js/src/jsinterp.h
+++ b/js/src/jsinterp.h
@@ -90,7 +90,7 @@ struct JSStackFrame {
      * variables on the stack initially, note when they are closed
      * over, and copy those that are out to the heap when we leave
      * their dynamic scope.
-     * 
+     *
      * The bytecode compiler produces a tree of block objects
      * accompanying each JSScript representing those lexical blocks in
      * the script that have let-bound variables associated with them.
@@ -102,7 +102,7 @@ struct JSStackFrame {
      * When we are in the static scope of such a block, blockChain
      * points to its compiler-allocated block object; otherwise, it is
      * NULL.
-     * 
+     *
      * scopeChain is the current scope chain, including 'call' and
      * 'block' objects for those function calls and lexical blocks
      * whose static scope we are currently executing in, and 'with'
@@ -158,7 +158,7 @@ static JS_INLINE uintN
 GlobalVarCount(JSStackFrame *fp)
 {
     uintN n;
-    
+
     JS_ASSERT(!fp->fun);
     n = fp->script->nfixed;
     if (fp->script->regexpsOffset != 0)
diff --git a/js/src/jsinttypes.h b/js/src/jsinttypes.h
index e239551f90c3..7e06b3edf0d5 100644
--- a/js/src/jsinttypes.h
+++ b/js/src/jsinttypes.h
@@ -43,7 +43,7 @@
  * Types:
  *   JSInt<N>, JSUint<N> (for <N> = 8, 16, 32, and 64)
  *   JSIntPtr, JSUIntPtr
- * 
+ *
  * JSInt<N> and JSUint<N> are signed and unsigned types known to be
  * <N> bits long.  Note that neither JSInt8 nor JSUInt8 is necessarily
  * equivalent to a plain "char".
diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp
index daed88393b99..dd6fd51665c1 100644
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -231,7 +231,7 @@ static inline jsdouble JS_FASTCALL
 math_ceil_kernel(jsdouble x)
 {
 #ifdef __APPLE__
-    if (x < 0 && x > -1.0) 
+    if (x < 0 && x > -1.0)
         return js_copysign(0, -1);
 #endif
     return ceil(x);
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 7f7c2f2dfe43..43bf3ab03259 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -78,7 +78,7 @@ js_json_parse(JSContext *cx, uintN argc, jsval *vp)
     jsval *argv = vp + 2;
     jsval reviver = JSVAL_NULL;
     JSAutoTempValueRooter(cx, 1, &reviver);
-    
+
     if (!JS_ConvertArguments(cx, argc, argv, "S / v", &s, &reviver))
         return JS_FALSE;
 
@@ -523,7 +523,7 @@ Str(JSContext *cx, jsid id, JSObject *holder, StringifyContext *scx, jsval *vp,
 
         char numBuf[DTOSTR_STANDARD_BUFFER_SIZE], *numStr;
         jsdouble d = JSVAL_IS_INT(*vp) ? jsdouble(JSVAL_TO_INT(*vp)) : *JSVAL_TO_DOUBLE(*vp);
-        numStr = JS_dtostr(numBuf, sizeof numBuf, DTOSTR_STANDARD, 0, d);        
+        numStr = JS_dtostr(numBuf, sizeof numBuf, DTOSTR_STANDARD, 0, d);
         if (!numStr) {
             JS_ReportOutOfMemory(cx);
             return JS_FALSE;
@@ -546,7 +546,7 @@ Str(JSContext *cx, jsid id, JSObject *holder, StringifyContext *scx, jsval *vp,
 
         return ok;
     }
-    
+
     *vp = JSVAL_VOID;
     return JS_TRUE;
 }
@@ -640,7 +640,7 @@ static JSBool
 Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
 {
     JS_CHECK_RECURSION(cx, return JS_FALSE);
-    
+
     if (!OBJ_GET_PROPERTY(cx, holder, id, vp))
         return JS_FALSE;
 
@@ -649,7 +649,7 @@ Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
     if (!JSVAL_IS_PRIMITIVE(*vp) && !js_IsCallable(obj = JSVAL_TO_OBJECT(*vp), cx)) {
         jsval propValue = JSVAL_NULL;
         JSAutoTempValueRooter tvr(cx, 1, &propValue);
-        
+
         if(OBJ_IS_ARRAY(cx, obj)) {
             jsuint length = 0;
             if (!js_GetLengthProperty(cx, obj, &length))
@@ -713,7 +713,7 @@ Walk(JSContext *cx, jsid id, JSObject *holder, jsval reviver, jsval *vp)
 static JSBool
 Revive(JSContext *cx, jsval reviver, jsval *vp)
 {
-    
+
     JSObject *obj = js_NewObject(cx, &js_ObjectClass, NULL, NULL);
     if (!obj)
         return JS_FALSE;
@@ -820,7 +820,7 @@ PushState(JSContext *cx, JSONParser *jp, JSONParserState state)
     if (*jp->statep == JSON_PARSE_STATE_FINISHED) {
         // extra input
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_JSON_BAD_PARSE);
-        return JS_FALSE; 
+        return JS_FALSE;
     }
 
     jp->statep++;
@@ -993,10 +993,10 @@ HandleNumber(JSContext *cx, JSONParser *jp, const jschar *buf, uint32 len)
         return JS_FALSE;
     }
 
-    jsval numVal;        
+    jsval numVal;
     if (!JS_NewNumberValue(cx, val, &numVal))
         return JS_FALSE;
-        
+
     return PushPrimitive(cx, jp, numVal);
 }
 
@@ -1248,7 +1248,7 @@ js_ConsumeJSONText(JSContext *cx, JSONParser *jp, const jschar *data, uint32 len
                 JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_JSON_BAD_PARSE);
                 return JS_FALSE;
             }
-            
+
             if (++(jp->numHex) == 4) {
                 js_FastAppendChar(&jp->buffer, jp->hexChar);
                 jp->hexChar = 0;
@@ -1265,7 +1265,7 @@ js_ConsumeJSONText(JSContext *cx, JSONParser *jp, const jschar *data, uint32 len
                 i--;
                 if (!PopState(cx, jp))
                     return JS_FALSE;
-            
+
                 if (!HandleData(cx, jp, JSON_DATA_KEYWORD))
                     return JS_FALSE;
             }
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 8d87d9df77e5..161dfbc94ae2 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -3802,7 +3802,7 @@ CheckDestructuring(JSContext *cx, BindData *data,
 /*
  * This is a greatly pared down version of CheckDestructuring that extends the
  * pn_pos.end source coordinate of each name in a destructuring binding such as
- * 
+ *
  *   var [x, y] = [function () y, 42];
  *
  * to cover its corresponding initializer, so that the initialized binding does
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 6c28b136a792..c2068d65d07c 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -106,8 +106,8 @@ typedef enum JSAccessMode {
     JSACC_PROTO  = 0,           /* XXXbe redundant w.r.t. id */
     JSACC_PARENT = 1,           /* XXXbe redundant w.r.t. id */
 
-                                /* 
-                                 * enum value #2 formerly called JSACC_IMPORT, 
+                                /*
+                                 * enum value #2 formerly called JSACC_IMPORT,
                                  * gap preserved for ABI compatibility.
                                  */
 
diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp
index 960593e235a1..05762c296b49 100644
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@@ -1997,7 +1997,7 @@ CompileRegExpToAST(JSContext* cx, JSTokenStream* ts,
                           + GetCompactIndexWidth(len);
         return JS_TRUE;
     }
-    
+
     return ParseRegExp(&state);
 }
 
@@ -2410,7 +2410,7 @@ class RegExpNativeCompiler {
             LIns *branch = lir->insBranch(LIR_jt, test, 0);
             extras[i].match = branch;
         }
-            
+
         fails.pushBack(lir->insBranch(LIR_jf, lir->ins2(LIR_eq, text_ch, lir->insImm(ch)), 0));
 
         for (int i = 0; i < nextras; ++i)
@@ -2418,7 +2418,7 @@ class RegExpNativeCompiler {
         return lir->ins2(LIR_piadd, pos, lir->insImm(2));
     }
 
-    JS_INLINE bool hasCases(jschar ch) 
+    JS_INLINE bool hasCases(jschar ch)
     {
         return JS_TOLOWER(ch) != JS_TOUPPER(ch);
     }
diff --git a/js/src/jsscan.cpp b/js/src/jsscan.cpp
index 4cab27e92684..37e50a80d85a 100644
--- a/js/src/jsscan.cpp
+++ b/js/src/jsscan.cpp
@@ -308,7 +308,7 @@ GetChar(JSTokenStream *ts)
                     ts->flags |= TSF_EOF;
                     return EOF;
                 }
-        
+
                 /* Fill ts->userbuf so that \r and \r\n convert to \n. */
                 crflag = (ts->flags & TSF_CRFLAG) != 0;
                 len = js_fgets(cbuf, JS_LINE_LIMIT - crflag, ts->file);
@@ -336,7 +336,7 @@ GetChar(JSTokenStream *ts)
                 ts->listener(ts->filename, ts->lineno, ts->userbuf.ptr, len,
                              &ts->listenerTSData, ts->listenerData);
             }
-        
+
             nl = ts->saveEOL;
             if (!nl) {
                 /*
@@ -362,7 +362,7 @@ GetChar(JSTokenStream *ts)
                     }
                 }
             }
-        
+
             /*
              * If there was a line terminator, copy thru it into linebuf.
              * Else copy JS_LINE_LIMIT-1 bytes into linebuf.
@@ -378,7 +378,7 @@ GetChar(JSTokenStream *ts)
             js_strncpy(ts->linebuf.base, ts->userbuf.ptr, len);
             ts->userbuf.ptr += len;
             olen = len;
-        
+
             /*
              * Make sure linebuf contains \n for EOL (don't do this in
              * userbuf because the user's string might be readonly).
@@ -420,11 +420,11 @@ GetChar(JSTokenStream *ts)
                     ts->linebuf.base[len-1] = '\n';
                 }
             }
-        
+
             /* Reset linebuf based on adjusted segment length. */
             ts->linebuf.limit = ts->linebuf.base + len;
             ts->linebuf.ptr = ts->linebuf.base;
-        
+
             /* Update position of linebuf within physical userbuf line. */
             if (!(ts->flags & TSF_NLFLAG))
                 ts->linepos += ts->linelen;
@@ -434,7 +434,7 @@ GetChar(JSTokenStream *ts)
                 ts->flags |= TSF_NLFLAG;
             else
                 ts->flags &= ~TSF_NLFLAG;
-        
+
             /* Update linelen from original segment length. */
             ts->linelen = olen;
         }
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 7da51cd43f71..929f01f72715 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1594,7 +1594,7 @@ JSScope::replacingShapeChange(JSContext *cx, JSScopeProperty *sprop, JSScopeProp
 {
     if (shape == sprop->shape)
         shape = newsprop->shape;
-    else 
+    else
         generateOwnShape(cx);
 }
 
@@ -1604,7 +1604,7 @@ JSScope::sealingShapeChange(JSContext *cx)
     generateOwnShape(cx);
 }
 
-void 
+void
 JSScope::shadowingShapeChange(JSContext *cx, JSScopeProperty *sprop)
 {
     generateOwnShape(cx);
diff --git a/js/src/jsstdint.h b/js/src/jsstdint.h
index 1ce569aea1b5..247149bc592d 100644
--- a/js/src/jsstdint.h
+++ b/js/src/jsstdint.h
@@ -40,7 +40,7 @@
 /*
  * This header provides definitions for the <stdint.h> types we use,
  * even on systems that lack <stdint.h>.
- * 
+ *
  * NOTE: This header should only be included in private SpiderMonkey
  * code; public headers should use only the JS{Int,Uint}N types; see
  * the comment for them in "jsinttypes.h".
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 8ecbd8a80bcb..f693fcd16847 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -1757,7 +1757,7 @@ TraceRecorder::isGlobal(jsval* p) const
             (size_t(p - globalObj->dslots) < (STOBJ_NSLOTS(globalObj) - JS_INITIAL_NSLOTS)));
 }
 
-/* 
+/*
  * Return the offset in the native stack for the given jsval. More formally,
  * |p| must be the address of a jsval that is represented in the native stack
  * area. The return value is the offset, from InterpState::stackBase, in bytes,
@@ -2240,7 +2240,7 @@ js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 cal
 }
 
 /*
- * Generic function to read upvars from Call objects of active heavyweight functions. 
+ * Generic function to read upvars from Call objects of active heavyweight functions.
  *     callee       Callee Function object in which the upvar is accessed.
  *     scopeIndex   Number of parent steps to make from |callee| to find upvar definition.
  *                  This must be at least 1 because |callee| is a Function and we must reach a Call.
@@ -2249,7 +2249,7 @@ js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 cal
  */
 template<typename T>
 uint32 JS_INLINE
-js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth, 
+js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
                   double* result)
 {
     JS_ASSERT(scopeIndex >= 1);
@@ -2305,7 +2305,7 @@ private:
 };
 
 uint32 JS_FASTCALL
-js_GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth, 
+js_GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
                  double* result)
 {
     return js_GetFromClosure<ArgClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
@@ -2320,7 +2320,7 @@ private:
 };
 
 uint32 JS_FASTCALL
-js_GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth, 
+js_GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
                  double* result)
 {
     return js_GetFromClosure<VarClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
@@ -4788,14 +4788,14 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
             if (e2->numGlobalSlots < e1->numGlobalSlots) {
                 /*
                  * Watch out for an extremely rare case (bug 502714). The sequence of events is:
-                 * 
+                 *
                  * 1) Inner tree compiles not knowing about global X (which has type A).
                  * 2) Inner tree learns about global X and specializes it to a different type
                  *    (type B).
                  * 3) Outer tree records inner tree with global X as type A, exiting as B.
                  * 4) Outer tree now has a nesting guard with typeof(X)=B.
                  * 5) Inner tree takes its original exit that does not know about X.
-                 * 
+                 *
                  * In this case, the nesting guard fails, and now it is illegal to use the nested
                  * typemap entry for X. The correct entry is in the inner guard's TreeInfo,
                  * analogous to the solution for bug 476653.
@@ -6523,9 +6523,9 @@ TraceRecorder::frameIfInRange(JSObject* obj, unsigned* depthp) const
     return NULL;
 }
 
-JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureVar, CONTEXT, OBJECT, UINT32, 
+JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureVar, CONTEXT, OBJECT, UINT32,
                      UINT32, UINT32, DOUBLEPTR, 0, 0)
-JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureArg, CONTEXT, OBJECT, UINT32, 
+JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureArg, CONTEXT, OBJECT, UINT32,
                      UINT32, UINT32, DOUBLEPTR, 0, 0)
 
 /*
@@ -6622,13 +6622,13 @@ TraceRecorder::scopeChainProp(JSObject* obj, jsval*& vp, LIns*& ins, bool& track
 
                 LIns* callee_ins = get(&cx->fp->argv[-2]);
                 LIns* outp = lir->insAlloc(sizeof(double));
-                LIns* args[] = { 
+                LIns* args[] = {
                     outp,
                     INS_CONST(callDepth),
                     INS_CONST(slot),
-                    INS_CONST(scopeIndex), 
+                    INS_CONST(scopeIndex),
                     callee_ins,
-                    cx_ins 
+                    cx_ins
                 };
                 const CallInfo* ci;
                 if (sprop->getter == js_GetCallArg)
@@ -9700,7 +9700,7 @@ TraceRecorder::record_JSOP_GETELEM()
                         typemap_ins = lir->ins2(LIR_add, fip_ins, INS_CONST(sizeof(FrameInfo) + 2/*callee,this*/ * sizeof(JSTraceType)));
                     }
 
-                    LIns* typep_ins = lir->ins2(LIR_add, typemap_ins, 
+                    LIns* typep_ins = lir->ins2(LIR_add, typemap_ins,
                                                 lir->ins2(LIR_mul, idx_ins, INS_CONST(sizeof(JSTraceType))));
                     LIns* type_ins = lir->insLoad(LIR_ldcb, typep_ins, 0);
                     guard(true,
@@ -9709,7 +9709,7 @@ TraceRecorder::record_JSOP_GETELEM()
                           BRANCH_EXIT);
 
                     // Read the value out of the native stack area.
-                    guard(true, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)), 
+                    guard(true, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
                           snapshot(BRANCH_EXIT));
                     size_t stackOffset = -treeInfo->nativeStackBase + nativeStackOffset(&afp->argv[0]);
                     LIns* args_addr_ins = lir->ins2(LIR_add, lirbuf->sp, INS_CONST(stackOffset));
@@ -9717,7 +9717,7 @@ TraceRecorder::record_JSOP_GETELEM()
                                                     lir->ins2(LIR_mul, idx_ins, INS_CONST(sizeof(double))));
                     v_ins = stackLoad(argi_addr_ins, type);
                 } else {
-                    guard(false, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)), 
+                    guard(false, lir->ins2(LIR_ult, idx_ins, INS_CONST(afp->argc)),
                           snapshot(BRANCH_EXIT));
                     v_ins = INS_VOID();
                 }
@@ -10225,7 +10225,7 @@ TraceRecorder::record_JSOP_APPLY()
         aobj = JSVAL_TO_OBJECT(vp[3]);
         aobj_ins = get(&vp[3]);
 
-        /* 
+        /*
          * We trace dense arrays and arguments objects. The code we generate for apply
          * uses imacros to handle a specific number of arguments.
          */
@@ -11093,7 +11093,7 @@ TraceRecorder::record_JSOP_BINDNAME()
     /*
      * If obj is a js_CallClass object, then we are tracing a reference to an
      * upvar in a heavyweight function. We cannot reach this point of the trace
-     * with a different call object because of the guard on the function call, 
+     * with a different call object because of the guard on the function call,
      * so we can assume the result of the bindname is constant on this trace.
      */
     if (obj != globalObj && OBJ_GET_CLASS(cx, obj) != &js_CallClass)
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 61dca54ecd8c..523ea7047457 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -281,7 +281,7 @@ typedef int8_t JSTraceType;
 
 /*
  * This indicates an invalid type or error. Note that it should not be used in typemaps,
- * because it is the wrong size. It can only be used as a uint32, for example as the 
+ * because it is the wrong size. It can only be used as a uint32, for example as the
  * return value from a function that returns a type as a uint32.
  */
 const uint32 TT_INVALID = uint32(-1);
@@ -332,7 +332,7 @@ public:
     _(TIMEOUT)                                                                  \
     _(DEEP_BAIL)                                                                \
     _(STATUS)
-        
+
 
 enum ExitType {
     #define MAKE_EXIT_CODE(x) x##_EXIT,
@@ -408,7 +408,7 @@ struct FrameInfo {
      * stack frame for the caller *before* the slots covered by spdist.
      * This may be negative if the caller is the top level script.
      * The key fact is that if we let 'cpos' be the start of the caller's
-     * native stack frame, then (cpos + spoffset) points to the first 
+     * native stack frame, then (cpos + spoffset) points to the first
      * non-argument slot in the callee's native stack frame.
      */
     int32          spoffset;
@@ -548,7 +548,7 @@ struct JSRecordingStatus JSRS_ERROR    = { JSRS_ERROR_code };
 #define STATUS_ABORTS_RECORDING(s) ((s) == JSRS_STOP || (s) == JSRS_ERROR)
 #else
 enum JSRecordingStatus {
-    JSRS_ERROR,        // Error; propagate to interpreter. 
+    JSRS_ERROR,        // Error; propagate to interpreter.
     JSRS_STOP,         // Abort recording.
     JSRS_CONTINUE,     // Continue recording.
     JSRS_IMACRO        // Entered imacro; continue recording.
@@ -995,13 +995,13 @@ js_LogTraceVisState(TraceVisState s, TraceVisExitReason r)
     }
 }
 
-static inline void 
+static inline void
 js_EnterTraceVisState(TraceVisState s, TraceVisExitReason r)
 {
     js_LogTraceVisState(s, r);
 }
 
-static inline void 
+static inline void
 js_ExitTraceVisState(TraceVisExitReason r)
 {
     js_LogTraceVisState(S_EXITLAST, r);
diff --git a/js/src/prmjtime.cpp b/js/src/prmjtime.cpp
index 61b99b65bdcc..986f480a30be 100644
--- a/js/src/prmjtime.cpp
+++ b/js/src/prmjtime.cpp
@@ -109,7 +109,7 @@ PRMJ_LocalGMTDifference()
 
 #if defined(XP_WIN) && !defined(WINCE)
     /* Windows does not follow POSIX. Updates to the
-     * TZ environment variable are not reflected 
+     * TZ environment variable are not reflected
      * immediately on that platform as they are
      * on UNIX systems without this call.
      */
@@ -170,8 +170,8 @@ static const JSInt64 win2un = JSLL_INIT(0x19DB1DE, 0xD53E8000);
 #if defined(HAVE_GETSYSTEMTIMEASFILETIME)
 inline void
 LowResTime(LPFILETIME lpft)
-{ 
-    GetSystemTimeAsFileTime(lpft); 
+{
+    GetSystemTimeAsFileTime(lpft);
 }
 #elif defined(HAVE_SYSTEMTIMETOFILETIME)
 inline void
@@ -229,9 +229,9 @@ NowCalibrate()
             LowResTime(&ft);
         } while (memcmp(&ftStart,&ft, sizeof(ft)) == 0);
         timeEndPeriod(1);
-        
+
 #ifdef WINCE
-        calibration.granularity = (FILETIME2INT64(ft) - 
+        calibration.granularity = (FILETIME2INT64(ft) -
                                    FILETIME2INT64(ftStart))/10;
 #endif
         /*
@@ -581,7 +581,7 @@ PRMJ_DSTOffset(JSInt64 local_time)
 
 #if defined(XP_WIN) && !defined(WINCE)
     /* Windows does not follow POSIX. Updates to the
-     * TZ environment variable are not reflected 
+     * TZ environment variable are not reflected
      * immediately on that platform as they are
      * on UNIX systems without this call.
      */
diff --git a/js/src/resource.h b/js/src/resource.h
index 9301810e4448..59dbde3775e9 100644
--- a/js/src/resource.h
+++ b/js/src/resource.h
@@ -4,7 +4,7 @@
 //
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        101

From dce181923ffc352aacb7a81f865b1ec06e26e862 Mon Sep 17 00:00:00 2001
From: David Mandelin <dmandelin@mozilla.com>
Date: Mon, 27 Jul 2009 18:49:27 -0700
Subject: [PATCH 27/61] Fix incompatible enum warnings in static asserts

---
 js/src/jstracer.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index f693fcd16847..a2c45c0b627d 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -515,9 +515,9 @@ static inline JSTraceType getPromotedType(jsval v)
     }
     uint8_t tag = JSVAL_TAG(v);
     JS_ASSERT(tag == JSVAL_DOUBLE || tag == JSVAL_STRING || tag == JSVAL_BOOLEAN);
-    JS_STATIC_ASSERT(TT_DOUBLE == JSVAL_DOUBLE);
-    JS_STATIC_ASSERT(TT_STRING == JSVAL_STRING);
-    JS_STATIC_ASSERT(TT_PSEUDOBOOLEAN == JSVAL_BOOLEAN);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_DOUBLE) == JSVAL_DOUBLE);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_STRING) == JSVAL_STRING);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_PSEUDOBOOLEAN) == JSVAL_BOOLEAN);
     return JSTraceType(tag);
 }
 
@@ -535,9 +535,9 @@ static inline JSTraceType getCoercedType(jsval v)
     }
     uint8_t tag = JSVAL_TAG(v);
     JS_ASSERT(tag == JSVAL_DOUBLE || tag == JSVAL_STRING || tag == JSVAL_BOOLEAN);
-    JS_STATIC_ASSERT(TT_DOUBLE == JSVAL_DOUBLE);
-    JS_STATIC_ASSERT(TT_STRING == JSVAL_STRING);
-    JS_STATIC_ASSERT(TT_PSEUDOBOOLEAN == JSVAL_BOOLEAN);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_DOUBLE) == JSVAL_DOUBLE);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_STRING) == JSVAL_STRING);
+    JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_PSEUDOBOOLEAN) == JSVAL_BOOLEAN);
     return JSTraceType(tag);
 }
 
@@ -2895,8 +2895,8 @@ TraceRecorder::determineSlotType(jsval* vp)
             m = TT_OBJECT;
     } else {
         JS_ASSERT(JSVAL_TAG(*vp) == JSVAL_STRING || JSVAL_TAG(*vp) == JSVAL_BOOLEAN);
-        JS_STATIC_ASSERT(TT_STRING == JSVAL_STRING);
-        JS_STATIC_ASSERT(TT_PSEUDOBOOLEAN == JSVAL_BOOLEAN);
+        JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_STRING) == JSVAL_STRING);
+        JS_STATIC_ASSERT(static_cast<jsvaltag>(TT_PSEUDOBOOLEAN) == JSVAL_BOOLEAN);
         m = JSTraceType(JSVAL_TAG(*vp));
     }
     JS_ASSERT(m != TT_INT32 || isInt32(*vp));

From d1254f2c2c17c11b6f40c2a2d570e91aeba53890 Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@mozilla.com>
Date: Mon, 27 Jul 2009 21:10:12 -0700
Subject: [PATCH 28/61] When finalizing, deallocate memory in a separate thread
 (505612, r=bent,brendan,waldo).

---
 js/src/Makefile.in  |   2 +
 js/src/jsapi.cpp    |  84 ++++++++++++-----------------
 js/src/jsarena.cpp  |  12 ++---
 js/src/jsarray.cpp  |  28 +++++-----
 js/src/jsatom.cpp   |   2 +-
 js/src/jscntxt.cpp  |  66 +++++++++++------------
 js/src/jscntxt.h    | 104 ++++++++++++++++++++++++++++++++++--
 js/src/jsdate.cpp   |   2 +-
 js/src/jsdbgapi.cpp |  30 +++++------
 js/src/jsdhash.cpp  |  12 ++---
 js/src/jsdtoa.cpp   |   6 +--
 js/src/jsemit.cpp   |  23 ++++----
 js/src/jsexn.cpp    |  24 ++++-----
 js/src/jsfile.cpp   | 127 ++++++++++++++++++++++----------------------
 js/src/jsfun.cpp    |  24 ++++-----
 js/src/jsgc.cpp     |  30 +++++++----
 js/src/jsgc.h       |  23 ++++++++
 js/src/jshash.cpp   |   4 +-
 js/src/jsinterp.cpp |   8 +--
 js/src/jsiter.cpp   |   6 +--
 js/src/jslock.cpp   |  10 ++--
 js/src/jsnum.cpp    |  24 ++++-----
 js/src/jsobj.cpp    |  42 +++++++--------
 js/src/json.cpp     |   7 ++-
 js/src/jsopcode.cpp |  86 +++++++++++++++---------------
 js/src/jsparse.cpp  |   4 +-
 js/src/jsprf.cpp    |  20 +++----
 js/src/jspubtd.h    |   1 -
 js/src/jsregexp.cpp |  57 ++++++++++----------
 js/src/jsscan.cpp   |  26 ++++-----
 js/src/jsscope.cpp  |  30 +++++------
 js/src/jsscript.cpp |  32 +++++------
 js/src/jsstr.cpp    |  97 +++++++++++++++++----------------
 js/src/jstask.cpp   | 126 +++++++++++++++++++++++++++++++++++++++++++
 js/src/jstask.h     |  84 +++++++++++++++++++++++++++++
 js/src/jstracer.cpp |   6 +--
 js/src/jsutil.cpp   |   2 +-
 js/src/jsutil.h     |  25 ++++++++-
 js/src/jsxdrapi.cpp |  30 +++++------
 js/src/jsxml.cpp    |  46 ++++++++--------
 40 files changed, 859 insertions(+), 513 deletions(-)
 create mode 100644 js/src/jstask.cpp
 create mode 100644 js/src/jstask.h

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 1653c69c0e45..9e8d426ebf00 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -144,6 +144,7 @@ CPPSRCS		= \
 		jsscope.cpp \
 		jsscript.cpp \
 		jsstr.cpp \
+		jstask.cpp \
 		jsutil.cpp \
 		jsxdrapi.cpp \
 		jsxml.cpp \
@@ -200,6 +201,7 @@ INSTALLED_HEADERS = \
 		jsscript.h \
 		jsstaticcheck.h \
 		jsstr.h \
+		jstask.h \
 		jstracer.h \
 		jstypes.h \
 		jsutil.h \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index f93cd95bf3c3..00e8a6ec37b3 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -79,6 +79,7 @@
 #include "jsscope.h"
 #include "jsscript.h"
 #include "jsstr.h"
+#include "jstask.h"
 #include "jstracer.h"
 #include "jsdbgapi.h"
 #include "prmjtime.h"
@@ -448,7 +449,7 @@ JS_AddArgumentFormatter(JSContext *cx, const char *format,
             goto out;
         mpp = &map->next;
     }
-    map = (JSArgumentFormatMap *) JS_malloc(cx, sizeof *map);
+    map = (JSArgumentFormatMap *) cx->malloc(sizeof *map);
     if (!map)
         return JS_FALSE;
     map->format = format;
@@ -471,7 +472,7 @@ JS_RemoveArgumentFormatter(JSContext *cx, const char *format)
     while ((map = *mpp) != NULL) {
         if (map->length == length && !strcmp(map->format, format)) {
             *mpp = map->next;
-            JS_free(cx, map);
+            cx->free(map);
             return;
         }
         mpp = &map->next;
@@ -773,7 +774,7 @@ JS_NewRuntime(uint32 maxbytes)
     }
 #endif /* DEBUG */
 
-    rt = (JSRuntime *) malloc(sizeof(JSRuntime));
+    rt = (JSRuntime *) js_malloc(sizeof(JSRuntime));
     if (!rt)
         return NULL;
 
@@ -817,6 +818,9 @@ JS_NewRuntime(uint32 maxbytes)
     rt->debuggerLock = JS_NEW_LOCK();
     if (!rt->debuggerLock)
         goto bad;
+    rt->deallocatorThread = new JSBackgroundThread();
+    if (!rt->deallocatorThread || !rt->deallocatorThread->init())
+        goto bad;
 #endif
     if (!js_InitPropertyTree(rt))
         goto bad;
@@ -886,9 +890,13 @@ JS_DestroyRuntime(JSRuntime *rt)
         JS_DESTROY_CONDVAR(rt->titleSharingDone);
     if (rt->debuggerLock)
         JS_DESTROY_LOCK(rt->debuggerLock);
+    if (rt->deallocatorThread) {
+        rt->deallocatorThread->cancel();
+        delete rt->deallocatorThread;
+    }
 #endif
     js_FinishPropertyTree(rt);
-    free(rt);
+    js_free(rt);
 }
 
 JS_PUBLIC_API(void)
@@ -1653,7 +1661,7 @@ NewIdArray(JSContext *cx, jsint length)
     JSIdArray *ida;
 
     ida = (JSIdArray *)
-          JS_malloc(cx, offsetof(JSIdArray, vector) + length * sizeof(jsval));
+        cx->malloc(offsetof(JSIdArray, vector) + length * sizeof(jsval));
     if (ida)
         ida->length = length;
     return ida;
@@ -1831,41 +1839,19 @@ JS_ComputeThis(JSContext *cx, jsval *vp)
 JS_PUBLIC_API(void *)
 JS_malloc(JSContext *cx, size_t nbytes)
 {
-    void *p;
-
-    JS_ASSERT(nbytes != 0);
-    if (nbytes == 0)
-        nbytes = 1;
-
-    p = malloc(nbytes);
-    if (!p) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-    cx->updateMallocCounter(nbytes);
-
-    return p;
+    return cx->malloc(nbytes);
 }
 
 JS_PUBLIC_API(void *)
 JS_realloc(JSContext *cx, void *p, size_t nbytes)
 {
-    void *orig = p;
-    p = realloc(p, nbytes);
-    if (!p) {
-        JS_ReportOutOfMemory(cx);
-        return NULL;
-    }
-    if (!orig)
-        cx->updateMallocCounter(nbytes);
-    return p;
+    return cx->realloc(p, nbytes);
 }
 
 JS_PUBLIC_API(void)
 JS_free(JSContext *cx, void *p)
 {
-    if (p)
-        free(p);
+    return cx->free(p);
 }
 
 JS_PUBLIC_API(char *)
@@ -1875,7 +1861,7 @@ JS_strdup(JSContext *cx, const char *s)
     void *p;
 
     n = strlen(s) + 1;
-    p = JS_malloc(cx, n);
+    p = cx->malloc(n);
     if (!p)
         return NULL;
     return (char *)memcpy(p, s, n);
@@ -2260,7 +2246,7 @@ DumpNotify(JSTracer *trc, void *thing, uint32 kind)
 
     edgeNameSize = strlen(edgeName) + 1;
     node = (JSHeapDumpNode *)
-        JS_malloc(cx, offsetof(JSHeapDumpNode, edgeName) + edgeNameSize);
+        cx->malloc(offsetof(JSHeapDumpNode, edgeName) + edgeNameSize);
     if (!node) {
         dtrc->ok = JS_FALSE;
         return;
@@ -2412,7 +2398,7 @@ JS_DumpHeap(JSContext *cx, FILE *fp, void* startThing, uint32 startKind,
         for (;;) {
             next = node->next;
             parent = node->parent;
-            JS_free(cx, node);
+            cx->free(node);
             node = next;
             if (node)
                 break;
@@ -2679,7 +2665,7 @@ JS_SetScriptStackQuota(JSContext *cx, size_t quota)
 JS_PUBLIC_API(void)
 JS_DestroyIdArray(JSContext *cx, JSIdArray *ida)
 {
-    JS_free(cx, ida);
+    cx->free(ida);
 }
 
 JS_PUBLIC_API(JSBool)
@@ -4644,7 +4630,7 @@ JS_CompileScript(JSContext *cx, JSObject *obj,
     if (!chars)
         return NULL;
     script = JS_CompileUCScript(cx, obj, chars, length, filename, lineno);
-    JS_free(cx, chars);
+    cx->free(chars);
     return script;
 }
 
@@ -4663,7 +4649,7 @@ JS_CompileScriptForPrincipals(JSContext *cx, JSObject *obj,
         return NULL;
     script = JS_CompileUCScriptForPrincipals(cx, obj, principals,
                                              chars, length, filename, lineno);
-    JS_free(cx, chars);
+    cx->free(chars);
     return script;
 }
 
@@ -4748,7 +4734,7 @@ JS_BufferIsCompilableUnit(JSContext *cx, JSObject *obj,
             JS_SetErrorReporter(cx, older);
         }
     }
-    JS_free(cx, chars);
+    cx->free(chars);
     JS_RestoreExceptionState(cx, exnState);
     return result;
 }
@@ -4857,7 +4843,7 @@ JS_CompileFunction(JSContext *cx, JSObject *obj, const char *name,
         return NULL;
     fun = JS_CompileUCFunction(cx, obj, name, nargs, argnames, chars, length,
                                filename, lineno);
-    JS_free(cx, chars);
+    cx->free(chars);
     return fun;
 }
 
@@ -4878,7 +4864,7 @@ JS_CompileFunctionForPrincipals(JSContext *cx, JSObject *obj,
     fun = JS_CompileUCFunctionForPrincipals(cx, obj, principals, name,
                                             nargs, argnames, chars, length,
                                             filename, lineno);
-    JS_free(cx, chars);
+    cx->free(chars);
     return fun;
 }
 
@@ -5088,7 +5074,7 @@ JS_EvaluateScript(JSContext *cx, JSObject *obj,
     if (!chars)
         return JS_FALSE;
     ok = JS_EvaluateUCScript(cx, obj, chars, length, filename, lineno, rval);
-    JS_free(cx, chars);
+    cx->free(chars);
     return ok;
 }
 
@@ -5110,7 +5096,7 @@ JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
         return JS_FALSE;
     ok = JS_EvaluateUCScriptForPrincipals(cx, obj, principals, chars, length,
                                           filename, lineno, rval);
-    JS_free(cx, chars);
+    cx->free(chars);
     return ok;
 }
 
@@ -5319,13 +5305,13 @@ JS_NewString(JSContext *cx, char *bytes, size_t nbytes)
     /* Free chars (but not bytes, which caller frees on error) if we fail. */
     str = js_NewString(cx, chars, length);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         return NULL;
     }
 
     /* Hand off bytes to the deflated string cache, if possible. */
     if (!js_SetStringBytes(cx, str, bytes, nbytes))
-        JS_free(cx, bytes);
+        cx->free(bytes);
     return str;
 }
 
@@ -5341,7 +5327,7 @@ JS_NewStringCopyN(JSContext *cx, const char *s, size_t n)
         return NULL;
     str = js_NewString(cx, js, n);
     if (!str)
-        JS_free(cx, js);
+        cx->free(js);
     return str;
 }
 
@@ -5361,7 +5347,7 @@ JS_NewStringCopyZ(JSContext *cx, const char *s)
         return NULL;
     str = js_NewString(cx, js, n);
     if (!str)
-        JS_free(cx, js);
+        cx->free(js);
     return str;
 }
 
@@ -5449,7 +5435,7 @@ JS_GetStringChars(JSString *str)
     if (str->isDependent()) {
         n = str->dependentLength();
         size = (n + 1) * sizeof(jschar);
-        s = (jschar *) malloc(size);
+        s = (jschar *) js_malloc(size);
         if (s) {
             memcpy(s, str->dependentChars(), n * sizeof *s);
             s[n] = 0;
@@ -5727,7 +5713,7 @@ JS_NewRegExpObject(JSContext *cx, char *bytes, size_t length, uintN flags)
     if (!chars)
         return NULL;
     obj = js_NewRegExpObject(cx, NULL, chars, length, flags);
-    JS_free(cx, chars);
+    cx->free(chars);
     return obj;
 }
 
@@ -5857,7 +5843,7 @@ JS_SaveExceptionState(JSContext *cx)
     JSExceptionState *state;
 
     CHECK_REQUEST(cx);
-    state = (JSExceptionState *) JS_malloc(cx, sizeof(JSExceptionState));
+    state = (JSExceptionState *) cx->malloc(sizeof(JSExceptionState));
     if (state) {
         state->throwing = JS_GetPendingException(cx, &state->exception);
         if (state->throwing && JSVAL_IS_GCTHING(state->exception))
@@ -5886,7 +5872,7 @@ JS_DropExceptionState(JSContext *cx, JSExceptionState *state)
     if (state) {
         if (state->throwing && JSVAL_IS_GCTHING(state->exception))
             JS_RemoveRoot(cx, &state->exception);
-        JS_free(cx, state);
+        cx->free(state);
     }
 }
 
diff --git a/js/src/jsarena.cpp b/js/src/jsarena.cpp
index 254d6801e1d4..68407af0a632 100644
--- a/js/src/jsarena.cpp
+++ b/js/src/jsarena.cpp
@@ -160,12 +160,12 @@ JS_ArenaAllocate(JSArenaPool *pool, size_t nb)
             if (pool->quotap) {
                 if (gross > *pool->quotap)
                     return NULL;
-                b = (JSArena *) malloc(gross);
+                b = (JSArena *) js_malloc(gross);
                 if (!b)
                     return NULL;
                 *pool->quotap -= gross;
             } else {
-                b = (JSArena *) malloc(gross);
+                b = (JSArena *) js_malloc(gross);
                 if (!b)
                     return NULL;
             }
@@ -227,12 +227,12 @@ JS_ArenaRealloc(JSArenaPool *pool, void *p, size_t size, size_t incr)
         growth = gross - (a->limit - (jsuword) a);
         if (growth > *pool->quotap)
             return NULL;
-        a = (JSArena *) realloc(a, gross);
+        a = (JSArena *) js_realloc(a, gross);
         if (!a)
             return NULL;
         *pool->quotap -= growth;
     } else {
-        a = (JSArena *) realloc(a, gross);
+        a = (JSArena *) js_realloc(a, gross);
         if (!a)
             return NULL;
     }
@@ -315,7 +315,7 @@ FreeArenaList(JSArenaPool *pool, JSArena *head)
             *pool->quotap += a->limit - (jsuword) a;
         JS_CLEAR_ARENA(a);
         JS_COUNT_ARENA(pool,--);
-        free(a);
+        js_free(a);
     } while ((a = *ap) != NULL);
 
     pool->current = head;
@@ -354,7 +354,7 @@ JS_FinishArenaPool(JSArenaPool *pool)
         JSArenaStats *stats, **statsp;
 
         if (pool->stats.name) {
-            free(pool->stats.name);
+            js_free(pool->stats.name);
             pool->stats.name = NULL;
         }
         for (statsp = &arena_stats_list; (stats = *statsp) != 0;
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index d3bff3916b4d..f4b1039efab6 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -314,7 +314,7 @@ ResizeSlots(JSContext *cx, JSObject *obj, uint32 oldsize, uint32 size)
 
     if (size == 0) {
         if (obj->dslots) {
-            JS_free(cx, obj->dslots - 1);
+            cx->free(obj->dslots - 1);
             obj->dslots = NULL;
         }
         return JS_TRUE;
@@ -330,7 +330,7 @@ ResizeSlots(JSContext *cx, JSObject *obj, uint32 oldsize, uint32 size)
     }
 
     slots = obj->dslots ? obj->dslots - 1 : NULL;
-    newslots = (jsval *) JS_realloc(cx, slots, (size + 1) * sizeof(jsval));
+    newslots = (jsval *) cx->realloc(slots, (size + 1) * sizeof(jsval));
     if (!newslots)
         return JS_FALSE;
 
@@ -1099,7 +1099,7 @@ array_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
             if (obj->dslots[i] == JSVAL_HOLE) {
                 if (!ii) {
                     ii = (JSIndexIterState *)
-                         JS_malloc(cx, offsetof(JSIndexIterState, holes) +
+                         cx->malloc(offsetof(JSIndexIterState, holes) +
                                    JS_BITMAP_SIZE(capacity));
                     if (!ii)
                         return JS_FALSE;
@@ -1116,7 +1116,7 @@ array_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
                 break;
             }
             ii = (JSIndexIterState *)
-                 JS_malloc(cx, offsetof(JSIndexIterState, holes));
+                 cx->malloc(offsetof(JSIndexIterState, holes));
             if (!ii)
                 return JS_FALSE;
             ii->hasHoles = JS_FALSE;
@@ -1157,7 +1157,7 @@ array_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
         if (JSVAL_TAG(*statep) != JSVAL_BOOLEAN) {
             JS_ASSERT((*statep & INDEX_ITER_TAG) == INDEX_ITER_TAG);
             ii = (JSIndexIterState *) (*statep & ~INDEX_ITER_TAG);
-            JS_free(cx, ii);
+            cx->free(ii);
         }
         *statep = JSVAL_NULL;
         break;
@@ -1188,7 +1188,7 @@ static void
 array_finalize(JSContext *cx, JSObject *obj)
 {
     if (obj->dslots)
-        JS_free(cx, obj->dslots - 1);
+        cx->free(obj->dslots - 1);
     obj->dslots = NULL;
 }
 
@@ -1336,7 +1336,7 @@ BufferToString(JSContext *cx, JSTempVector<jschar> &buf, jsval *rval)
     jschar *chars = buf.extractRawBuffer();
     JSString *str = js_NewString(cx, chars, length);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         return JS_FALSE;
     }
     *rval = STRING_TO_JSVAL(str);
@@ -1392,7 +1392,7 @@ array_toSource(JSContext *cx, uintN argc, jsval *vp)
         if (!(ok = buf.pushBack(arr, arr + 3)))
             goto done;
         if (sharpchars)
-            JS_free(cx, sharpchars);
+            cx->free(sharpchars);
         goto make_string;
     }
 #endif
@@ -2151,7 +2151,7 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
         return JS_FALSE;
     }
 #endif
-    vec = (jsval *) JS_malloc(cx, 2 * (size_t) len * sizeof(jsval));
+    vec = (jsval *) cx->malloc(2 * (size_t) len * sizeof(jsval));
     if (!vec)
         return JS_FALSE;
 
@@ -2280,8 +2280,8 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
             } while (i != 0);
 
             JS_ASSERT(tvr.u.array == vec);
-            vec = (jsval *) JS_realloc(cx, vec,
-                                       4 * (size_t) newlen * sizeof(jsval));
+            vec = (jsval *) cx->realloc(vec,
+                                        4 * (size_t) newlen * sizeof(jsval));
             if (!vec) {
                 vec = tvr.u.array;
                 ok = JS_FALSE;
@@ -2342,7 +2342,7 @@ array_sort(JSContext *cx, uintN argc, jsval *vp)
 
   out:
     JS_POP_TEMP_ROOT(cx, &tvr);
-    JS_free(cx, vec);
+    cx->free(vec);
     if (!ok)
         return JS_FALSE;
 
@@ -3507,7 +3507,7 @@ js_ArrayInfo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         if (JSVAL_IS_PRIMITIVE(argv[i]) ||
             !OBJ_IS_ARRAY(cx, (array = JSVAL_TO_OBJECT(argv[i])))) {
             fprintf(stderr, "%s: not array\n", bytes);
-            JS_free(cx, bytes);
+            cx->free(bytes);
             continue;
         }
         fprintf(stderr, "%s: %s (len %lu", bytes,
@@ -3519,7 +3519,7 @@ js_ArrayInfo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
                     js_DenseArrayCapacity(array));
         }
         fputs(")\n", stderr);
-        JS_free(cx, bytes);
+        cx->free(bytes);
     }
     return JS_TRUE;
 }
diff --git a/js/src/jsatom.cpp b/js/src/jsatom.cpp
index 6a921d9b0b92..8943f22f224d 100644
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@@ -783,7 +783,7 @@ js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags)
     str.initFlat(chars, inflatedLength);
     atom = js_AtomizeString(cx, &str, ATOM_TMPSTR | flags);
     if (chars != inflated && str.flatChars())
-        JS_free(cx, chars);
+        cx->free(chars);
     return atom;
 }
 
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 6bcd70f97f3f..42b579b363bf 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -142,7 +142,7 @@ static JSThread *
 NewThread(jsword id)
 {
     JS_ASSERT(js_CurrentThreadId() == id);
-    JSThread *thread = (JSThread *) calloc(1, sizeof(JSThread));
+    JSThread *thread = (JSThread *) js_calloc(sizeof(JSThread));
     if (!thread)
         return NULL;
     JS_INIT_CLIST(&thread->contextList);
@@ -158,7 +158,7 @@ DestroyThread(JSThread *thread)
     JS_ASSERT(JS_CLIST_IS_EMPTY(&thread->contextList));
     JS_ASSERT(!thread->titleToShare);
     FinishThreadData(&thread->data);
-    free(thread);
+    js_free(thread);
 }
 
 JSBool
@@ -370,7 +370,7 @@ js_NewContext(JSRuntime *rt, size_t stackChunkSize)
      * runtime list. After that it can be accessed from another thread via
      * js_ContextIterator.
      */
-    cx = (JSContext *) calloc(1, sizeof *cx);
+    cx = (JSContext *) js_calloc(sizeof *cx);
     if (!cx)
         return NULL;
 
@@ -743,14 +743,14 @@ FreeContext(JSContext *cx)
     JS_FinishArenaPool(&cx->tempPool);
 
     if (cx->lastMessage)
-        free(cx->lastMessage);
+        js_free(cx->lastMessage);
 
     /* Remove any argument formatters. */
     map = cx->argumentFormatMap;
     while (map) {
         JSArgumentFormatMap *temp = map;
         map = map->next;
-        JS_free(cx, temp);
+        cx->free(temp);
     }
 
     /* Destroy the busy array table. */
@@ -769,13 +769,13 @@ FreeContext(JSContext *cx)
     if (lrs) {
         while ((lrc = lrs->topChunk) != &lrs->firstChunk) {
             lrs->topChunk = lrc->down;
-            JS_free(cx, lrc);
+            cx->free(lrc);
         }
-        JS_free(cx, lrs);
+        cx->free(lrs);
     }
 
     /* Finally, free cx itself. */
-    free(cx);
+    js_free(cx);
 }
 
 JSBool
@@ -1013,7 +1013,7 @@ js_EnterLocalRootScope(JSContext *cx)
 
     lrs = cx->localRootStack;
     if (!lrs) {
-        lrs = (JSLocalRootStack *) JS_malloc(cx, sizeof *lrs);
+        lrs = (JSLocalRootStack *) cx->malloc(sizeof *lrs);
         if (!lrs)
             return JS_FALSE;
         lrs->scopeMark = JSLRS_NULL_MARK;
@@ -1056,7 +1056,7 @@ js_LeaveLocalRootScopeWithResult(JSContext *cx, jsval rval)
         lrc = lrs->topChunk;
         JS_ASSERT(lrc != &lrs->firstChunk);
         lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
+        cx->free(lrc);
         --n;
     }
 
@@ -1096,10 +1096,10 @@ js_LeaveLocalRootScopeWithResult(JSContext *cx, jsval rval)
      */
     if (mark == 0) {
         cx->localRootStack = NULL;
-        JS_free(cx, lrs);
+        cx->free(lrs);
     } else if (m == 0) {
         lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
+        cx->free(lrc);
     }
 }
 
@@ -1158,7 +1158,7 @@ js_ForgetLocalRoot(JSContext *cx, jsval v)
         JS_ASSERT(n != 0);
         JS_ASSERT(lrc != &lrs->firstChunk);
         lrs->topChunk = lrc->down;
-        JS_free(cx, lrc);
+        cx->free(lrc);
     }
 }
 
@@ -1187,7 +1187,7 @@ js_PushLocalRoot(JSContext *cx, JSLocalRootStack *lrs, jsval v)
          * After lrs->firstChunk, trying to index at a power-of-two chunk
          * boundary: need a new chunk.
          */
-        lrc = (JSLocalRootChunk *) JS_malloc(cx, sizeof *lrc);
+        lrc = (JSLocalRootChunk *) cx->malloc(sizeof *lrc);
         if (!lrc)
             return -1;
         lrc->down = lrs->topChunk;
@@ -1380,8 +1380,8 @@ js_ReportErrorVA(JSContext *cx, uintN flags, const char *format, va_list ap)
     }
 
     ReportError(cx, message, &report);
-    free(message);
-    JS_free(cx, ucmessage);
+    js_free(message);
+    cx->free(ucmessage);
     return warning;
 }
 
@@ -1432,7 +1432,7 @@ js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
              * pointers later.
              */
             reportp->messageArgs = (const jschar **)
-                JS_malloc(cx, sizeof(jschar *) * (argCount + 1));
+                cx->malloc(sizeof(jschar *) * (argCount + 1));
             if (!reportp->messageArgs)
                 return JS_FALSE;
             reportp->messageArgs[argCount] = NULL;
@@ -1476,9 +1476,9 @@ js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
                 * is used once and only once in the expansion !!!
                 */
                 reportp->ucmessage = out = (jschar *)
-                    JS_malloc(cx, (expandedLength + 1) * sizeof(jschar));
+                    cx->malloc((expandedLength + 1) * sizeof(jschar));
                 if (!out) {
-                    JS_free (cx, buffer);
+                    cx->free(buffer);
                     goto error;
                 }
                 while (*fmt) {
@@ -1498,7 +1498,7 @@ js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
                 }
                 JS_ASSERT(expandedArgs == argCount);
                 *out = 0;
-                JS_free (cx, buffer);
+                cx->free(buffer);
                 *messagep =
                     js_DeflateString(cx, reportp->ucmessage,
                                      (size_t)(out - reportp->ucmessage));
@@ -1527,7 +1527,7 @@ js_ExpandErrorArguments(JSContext *cx, JSErrorCallback callback,
         const char *defaultErrorMessage
             = "No error message available for error number %d";
         size_t nbytes = strlen(defaultErrorMessage) + 16;
-        *messagep = (char *)JS_malloc(cx, nbytes);
+        *messagep = (char *)cx->malloc(nbytes);
         if (!*messagep)
             goto error;
         JS_snprintf(*messagep, nbytes, defaultErrorMessage, errorNumber);
@@ -1540,17 +1540,17 @@ error:
         if (charArgs) {
             i = 0;
             while (reportp->messageArgs[i])
-                JS_free(cx, (void *)reportp->messageArgs[i++]);
+                cx->free((void *)reportp->messageArgs[i++]);
         }
-        JS_free(cx, (void *)reportp->messageArgs);
+        cx->free((void *)reportp->messageArgs);
         reportp->messageArgs = NULL;
     }
     if (reportp->ucmessage) {
-        JS_free(cx, (void *)reportp->ucmessage);
+        cx->free((void *)reportp->ucmessage);
         reportp->ucmessage = NULL;
     }
     if (*messagep) {
-        JS_free(cx, (void *)*messagep);
+        cx->free((void *)*messagep);
         *messagep = NULL;
     }
     return JS_FALSE;
@@ -1581,7 +1581,7 @@ js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
     ReportError(cx, message, &report);
 
     if (message)
-        JS_free(cx, message);
+        cx->free(message);
     if (report.messageArgs) {
         /*
          * js_ExpandErrorArguments owns its messageArgs only if it had to
@@ -1590,12 +1590,12 @@ js_ReportErrorNumberVA(JSContext *cx, uintN flags, JSErrorCallback callback,
         if (charArgs) {
             int i = 0;
             while (report.messageArgs[i])
-                JS_free(cx, (void *)report.messageArgs[i++]);
+                cx->free((void *)report.messageArgs[i++]);
         }
-        JS_free(cx, (void *)report.messageArgs);
+        cx->free((void *)report.messageArgs);
     }
     if (report.ucmessage)
-        JS_free(cx, (void *)report.ucmessage);
+        cx->free((void *)report.ucmessage);
 
     return warning;
 }
@@ -1609,7 +1609,7 @@ js_ReportErrorAgain(JSContext *cx, const char *message, JSErrorReport *reportp)
         return;
 
     if (cx->lastMessage)
-        free(cx->lastMessage);
+        js_free(cx->lastMessage);
     cx->lastMessage = JS_strdup(cx, message);
     if (!cx->lastMessage)
         return;
@@ -1667,7 +1667,7 @@ js_ReportIsNullOrUndefined(JSContext *cx, intN spindex, jsval v,
                                           js_null_str, NULL);
     }
 
-    JS_free(cx, bytes);
+    cx->free(bytes);
     return ok;
 }
 
@@ -1690,7 +1690,7 @@ js_ReportMissingArg(JSContext *cx, jsval *vp, uintN arg)
     JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
                          JSMSG_MISSING_FUN_ARG, argbuf,
                          bytes ? bytes : "");
-    JS_free(cx, bytes);
+    cx->free(bytes);
 }
 
 JSBool
@@ -1709,7 +1709,7 @@ js_ReportValueErrorFlags(JSContext *cx, uintN flags, const uintN errorNumber,
 
     ok = JS_ReportErrorFlagsAndNumber(cx, flags, js_GetErrorMessage,
                                       NULL, errorNumber, bytes, arg1, arg2);
-    JS_free(cx, bytes);
+    cx->free(bytes);
     return ok;
 }
 
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index b079cb014d19..c3d2465472ec 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -57,6 +57,7 @@
 #include "jsregexp.h"
 #include "jsutil.h"
 #include "jsarray.h"
+#include "jstask.h"
 
 JS_BEGIN_EXTERN_C
 
@@ -255,6 +256,13 @@ struct JSThreadData {
      * locks on each JS_malloc.
      */
     size_t              gcMallocBytes;
+
+#ifdef JS_THREADSAFE
+    /*
+     * Deallocator task for this thread.
+     */
+    JSFreePointerListTask *deallocatorTask;
+#endif
 };
 
 #ifdef JS_THREADSAFE
@@ -699,6 +707,26 @@ struct JSRuntime {
 
     void setGCTriggerFactor(uint32 factor);
     void setGCLastBytes(size_t lastBytes);
+
+    inline void* malloc(size_t bytes) {
+        return ::js_malloc(bytes);
+    }
+
+    inline void* calloc(size_t bytes) {
+        return ::js_calloc(bytes);
+    }
+
+    inline void* realloc(void* p, size_t bytes) {
+        return ::js_realloc(p, bytes);
+    }
+
+    inline void free(void* p) {
+        ::js_free(p);
+    }
+
+#ifdef JS_THREADSAFE
+    JSBackgroundThread    *deallocatorThread;
+#endif
 };
 
 /* Common macros to access thread-local caches in JSThread or JSRuntime. */
@@ -1050,16 +1078,86 @@ struct JSContext {
     jsval               *nativeVp;
 #endif
 
+#ifdef JS_THREADSAFE
+    inline void createDeallocatorTask() {
+        JSThreadData* tls = JS_THREAD_DATA(this);
+        JS_ASSERT(!tls->deallocatorTask);
+        if (runtime->deallocatorThread && !runtime->deallocatorThread->busy())
+            tls->deallocatorTask = new JSFreePointerListTask();
+    }
+
+    inline void submitDeallocatorTask() {
+        JSThreadData* tls = JS_THREAD_DATA(this);
+        if (tls->deallocatorTask) {
+            runtime->deallocatorThread->schedule(tls->deallocatorTask);
+            tls->deallocatorTask = NULL;
+        }
+    }
+#endif
+
     /* Call this after succesful malloc of memory for GC-related things. */
-    inline void
-    updateMallocCounter(size_t nbytes)
-    {
+    inline void updateMallocCounter(size_t nbytes) {
         size_t *pbytes, bytes;
 
         pbytes = &JS_THREAD_DATA(this)->gcMallocBytes;
         bytes = *pbytes;
         *pbytes = (size_t(-1) - bytes <= nbytes) ? size_t(-1) : bytes + nbytes;
     }
+
+    inline void* malloc(size_t bytes) {
+        JS_ASSERT(bytes != 0);
+        void *p = runtime->malloc(bytes);
+        if (!p) {
+            JS_ReportOutOfMemory(this);
+            return NULL;
+        }
+        updateMallocCounter(bytes);
+        return p;
+    }
+
+    inline void* calloc(size_t bytes) {
+        JS_ASSERT(bytes != 0);
+        void *p = runtime->calloc(bytes);
+        if (!p) {
+            JS_ReportOutOfMemory(this);
+            return NULL;
+        }
+        updateMallocCounter(bytes);
+        return p;
+    }
+
+    inline void* realloc(void* p, size_t bytes) {
+        void *orig = p;
+        p = runtime->realloc(p, bytes);
+        if (!p) {
+            JS_ReportOutOfMemory(this);
+            return NULL;
+        }
+        if (!orig)
+            updateMallocCounter(bytes);
+        return p;
+    }
+
+#ifdef JS_THREADSAFE
+    inline void free(void* p) {
+        if (!p)
+            return;
+        if (thread) {
+            JSFreePointerListTask* task = JS_THREAD_DATA(this)->deallocatorTask;
+            if (task) {
+                task->add(p);
+                return;
+            }
+        }
+        runtime->free(p);
+    }
+#else
+    inline void free(void* p) {
+        if (!p)
+            return;
+        runtime->free(p);
+    }
+#endif
 };
 
 #ifdef JS_THREADSAFE
diff --git a/js/src/jsdate.cpp b/js/src/jsdate.cpp
index c6a5f870a57c..9eaa85e60fc6 100644
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -1961,7 +1961,7 @@ date_toSource(JSContext *cx, uintN argc, jsval *vp)
 
     str = JS_NewString(cx, bytes, strlen(bytes));
     if (!str) {
-        free(bytes);
+        js_free(bytes);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index 92f35ed6c407..d9e9ed62a2fb 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -123,7 +123,7 @@ js_UntrapScriptCode(JSContext *cx, JSScript *script)
                     continue;
                 nbytes += (sn - notes + 1) * sizeof *sn;
 
-                code = (jsbytecode *) JS_malloc(cx, nbytes);
+                code = (jsbytecode *) cx->malloc(nbytes);
                 if (!code)
                     break;
                 memcpy(code, script->code, nbytes);
@@ -155,12 +155,12 @@ JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
     } else {
         sample = rt->debuggerMutations;
         DBG_UNLOCK(rt);
-        trap = (JSTrap *) JS_malloc(cx, sizeof *trap);
+        trap = (JSTrap *) cx->malloc(sizeof *trap);
         if (!trap)
             return JS_FALSE;
         trap->closure = NULL;
         if(!js_AddRoot(cx, &trap->closure, "trap->closure")) {
-            JS_free(cx, trap);
+            cx->free(trap);
             return JS_FALSE;
         }
         DBG_LOCK(rt);
@@ -184,7 +184,7 @@ JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
     DBG_UNLOCK(rt);
     if (junk) {
         js_RemoveRoot(rt, &junk->closure);
-        JS_free(cx, junk);
+        cx->free(junk);
     }
     return JS_TRUE;
 }
@@ -213,7 +213,7 @@ DestroyTrapAndUnlock(JSContext *cx, JSTrap *trap)
     DBG_UNLOCK(cx->runtime);
 
     js_RemoveRoot(cx->runtime, &trap->closure);
-    JS_free(cx, trap);
+    cx->free(trap);
 }
 
 JS_PUBLIC_API(void)
@@ -413,7 +413,7 @@ DropWatchPointAndUnlock(JSContext *cx, JSWatchPoint *wp, uintN flag)
         }
     }
 
-    JS_free(cx, wp);
+    cx->free(wp);
     return ok;
 }
 
@@ -619,7 +619,7 @@ js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
                     if (nslots <= JS_ARRAY_LENGTH(smallv)) {
                         argv = smallv;
                     } else {
-                        argv = (jsval *) JS_malloc(cx, nslots * sizeof(jsval));
+                        argv = (jsval *) cx->malloc(nslots * sizeof(jsval));
                         if (!argv) {
                             DBG_LOCK(rt);
                             DropWatchPointAndUnlock(cx, wp, JSWP_HELD);
@@ -651,7 +651,7 @@ js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
                             JSFUN_HEAVYWEIGHT_TEST(fun->flags) &&
                             !js_GetCallObject(cx, &frame)) {
                             if (argv != smallv)
-                                JS_free(cx, argv);
+                                cx->free(argv);
                             DBG_LOCK(rt);
                             DropWatchPointAndUnlock(cx, wp, JSWP_HELD);
                             return JS_FALSE;
@@ -679,7 +679,7 @@ js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
                     cx->fp = frame.down;
                     if (argv != smallv)
-                        JS_free(cx, argv);
+                        cx->free(argv);
                 }
             }
             DBG_LOCK(rt);
@@ -825,7 +825,7 @@ JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval idval,
             goto out;
         }
 
-        wp = (JSWatchPoint *) JS_malloc(cx, sizeof *wp);
+        wp = (JSWatchPoint *) cx->malloc(sizeof *wp);
         if (!wp) {
             ok = JS_FALSE;
             goto out;
@@ -1343,7 +1343,7 @@ JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
     length = (uintN) len;
     ok = JS_EvaluateUCInStackFrame(cx, fp, chars, length, filename, lineno,
                                    rval);
-    JS_free(cx, chars);
+    cx->free(chars);
 
     return ok;
 }
@@ -1469,7 +1469,7 @@ JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda)
     }
 
     n = scope->entryCount;
-    pd = (JSPropertyDesc *) JS_malloc(cx, (size_t)n * sizeof(JSPropertyDesc));
+    pd = (JSPropertyDesc *) cx->malloc((size_t)n * sizeof(JSPropertyDesc));
     if (!pd)
         return JS_FALSE;
     i = 0;
@@ -1511,7 +1511,7 @@ JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda)
         if (pd[i].flags & JSPD_ALIAS)
             js_RemoveRoot(cx->runtime, &pd[i].alias);
     }
-    JS_free(cx, pd);
+    cx->free(pd);
 }
 
 /************************************************************************/
@@ -1884,7 +1884,7 @@ js_DumpCallgrind(JSContext *cx, JSObject *obj,
         cstr = js_DeflateString(cx, str->chars(), str->length());
         if (cstr) {
             CALLGRIND_DUMP_STATS_AT(cstr);
-            JS_free(cx, cstr);
+            cx->free(cstr);
             return JS_TRUE;
         }
     }
@@ -1962,7 +1962,7 @@ js_StartVtune(JSContext *cx, JSObject *obj,
     status = VTStartSampling(&params);
 
     if (params.tb5Filename != default_filename)
-        JS_free(cx, params.tb5Filename);
+        cx->free(params.tb5Filename);
 
     if (status != 0) {
         if (status == VTAPI_MULTIPLE_RUNS)
diff --git a/js/src/jsdhash.cpp b/js/src/jsdhash.cpp
index 8252b4b651b4..c8b9db09dc0d 100644
--- a/js/src/jsdhash.cpp
+++ b/js/src/jsdhash.cpp
@@ -111,13 +111,13 @@
 JS_PUBLIC_API(void *)
 JS_DHashAllocTable(JSDHashTable *table, uint32 nbytes)
 {
-    return malloc(nbytes);
+    return js_malloc(nbytes);
 }
 
 JS_PUBLIC_API(void)
 JS_DHashFreeTable(JSDHashTable *table, void *ptr)
 {
-    free(ptr);
+    js_free(ptr);
 }
 
 JS_PUBLIC_API(JSDHashNumber)
@@ -180,7 +180,7 @@ JS_DHashFreeStringKey(JSDHashTable *table, JSDHashEntryHdr *entry)
 {
     const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
 
-    free((void *) stub->key);
+    js_free((void *) stub->key);
     memset(entry, 0, table->entrySize);
 }
 
@@ -212,11 +212,11 @@ JS_NewDHashTable(const JSDHashTableOps *ops, void *data, uint32 entrySize,
 {
     JSDHashTable *table;
 
-    table = (JSDHashTable *) malloc(sizeof *table);
+    table = (JSDHashTable *) js_malloc(sizeof *table);
     if (!table)
         return NULL;
     if (!JS_DHashTableInit(table, ops, data, entrySize, capacity)) {
-        free(table);
+        js_free(table);
         return NULL;
     }
     return table;
@@ -226,7 +226,7 @@ JS_PUBLIC_API(void)
 JS_DHashTableDestroy(JSDHashTable *table)
 {
     JS_DHashTableFinish(table);
-    free(table);
+    js_free(table);
 }
 
 JS_PUBLIC_API(JSBool)
diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
index b1197ac043d3..111cb5dec9d3 100644
--- a/js/src/jsdtoa.cpp
+++ b/js/src/jsdtoa.cpp
@@ -368,7 +368,7 @@ JS_dtobasestr(int base, double dinput)
     JS_ASSERT(base >= 2 && base <= 36);
 
     dval(d) = dinput;
-    buffer = (char*) malloc(DTOBASESTR_BUFFER_SIZE);
+    buffer = (char*) js_malloc(DTOBASESTR_BUFFER_SIZE);
     if (buffer) {
         p = buffer;
         if (dval(d) < 0.0
@@ -412,7 +412,7 @@ JS_dtobasestr(int base, double dinput)
               nomem1:
                 Bfree(b);
                 UNLOCK_DTOA();
-                free(buffer);
+                js_free(buffer);
                 return NULL;
             }
             do {
@@ -449,7 +449,7 @@ JS_dtobasestr(int base, double dinput)
                     Bfree(mlo);
                 Bfree(mhi);
                 UNLOCK_DTOA();
-                free(buffer);
+                js_free(buffer);
                 return NULL;
             }
             JS_ASSERT(e < 0);
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index f591e844b6f0..5105d8bba498 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -112,10 +112,10 @@ JSCodeGenerator::~JSCodeGenerator()
 
     /* NB: non-null only after OOM. */
     if (spanDeps)
-        JS_free(compiler->context, spanDeps);
+        compiler->context->free(spanDeps);
 
     if (upvarMap.vector)
-        JS_free(compiler->context, upvarMap.vector);
+        compiler->context->free(upvarMap.vector);
 }
 
 static ptrdiff_t
@@ -549,7 +549,7 @@ AddSpanDep(JSContext *cx, JSCodeGenerator *cg, jsbytecode *pc, jsbytecode *pc2,
     if ((index & (index - 1)) == 0 &&
         (!(sdbase = cg->spanDeps) || index >= SPANDEPS_MIN)) {
         size = sdbase ? SPANDEPS_SIZE(index) : SPANDEPS_SIZE_MIN / 2;
-        sdbase = (JSSpanDep *) JS_realloc(cx, sdbase, size + size);
+        sdbase = (JSSpanDep *) cx->realloc(sdbase, size + size);
         if (!sdbase)
             return JS_FALSE;
         cg->spanDeps = sdbase;
@@ -1165,7 +1165,7 @@ OptimizeSpanDeps(JSContext *cx, JSCodeGenerator *cg)
      * can span top-level statements, because JS lacks goto.
      */
     size = SPANDEPS_SIZE(JS_BIT(JS_CeilingLog2(cg->numSpanDeps)));
-    JS_free(cx, cg->spanDeps);
+    cx->free(cg->spanDeps);
     cg->spanDeps = NULL;
     FreeJumpTargets(cg, cg->jumpTargets);
     cg->jumpTargets = NULL;
@@ -1899,7 +1899,7 @@ MakeUpvarForEval(JSParseNode *pn, JSCodeGenerator *cg)
         JS_ASSERT(ALE_INDEX(ale) <= length);
         if (ALE_INDEX(ale) == length) {
             length = 2 * JS_MAX(2, length);
-            vector = (uint32 *) JS_realloc(cx, vector, length * sizeof *vector);
+            vector = (uint32 *) cx->realloc(vector, length * sizeof *vector);
             if (!vector)
                 return false;
             cg->upvarMap.vector = vector;
@@ -2197,7 +2197,7 @@ BindNameToSlot(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
             if (!vector) {
                 uint32 length = cg->lexdeps.count;
 
-                vector = (uint32 *) calloc(length, sizeof *vector);
+                vector = (uint32 *) js_calloc(length * sizeof *vector);
                 if (!vector) {
                     JS_ReportOutOfMemory(cx);
                     return JS_FALSE;
@@ -3144,9 +3144,8 @@ EmitSwitch(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn,
                     /* Just grab 8K for the worst-case bitmap. */
                     intmap_bitlen = JS_BIT(16);
                     intmap = (jsbitmap *)
-                        JS_malloc(cx,
-                                  (JS_BIT(16) >> JS_BITS_PER_WORD_LOG2)
-                                  * sizeof(jsbitmap));
+                        cx->malloc((JS_BIT(16) >> JS_BITS_PER_WORD_LOG2)
+                                   * sizeof(jsbitmap));
                     if (!intmap) {
                         JS_ReportOutOfMemory(cx);
                         return JS_FALSE;
@@ -3163,7 +3162,7 @@ EmitSwitch(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn,
 
       release:
         if (intmap && intmap != intmap_space)
-            JS_free(cx, intmap);
+            cx->free(intmap);
         if (!ok)
             return JS_FALSE;
 
@@ -3307,7 +3306,7 @@ EmitSwitch(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn,
              */
             if (tableLength != 0) {
                 tableSize = (size_t)tableLength * sizeof *table;
-                table = (JSParseNode **) JS_malloc(cx, tableSize);
+                table = (JSParseNode **) cx->malloc(tableSize);
                 if (!table)
                     return JS_FALSE;
                 memset(table, 0, tableSize);
@@ -3475,7 +3474,7 @@ EmitSwitch(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn,
 
 out:
     if (table)
-        JS_free(cx, table);
+        cx->free(table);
     if (ok) {
         ok = js_PopStatementCG(cx, cg);
 
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 34d9312cce8e..a83d658a4e61 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -164,7 +164,7 @@ CopyErrorReport(JSContext *cx, JSErrorReport *report)
      */
     mallocSize = sizeof(JSErrorReport) + argsArraySize + argsCopySize +
                  ucmessageSize + uclinebufSize + linebufSize + filenameSize;
-    cursor = (uint8 *)JS_malloc(cx, mallocSize);
+    cursor = (uint8 *)cx->malloc(mallocSize);
     if (!cursor)
         return NULL;
 
@@ -301,7 +301,7 @@ InitExnPrivate(JSContext *cx, JSObject *exnObject, JSString *message,
         js_ReportAllocationOverflow(cx);
         return JS_FALSE;
     }
-    priv = (JSExnPrivate *)JS_malloc(cx, size);
+    priv = (JSExnPrivate *)cx->malloc(size);
     if (!priv)
         return JS_FALSE;
 
@@ -417,8 +417,8 @@ exn_finalize(JSContext *cx, JSObject *obj)
     priv = GetExnPrivate(cx, obj);
     if (priv) {
         if (priv->errorReport)
-            JS_free(cx, priv->errorReport);
-        JS_free(cx, priv);
+            cx->free(priv->errorReport);
+        cx->free(priv);
     }
 }
 
@@ -586,7 +586,7 @@ StackTraceToString(JSContext *cx, JSExnPrivate *priv)
             if (stackmax >= STACK_LENGTH_LIMIT)                               \
                 goto done;                                                    \
             stackmax = stackmax ? 2 * stackmax : 64;                          \
-            ptr_ = JS_realloc(cx, stackbuf, (stackmax+1) * sizeof(jschar));   \
+            ptr_ = cx->realloc(stackbuf, (stackmax+1) * sizeof(jschar));      \
             if (!ptr_)                                                        \
                 goto bad;                                                     \
             stackbuf = (jschar *) ptr_;                                       \
@@ -608,7 +608,7 @@ StackTraceToString(JSContext *cx, JSExnPrivate *priv)
                 goto done;                                                    \
             }                                                                 \
             stackmax = JS_BIT(JS_CeilingLog2(stacklen + length_));            \
-            ptr_ = JS_realloc(cx, stackbuf, (stackmax+1) * sizeof(jschar));   \
+            ptr_ = cx->realloc(stackbuf, (stackmax+1) * sizeof(jschar));      \
             if (!ptr_)                                                        \
                 goto bad;                                                     \
             stackbuf = (jschar *) ptr_;                                       \
@@ -659,7 +659,7 @@ StackTraceToString(JSContext *cx, JSExnPrivate *priv)
          * don't use JS_realloc here; simply let the oversized allocation
          * be owned by the string in that rare case.
          */
-        void *shrunk = JS_realloc(cx, stackbuf, (stacklen+1) * sizeof(jschar));
+        void *shrunk = cx->realloc(stackbuf, (stacklen+1) * sizeof(jschar));
         if (shrunk)
             stackbuf = (jschar *) shrunk;
     }
@@ -671,7 +671,7 @@ StackTraceToString(JSContext *cx, JSExnPrivate *priv)
 
   bad:
     if (stackbuf)
-        JS_free(cx, stackbuf);
+        cx->free(stackbuf);
     return NULL;
 }
 
@@ -800,7 +800,7 @@ exn_toString(JSContext *cx, uintN argc, jsval *vp)
         name_length = name->length();
         message_length = message->length();
         length = (name_length ? name_length + 2 : 0) + message_length;
-        cp = chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+        cp = chars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
         if (!chars)
             return JS_FALSE;
 
@@ -815,7 +815,7 @@ exn_toString(JSContext *cx, uintN argc, jsval *vp)
 
         result = js_NewString(cx, chars, length);
         if (!result) {
-            JS_free(cx, chars);
+            cx->free(chars);
             return JS_FALSE;
         }
     } else {
@@ -915,7 +915,7 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
         }
     }
 
-    cp = chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+    cp = chars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
     if (!chars) {
         ok = JS_FALSE;
         goto out;
@@ -955,7 +955,7 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
 
     result = js_NewString(cx, chars, length);
     if (!result) {
-        JS_free(cx, chars);
+        cx->free(chars);
         ok = JS_FALSE;
         goto out;
     }
diff --git a/js/src/jsfile.cpp b/js/src/jsfile.cpp
index b3d618275ddb..8228c44add60 100644
--- a/js/src/jsfile.cpp
+++ b/js/src/jsfile.cpp
@@ -296,7 +296,7 @@ static char*
 js_combinePath(JSContext *cx, const char *base, const char *name)
 {
     int len = strlen(base);
-    char* result = JS_malloc(cx, len + strlen(name) + 2);
+    char* result = cx->malloc(len + strlen(name) + 2);
 
     if (!result)
         return NULL;
@@ -335,7 +335,7 @@ js_fileBaseName(JSContext *cx, const char *pathname)
     }
 
     /* Allocate and copy. */
-    result = JS_malloc(cx, aux - index + 1);
+    result = cx->malloc(aux - index + 1);
     if (!result)
         return NULL;
     strncpy(result, pathname + index + 1, aux - index);
@@ -366,7 +366,7 @@ js_fileDirectoryName(JSContext *cx, const char *pathname)
 
     if (cp < pathname && end != pathname) {
         /* There were just /s, return the root. */
-        result = JS_malloc(cx, 1 + 1); /* The separator + trailing NUL. */
+        result = cx->malloc(1 + 1); /* The separator + trailing NUL. */
         result[0] = FILESEPARATOR;
         result[1] = '\0';
         return result;
@@ -388,7 +388,7 @@ js_fileDirectoryName(JSContext *cx, const char *pathname)
         }
 
         pathsize = end - pathname + 1;
-        result = JS_malloc(cx, pathsize + 1);
+        result = cx->malloc(pathsize + 1);
         if (!result)
             return NULL;
 
@@ -401,7 +401,7 @@ js_fileDirectoryName(JSContext *cx, const char *pathname)
 
     /* Return everything up to and including the seperator. */
     pathsize = cp - pathname + 1;
-    result = JS_malloc(cx, pathsize + 1);
+    result = cx->malloc(pathsize + 1);
     if (!result)
         return NULL;
 
@@ -462,7 +462,7 @@ js_canonicalPath(JSContext *cx, char *oldpath)
     while (j >= 0 && path[j] == ' ')
         j--;
 
-    tmp = JS_malloc(cx, j-i+2);
+    tmp = cx->malloc(j-i+2);
     if (!tmp)
         return NULL;
 
@@ -478,7 +478,7 @@ js_canonicalPath(JSContext *cx, char *oldpath)
     /* file:// support. */
     if (!strncmp(path, URL_PREFIX, strlen(URL_PREFIX))) {
         tmp = js_canonicalPath(cx, path + strlen(URL_PREFIX));
-        JS_free(cx, path);
+        cx->free(path);
         return tmp;
     }
 
@@ -486,7 +486,7 @@ js_canonicalPath(JSContext *cx, char *oldpath)
         tmp = js_absolutePath(cx, path);
         if (!tmp)
             return NULL;
-        JS_free(cx, path);
+        cx->free(path);
         path = tmp;
     }
 
@@ -505,7 +505,7 @@ js_canonicalPath(JSContext *cx, char *oldpath)
                 back--;
             } else {
                 tmp = result;
-                result = JS_malloc(cx, strlen(base) + 1 + strlen(tmp) + 1);
+                result = cx->malloc(strlen(base) + 1 + strlen(tmp) + 1);
                 if (!result)
                     goto out;
 
@@ -516,18 +516,18 @@ js_canonicalPath(JSContext *cx, char *oldpath)
                     result[c + 1] = '\0';
                     strcat(result, tmp);
                 }
-                JS_free(cx, tmp);
+                cx->free(tmp);
             }
         }
-        JS_free(cx, current);
-        JS_free(cx, base);
+        cx->free(current);
+        cx->free(base);
         current = dir;
         base =  js_fileBaseName(cx, current);
         dir = js_fileDirectoryName(cx, current);
     }
 
     tmp = result;
-    result = JS_malloc(cx, strlen(dir)+1+strlen(tmp)+1);
+    result = cx->malloc(strlen(dir) + 1 + strlen(tmp) + 1);
     if (!result)
         goto out;
 
@@ -543,13 +543,13 @@ js_canonicalPath(JSContext *cx, char *oldpath)
 
 out:
     if (tmp)
-        JS_free(cx, tmp);
+        cx->free(tmp);
     if (dir)
-        JS_free(cx, dir);
+        cx->free(dir);
     if (base)
-        JS_free(cx, base);
+        cx->free(base);
     if (current)
-        JS_free(cx, current);
+        cx->free(current);
 
     return result;
 }
@@ -753,7 +753,7 @@ js_FileHasOption(JSContext *cx, const char *oldoptions, const char *name)
             break;
         current = comma + 1;
     }
-    JS_free(cx, options);
+    cx->free(options);
     return found;
 }
 
@@ -838,20 +838,20 @@ js_FileRead(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
 
     switch (mode) {
       case ASCII:
-        aux = (unsigned char*)JS_malloc(cx, len);
+        aux = (unsigned char*)cx->malloc(len);
         if (!aux)
             return 0;
 
         count = js_BufferedRead(file, aux, len);
         if (count == -1) {
-            JS_free(cx, aux);
+            cx->free(aux);
             return 0;
         }
 
         for (i = 0; i < len; i++)
             buf[i] = (jschar)aux[i];
 
-        JS_free(cx, aux);
+        cx->free(aux);
         break;
 
       case UTF8:
@@ -977,7 +977,7 @@ js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
 
     switch (mode) {
       case ASCII:
-        aux = (unsigned char*)JS_malloc(cx, len);
+        aux = (unsigned char*)cx->malloc(len);
         if (!aux)
             return 0;
 
@@ -989,21 +989,21 @@ js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
                 : fwrite(aux, 1, len, file->nativehandle);
 
         if (count==-1) {
-            JS_free(cx, aux);
+            cx->free(aux);
             return 0;
         }
 
-        JS_free(cx, aux);
+        cx->free(aux);
         break;
 
       case UTF8:
-        utfbuf = (unsigned char*)JS_malloc(cx, len*3);
+        utfbuf = (unsigned char*)cx->malloc(len*3);
         if (!utfbuf)  return 0;
         i = 0;
         for (count = 0;count<len;count++) {
             j = one_ucs2_to_utf8_char(utfbuf+i, utfbuf+len*3, buf[count]);
             if (j==-1) {
-                JS_free(cx, utfbuf);
+                cx->free(utfbuf);
                 return 0;
             }
             i+=j;
@@ -1013,10 +1013,10 @@ js_FileWrite(JSContext *cx, JSFile *file, jschar *buf, int32 len, int32 mode)
             : fwrite(utfbuf, 1, i, file->nativehandle);
 
         if (j<i) {
-            JS_free(cx, utfbuf);
+            cx->free(utfbuf);
             return 0;
         }
-        JS_free(cx, utfbuf);
+        cx->free(utfbuf);
         break;
 
       case UCS2:
@@ -1179,13 +1179,13 @@ js_parent(JSContext *cx, JSFile *file, jsval *resultp)
     } else {
         JSObject *obj = js_NewFileObject(cx, str);
         if (!obj) {
-            JS_free(cx, str);
+            cx->free(str);
             return JS_FALSE;
         }
         *resultp = OBJECT_TO_JSVAL(obj);
     }
 
-    JS_free(cx, str);
+    cx->free(str);
     return JS_TRUE;
 }
 
@@ -1206,7 +1206,7 @@ js_name(JSContext *cx, JSFile *file, jsval *vp)
 
     str = JS_NewString(cx, name, strlen(name));
     if (!str) {
-        JS_free(cx, name);
+        cx->free(name);
         return JS_FALSE;
     }
 
@@ -1353,7 +1353,7 @@ file_open(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
                 pipemode[i++] = '\0';
                 file->nativehandle = POPEN(&file->path[1], pipemode);
             } else if(file->path[len-1] == PIPE_SYMBOL) {
-                char *command = JS_malloc(cx, len);
+                char *command = cx->malloc(len);
 
                 strncpy(command, file->path, len-1);
                 command[len-1] = '\0';
@@ -1364,7 +1364,7 @@ file_open(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 #endif
                 pipemode[i++] = '\0';
                 file->nativehandle = POPEN(command, pipemode);
-                JS_free(cx, command);
+                cx->free(command);
             }
             /* set the flags */
             file->isNative = JS_TRUE;
@@ -1377,7 +1377,7 @@ file_open(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     }
 
     js_ResetBuffers(file);
-    JS_free(cx, mode);
+    cx->free(mode);
     mode = NULL;
 
     /* Set the open flag and return result */
@@ -1396,7 +1396,7 @@ good:
 
 out:
     if(mode)
-        JS_free(cx, mode);
+        cx->free(mode);
     return JS_FALSE;
 }
 
@@ -1511,13 +1511,13 @@ file_copyTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         goto out;
     }
 
-    buffer = JS_malloc(cx, size);
+    buffer = cx->malloc(size);
 
     count = INT_TO_JSVAL(PR_Read(file->handle, buffer, size));
 
     /* reading panic */
     if (count!=size) {
-        JS_free(cx, buffer);
+        cx->free(buffer);
         JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
               JSFILEMSG_COPY_READ_ERROR, file->path);
         goto out;
@@ -1527,13 +1527,13 @@ file_copyTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
     /* writing panic */
     if (count!=size) {
-        JS_free(cx, buffer);
+        cx->free(buffer);
         JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
               JSFILEMSG_COPY_WRITE_ERROR, file->path);
         goto out;
     }
 
-    JS_free(cx, buffer);
+    cx->free(buffer);
 
 	if(!fileInitiallyOpen){
 		if(!file_close(cx, obj, 0, NULL, rval)) goto out;
@@ -1577,7 +1577,7 @@ file_renameTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 
     if (PR_Rename(file->path, dest)==PR_SUCCESS){
         /* copy the new filename */
-        JS_free(cx, file->path);
+        cx->free(file->path);
         file->path = dest;
         *rval = JSVAL_TRUE;
         return JS_TRUE;
@@ -1729,17 +1729,17 @@ file_read(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
     /* want = (want>262144)?262144:want; * arbitrary size limitation */
 
-    buf = JS_malloc(cx, want*sizeof buf[0]);
+    buf = cx->malloc(want*sizeof buf[0]);
     if (!buf)  goto out;
 
     count =  js_FileRead(cx, file, buf, want, file->type);
     if (count>0) {
         str = JS_NewUCStringCopyN(cx, buf, count);
         *rval = STRING_TO_JSVAL(str);
-        JS_free(cx, buf);
+        cx->free(buf);
         return JS_TRUE;
     } else {
-        JS_free(cx, buf);
+        cx->free(buf);
         goto out;
     }
 out:
@@ -1760,7 +1760,7 @@ file_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     SECURITY_CHECK(cx, NULL, "readln", file);
     JSFILE_CHECK_READ;
 
-    buf = JS_malloc(cx, MAX_LINE_LENGTH * sizeof data);
+    buf = cx->malloc(MAX_LINE_LENGTH * sizeof data);
     if (!buf)
         return JS_FALSE;
 
@@ -1792,8 +1792,7 @@ file_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
           default:
             if (--room < 0) {
-                tmp = JS_realloc(cx, buf,
-                                 (offset + MAX_LINE_LENGTH) * sizeof data);
+                tmp = cx->realloc(buf, (offset + MAX_LINE_LENGTH) * sizeof data);
                 if (!tmp)
                     goto out;
 
@@ -1814,7 +1813,7 @@ eof:
 
 done:
     buf[offset] = 0;
-    tmp = JS_realloc(cx, buf, (offset + 1) * sizeof data);
+    tmp = cx->realloc(buf, (offset + 1) * sizeof data);
     if (!tmp)
         goto out;
 
@@ -1827,7 +1826,7 @@ done:
 
 out:
     if (buf)
-        JS_free(cx, buf);
+        cx->free(buf);
 
     return JS_FALSE;
 }
@@ -1980,7 +1979,7 @@ file_list(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         filePath = js_combinePath(cx, file->path, (char*)entry->name);
 
         eachFile = js_NewFileObject(cx, filePath);
-        JS_free(cx, filePath);
+        cx->free(filePath);
         if (!eachFile){
             JS_ReportWarning(cx, "File %s cannot be retrieved", filePath);
             continue;
@@ -2017,7 +2016,7 @@ file_mkdir(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         char        *dir = js_fileDirectoryName(cx, file->path);
         JSObject    *dirObj = js_NewFileObject(cx, dir);
 
-        JS_free(cx, dir);
+        cx->free(dir);
 
         /* call file_mkdir with the right set of parameters if needed */
         if (file_mkdir(cx, dirObj, argc, argv, rval))
@@ -2031,12 +2030,12 @@ file_mkdir(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         fullName = js_combinePath(cx, file->path, dirName);
         if (PR_MkDir(fullName, 0755)==PR_SUCCESS){
             *rval = JSVAL_TRUE;
-            JS_free(cx, fullName);
+            cx->free(fullName);
             return JS_TRUE;
         }else{
             JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
                 JSFILEMSG_OP_FAILED, "mkdir", fullName);
-            JS_free(cx, fullName);
+            cx->free(fullName);
             goto out;
         }
     }
@@ -2077,7 +2076,7 @@ file_toURL(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
         return JS_FALSE;
     str = js_NewString(cx, urlChars, len);
     if (!str) {
-        JS_free(cx, urlChars);
+        cx->free(urlChars);
         return JS_FALSE;
     }
     *rval = STRING_TO_JSVAL(str);
@@ -2104,9 +2103,9 @@ file_finalize(JSContext *cx, JSObject *obj)
         }
 
         if (file->path)
-            JS_free(cx, file->path);
+            cx->free(file->path);
 
-        JS_free(cx, file);
+        cx->free(file);
     }
 }
 
@@ -2118,7 +2117,7 @@ file_init(JSContext *cx, JSObject *obj, char *bytes)
 {
     JSFile *file;
 
-    file = JS_malloc(cx, sizeof *file);
+    file = cx->malloc(sizeof *file);
     if (!file)
         return NULL;
     memset(file, 0 , sizeof *file);
@@ -2130,7 +2129,7 @@ file_init(JSContext *cx, JSObject *obj, char *bytes)
     if (!JS_SetPrivate(cx, obj, file)) {
         JS_ReportErrorNumber(cx, JSFile_GetErrorMessage, NULL,
                              JSFILEMSG_CANNOT_SET_PRIVATE_FILE, file->path);
-        JS_free(cx, file);
+        cx->free(file);
         return NULL;
     }
 
@@ -2176,7 +2175,7 @@ js_NewFileObjectFromFILE(JSContext *cx, FILE *nativehandle, char *filename,
 
     /* free result of RESOLVE_PATH from file_init. */
     JS_ASSERT(file->path != NULL);
-    JS_free(cx, file->path);
+    cx->free(file->path);
 
     file->path = strdup(filename);
     file->isOpen = open;
@@ -2399,7 +2398,7 @@ file_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
     case FILE_MODE:
         SECURITY_CHECK(cx, NULL, "mode", file);
         JSFILE_CHECK_OPEN("mode");
-        bytes = JS_malloc(cx, MODE_SIZE);
+        bytes = cx->malloc(MODE_SIZE);
         bytes[0] = '\0';
         flag = JS_FALSE;
 
@@ -2439,7 +2438,7 @@ file_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
             flag = JS_TRUE;
         }
         *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, bytes));
-        JS_free(cx, bytes);
+        cx->free(bytes);
         break;
     case FILE_CREATED:
         SECURITY_CHECK(cx, NULL, "creationTime", file);
@@ -2575,7 +2574,7 @@ file_getProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
                     bytes = js_combinePath(cx, file->path, prop_name);
                     *vp = OBJECT_TO_JSVAL(js_NewFileObject(cx, bytes));
                     PR_CloseDir(dir);
-                    JS_free(cx, bytes);
+                    cx->free(bytes);
                     return !JSVAL_IS_NULL(*vp);
                 }
             }
@@ -2717,10 +2716,10 @@ js_InitFileClass(JSContext *cx, JSObject* obj)
 	/* Define CURRENTDIR property. We are doing this to get a
 	slash at the end of the current dir */
     afile = js_NewFileObject(cx, CURRENT_DIR);
-    currentdir =  JS_malloc(cx, MAX_PATH_LENGTH);
-    currentdir =  getcwd(currentdir, MAX_PATH_LENGTH);
+    currentdir = cx->malloc(MAX_PATH_LENGTH);
+    currentdir = getcwd(currentdir, MAX_PATH_LENGTH);
     afile = js_NewFileObject(cx, currentdir);
-    JS_free(cx, currentdir);
+    cx->free(currentdir);
     vp = OBJECT_TO_JSVAL(afile);
     JS_DefinePropertyWithTinyId(cx, ctor, CURRENTDIR_PROPERTY, 0, vp,
                 JS_PropertyStub, file_currentDirSetter,
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 90fc581a95c0..d4b02a1cb220 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -136,7 +136,7 @@ MarkArgDeleted(JSContext *cx, JSStackFrame *fp, uintN slot)
             bitmap = (jsbitmap *) &bmapint;
         } else {
             nbytes = JS_HOWMANY(nbits, JS_BITS_PER_WORD) * sizeof(jsbitmap);
-            bitmap = (jsbitmap *) JS_malloc(cx, nbytes);
+            bitmap = (jsbitmap *) cx->malloc(nbytes);
             if (!bitmap)
                 return JS_FALSE;
             memset(bitmap, 0, nbytes);
@@ -311,7 +311,7 @@ js_PutArgsObject(JSContext *cx, JSStackFrame *fp)
     if (!JSVAL_IS_VOID(bmapval)) {
         JS_SetReservedSlot(cx, argsobj, 0, JSVAL_VOID);
         if (fp->argc > JSVAL_INT_BITS)
-            JS_free(cx, JSVAL_TO_PRIVATE(bmapval));
+            cx->free(JSVAL_TO_PRIVATE(bmapval));
     }
 
     /*
@@ -2758,10 +2758,10 @@ FreeLocalNameHash(JSContext *cx, JSLocalNameMap *map)
 
     for (dup = map->lastdup; dup; dup = next) {
         next = dup->link;
-        JS_free(cx, dup);
+        cx->free(dup);
     }
     JS_DHashTableFinish(&map->names);
-    JS_free(cx, map);
+    cx->free(map);
 }
 
 static JSBool
@@ -2789,7 +2789,7 @@ HashLocalName(JSContext *cx, JSLocalNameMap *map, JSAtom *name,
     if (entry->name) {
         JS_ASSERT(entry->name == name);
         JS_ASSERT(entry->localKind == JSLOCAL_ARG);
-        dup = (JSNameIndexPair *) JS_malloc(cx, sizeof *dup);
+        dup = (JSNameIndexPair *) cx->malloc(sizeof *dup);
         if (!dup)
             return JS_FALSE;
         dup->name = entry->name;
@@ -2835,7 +2835,7 @@ js_AddLocal(JSContext *cx, JSFunction *fun, JSAtom *atom, JSLocalKind kind)
         if (n > 1) {
             array = fun->u.i.names.array;
         } else {
-            array = (jsuword *) JS_malloc(cx, MAX_ARRAY_LOCALS * sizeof *array);
+            array = (jsuword *) cx->malloc(MAX_ARRAY_LOCALS * sizeof *array);
             if (!array)
                 return JS_FALSE;
             array[0] = fun->u.i.names.taggedAtom;
@@ -2860,7 +2860,7 @@ js_AddLocal(JSContext *cx, JSFunction *fun, JSAtom *atom, JSLocalKind kind)
         }
     } else if (n == MAX_ARRAY_LOCALS) {
         array = fun->u.i.names.array;
-        map = (JSLocalNameMap *) JS_malloc(cx, sizeof *map);
+        map = (JSLocalNameMap *) cx->malloc(sizeof *map);
         if (!map)
             return JS_FALSE;
         if (!JS_DHashTableInit(&map->names, JS_DHashGetStubOps(),
@@ -2868,7 +2868,7 @@ js_AddLocal(JSContext *cx, JSFunction *fun, JSAtom *atom, JSLocalKind kind)
                                JS_DHASH_DEFAULT_CAPACITY(MAX_ARRAY_LOCALS
                                                          * 2))) {
             JS_ReportOutOfMemory(cx);
-            JS_free(cx, map);
+            cx->free(map);
             return JS_FALSE;
         }
 
@@ -2901,7 +2901,7 @@ js_AddLocal(JSContext *cx, JSFunction *fun, JSAtom *atom, JSLocalKind kind)
          * to replace fun->u.i.names with the built map.
          */
         fun->u.i.names.map = map;
-        JS_free(cx, array);
+        cx->free(array);
     } else {
         if (*indexp == JS_BITMASK(16)) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
@@ -3123,7 +3123,7 @@ DestroyLocalNames(JSContext *cx, JSFunction *fun)
     if (n <= 1)
         return;
     if (n <= MAX_ARRAY_LOCALS)
-        JS_free(cx, fun->u.i.names.array);
+        cx->free(fun->u.i.names.array);
     else
         FreeLocalNameHash(cx, fun->u.i.names.map);
 }
@@ -3139,8 +3139,8 @@ js_FreezeLocalNames(JSContext *cx, JSFunction *fun)
     n = fun->nargs + fun->u.i.nvars + fun->u.i.nupvars;
     if (2 <= n && n < MAX_ARRAY_LOCALS) {
         /* Shrink over-allocated array ignoring realloc failures. */
-        array = (jsuword *) JS_realloc(cx, fun->u.i.names.array,
-                                       n * sizeof *array);
+        array = (jsuword *) cx->realloc(fun->u.i.names.array,
+                                        n * sizeof *array);
         if (array)
             fun->u.i.names.array = array;
     }
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index f6a76120c4d4..386a65c83e83 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -76,6 +76,7 @@
 #include "jsscript.h"
 #include "jsstaticcheck.h"
 #include "jsstr.h"
+#include "jstask.h"
 #include "jstracer.h"
 
 #if JS_HAS_XML_SUPPORT
@@ -722,7 +723,7 @@ FreePtrTable(JSPtrTable *table, const JSPtrTableInfo *info)
 {
     if (table->array) {
         JS_ASSERT(table->count > 0);
-        free(table->array);
+        js_free(table->array);
         table->array = NULL;
         table->count = 0;
     }
@@ -756,8 +757,8 @@ AddToPtrTable(JSContext *cx, JSPtrTable *table, const JSPtrTableInfo *info,
             if (capacity > (size_t)-1 / sizeof table->array[0])
                 goto bad;
         }
-        array = (void **) realloc(table->array,
-                                  capacity * sizeof table->array[0]);
+        array = (void **) js_realloc(table->array,
+                                     capacity * sizeof table->array[0]);
         if (!array)
             goto bad;
 #ifdef DEBUG
@@ -796,11 +797,11 @@ ShrinkPtrTable(JSPtrTable *table, const JSPtrTableInfo *info,
         array = table->array;
         JS_ASSERT(array);
         if (capacity == 0) {
-            free(array);
+            js_free(array);
             table->array = NULL;
             return;
         }
-        array = (void **) realloc(array, capacity * sizeof array[0]);
+        array = (void **) js_realloc(array, capacity * sizeof array[0]);
         if (array)
             table->array = array;
     }
@@ -881,7 +882,7 @@ NewGCChunk(void)
      *
      * bytes to ensure that we always have room to store the gap.
      */
-    p = malloc((js_gcArenasPerChunk + 1) << GC_ARENA_SHIFT);
+    p = js_malloc((js_gcArenasPerChunk + 1) << GC_ARENA_SHIFT);
     if (!p)
         return 0;
 
@@ -913,11 +914,11 @@ DestroyGCChunk(jsuword chunk)
 #endif
 
 #if HAS_POSIX_MEMALIGN
-    free((void *) chunk);
+    js_free((void *) chunk);
 #else
     /* See comments in NewGCChunk. */
     JS_ASSERT(*GetMallocedChunkGapPtr(chunk) < GC_ARENA_SIZE);
-    free((void *) (chunk - *GetMallocedChunkGapPtr(chunk)));
+    js_free((void *) (chunk - *GetMallocedChunkGapPtr(chunk)));
 #endif
 }
 
@@ -3270,7 +3271,10 @@ js_FinalizeStringRT(JSRuntime *rt, JSString *str, intN type, JSContext *cx)
                 JS_ASSERT(type < 0);
                 rt->unitStrings[*chars] = NULL;
             } else if (type < 0) {
-                free(chars);
+                if (cx)
+                    cx->free(chars);
+                else
+                    rt->free(chars);
             } else {
                 JS_ASSERT((uintN) type < JS_ARRAY_LENGTH(str_finalizers));
                 finalizer = str_finalizers[type];
@@ -3556,6 +3560,10 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
 
     rt->gcMarkingTracer = NULL;
 
+#ifdef JS_THREADSAFE
+    cx->createDeallocatorTask();
+#endif
+
     /*
      * Sweep phase.
      *
@@ -3734,6 +3742,10 @@ js_GC(JSContext *cx, JSGCInvocationKind gckind)
      */
     DestroyGCArenas(rt, emptyArenas);
 
+#ifdef JS_THREADSAFE
+    cx->submitDeallocatorTask();
+#endif
+
     if (rt->gcCallback)
         (void) rt->gcCallback(cx, JSGC_FINALIZE_END);
 #ifdef DEBUG_srcnotesize
diff --git a/js/src/jsgc.h b/js/src/jsgc.h
index 417c6405274d..52ec7982fd68 100644
--- a/js/src/jsgc.h
+++ b/js/src/jsgc.h
@@ -47,6 +47,7 @@
 #include "jsdhash.h"
 #include "jsbit.h"
 #include "jsutil.h"
+#include "jstask.h"
 
 JS_BEGIN_EXTERN_C
 
@@ -341,6 +342,28 @@ js_AddAsGCBytes(JSContext *cx, size_t sz);
 extern void
 js_RemoveAsGCBytes(JSRuntime* rt, size_t sz);
 
+#ifdef JS_THREADSAFE
+class JSFreePointerListTask : public JSBackgroundTask {
+    void *head;
+  public:
+    JSFreePointerListTask() : head(NULL) {}
+
+    void add(void* ptr) {
+        *(void**)ptr = head;
+        head = ptr;
+    }
+
+    void run() {
+        void *ptr = head;
+        while (ptr) {
+            void *next = *(void **)ptr;
+            js_free(ptr);
+            ptr = next;
+        }
+    }
+};
+#endif
+
 /*
  * Free the chars held by str when it is finalized by the GC. When type is
  * less then zero, it denotes an internal string. Otherwise it denotes the
diff --git a/js/src/jshash.cpp b/js/src/jshash.cpp
index 9e9466e4b6ed..e347744e7319 100644
--- a/js/src/jshash.cpp
+++ b/js/src/jshash.cpp
@@ -73,7 +73,7 @@ DefaultAllocTable(void *pool, size_t size)
 static void
 DefaultFreeTable(void *pool, void *item, size_t size)
 {
-    free(item);
+    js_free(item);
 }
 
 static JSHashEntry *
@@ -86,7 +86,7 @@ static void
 DefaultFreeEntry(void *pool, JSHashEntry *he, uintN flag)
 {
     if (flag == HT_FREE_ENTRY)
-        free(he);
+        js_free(he);
 }
 
 static JSHashAllocOps defaultHashAllocOps = {
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index d77602e4782f..0d9a50ba5ad1 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -2145,7 +2145,7 @@ js_TraceOpcode(JSContext *cx)
                     fprintf(tracefp, "%s %s",
                             (n == -ndefs) ? "  output:" : ",",
                             bytes);
-                    JS_free(cx, bytes);
+                    cx->free(bytes);
                 }
             }
             fprintf(tracefp, " @ %u\n", (uintN) (regs->sp - StackBase(fp)));
@@ -2177,7 +2177,7 @@ js_TraceOpcode(JSContext *cx)
                 fprintf(tracefp, "%s %s",
                         (n == -nuses) ? "  inputs:" : ",",
                         bytes);
-                JS_free(cx, bytes);
+                cx->free(bytes);
             }
         }
         fprintf(tracefp, " @ %u\n", (uintN) (regs->sp - StackBase(fp)));
@@ -2264,7 +2264,7 @@ js_DumpOpMeters()
 
 # define SIGNIFICANT(count,total) (200. * (count) >= (total))
 
-    graph = (Edge *) calloc(nedges, sizeof graph[0]);
+    graph = (Edge *) js_calloc(nedges * sizeof graph[0]);
     for (i = nedges = 0; i < JSOP_LIMIT; i++) {
         from = js_CodeName[i];
         for (j = 0; j < JSOP_LIMIT; j++) {
@@ -2293,7 +2293,7 @@ js_DumpOpMeters()
                 graph[i].from, graph[i].to,
                 (unsigned long)graph[i].count, style);
     }
-    free(graph);
+    js_free(graph);
     fputs("}\n", fp);
     fclose(fp);
 
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index f941a6e3bd7e..a9c3473f9775 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -649,7 +649,7 @@ generator_finalize(JSContext *cx, JSObject *obj)
          */
         JS_ASSERT(gen->state == JSGEN_NEWBORN || gen->state == JSGEN_CLOSED ||
                   gen->state == JSGEN_OPEN);
-        JS_free(cx, gen);
+        cx->free(gen);
     }
 }
 
@@ -716,7 +716,7 @@ js_NewGenerator(JSContext *cx, JSStackFrame *fp)
 
     /* Allocate obj's private data struct. */
     gen = (JSGenerator *)
-          JS_malloc(cx, sizeof(JSGenerator) + (nslots - 1) * sizeof(jsval));
+        cx->malloc(sizeof(JSGenerator) + (nslots - 1) * sizeof(jsval));
     if (!gen)
         goto bad;
 
@@ -783,7 +783,7 @@ js_NewGenerator(JSContext *cx, JSStackFrame *fp)
     gen->state = JSGEN_NEWBORN;
 
     if (!JS_SetPrivate(cx, obj, gen)) {
-        JS_free(cx, gen);
+        cx->free(gen);
         goto bad;
     }
     return obj;
diff --git a/js/src/jslock.cpp b/js/src/jslock.cpp
index e31c15b9ab00..e1064f26a390 100644
--- a/js/src/jslock.cpp
+++ b/js/src/jslock.cpp
@@ -896,7 +896,7 @@ DestroyFatlock(JSFatLock *fl)
 {
     PR_DestroyLock(fl->slock);
     PR_DestroyCondVar(fl->svar);
-    free(fl);
+    js_free(fl);
 }
 
 static JSFatLock *
@@ -990,7 +990,7 @@ js_SetupLocks(int listc, int globc)
     global_locks_log2 = JS_CeilingLog2(globc);
     global_locks_mask = JS_BITMASK(global_locks_log2);
     global_lock_count = JS_BIT(global_locks_log2);
-    global_locks = (PRLock **) malloc(global_lock_count * sizeof(PRLock*));
+    global_locks = (PRLock **) js_malloc(global_lock_count * sizeof(PRLock*));
     if (!global_locks)
         return JS_FALSE;
     for (i = 0; i < global_lock_count; i++) {
@@ -1001,7 +1001,7 @@ js_SetupLocks(int listc, int globc)
             return JS_FALSE;
         }
     }
-    fl_list_table = (JSFatLockTable *) malloc(i * sizeof(JSFatLockTable));
+    fl_list_table = (JSFatLockTable *) js_malloc(i * sizeof(JSFatLockTable));
     if (!fl_list_table) {
         js_CleanupLocks();
         return JS_FALSE;
@@ -1023,7 +1023,7 @@ js_CleanupLocks()
     if (global_locks) {
         for (i = 0; i < global_lock_count; i++)
             PR_DestroyLock(global_locks[i]);
-        free(global_locks);
+        js_free(global_locks);
         global_locks = NULL;
         global_lock_count = 1;
         global_locks_log2 = 0;
@@ -1036,7 +1036,7 @@ js_CleanupLocks()
             DeleteListOfFatlocks(fl_list_table[i].taken);
             fl_list_table[i].taken = NULL;
         }
-        free(fl_list_table);
+        js_free(fl_list_table);
         fl_list_table = NULL;
         fl_list_table_len = 0;
     }
diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp
index 893f74aaaa2c..5c8993aa080e 100644
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -384,7 +384,7 @@ num_toString(JSContext *cx, uintN argc, jsval *vp)
             return JS_FALSE;
         }
         str = JS_NewStringCopyZ(cx, dStr);
-        free(dStr);
+        js_free(dStr);
     }
     if (!str)
         return JS_FALSE;
@@ -460,7 +460,7 @@ num_toLocaleString(JSContext *cx, uintN argc, jsval *vp)
     }
     tmpGroup--;
 
-    buf = (char *)JS_malloc(cx, size + 1);
+    buf = (char *)cx->malloc(size + 1);
     if (!buf)
         return JS_FALSE;
 
@@ -492,7 +492,7 @@ num_toLocaleString(JSContext *cx, uintN argc, jsval *vp)
 
     str = JS_NewString(cx, buf, size);
     if (!str) {
-        JS_free(cx, buf);
+        cx->free(buf);
         return JS_FALSE;
     }
 
@@ -739,9 +739,9 @@ js_FinishRuntimeNumberState(JSContext *cx)
     rt->jsNegativeInfinity = NULL;
     rt->jsPositiveInfinity = NULL;
 
-    JS_free(cx, (void *)rt->thousandsSeparator);
-    JS_free(cx, (void *)rt->decimalSeparator);
-    JS_free(cx, (void *)rt->numGrouping);
+    cx->free((void *)rt->thousandsSeparator);
+    cx->free((void *)rt->decimalSeparator);
+    cx->free((void *)rt->numGrouping);
     rt->thousandsSeparator = rt->decimalSeparator = rt->numGrouping = NULL;
 }
 
@@ -852,7 +852,7 @@ NumberToStringWithBase(JSContext *cx, jsdouble d, jsint base)
         return NULL;
     s = JS_NewStringCopyZ(cx, numStr);
     if (!(numStr >= buf && numStr < buf + sizeof buf))
-        free(numStr);
+        js_free(numStr);
     return s;
 }
 
@@ -1251,7 +1251,7 @@ js_strtod(JSContext *cx, const jschar *s, const jschar *send,
 
     /* Use cbuf to avoid malloc */
     if (length >= sizeof cbuf) {
-        cstr = (char *) JS_malloc(cx, length + 1);
+        cstr = (char *) cx->malloc(length + 1);
         if (!cstr)
            return JS_FALSE;
     } else {
@@ -1292,7 +1292,7 @@ js_strtod(JSContext *cx, const jschar *s, const jschar *send,
 
     i = estr - cstr;
     if (cstr != cbuf)
-        JS_free(cx, cstr);
+        cx->free(cstr);
     *ep = i ? s1 + i : s;
     *dp = d;
     return JS_TRUE;
@@ -1405,7 +1405,7 @@ js_strtointeger(JSContext *cx, const jschar *s, const jschar *send,
              */
             size_t i;
             size_t length = s1 - start;
-            char *cstr = (char *) JS_malloc(cx, length + 1);
+            char *cstr = (char *) cx->malloc(length + 1);
             char *estr;
             int err=0;
 
@@ -1418,12 +1418,12 @@ js_strtointeger(JSContext *cx, const jschar *s, const jschar *send,
             value = JS_strtod(cstr, &estr, &err);
             if (err == JS_DTOA_ENOMEM) {
                 JS_ReportOutOfMemory(cx);
-                JS_free(cx, cstr);
+                cx->free(cstr);
                 return JS_FALSE;
             }
             if (err == JS_DTOA_ERANGE && value == HUGE_VAL)
                 value = *cx->runtime->jsPositiveInfinity;
-            JS_free(cx, cstr);
+            cx->free(cstr);
         } else if ((base & (base - 1)) == 0) {
             /*
              * The number may also be inaccurate for power-of-two bases.  This
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 9ca39003a927..ed62904eecdc 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -560,7 +560,7 @@ out:
             ida = JS_Enumerate(cx, obj);
             if (!ida) {
                 if (*sp) {
-                    JS_free(cx, *sp);
+                    cx->free(*sp);
                     *sp = NULL;
                 }
                 goto bad;
@@ -704,7 +704,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
 
     if (!chars) {
         /* If outermost, allocate 4 + 1 for "({})" and the terminator. */
-        chars = (jschar *) malloc(((outermost ? 4 : 2) + 1) * sizeof(jschar));
+        chars = (jschar *) js_malloc(((outermost ? 4 : 2) + 1) * sizeof(jschar));
         nchars = 0;
         if (!chars)
             goto error;
@@ -715,9 +715,9 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
         MAKE_SHARP(he);
         nchars = js_strlen(chars);
         chars = (jschar *)
-            realloc((ochars = chars), (nchars + 2 + 1) * sizeof(jschar));
+            js_realloc((ochars = chars), (nchars + 2 + 1) * sizeof(jschar));
         if (!chars) {
-            free(ochars);
+            js_free(ochars);
             goto error;
         }
         if (outermost) {
@@ -958,11 +958,11 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
 
             /* Allocate 1 + 1 at end for closing brace and terminating 0. */
             chars = (jschar *)
-                realloc((ochars = chars), curlen * sizeof(jschar));
+                js_realloc((ochars = chars), curlen * sizeof(jschar));
             if (!chars) {
                 /* Save code space on error: let JS_free ignore null vsharp. */
-                JS_free(cx, vsharp);
-                free(ochars);
+                cx->free(vsharp);
+                js_free(ochars);
                 goto error;
             }
 
@@ -1005,7 +1005,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
             nchars += vlength;
 
             if (vsharp)
-                JS_free(cx, vsharp);
+                cx->free(vsharp);
         }
     }
 
@@ -1019,7 +1019,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
 
     if (!ok) {
         if (chars)
-            free(chars);
+            js_free(chars);
         goto out;
     }
 
@@ -1031,7 +1031,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
   make_string:
     str = js_NewString(cx, chars, nchars);
     if (!str) {
-        free(chars);
+        js_free(chars);
         ok = JS_FALSE;
         goto out;
     }
@@ -1042,8 +1042,8 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
     return ok;
 
   overflow:
-    JS_free(cx, vsharp);
-    free(chars);
+    cx->free(vsharp);
+    js_free(chars);
     chars = NULL;
     goto error;
 }
@@ -1064,7 +1064,7 @@ obj_toString(JSContext *cx, uintN argc, jsval *vp)
     obj = js_GetWrappedObject(cx, obj);
     clazz = OBJ_GET_CLASS(cx, obj)->name;
     nchars = 9 + strlen(clazz);         /* 9 for "[object ]" */
-    chars = (jschar *) JS_malloc(cx, (nchars + 1) * sizeof(jschar));
+    chars = (jschar *) cx->malloc((nchars + 1) * sizeof(jschar));
     if (!chars)
         return JS_FALSE;
 
@@ -1079,7 +1079,7 @@ obj_toString(JSContext *cx, uintN argc, jsval *vp)
 
     str = js_NewString(cx, chars, nchars);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -2986,7 +2986,7 @@ AllocSlots(JSContext *cx, JSObject *obj, size_t nslots)
     JS_ASSERT(nslots > JS_INITIAL_NSLOTS);
 
     jsval* slots;
-    slots = (jsval*) JS_malloc(cx, SLOTS_TO_DYNAMIC_WORDS(nslots) * sizeof(jsval));
+    slots = (jsval*) cx->malloc(SLOTS_TO_DYNAMIC_WORDS(nslots) * sizeof(jsval));
     if (!slots)
         return true;
 
@@ -3044,7 +3044,7 @@ js_GrowSlots(JSContext *cx, JSObject *obj, size_t nslots)
 
     size_t oslots = size_t(slots[-1]);
 
-    slots = (jsval*) JS_realloc(cx, slots - 1, nwords * sizeof(jsval));
+    slots = (jsval*) cx->realloc(slots - 1, nwords * sizeof(jsval));
     *slots++ = nslots;
     obj->dslots = slots;
 
@@ -3069,11 +3069,11 @@ js_ShrinkSlots(JSContext *cx, JSObject *obj, size_t nslots)
     JS_ASSERT(nslots <= size_t(slots[-1]));
 
     if (nslots <= JS_INITIAL_NSLOTS) {
-        JS_free(cx, slots - 1);
+        cx->free(slots - 1);
         obj->dslots = NULL;
     } else {
         size_t nwords = SLOTS_TO_DYNAMIC_WORDS(nslots);
-        slots = (jsval*) JS_realloc(cx, slots - 1, nwords * sizeof(jsval));
+        slots = (jsval*) cx->realloc(slots - 1, nwords * sizeof(jsval));
         *slots++ = nslots;
         obj->dslots = slots;
     }
@@ -4965,7 +4965,7 @@ js_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
             }
 
             allocated = NativeEnumeratorSize(length);
-            ne = (JSNativeEnumerator *) JS_malloc(cx, allocated);
+            ne = (JSNativeEnumerator *) cx->malloc(allocated);
             if (!ne) {
                 JS_UNLOCK_SCOPE(cx, scope);
                 return JS_FALSE;
@@ -4997,7 +4997,7 @@ js_Enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
                 JS_LOCK_GC(cx->runtime);
                 if (!js_AddAsGCBytes(cx, allocated)) {
                     /* js_AddAsGCBytes releases the GC lock on failures. */
-                    JS_free(cx, ne);
+                    cx->free(ne);
                     return JS_FALSE;
                 }
                 ne->next = cx->runtime->nativeEnumerators;
@@ -5090,7 +5090,7 @@ js_TraceNativeEnumerators(JSTracer *trc)
         } else if (doGC) {
             js_RemoveAsGCBytes(rt, NativeEnumeratorSize(ne->length));
             *nep = ne->next;
-            JS_free(trc->context, ne);
+            trc->context->free(ne);
             continue;
         }
         nep = &ne->next;
diff --git a/js/src/json.cpp b/js/src/json.cpp
index 43bf3ab03259..6f790f0e9843 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -38,7 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <string.h>     /* memset */
+#include <string.h>
 #include "jsapi.h"
 #include "jsarena.h"
 #include "jsarray.h"
@@ -740,10 +740,9 @@ js_BeginJSONParse(JSContext *cx, jsval *rootVal)
     if (!arr)
         return NULL;
 
-    JSONParser *jp = (JSONParser*) JS_malloc(cx, sizeof(JSONParser));
+    JSONParser *jp = (JSONParser*) cx->calloc(sizeof(JSONParser));
     if (!jp)
         return NULL;
-    memset(jp, 0, sizeof *jp);
 
     jp->objectStack = arr;
     if (!js_AddRoot(cx, &jp->objectStack, "JSON parse stack"))
@@ -798,7 +797,7 @@ js_FinishJSONParse(JSContext *cx, JSONParser *jp, jsval reviver)
 
     JSBool ok = *jp->statep == JSON_PARSE_STATE_FINISHED;
     jsval *vp = jp->rootVal;
-    JS_free(cx, jp);
+    cx->free(jp);
 
     if (!early_ok)
         return JS_FALSE;
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 98e0970ceddb..28376ee0076b 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -604,7 +604,7 @@ Sprint(Sprinter *sp, const char *format, ...)
         return -1;
     }
     offset = SprintCString(sp, bp);
-    free(bp);
+    js_free(bp);
     return offset;
 }
 
@@ -737,7 +737,7 @@ JS_NEW_PRINTER(JSContext *cx, const char *name, JSFunction *fun,
 {
     JSPrinter *jp;
 
-    jp = (JSPrinter *) JS_malloc(cx, sizeof(JSPrinter));
+    jp = (JSPrinter *) cx->malloc(sizeof(JSPrinter));
     if (!jp)
         return NULL;
     INIT_SPRINTER(cx, &jp->sprinter, &jp->pool, 0);
@@ -764,7 +764,7 @@ void
 js_DestroyPrinter(JSPrinter *jp)
 {
     JS_FinishArenaPool(&jp->pool);
-    JS_free(jp->sprinter.context, jp);
+    jp->sprinter.context->free(jp);
 }
 
 JSString *
@@ -832,7 +832,7 @@ js_printf(JSPrinter *jp, const char *format, ...)
     /* Allocate temp space, convert format, and put. */
     bp = JS_vsmprintf(format, ap);      /* XXX vsaprintf */
     if (fp) {
-        JS_free(jp->sprinter.context, fp);
+        jp->sprinter.context->free(fp);
         format = NULL;
     }
     if (!bp) {
@@ -843,7 +843,7 @@ js_printf(JSPrinter *jp, const char *format, ...)
     cc = strlen(bp);
     if (SprintPut(&jp->sprinter, bp, (size_t)cc) < 0)
         cc = -1;
-    free(bp);
+    js_free(bp);
 
     va_end(ap);
     return cc;
@@ -929,7 +929,7 @@ GetOff(SprintStack *ss, uintN i)
             if (off < 0)
                 off = 0;
             ss->offsets[i] = off;
-            JS_free(ss->sprinter.context, bytes);
+            ss->sprinter.context->free(bytes);
             return off;
         }
         if (!ss->sprinter.base && SprintPut(&ss->sprinter, "", 0) >= 0) {
@@ -2508,14 +2508,14 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     len = 0;
 
                     if (!Decompile(ss, done, pc - done, JSOP_POP)) {
-                        JS_free(cx, (char *)lval);
+                        cx->free((char *)lval);
                         return NULL;
                     }
 
                     /* Pop Decompile result and print comma expression. */
                     rval = POP_STR();
                     todo = Sprint(&ss->sprinter, "%s, %s", lval, rval);
-                    JS_free(cx, (char *)lval);
+                    cx->free((char *)lval);
                     break;
 
                   case SRC_HIDDEN:
@@ -2547,7 +2547,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                         /* Set saveop to reflect what we will push. */
                         saveop = JSOP_LEAVEBLOCKEXPR;
                         if (!Decompile(ss, pc, len, saveop)) {
-                            JS_free(cx, (char *)lval);
+                            cx->free((char *)lval);
                             return NULL;
                         }
                         rval = PopStr(ss, JSOP_SETNAME);
@@ -2556,7 +2556,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                                       ? "let (%s) (%s)"
                                       : "let (%s) %s",
                                       lval, rval);
-                        JS_free(cx, (char *)lval);
+                        cx->free((char *)lval);
                     }
                     break;
 
@@ -2620,7 +2620,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 if ((size_t)argc <= JS_ARRAY_LENGTH(smallv)) {
                     atomv = smallv;
                 } else {
-                    atomv = (JSAtom **) JS_malloc(cx, argc * sizeof(JSAtom *));
+                    atomv = (JSAtom **) cx->malloc(argc * sizeof(JSAtom *));
                     if (!atomv)
                         return NULL;
                 }
@@ -2755,7 +2755,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 #undef LOCAL_ASSERT_OUT
               enterblock_out:
                 if (atomv != smallv)
-                    JS_free(cx, atomv);
+                    cx->free(atomv);
                 if (!ok)
                     return NULL;
               }
@@ -3280,7 +3280,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     DECOMPILE_CODE(pc + oplen, len - oplen);
                     lval = JS_strdup(cx, POP_STR());
                     if (!lval) {
-                        JS_free(cx, (void *)xval);
+                        cx->free((void *)xval);
                         return NULL;
                     }
                     pc += len;
@@ -3291,8 +3291,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     rval = POP_STR();
                     todo = Sprint(&ss->sprinter, "%s ? %s : %s",
                                   xval, lval, rval);
-                    JS_free(cx, (void *)xval);
-                    JS_free(cx, (void *)lval);
+                    cx->free((void *)xval);
+                    cx->free((void *)lval);
                     break;
 
                   default:
@@ -3319,7 +3319,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 pc += len;
                 len = done - pc;
                 if (!Decompile(ss, pc, len, op)) {
-                    JS_free(cx, (char *)lval);
+                    cx->free((char *)lval);
                     return NULL;
                 }
                 rval = POP_STR();
@@ -3332,14 +3332,14 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                         todo = Sprint(&ss->sprinter, "%s %s\n", lval, xval);
                         tail = Sprint(&ss->sprinter, "%*s%s",
                                       jp->indent + 4, "", rval);
-                        JS_free(cx, (char *)rval);
+                        cx->free((char *)rval);
                     }
                     if (tail < 0)
                         todo = -1;
                 } else {
                     todo = Sprint(&ss->sprinter, "%s %s %s", lval, xval, rval);
                 }
-                JS_free(cx, (char *)lval);
+                cx->free((char *)lval);
                 break;
 
               case JSOP_AND:
@@ -3532,7 +3532,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 #endif
                 argc = GET_ARGC(pc);
                 argv = (char **)
-                    JS_malloc(cx, (size_t)(argc + 1) * sizeof *argv);
+                    cx->malloc((size_t)(argc + 1) * sizeof *argv);
                 if (!argv)
                     return NULL;
 
@@ -3590,8 +3590,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     ok = JS_FALSE;
 
                 for (i = 0; i <= argc; i++)
-                    JS_free(cx, argv[i]);
-                JS_free(cx, argv);
+                    cx->free(argv[i]);
+                cx->free(argv);
                 if (!ok)
                     return NULL;
 #if JS_HAS_LVALUE_RETURN
@@ -4095,7 +4095,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     if (!rval)
                         return NULL;
                     todo = SprintCString(&ss->sprinter, rval);
-                    JS_free(cx, (void *)rval);
+                    cx->free((void *)rval);
                     break;
                 }
 #endif /* JS_HAS_GENERATOR_EXPRS */
@@ -4166,7 +4166,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     ok = JS_TRUE;
                 } else {
                     table = (TableEntry *)
-                            JS_malloc(cx, (size_t)n * sizeof *table);
+                            cx->malloc((size_t)n * sizeof *table);
                     if (!table)
                         return NULL;
                     for (i = j = 0; i < n; i++) {
@@ -4186,12 +4186,12 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                         pc2 += jmplen;
                     }
                     tmp = (TableEntry *)
-                          JS_malloc(cx, (size_t)j * sizeof *table);
+                          cx->malloc((size_t)j * sizeof *table);
                     if (tmp) {
                         VOUCH_DOES_NOT_REQUIRE_STACK();
                         ok = js_MergeSort(table, (size_t)j, sizeof(TableEntry),
                                           CompareOffsets, NULL, tmp);
-                        JS_free(cx, tmp);
+                        cx->free(tmp);
                     } else {
                         ok = JS_FALSE;
                     }
@@ -4201,7 +4201,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     ok = DecompileSwitch(ss, table, (uintN)j, pc, len, off,
                                          JS_FALSE);
                 }
-                JS_free(cx, table);
+                cx->free(table);
                 if (!ok)
                     return NULL;
                 todo = -2;
@@ -4227,7 +4227,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 pc2 += UINT16_LEN;
 
                 table = (TableEntry *)
-                    JS_malloc(cx, (size_t)npairs * sizeof *table);
+                    cx->malloc((size_t)npairs * sizeof *table);
                 if (!table)
                     return NULL;
                 for (k = 0; k < npairs; k++) {
@@ -4248,7 +4248,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 
                 ok = DecompileSwitch(ss, table, (uintN)npairs, pc, len, off,
                                      JS_FALSE);
-                JS_free(cx, table);
+                cx->free(table);
                 if (!ok)
                     return NULL;
                 todo = -2;
@@ -4292,7 +4292,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                  * and the distance to its statements in table[i].offset.
                  */
                 table = (TableEntry *)
-                    JS_malloc(cx, (size_t)ncases * sizeof *table);
+                    cx->malloc((size_t)ncases * sizeof *table);
                 if (!table)
                     return NULL;
                 pc2 = pc;
@@ -4322,7 +4322,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
 
                 ok = DecompileSwitch(ss, table, (uintN)ncases, pc, len, off,
                                      JS_TRUE);
-                JS_free(cx, table);
+                cx->free(table);
                 if (!ok)
                     return NULL;
                 todo = -2;
@@ -4370,7 +4370,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                     break;
                 }
 
-                argv = (char **) JS_malloc(cx, size_t(argc) * sizeof *argv);
+                argv = (char **) cx->malloc(size_t(argc) * sizeof *argv);
                 if (!argv)
                     return NULL;
 
@@ -4394,8 +4394,8 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 }
 
                 for (i = 0; i < argc; i++)
-                    JS_free(cx, argv[i]);
-                JS_free(cx, argv);
+                    cx->free(argv[i]);
+                cx->free(argv);
                 if (!ok)
                     return NULL;
 
@@ -4728,7 +4728,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                      (*rval == '\0' ||
                       (SprintPut(&ss->sprinter, " ", 1) >= 0 &&
                        SprintCString(&ss->sprinter, rval)));
-                JS_free(cx, (char *)rval);
+                cx->free((char *)rval);
                 if (!ok)
                     return NULL;
                 SprintPut(&ss->sprinter, "?>", 2);
@@ -4836,7 +4836,7 @@ DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, uintN len,
 
     ok = Decompile(&ss, pc, len, JSOP_NOP) != NULL;
     if (code != oldcode) {
-        JS_free(cx, jp->script->code);
+        cx->free(jp->script->code);
         jp->script->code = oldcode;
         jp->script->main = oldmain;
     }
@@ -5055,7 +5055,7 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
          * populated interpreter's stack with its current content.
          */
         pcstack = (jsbytecode **)
-                  JS_malloc(cx, StackDepth(script) * sizeof *pcstack);
+                  cx->malloc(StackDepth(script) * sizeof *pcstack);
         if (!pcstack)
             return NULL;
         pcdepth = ReconstructPCStack(cx, script, pc, pcstack);
@@ -5096,7 +5096,7 @@ js_DecompileValueGenerator(JSContext *cx, intN spindex, jsval v,
         }
 
       release_pcstack:
-        JS_free(cx, pcstack);
+        cx->free(pcstack);
         if (pcdepth < 0)
             goto do_fallback;
     }
@@ -5232,7 +5232,7 @@ DecompileExpression(JSContext *cx, JSScript *script, JSFunction *fun,
     }
 
     pcstack = (jsbytecode **)
-              JS_malloc(cx, StackDepth(script) * sizeof *pcstack);
+              cx->malloc(StackDepth(script) * sizeof *pcstack);
     if (!pcstack) {
         name = NULL;
         goto out;
@@ -5259,12 +5259,12 @@ DecompileExpression(JSContext *cx, JSScript *script, JSFunction *fun,
 
   out:
     if (code != oldcode) {
-        JS_free(cx, script->code);
+        cx->free(script->code);
         script->code = oldcode;
         script->main = oldmain;
     }
 
-    JS_free(cx, pcstack);
+    cx->free(pcstack);
     return name;
 }
 
@@ -5339,7 +5339,7 @@ SimulateImacroCFG(JSContext *cx, JSScript *script,
                   jsbytecode **pcstack)
 {
     size_t nbytes = StackDepth(script) * sizeof *pcstack;
-    jsbytecode** tmp_pcstack = (jsbytecode **) JS_malloc(cx, nbytes);
+    jsbytecode** tmp_pcstack = (jsbytecode **) cx->malloc(nbytes);
     if (!tmp_pcstack)
         return -1;
     memcpy(tmp_pcstack, pcstack, nbytes);
@@ -5379,11 +5379,11 @@ SimulateImacroCFG(JSContext *cx, JSScript *script,
 
   success:
     memcpy(pcstack, tmp_pcstack, nbytes);
-    JS_free(cx, tmp_pcstack);
+    cx->free(tmp_pcstack);
     return pcdepth;
 
   failure:
-    JS_free(cx, tmp_pcstack);
+    cx->free(tmp_pcstack);
     return -1;
 }
 
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 161dfbc94ae2..35cd45dd9d63 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -9036,12 +9036,12 @@ js_FoldConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc, bool inCond)
             }
 
             /* Allocate a new buffer and string descriptor for the result. */
-            chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+            chars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
             if (!chars)
                 return JS_FALSE;
             str = js_NewString(cx, chars, length);
             if (!str) {
-                JS_free(cx, chars);
+                cx->free(chars);
                 return JS_FALSE;
             }
 
diff --git a/js/src/jsprf.cpp b/js/src/jsprf.cpp
index 5686c1eabcda..6e02bc2d1857 100644
--- a/js/src/jsprf.cpp
+++ b/js/src/jsprf.cpp
@@ -412,7 +412,7 @@ static int cvt_ws(SprintfState *ss, const jschar *ws, int width, int prec,
         if (!s)
             return -1; /* JSStuffFunc error indicator. */
         result = cvt_s(ss, s, width, prec, flags);
-        free(s);
+        js_free(s);
     } else {
         result = cvt_s(ss, NULL, width, prec, flags);
     }
@@ -630,7 +630,7 @@ static struct NumArgState* BuildArgArray( const char *fmt, va_list ap, int* rv,
 
     if( *rv < 0 ){
         if( nas != nasArray )
-            free( nas );
+            js_free( nas );
         return NULL;
     }
 
@@ -667,7 +667,7 @@ static struct NumArgState* BuildArgArray( const char *fmt, va_list ap, int* rv,
 
         default:
             if( nas != nasArray )
-                free( nas );
+                js_free( nas );
             *rv = -1;
             return NULL;
         }
@@ -756,7 +756,7 @@ static int dosprintf(SprintfState *ss, const char *fmt, va_list ap)
 
             if( nas[i-1].type == TYPE_UNKNOWN ){
                 if( nas && ( nas != nasArray ) )
-                    free( nas );
+                    js_free( nas );
                 return -1;
             }
 
@@ -1037,7 +1037,7 @@ static int dosprintf(SprintfState *ss, const char *fmt, va_list ap)
     rv = (*ss->stuff)(ss, "\0", 1);
 
     if( nas && ( nas != nasArray ) ){
-        free( nas );
+        js_free( nas );
     }
 
     return rv;
@@ -1098,9 +1098,9 @@ static int GrowStuff(SprintfState *ss, const char *sp, JSUint32 len)
         /* Grow the buffer */
         newlen = ss->maxlen + ((len > 32) ? len : 32);
         if (ss->base) {
-            newbase = (char*) realloc(ss->base, newlen);
+            newbase = (char*) js_realloc(ss->base, newlen);
         } else {
-            newbase = (char*) malloc(newlen);
+            newbase = (char*) js_malloc(newlen);
         }
         if (!newbase) {
             /* Ran out of memory */
@@ -1139,7 +1139,7 @@ JS_PUBLIC_API(char *) JS_smprintf(const char *fmt, ...)
 */
 JS_PUBLIC_API(void) JS_smprintf_free(char *mem)
 {
-        free(mem);
+        js_free(mem);
 }
 
 JS_PUBLIC_API(char *) JS_vsmprintf(const char *fmt, va_list ap)
@@ -1154,7 +1154,7 @@ JS_PUBLIC_API(char *) JS_vsmprintf(const char *fmt, va_list ap)
     rv = dosprintf(&ss, fmt, ap);
     if (rv < 0) {
         if (ss.base) {
-            free(ss.base);
+            js_free(ss.base);
         }
         return 0;
     }
@@ -1253,7 +1253,7 @@ JS_PUBLIC_API(char *) JS_vsprintf_append(char *last, const char *fmt, va_list ap
     rv = dosprintf(&ss, fmt, ap);
     if (rv < 0) {
         if (ss.base) {
-            free(ss.base);
+            js_free(ss.base);
         }
         return 0;
     }
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index c2068d65d07c..7efcbfbcc64a 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -145,7 +145,6 @@ typedef struct JSObject          JSObject;
 typedef struct JSObjectMap       JSObjectMap;
 typedef struct JSObjectOps       JSObjectOps;
 typedef struct JSRuntime         JSRuntime;
-typedef struct JSRuntime         JSTaskState;   /* XXX deprecated name */
 typedef struct JSScript          JSScript;
 typedef struct JSStackFrame      JSStackFrame;
 typedef struct JSString          JSString;
diff --git a/js/src/jsregexp.cpp b/js/src/jsregexp.cpp
index 05762c296b49..8a098ee42659 100644
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@@ -585,12 +585,12 @@ ParseRegExp(CompilerState *state)
     }
 
     operatorStack = (REOpData *)
-        JS_malloc(state->context, sizeof(REOpData) * operatorStackSize);
+        state->context->malloc(sizeof(REOpData) * operatorStackSize);
     if (!operatorStack)
         return JS_FALSE;
 
     operandStack = (RENode **)
-        JS_malloc(state->context, sizeof(RENode *) * operandStackSize);
+        state->context->malloc(sizeof(RENode *) * operandStackSize);
     if (!operandStack)
         goto out;
 
@@ -682,8 +682,8 @@ pushOperand:
                     RENode **tmp;
                     operandStackSize += operandStackSize;
                     tmp = (RENode **)
-                        JS_realloc(state->context, operandStack,
-                                   sizeof(RENode *) * operandStackSize);
+                        state->context->realloc(operandStack,
+                                                sizeof(RENode *) * operandStackSize);
                     if (!tmp)
                         goto out;
                     operandStack = tmp;
@@ -817,8 +817,8 @@ pushOperator:
                 REOpData *tmp;
                 operatorStackSize += operatorStackSize;
                 tmp = (REOpData *)
-                    JS_realloc(state->context, operatorStack,
-                               sizeof(REOpData) * operatorStackSize);
+                    state->context->realloc(operatorStack,
+                                            sizeof(REOpData) * operatorStackSize);
                 if (!tmp)
                     goto out;
                 operatorStack = tmp;
@@ -831,9 +831,9 @@ pushOperator:
     }
 out:
     if (operatorStack)
-        JS_free(state->context, operatorStack);
+        state->context->free(operatorStack);
     if (operandStack)
-        JS_free(state->context, operandStack);
+        state->context->free(operandStack);
     return result;
 }
 
@@ -1647,9 +1647,8 @@ EmitREBytecode(CompilerState *state, JSRegExp *re, size_t treeDepth,
         emitStateStack = NULL;
     } else {
         emitStateStack =
-            (EmitStateStackEntry *)JS_malloc(state->context,
-                                             sizeof(EmitStateStackEntry) *
-                                             treeDepth);
+            (EmitStateStackEntry *)
+            state->context->malloc(sizeof(EmitStateStackEntry) * treeDepth);
         if (!emitStateStack)
             return NULL;
     }
@@ -1951,7 +1950,7 @@ EmitREBytecode(CompilerState *state, JSRegExp *re, size_t treeDepth,
 
   cleanup:
     if (emitStateStack)
-        JS_free(state->context, emitStateStack);
+        state->context->free(emitStateStack);
     return pc;
 
   jump_too_big:
@@ -3228,7 +3227,7 @@ js_NewRegExp(JSContext *cx, JSTokenStream *ts,
         goto out;
 
     resize = offsetof(JSRegExp, program) + state.progLength + 1;
-    re = (JSRegExp *) JS_malloc(cx, resize);
+    re = (JSRegExp *) cx->malloc(resize);
     if (!re)
         goto out;
 
@@ -3237,7 +3236,7 @@ js_NewRegExp(JSContext *cx, JSTokenStream *ts,
     re->classCount = state.classCount;
     if (re->classCount) {
         re->classList = (RECharSet *)
-            JS_malloc(cx, re->classCount * sizeof(RECharSet));
+            cx->malloc(re->classCount * sizeof(RECharSet));
         if (!re->classList) {
             js_DestroyRegExp(cx, re);
             re = NULL;
@@ -3266,7 +3265,7 @@ js_NewRegExp(JSContext *cx, JSTokenStream *ts,
         JSRegExp *tmp;
         JS_ASSERT((size_t)(endPC - re->program) < state.progLength + 1);
         resize = offsetof(JSRegExp, program) + (endPC - re->program);
-        tmp = (JSRegExp *) JS_realloc(cx, re, resize);
+        tmp = (JSRegExp *) cx->realloc(re, resize);
         if (tmp)
             re = tmp;
     }
@@ -3606,7 +3605,7 @@ ProcessCharSet(JSContext *cx, JSRegExp *re, RECharSet *charSet)
     JS_ASSERT(end[0] == ']');
 
     byteLength = (charSet->length >> 3) + 1;
-    charSet->u.bits = (uint8 *)JS_malloc(cx, byteLength);
+    charSet->u.bits = (uint8 *)cx->malloc(byteLength);
     if (!charSet->u.bits) {
         JS_ReportOutOfMemory(cx);
         return JS_FALSE;
@@ -3800,12 +3799,12 @@ js_DestroyRegExp(JSContext *cx, JSRegExp *re)
             uintN i;
             for (i = 0; i < re->classCount; i++) {
                 if (re->classList[i].converted)
-                    JS_free(cx, re->classList[i].u.bits);
+                    cx->free(re->classList[i].u.bits);
                 re->classList[i].u.bits = NULL;
             }
-            JS_free(cx, re->classList);
+            cx->free(re->classList);
         }
-        JS_free(cx, re);
+        cx->free(re);
     }
 }
 
@@ -4870,12 +4869,12 @@ js_ExecuteRegExp(JSContext *cx, JSRegExp *re, JSString *str, size_t *indexp,
                 if (!morepar) {
                     res->moreLength = 10;
                     morepar = (JSSubString*)
-                        JS_malloc(cx, 10 * sizeof(JSSubString));
+                        cx->malloc(10 * sizeof(JSSubString));
                 } else if (morenum >= res->moreLength) {
                     res->moreLength += 10;
                     morepar = (JSSubString*)
-                        JS_realloc(cx, morepar,
-                                   res->moreLength * sizeof(JSSubString));
+                        cx->realloc(morepar,
+                                    res->moreLength * sizeof(JSSubString));
                 }
                 if (!morepar) {
                     cx->weakRoots.newborn[GCX_OBJECT] = NULL;
@@ -5114,7 +5113,7 @@ js_FreeRegExpStatics(JSContext *cx)
     JSRegExpStatics *res = &cx->regExpStatics;
 
     if (res->moreParens) {
-        JS_free(cx, res->moreParens);
+        cx->free(res->moreParens);
         res->moreParens = NULL;
     }
     JS_FinishArenaPool(&cx->regexpPool);
@@ -5365,7 +5364,7 @@ js_regexp_toString(JSContext *cx, JSObject *obj, jsval *vp)
     nflags = 0;
     for (flags = re->flags; flags != 0; flags &= flags - 1)
         nflags++;
-    chars = (jschar*) JS_malloc(cx, (length + nflags + 1) * sizeof(jschar));
+    chars = (jschar*) cx->malloc((length + nflags + 1) * sizeof(jschar));
     if (!chars) {
         JS_UNLOCK_OBJ(cx, obj);
         return JS_FALSE;
@@ -5389,7 +5388,7 @@ js_regexp_toString(JSContext *cx, JSObject *obj, jsval *vp)
 
     str = js_NewString(cx, chars, length);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -5472,15 +5471,15 @@ regexp_compile_sub(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
             if (*cp == '/' && (cp == start || cp[-1] != '\\')) {
                 nbytes = (++length + 1) * sizeof(jschar);
                 if (!nstart) {
-                    nstart = (jschar *) JS_malloc(cx, nbytes);
+                    nstart = (jschar *) cx->malloc(nbytes);
                     if (!nstart)
                         return JS_FALSE;
                     ncp = nstart + (cp - start);
                     js_strncpy(nstart, start, cp - start);
                 } else {
-                    tmp = (jschar *) JS_realloc(cx, nstart, nbytes);
+                    tmp = (jschar *) cx->realloc(nstart, nbytes);
                     if (!tmp) {
-                        JS_free(cx, nstart);
+                        cx->free(nstart);
                         return JS_FALSE;
                     }
                     ncp = tmp + (ncp - nstart);
@@ -5498,7 +5497,7 @@ regexp_compile_sub(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
             *ncp = 0;
             str = js_NewString(cx, nstart, length);
             if (!str) {
-                JS_free(cx, nstart);
+                cx->free(nstart);
                 return JS_FALSE;
             }
             argv[0] = STRING_TO_JSVAL(str);
diff --git a/js/src/jsscan.cpp b/js/src/jsscan.cpp
index 37e50a80d85a..90f3547671d4 100644
--- a/js/src/jsscan.cpp
+++ b/js/src/jsscan.cpp
@@ -258,7 +258,7 @@ void
 js_CloseTokenStream(JSContext *cx, JSTokenStream *ts)
 {
     if (ts->flags & TSF_OWNFILENAME)
-        JS_free(cx, (void *) ts->filename);
+        cx->free((void *) ts->filename);
 }
 
 JS_FRIEND_API(int)
@@ -562,7 +562,7 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, JSParseNode *pn,
     }
     report.lineno = ts->lineno;
     linelength = ts->linebuf.limit - ts->linebuf.base;
-    linechars = (jschar *)JS_malloc(cx, (linelength + 1) * sizeof(jschar));
+    linechars = (jschar *)cx->malloc((linelength + 1) * sizeof(jschar));
     if (!linechars) {
         warning = JS_FALSE;
         goto out;
@@ -651,21 +651,21 @@ js_ReportCompileErrorNumber(JSContext *cx, JSTokenStream *ts, JSParseNode *pn,
 
   out:
     if (linebytes)
-        JS_free(cx, linebytes);
+        cx->free(linebytes);
     if (linechars)
-        JS_free(cx, linechars);
+        cx->free(linechars);
     if (message)
-        JS_free(cx, message);
+        cx->free(message);
     if (report.ucmessage)
-        JS_free(cx, (void *)report.ucmessage);
+        cx->free((void *)report.ucmessage);
 
     if (report.messageArgs) {
         if (!(flags & JSREPORT_UC)) {
             i = 0;
             while (report.messageArgs[i])
-                JS_free(cx, (void *)report.messageArgs[i++]);
+                cx->free((void *)report.messageArgs[i++]);
         }
-        JS_free(cx, (void *)report.messageArgs);
+        cx->free((void *)report.messageArgs);
     }
 
     if (!JSREPORT_IS_WARNING(flags)) {
@@ -698,7 +698,7 @@ GrowStringBuffer(JSStringBuffer *sb, size_t amount)
 
         /* Now do the full overflow check. */
         if (size_t(offset) < newlength && newlength < ~size_t(0) / sizeof(jschar)) {
-            jschar *bp = (jschar *) realloc(sb->base, newlength * sizeof(jschar));
+            jschar *bp = (jschar *) js_realloc(sb->base, newlength * sizeof(jschar));
             if (bp) {
                 sb->base = bp;
                 sb->ptr = bp + offset;
@@ -709,7 +709,7 @@ GrowStringBuffer(JSStringBuffer *sb, size_t amount)
     }
 
     /* Either newlength overflow or realloc failure: poison the well. */
-    free(sb->base);
+    js_free(sb->base);
     sb->base = STRING_BUFFER_ERROR_BASE;
     return false;
 }
@@ -719,7 +719,7 @@ FreeStringBuffer(JSStringBuffer *sb)
 {
     JS_ASSERT(STRING_BUFFER_OK(sb));
     if (sb->base)
-        free(sb->base);
+        js_free(sb->base);
 }
 
 void
@@ -924,7 +924,7 @@ bad:
     if (bytes) {
         js_ReportCompileErrorNumber(cx, ts, NULL, JSREPORT_ERROR,
                                     msg, bytes);
-        JS_free(cx, bytes);
+        cx->free(bytes);
     }
     return JS_FALSE;
 }
@@ -1788,7 +1788,7 @@ retry:
                         if (c == '\n') {
                             if (i > 0) {
                                 if (ts->flags & TSF_OWNFILENAME)
-                                    JS_free(cx, (void *) ts->filename);
+                                    cx->free((void *) ts->filename);
                                 ts->filename = JS_strdup(cx, filename);
                                 if (!ts->filename)
                                     goto error;
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 929f01f72715..40c5add19fe3 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -166,7 +166,7 @@ JSScope::createTable(JSContext *cx, bool report)
         sizeLog2 = MIN_SCOPE_SIZE_LOG2;
     }
 
-    table = (JSScopeProperty **) calloc(JS_BIT(sizeLog2), sizeof(JSScopeProperty *));
+    table = (JSScopeProperty **) js_calloc(JS_BIT(sizeLog2) * sizeof(JSScopeProperty *));
     if (!table) {
         if (report)
             JS_ReportOutOfMemory(cx);
@@ -188,7 +188,7 @@ JSScope::create(JSContext *cx, JSObjectOps *ops, JSClass *clasp, JSObject *obj)
     JS_ASSERT(OPS_IS_NATIVE(ops));
     JS_ASSERT(obj);
 
-    JSScope *scope = (JSScope *) JS_malloc(cx, sizeof(JSScope));
+    JSScope *scope = (JSScope *) cx->malloc(sizeof(JSScope));
     if (!scope)
         return NULL;
 
@@ -213,7 +213,7 @@ JSScope::createEmptyScope(JSContext *cx, JSClass *clasp)
 {
     JS_ASSERT(!emptyScope);
 
-    JSScope *scope = (JSScope *) JS_malloc(cx, sizeof(JSScope));
+    JSScope *scope = (JSScope *) cx->malloc(sizeof(JSScope));
     if (!scope)
         return NULL;
 
@@ -252,13 +252,13 @@ JSScope::destroy(JSContext *cx, JSScope *scope)
     js_FinishTitle(cx, &scope->title);
 #endif
     if (scope->table)
-        JS_free(cx, scope->table);
+        cx->free(scope->table);
     if (scope->emptyScope)
         scope->emptyScope->drop(cx, NULL);
 
     LIVE_SCOPE_METER(cx, cx->runtime->liveScopeProps -= scope->entryCount);
     JS_RUNTIME_UNMETER(cx->runtime, liveScopes);
-    JS_free(cx, scope);
+    cx->free(scope);
 }
 
 #ifdef JS_DUMP_PROPTREE_STATS
@@ -401,11 +401,9 @@ JSScope::changeTable(JSContext *cx, int change)
     oldsize = JS_BIT(oldlog2);
     newsize = JS_BIT(newlog2);
     nbytes = SCOPE_TABLE_NBYTES(newsize);
-    newtable = (JSScopeProperty **) calloc(nbytes, 1);
-    if (!newtable) {
-        JS_ReportOutOfMemory(cx);
+    newtable = (JSScopeProperty **) cx->calloc(nbytes);
+    if (!newtable)
         return false;
-    }
 
     /* Now that we have newtable allocated, update members. */
     hashShift = JS_DHASH_BITS - newlog2;
@@ -428,7 +426,7 @@ JSScope::changeTable(JSContext *cx, int change)
     }
 
     /* Finally, free the old table storage. */
-    JS_free(cx, oldtable);
+    cx->free(oldtable);
     return true;
 }
 
@@ -578,7 +576,7 @@ NewPropTreeKidsChunk(JSRuntime *rt)
 {
     PropTreeKidsChunk *chunk;
 
-    chunk = (PropTreeKidsChunk *) calloc(1, sizeof *chunk);
+    chunk = (PropTreeKidsChunk *) js_calloc(sizeof *chunk);
     if (!chunk)
         return NULL;
     JS_ASSERT(((jsuword)chunk & CHUNKY_KIDS_TAG) == 0);
@@ -592,7 +590,7 @@ DestroyPropTreeKidsChunk(JSRuntime *rt, PropTreeKidsChunk *chunk)
     JS_RUNTIME_UNMETER(rt, propTreeKidsChunks);
     if (chunk->table)
         JS_DHashTableDestroy(chunk->table);
-    free(chunk);
+    js_free(chunk);
 }
 
 /* NB: Called with rt->gcLock held. */
@@ -1215,7 +1213,7 @@ JSScope::add(JSContext *cx, jsid id,
                 splen = entryCount;
                 JS_ASSERT(splen != 0);
                 spvec = (JSScopeProperty **)
-                        JS_malloc(cx, SCOPE_TABLE_NBYTES(splen));
+                        cx->malloc(SCOPE_TABLE_NBYTES(splen));
                 if (!spvec)
                     goto fail_overwrite;
                 i = splen;
@@ -1248,7 +1246,7 @@ JSScope::add(JSContext *cx, jsid id,
                     } else {
                         sprop = GetPropertyTreeChild(cx, sprop, spvec[i]);
                         if (!sprop) {
-                            JS_free(cx, spvec);
+                            cx->free(spvec);
                             goto fail_overwrite;
                         }
 
@@ -1257,7 +1255,7 @@ JSScope::add(JSContext *cx, jsid id,
                         SPROP_STORE_PRESERVING_COLLISION(spp2, sprop);
                     }
                 } while (++i < splen);
-                JS_free(cx, spvec);
+                cx->free(spvec);
 
                 /*
                  * Now sprop points to the last property in this scope, where
@@ -1558,7 +1556,7 @@ JSScope::clear(JSContext *cx)
     LIVE_SCOPE_METER(cx, cx->runtime->liveScopeProps -= entryCount);
 
     if (table)
-        free(table);
+        js_free(table);
     clearMiddleDelete();
     js_LeaveTraceIfGlobalObject(cx, object);
     initMinimal(cx);
diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp
index 35d203d5e598..54e87a75697e 100644
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@@ -140,7 +140,7 @@ script_toSource(JSContext *cx, uintN argc, jsval *vp)
     }
 
     /* Allocate the source string and copy into it. */
-    t = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
+    t = (jschar *) cx->malloc((n + 1) * sizeof(jschar));
     if (!t)
         return JS_FALSE;
     for (i = 0; i < j; i++)
@@ -154,7 +154,7 @@ script_toSource(JSContext *cx, uintN argc, jsval *vp)
     /* Create and return a JS string for t. */
     str = JS_NewUCString(cx, t, n);
     if (!str) {
-        JS_free(cx, t);
+        cx->free(t);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -533,7 +533,7 @@ js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *hasMagic)
     ok = JS_XDRBytes(xdr, (char *) code, length * sizeof(jsbytecode));
 
     if (code != script->code)
-        JS_free(cx, code);
+        cx->free(code);
 
     if (!ok)
         goto error;
@@ -576,7 +576,7 @@ js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *hasMagic)
             filename = js_SaveScriptFilename(cx, filename);
             if (!filename)
                 goto error;
-            JS_free(cx, (void *) script->filename);
+            cx->free((void *) script->filename);
             script->filename = filename;
             filenameWasSaved = JS_TRUE;
         }
@@ -665,7 +665,7 @@ js_XDRScript(JSXDRState *xdr, JSScript **scriptp, JSBool *hasMagic)
     if (xdr->mode == JSXDR_DECODE) {
         JS_POP_TEMP_ROOT(cx, &tvr);
         if (script->filename && !filenameWasSaved) {
-            JS_free(cx, (void *) script->filename);
+            cx->free((void *) script->filename);
             script->filename = NULL;
         }
         js_DestroyScript(cx, script);
@@ -783,7 +783,7 @@ script_thaw(JSContext *cx, uintN argc, jsval *vp)
 
     /* Swap bytes in Unichars to keep frozen strings machine-independent. */
     from = (jschar *)buf;
-    to = (jschar *) JS_malloc(cx, len * sizeof(jschar));
+    to = (jschar *) cx->malloc(len * sizeof(jschar));
     if (!to) {
         JS_XDRDestroy(xdr);
         return JS_FALSE;
@@ -839,7 +839,7 @@ out:
     JS_XDRMemSetData(xdr, NULL, 0);
     JS_XDRDestroy(xdr);
 #if IS_BIG_ENDIAN
-    JS_free(cx, buf);
+    cx->free(buf);
 #endif
     *vp = JSVAL_TRUE;
     return ok;
@@ -995,13 +995,13 @@ typedef struct ScriptFilenameEntry {
 static void *
 js_alloc_table_space(void *priv, size_t size)
 {
-    return malloc(size);
+    return js_malloc(size);
 }
 
 static void
 js_free_table_space(void *priv, void *item, size_t size)
 {
-    free(item);
+    js_free(item);
 }
 
 static JSHashEntry *
@@ -1010,7 +1010,7 @@ js_alloc_sftbl_entry(void *priv, const void *key)
     size_t nbytes = offsetof(ScriptFilenameEntry, filename) +
                     strlen((const char *) key) + 1;
 
-    return (JSHashEntry *) malloc(JS_MAX(nbytes, sizeof(JSHashEntry)));
+    return (JSHashEntry *) js_malloc(JS_MAX(nbytes, sizeof(JSHashEntry)));
 }
 
 static void
@@ -1018,7 +1018,7 @@ js_free_sftbl_entry(void *priv, JSHashEntry *he, uintN flag)
 {
     if (flag != HT_FREE_ENTRY)
         return;
-    free(he);
+    js_free(he);
 }
 
 static JSHashAllocOps sftbl_alloc_ops = {
@@ -1080,7 +1080,7 @@ js_FreeRuntimeScriptState(JSRuntime *rt)
     while (!JS_CLIST_IS_EMPTY(&rt->scriptFilenamePrefixes)) {
         sfp = (ScriptFilenamePrefix *) rt->scriptFilenamePrefixes.next;
         JS_REMOVE_LINK(&sfp->links);
-        free(sfp);
+        js_free(sfp);
     }
     js_FinishRuntimeScriptState(rt);
 }
@@ -1143,7 +1143,7 @@ SaveScriptFilename(JSRuntime *rt, const char *filename, uint32 flags)
 
         if (!sfp) {
             /* No such prefix: add one now. */
-            sfp = (ScriptFilenamePrefix *) malloc(sizeof(ScriptFilenamePrefix));
+            sfp = (ScriptFilenamePrefix *) js_malloc(sizeof(ScriptFilenamePrefix));
             if (!sfp)
                 return NULL;
             JS_INSERT_AFTER(&sfp->links, link);
@@ -1384,7 +1384,7 @@ js_NewScript(JSContext *cx, uint32 length, uint32 nsrcnotes, uint32 natoms,
     if (ntrynotes != 0)
         size += sizeof(JSTryNoteArray) + ntrynotes * sizeof(JSTryNote);
 
-    script = (JSScript *) JS_malloc(cx, size);
+    script = (JSScript *) cx->malloc(size);
     if (!script)
         return NULL;
     memset(script, 0, sizeof(JSScript));
@@ -1536,7 +1536,7 @@ js_NewScriptFromCG(JSContext *cx, JSCodeGenerator *cg)
         memcpy(JS_SCRIPT_UPVARS(script)->vector, cg->upvarMap.vector,
                cg->upvarList.count * sizeof(uint32));
         cg->upvarList.clear();
-        JS_free(cx, cg->upvarMap.vector);
+        cx->free(cg->upvarMap.vector);
         cg->upvarMap.vector = NULL;
     }
 
@@ -1648,7 +1648,7 @@ js_DestroyScript(JSContext *cx, JSScript *script)
         }
     }
 
-    JS_free(cx, script);
+    cx->free(script);
 }
 
 void
diff --git a/js/src/jsstr.cpp b/js/src/jsstr.cpp
index e9440dd82c22..c59efa86d02a 100644
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@@ -145,7 +145,7 @@ js_ConcatStrings(JSContext *cx, JSString *left, JSString *right)
 
     if (!left->isMutable()) {
         /* We must copy if left does not own a buffer to realloc. */
-        s = (jschar *) JS_malloc(cx, (ln + rn + 1) * sizeof(jschar));
+        s = (jschar *) cx->malloc((ln + rn + 1) * sizeof(jschar));
         if (!s)
             return NULL;
         js_strncpy(s, ls, ln);
@@ -153,7 +153,7 @@ js_ConcatStrings(JSContext *cx, JSString *left, JSString *right)
     } else {
         /* We can realloc left's space and make it depend on our result. */
         JS_ASSERT(left->isFlat());
-        s = (jschar *) JS_realloc(cx, ls, (ln + rn + 1) * sizeof(jschar));
+        s = (jschar *) cx->realloc(ls, (ln + rn + 1) * sizeof(jschar));
         if (!s)
             return NULL;
 
@@ -173,9 +173,9 @@ js_ConcatStrings(JSContext *cx, JSString *left, JSString *right)
     if (!str) {
         /* Out of memory: clean up any space we (re-)allocated. */
         if (!ldep) {
-            JS_free(cx, s);
+            cx->free(s);
         } else {
-            s = (jschar *) JS_realloc(cx, ls, (ln + 1) * sizeof(jschar));
+            s = (jschar *) cx->realloc(ls, (ln + 1) * sizeof(jschar));
             if (s)
                 left->mChars = s;
         }
@@ -210,7 +210,7 @@ js_UndependString(JSContext *cx, JSString *str)
     if (str->isDependent()) {
         n = str->dependentLength();
         size = (n + 1) * sizeof(jschar);
-        s = (jschar *) JS_malloc(cx, size);
+        s = (jschar *) cx->malloc(size);
         if (!s)
             return NULL;
 
@@ -402,7 +402,7 @@ js_str_escape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
         return JS_FALSE;
     }
 
-    newchars = (jschar *) JS_malloc(cx, (newlength + 1) * sizeof(jschar));
+    newchars = (jschar *) cx->malloc((newlength + 1) * sizeof(jschar));
     if (!newchars)
         return JS_FALSE;
     for (i = 0, ni = 0; i < length; i++) {
@@ -430,7 +430,7 @@ js_str_escape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 
     str = js_NewString(cx, newchars, newlength);
     if (!str) {
-        JS_free(cx, newchars);
+        cx->free(newchars);
         return JS_FALSE;
     }
     *rval = STRING_TO_JSVAL(str);
@@ -464,7 +464,7 @@ str_unescape(JSContext *cx, uintN argc, jsval *vp)
     str->getCharsAndLength(chars, length);
 
     /* Don't bother allocating less space for the new string. */
-    newchars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+    newchars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
     if (!newchars)
         return JS_FALSE;
     ni = i = 0;
@@ -493,7 +493,7 @@ str_unescape(JSContext *cx, uintN argc, jsval *vp)
 
     str = js_NewString(cx, newchars, ni);
     if (!str) {
-        JS_free(cx, newchars);
+        cx->free(newchars);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -695,7 +695,7 @@ str_toSource(JSContext *cx, uintN argc, jsval *vp)
     j = JS_snprintf(buf, sizeof buf, "(new %s(", js_StringClass.name);
     str->getCharsAndLength(s, k);
     n = j + k + 2;
-    t = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
+    t = (jschar *) cx->malloc((n + 1) * sizeof(jschar));
     if (!t)
         return JS_FALSE;
     for (i = 0; i < j; i++)
@@ -707,7 +707,7 @@ str_toSource(JSContext *cx, uintN argc, jsval *vp)
     t[i] = 0;
     str = js_NewString(cx, t, n);
     if (!str) {
-        JS_free(cx, t);
+        cx->free(t);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -799,7 +799,7 @@ js_toLowerCase(JSContext *cx, JSString *str)
     jschar *news;
 
     str->getCharsAndLength(s, n);
-    news = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
+    news = (jschar *) cx->malloc((n + 1) * sizeof(jschar));
     if (!news)
         return NULL;
     for (i = 0; i < n; i++)
@@ -807,7 +807,7 @@ js_toLowerCase(JSContext *cx, JSString *str)
     news[n] = 0;
     str = js_NewString(cx, news, n);
     if (!str) {
-        JS_free(cx, news);
+        cx->free(news);
         return NULL;
     }
     return str;
@@ -850,7 +850,7 @@ js_toUpperCase(JSContext *cx, JSString *str)
     jschar *news;
 
     str->getCharsAndLength(s, n);
-    news = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
+    news = (jschar *) cx->malloc((n + 1) * sizeof(jschar));
     if (!news)
         return NULL;
     for (i = 0; i < n; i++)
@@ -858,7 +858,7 @@ js_toUpperCase(JSContext *cx, JSString *str)
     news[n] = 0;
     str = js_NewString(cx, news, n);
     if (!str) {
-        JS_free(cx, news);
+        cx->free(news);
         return NULL;
     }
     return str;
@@ -1659,7 +1659,7 @@ find_replen(JSContext *cx, ReplaceData *rdata, size_t *sizep)
       lambda_out:
         js_FreeStack(cx, mark);
         if (freeMoreParens)
-            JS_free(cx, cx->regExpStatics.moreParens);
+            cx->free(cx->regExpStatics.moreParens);
         cx->regExpStatics = save;
         return ok;
     }
@@ -1716,7 +1716,7 @@ replace_destroy(JSContext *cx, GlobData *data)
     ReplaceData *rdata;
 
     rdata = (ReplaceData *)data;
-    JS_free(cx, rdata->chars);
+    cx->free(rdata->chars);
     rdata->chars = NULL;
 }
 
@@ -1741,9 +1741,9 @@ replace_glob(JSContext *cx, jsint count, GlobData *data)
     growth = leftlen + replen;
     chars = (jschar *)
         (rdata->chars
-         ? JS_realloc(cx, rdata->chars, (rdata->length + growth + 1)
+         ? cx->realloc(rdata->chars, (rdata->length + growth + 1)
                                         * sizeof(jschar))
-         : JS_malloc(cx, (growth + 1) * sizeof(jschar)));
+         : cx->malloc((growth + 1) * sizeof(jschar)));
     if (!chars)
         return JS_FALSE;
     rdata->chars = chars;
@@ -1826,7 +1826,7 @@ js_StringReplaceHelper(JSContext *cx, uintN argc, JSObject *lambda,
         if (!ok)
             goto out;
         length += leftlen;
-        chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+        chars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
         if (!chars) {
             ok = JS_FALSE;
             goto out;
@@ -1840,9 +1840,9 @@ js_StringReplaceHelper(JSContext *cx, uintN argc, JSObject *lambda,
     rightlen = cx->regExpStatics.rightContext.length;
     length = rdata.length + rightlen;
     chars = (jschar *)
-        JS_realloc(cx, rdata.chars, (length + 1) * sizeof(jschar));
+        cx->realloc(rdata.chars, (length + 1) * sizeof(jschar));
     if (!chars) {
-        JS_free(cx, rdata.chars);
+        cx->free(rdata.chars);
         ok = JS_FALSE;
         goto out;
     }
@@ -1852,7 +1852,7 @@ js_StringReplaceHelper(JSContext *cx, uintN argc, JSObject *lambda,
 
     str = js_NewString(cx, chars, length);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         ok = JS_FALSE;
         goto out;
     }
@@ -2266,7 +2266,7 @@ tagify(JSContext *cx, const char *begin, JSString *param, const char *end,
         return JS_FALSE;
     }
 
-    tagbuf = (jschar *) JS_malloc(cx, (taglen + 1) * sizeof(jschar));
+    tagbuf = (jschar *) cx->malloc((taglen + 1) * sizeof(jschar));
     if (!tagbuf)
         return JS_FALSE;
 
@@ -2294,7 +2294,7 @@ tagify(JSContext *cx, const char *begin, JSString *param, const char *end,
 
     str = js_NewString(cx, tagbuf, taglen);
     if (!str) {
-        free((char *)tagbuf);
+        js_free((char *)tagbuf);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -2531,13 +2531,13 @@ str_fromCharCode(JSContext *cx, uintN argc, jsval *vp)
         *vp = STRING_TO_JSVAL(str);
         return JS_TRUE;
     }
-    chars = (jschar *) JS_malloc(cx, (argc + 1) * sizeof(jschar));
+    chars = (jschar *) cx->malloc((argc + 1) * sizeof(jschar));
     if (!chars)
         return JS_FALSE;
     for (i = 0; i < argc; i++) {
         code = js_ValueToUint16(cx, &argv[i]);
         if (JSVAL_IS_NULL(argv[i])) {
-            JS_free(cx, chars);
+            cx->free(chars);
             return JS_FALSE;
         }
         chars[i] = (jschar)code;
@@ -2545,7 +2545,7 @@ str_fromCharCode(JSContext *cx, uintN argc, jsval *vp)
     chars[i] = 0;
     str = js_NewString(cx, chars, argc);
     if (!str) {
-        JS_free(cx, chars);
+        cx->free(chars);
         return JS_FALSE;
     }
     *vp = STRING_TO_JSVAL(str);
@@ -2621,9 +2621,8 @@ js_GetUnitStringForChar(JSContext *cx, jschar c)
     JS_ASSERT(c < UNIT_STRING_LIMIT);
     rt = cx->runtime;
     if (!rt->unitStrings) {
-        sp = (JSString **) calloc(UNIT_STRING_LIMIT * sizeof(JSString *) +
-                                  UNIT_STRING_LIMIT * 2 * sizeof(jschar),
-                                  1);
+        sp = (JSString **) js_calloc(UNIT_STRING_LIMIT * sizeof(JSString *) +
+                                     UNIT_STRING_LIMIT * 2 * sizeof(jschar));
         if (!sp) {
             JS_ReportOutOfMemory(cx);
             return NULL;
@@ -2639,7 +2638,7 @@ js_GetUnitStringForChar(JSContext *cx, jschar c)
             JS_UNLOCK_GC(rt);
         } else {
             JS_UNLOCK_GC(rt);
-            free(sp);
+            js_free(sp);
         }
     }
     if (!rt->unitStrings[c]) {
@@ -2676,7 +2675,7 @@ js_GetUnitString(JSContext *cx, JSString *str, size_t index)
 void
 js_FinishUnitStrings(JSRuntime *rt)
 {
-    free(rt->unitStrings);
+    js_free(rt->unitStrings);
     rt->unitStrings = NULL;
 }
 
@@ -2832,14 +2831,14 @@ js_NewStringCopyN(JSContext *cx, const jschar *s, size_t n)
     jschar *news;
     JSString *str;
 
-    news = (jschar *) JS_malloc(cx, (n + 1) * sizeof(jschar));
+    news = (jschar *) cx->malloc((n + 1) * sizeof(jschar));
     if (!news)
         return NULL;
     js_strncpy(news, s, n);
     news[n] = 0;
     str = js_NewString(cx, news, n);
     if (!str)
-        JS_free(cx, news);
+        cx->free(news);
     return str;
 }
 
@@ -2852,13 +2851,13 @@ js_NewStringCopyZ(JSContext *cx, const jschar *s)
 
     n = js_strlen(s);
     m = (n + 1) * sizeof(jschar);
-    news = (jschar *) JS_malloc(cx, m);
+    news = (jschar *) cx->malloc(m);
     if (!news)
         return NULL;
     memcpy(news, s, m);
     str = js_NewString(cx, news, n);
     if (!str)
-        JS_free(cx, news);
+        cx->free(news);
     return str;
 }
 
@@ -2876,7 +2875,7 @@ js_PurgeDeflatedStringCache(JSRuntime *rt, JSString *str)
 #ifdef DEBUG
         rt->deflatedStringCacheBytes -= str->length();
 #endif
-        free(he->value);
+        js_free(he->value);
         JS_HashTableRawRemove(rt->deflatedStringCache, hep, he);
     }
     JS_RELEASE_LOCK(rt->deflatedStringCacheLock);
@@ -3121,7 +3120,7 @@ js_InflateString(JSContext *cx, const char *bytes, size_t *lengthp)
     if (js_CStringsAreUTF8) {
         if (!js_InflateStringToBuffer(cx, bytes, nbytes, NULL, &nchars))
             goto bad;
-        chars = (jschar *) JS_malloc(cx, (nchars + 1) * sizeof (jschar));
+        chars = (jschar *) cx->malloc((nchars + 1) * sizeof (jschar));
         if (!chars)
             goto bad;
 #ifdef DEBUG
@@ -3131,7 +3130,7 @@ js_InflateString(JSContext *cx, const char *bytes, size_t *lengthp)
         JS_ASSERT(ok);
     } else {
         nchars = nbytes;
-        chars = (jschar *) JS_malloc(cx, (nchars + 1) * sizeof(jschar));
+        chars = (jschar *) cx->malloc((nchars + 1) * sizeof(jschar));
         if (!chars)
             goto bad;
         for (i = 0; i < nchars; i++)
@@ -3166,7 +3165,7 @@ js_DeflateString(JSContext *cx, const jschar *chars, size_t nchars)
         nbytes = js_GetDeflatedStringLength(cx, chars, nchars);
         if (nbytes == (size_t) -1)
             return NULL;
-        bytes = (char *) (cx ? JS_malloc(cx, nbytes + 1) : malloc(nbytes + 1));
+        bytes = (char *) (cx ? cx->malloc(nbytes + 1) : js_malloc(nbytes + 1));
         if (!bytes)
             return NULL;
 #ifdef DEBUG
@@ -3176,7 +3175,7 @@ js_DeflateString(JSContext *cx, const jschar *chars, size_t nchars)
         JS_ASSERT(ok);
     } else {
         nbytes = nchars;
-        bytes = (char *) (cx ? JS_malloc(cx, nbytes + 1) : malloc(nbytes + 1));
+        bytes = (char *) (cx ? cx->malloc(nbytes + 1) : js_malloc(nbytes + 1));
         if (!bytes)
             return NULL;
         for (i = 0; i < nbytes; i++)
@@ -3491,9 +3490,9 @@ js_GetStringBytes(JSContext *cx, JSString *str)
                 str->setDeflated();
             } else {
                 if (cx)
-                    JS_free(cx, bytes);
+                    cx->free(bytes);
                 else
-                    free(bytes);
+                    js_free(bytes);
                 bytes = NULL;
             }
         }
@@ -4836,8 +4835,8 @@ AddCharsToURI(JSContext *cx, JSCharBuffer *buf,
     if (!buf->chars ||
         JS_HOWMANY(total, URI_CHUNK) > JS_HOWMANY(buf->length + 1, URI_CHUNK)) {
         total = JS_ROUNDUP(total, URI_CHUNK);
-        newchars = (jschar *) JS_realloc(cx, buf->chars,
-                                         total * sizeof(jschar));
+        newchars = (jschar *) cx->realloc(buf->chars,
+                                          total * sizeof(jschar));
         if (!newchars)
             return JS_FALSE;
         buf->chars = newchars;
@@ -4860,7 +4859,7 @@ TransferBufferToString(JSContext *cx, JSCharBuffer *cb, jsval *rval)
      * don't worry about that case here.
      */
     n = cb->length;
-    chars = (jschar *) JS_realloc(cx, cb->chars, (n + 1) * sizeof(jschar));
+    chars = (jschar *) cx->realloc(cb->chars, (n + 1) * sizeof(jschar));
     if (!chars)
         chars = cb->chars;
     str = js_NewString(cx, chars, n);
@@ -4953,7 +4952,7 @@ Encode(JSContext *cx, JSString *str, const jschar *unescapedSet,
     return JS_TRUE;
 
   bad:
-    JS_free(cx, cb.chars);
+    cx->free(cb.chars);
     return JS_FALSE;
 }
 
@@ -5048,7 +5047,7 @@ Decode(JSContext *cx, JSString *str, const jschar *reservedSet, jsval *rval)
     /* FALL THROUGH */
 
   bad:
-    JS_free(cx, cb.chars);
+    cx->free(cb.chars);
     return JS_FALSE;
 }
 
diff --git a/js/src/jstask.cpp b/js/src/jstask.cpp
new file mode 100644
index 000000000000..2814b953292d
--- /dev/null
+++ b/js/src/jstask.cpp
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
+ * ***** 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 SpiderMonkey JavaScript 1.9.1 code, released
+ * June 30, 2009.
+ *
+ * The Initial Developer of the Original Code is
+ *   Andreas Gal <gal@mozilla.com>
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#include "jstask.h"
+
+#ifdef JS_THREADSAFE
+static void start(void* arg) {
+    ((JSBackgroundThread*)arg)->work();
+}
+
+JSBackgroundThread::JSBackgroundThread()
+  : thread(NULL), stack(NULL), lock(NULL), wakeup(NULL), shutdown(false)
+{
+}
+
+JSBackgroundThread::~JSBackgroundThread()
+{
+    if (wakeup)
+        PR_DestroyCondVar(wakeup);
+    if (lock)
+        PR_DestroyLock(lock);
+    /* PR_DestroyThread is not necessary. */
+}
+
+bool
+JSBackgroundThread::init()
+{
+    if (!(lock = PR_NewLock()))
+        return false;
+    if (!(wakeup = PR_NewCondVar(lock)))
+        return false;
+    thread = PR_CreateThread(PR_USER_THREAD, start, this, PR_PRIORITY_LOW,
+                             PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
+    return !!thread;
+}
+
+void
+JSBackgroundThread::cancel()
+{
+    PR_Lock(lock);
+    if (shutdown) {
+        PR_Unlock(lock);
+        return;
+    }
+    shutdown = true;
+    PR_NotifyCondVar(wakeup);
+    PR_Unlock(lock);
+    PR_JoinThread(thread);
+}
+
+void
+JSBackgroundThread::work()
+{
+    PR_Lock(lock);
+    do {
+        PR_WaitCondVar(wakeup, PR_INTERVAL_NO_TIMEOUT);
+        JSBackgroundTask* t;
+        while ((t = stack) != NULL) {
+            stack = t->next;
+            PR_Unlock(lock);
+            t->run();
+            delete t;
+            PR_Lock(lock);
+        }
+    } while (!shutdown);
+    PR_Unlock(lock);
+}
+
+bool
+JSBackgroundThread::busy()
+{
+    return !!stack; // we tolerate some racing here
+}
+
+void
+JSBackgroundThread::schedule(JSBackgroundTask* task)
+{
+    PR_Lock(lock);
+    if (shutdown) {
+        PR_Unlock(lock);
+        task->run();
+        delete task;
+        return;
+    }
+    task->next = stack;
+    stack = task;
+    PR_NotifyCondVar(wakeup);
+    PR_Unlock(lock);
+}
+
+#endif
diff --git a/js/src/jstask.h b/js/src/jstask.h
new file mode 100644
index 000000000000..30bc009a2c2a
--- /dev/null
+++ b/js/src/jstask.h
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=4 sw=4 et tw=99 ft=cpp:
+ *
+ * ***** 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 SpiderMonkey JavaScript 1.9 code, released
+ * June 30, 2009.
+ *
+ * The Initial Developer of the Original Code is
+ *   Andreas Gal <gal@mozilla.com>
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#ifndef jstask_h___
+#define jstask_h___
+
+class JSBackgroundTask {
+    friend class JSBackgroundThread;
+    JSBackgroundTask* next;
+  public:
+    virtual void run() = 0;
+};
+
+#ifdef JS_THREADSAFE
+
+#include "prthread.h"
+#include "prlock.h"
+#include "prcvar.h"
+
+class JSBackgroundThread {
+    PRThread*         thread;
+    JSBackgroundTask* stack;
+    PRLock*           lock;
+    PRCondVar*        wakeup;
+    bool              shutdown;
+
+  public:
+    JSBackgroundThread();
+    ~JSBackgroundThread();
+
+    bool init();
+    void cancel();
+    void work();
+    bool busy();
+    void schedule(JSBackgroundTask* task);
+};
+
+#else
+
+class JSBackgroundThread {
+  public:
+    void schedule(JSBackgroundTask* task) {
+        task->run();
+    }
+};
+
+#endif
+
+#endif /* jstask_h___ */
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index a2c45c0b627d..90c0fd2bd082 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -3616,11 +3616,11 @@ TraceRecorder::compile(JSTraceMonitor* tm)
     /* :TODO: windows support */
 #if defined DEBUG && !defined WIN32
     const char* filename = cx->fp->script->filename;
-    char* label = (char*)malloc((filename ? strlen(filename) : 7) + 16);
+    char* label = (char*)js_malloc((filename ? strlen(filename) : 7) + 16);
     sprintf(label, "%s:%u", filename ? filename : "<stdin>",
             js_FramePCToLineNumber(cx, cx->fp));
     fragmento->labels->add(fragment, sizeof(Fragment), 0, label);
-    free(label);
+    js_free(label);
 #endif
     AUDIT(traceCompleted);
 }
@@ -12445,7 +12445,7 @@ js_StartTraceVis(JSContext *cx, JSObject *obj,
         if (!filename)
             goto error;
         ok = JS_StartTraceVis(filename);
-        JS_free(cx, filename);
+        cx->free(filename);
     } else {
         ok = JS_StartTraceVis();
     }
diff --git a/js/src/jsutil.cpp b/js/src/jsutil.cpp
index e3a62878e3d8..43d4eb37ff44 100644
--- a/js/src/jsutil.cpp
+++ b/js/src/jsutil.cpp
@@ -297,7 +297,7 @@ CallTree(void **bp)
             return NULL;
 
         /* Create a new callsite record. */
-        site = (JSCallsite *) malloc(sizeof(JSCallsite));
+        site = (JSCallsite *) js_malloc(sizeof(JSCallsite));
         if (!site)
             return NULL;
 
diff --git a/js/src/jsutil.h b/js/src/jsutil.h
index 18264ccca459..6e0895b2fb9d 100644
--- a/js/src/jsutil.h
+++ b/js/src/jsutil.h
@@ -44,6 +44,8 @@
 #ifndef jsutil_h___
 #define jsutil_h___
 
+#include <stdlib.h>
+
 JS_BEGIN_EXTERN_C
 
 /*
@@ -176,9 +178,30 @@ JS_Backtrace(int skip);
 
 extern JS_FRIEND_API(void)
 JS_DumpBacktrace(JSCallsite *trace);
-
 #endif
 
+static JS_INLINE void* js_malloc(size_t bytes) {
+    if (bytes < sizeof(void*)) /* for asyncFree */
+        bytes = sizeof(void*);
+    return malloc(bytes);
+}
+
+static JS_INLINE void* js_calloc(size_t bytes) {
+    if (bytes < sizeof(void*)) /* for asyncFree */
+        bytes = sizeof(void*);
+    return calloc(bytes, 1);
+}
+
+static JS_INLINE void* js_realloc(void* p, size_t bytes) {
+    if (bytes < sizeof(void*)) /* for asyncFree */
+        bytes = sizeof(void*);
+    return realloc(p, bytes);
+}
+
+static JS_INLINE void js_free(void* p) {
+    free(p);
+}
+
 JS_END_EXTERN_C
 
 #endif /* jsutil_h___ */
diff --git a/js/src/jsxdrapi.cpp b/js/src/jsxdrapi.cpp
index b2d3efc1bf83..2eb9419d74e4 100644
--- a/js/src/jsxdrapi.cpp
+++ b/js/src/jsxdrapi.cpp
@@ -90,7 +90,7 @@ typedef struct JSXDRMemState {
             if (MEM_LIMIT(xdr) &&                                             \
                 MEM_COUNT(xdr) + bytes > MEM_LIMIT(xdr)) {                    \
                 uint32 limit_ = JS_ROUNDUP(MEM_COUNT(xdr) + bytes, MEM_BLOCK);\
-                void *data_ = JS_realloc((xdr)->cx, MEM_BASE(xdr), limit_);   \
+                void *data_ = (xdr)->cx->realloc(MEM_BASE(xdr), limit_);      \
                 if (!data_)                                                   \
                     return 0;                                                 \
                 MEM_BASE(xdr) = (char *) data_;                               \
@@ -216,7 +216,7 @@ mem_tell(JSXDRState *xdr)
 static void
 mem_finalize(JSXDRState *xdr)
 {
-    JS_free(xdr->cx, MEM_BASE(xdr));
+    xdr->cx->free(MEM_BASE(xdr));
 }
 
 static JSXDROps xdrmem_ops = {
@@ -239,13 +239,13 @@ JS_XDRInitBase(JSXDRState *xdr, JSXDRMode mode, JSContext *cx)
 JS_PUBLIC_API(JSXDRState *)
 JS_XDRNewMem(JSContext *cx, JSXDRMode mode)
 {
-    JSXDRState *xdr = (JSXDRState *) JS_malloc(cx, sizeof(JSXDRMemState));
+    JSXDRState *xdr = (JSXDRState *) cx->malloc(sizeof(JSXDRMemState));
     if (!xdr)
         return NULL;
     JS_XDRInitBase(xdr, mode, cx);
     if (mode == JSXDR_ENCODE) {
-        if (!(MEM_BASE(xdr) = (char *) JS_malloc(cx, MEM_BLOCK))) {
-            JS_free(cx, xdr);
+        if (!(MEM_BASE(xdr) = (char *) cx->malloc(MEM_BLOCK))) {
+            cx->free(xdr);
             return NULL;
         }
     } else {
@@ -299,11 +299,11 @@ JS_XDRDestroy(JSXDRState *xdr)
     JSContext *cx = xdr->cx;
     xdr->ops->finalize(xdr);
     if (xdr->registry) {
-        JS_free(cx, xdr->registry);
+        cx->free(xdr->registry);
         if (xdr->reghash)
             JS_DHashTableDestroy((JSDHashTable *) xdr->reghash);
     }
-    JS_free(cx, xdr);
+    cx->free(xdr);
 }
 
 JS_PUBLIC_API(JSBool)
@@ -381,18 +381,18 @@ JS_XDRCString(JSXDRState *xdr, char **sp)
         len = strlen(*sp);
     JS_XDRUint32(xdr, &len);
     if (xdr->mode == JSXDR_DECODE) {
-        if (!(*sp = (char *) JS_malloc(xdr->cx, len + 1)))
+        if (!(*sp = (char *) xdr->cx->malloc(len + 1)))
             return JS_FALSE;
     }
     if (!JS_XDRBytes(xdr, *sp, len)) {
         if (xdr->mode == JSXDR_DECODE)
-            JS_free(xdr->cx, *sp);
+            xdr->cx->free(*sp);
         return JS_FALSE;
     }
     if (xdr->mode == JSXDR_DECODE) {
         (*sp)[len] = '\0';
     } else if (xdr->mode == JSXDR_FREE) {
-        JS_free(xdr->cx, *sp);
+        xdr->cx->free(*sp);
         *sp = NULL;
     }
     return JS_TRUE;
@@ -452,7 +452,7 @@ JS_XDRString(JSXDRState *xdr, JSString **strp)
         return JS_FALSE;
 
     if (xdr->mode == JSXDR_DECODE) {
-        chars = (jschar *) JS_malloc(xdr->cx, (nchars + 1) * sizeof(jschar));
+        chars = (jschar *) xdr->cx->malloc((nchars + 1) * sizeof(jschar));
         if (!chars)
             return JS_FALSE;
     } else {
@@ -471,7 +471,7 @@ JS_XDRString(JSXDRState *xdr, JSString **strp)
 
 bad:
     if (xdr->mode == JSXDR_DECODE)
-        JS_free(xdr->cx, chars);
+        xdr->cx->free(chars);
     return JS_FALSE;
 }
 
@@ -662,7 +662,7 @@ js_XDRStringAtom(JSXDRState *xdr, JSAtom **atomp)
          * This is very uncommon. Don't use the tempPool arena for this as
          * most allocations here will be bigger than tempPool's arenasize.
          */
-        chars = (jschar *) JS_malloc(cx, nchars * sizeof(jschar));
+        chars = (jschar *) cx->malloc(nchars * sizeof(jschar));
         if (!chars)
             return JS_FALSE;
     }
@@ -670,7 +670,7 @@ js_XDRStringAtom(JSXDRState *xdr, JSAtom **atomp)
     if (XDRChars(xdr, chars, nchars))
         atom = js_AtomizeChars(cx, chars, nchars, 0);
     if (chars != stackChars)
-        JS_free(cx, chars);
+        cx->free(chars);
 
     if (!atom)
         return JS_FALSE;
@@ -709,7 +709,7 @@ JS_XDRRegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *idp)
     if (numclasses == maxclasses) {
         maxclasses = (maxclasses == 0) ? CLASS_REGISTRY_MIN : maxclasses << 1;
         registry = (JSClass **)
-            JS_realloc(xdr->cx, xdr->registry, maxclasses * sizeof(JSClass *));
+            xdr->cx->realloc(xdr->registry, maxclasses * sizeof(JSClass *));
         if (!registry)
             return JS_FALSE;
         xdr->registry = registry;
diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index 46cdb5e66b6a..1e8d73f9a892 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -460,7 +460,7 @@ qname_toString(JSContext *cx, uintN argc, jsval *vp)
 
     if (str && clasp == &js_AttributeNameClass) {
         length = str->length();
-        chars = (jschar *) JS_malloc(cx, (length + 2) * sizeof(jschar));
+        chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
         if (!chars)
             return JS_FALSE;
         *chars = '@';
@@ -468,7 +468,7 @@ qname_toString(JSContext *cx, uintN argc, jsval *vp)
         chars[++length] = 0;
         str = js_NewString(cx, chars, length);
         if (!str) {
-            JS_free(cx, chars);
+            cx->free(chars);
             return JS_FALSE;
         }
     }
@@ -933,7 +933,7 @@ XMLArraySetCapacity(JSContext *cx, JSXMLArray *array, uint32 capacity)
     if (capacity == 0) {
         /* We could let realloc(p, 0) free this, but purify gets confused. */
         if (array->vector)
-            free(array->vector);
+            cx->free(array->vector);
         vector = NULL;
     } else {
         if (
@@ -941,7 +941,7 @@ XMLArraySetCapacity(JSContext *cx, JSXMLArray *array, uint32 capacity)
             (size_t)capacity > ~(size_t)0 / sizeof(void *) ||
 #endif
             !(vector = (void **)
-                       realloc(array->vector, capacity * sizeof(void *)))) {
+                       js_realloc(array->vector, capacity * sizeof(void *)))) {
             if (cx)
                 JS_ReportOutOfMemory(cx);
             return JS_FALSE;
@@ -975,7 +975,7 @@ XMLArrayFinish(JSContext *cx, JSXMLArray *array)
 {
     JSXMLArrayCursor *cursor;
 
-    JS_free(cx, array->vector);
+    cx->free(array->vector);
 
     while ((cursor = array->cursors) != NULL)
         XMLArrayCursorFinish(cursor);
@@ -1039,7 +1039,7 @@ XMLArrayAddMember(JSContext *cx, JSXMLArray *array, uint32 index, void *elt)
                 (size_t)capacity > ~(size_t)0 / sizeof(void *) ||
 #endif
                 !(vector = (void **)
-                           realloc(array->vector, capacity * sizeof(void *)))) {
+                           js_realloc(array->vector, capacity * sizeof(void *)))) {
                 JS_ReportOutOfMemory(cx);
                 return JS_FALSE;
             }
@@ -1120,10 +1120,10 @@ XMLArrayTruncate(JSContext *cx, JSXMLArray *array, uint32 length)
 
     if (length == 0) {
         if (array->vector)
-            free(array->vector);
+            cx->free(array->vector);
         vector = NULL;
     } else {
-        vector = (void **) realloc(array->vector, length * sizeof(void *));
+        vector = (void **) js_realloc(array->vector, length * sizeof(void *));
         if (!vector)
             return;
     }
@@ -1854,7 +1854,7 @@ ParseXMLSource(JSContext *cx, JSString *src)
     length = constrlen(prefix) + urilen + constrlen(middle) + srclen +
              constrlen(suffix);
 
-    chars = (jschar *) JS_malloc(cx, (length + 1) * sizeof(jschar));
+    chars = (jschar *) cx->malloc((length + 1) * sizeof(jschar));
     if (!chars)
         return NULL;
 
@@ -1905,7 +1905,7 @@ ParseXMLSource(JSContext *cx, JSString *src)
         }
     }
 
-    JS_free(cx, chars);
+    cx->free(chars);
     return xml;
 
 #undef constrlen
@@ -2138,7 +2138,7 @@ MakeXMLSpecialString(JSContext *cx, JSStringBuffer *sb,
                 prefixlength + length + ((length2 != 0) ? 1 + length2 : 0) +
                 suffixlength;
     bp = base = (jschar *)
-                JS_realloc(cx, sb->base, (newlength + 1) * sizeof(jschar));
+        cx->realloc(sb->base, (newlength + 1) * sizeof(jschar));
     if (!bp) {
         js_FinishStringBuffer(sb);
         return NULL;
@@ -2159,7 +2159,7 @@ MakeXMLSpecialString(JSContext *cx, JSStringBuffer *sb,
 
     str = js_NewString(cx, base, newlength);
     if (!str)
-        free(base);
+        cx->free(base);
     return str;
 }
 
@@ -2210,7 +2210,7 @@ AppendAttributeValue(JSContext *cx, JSStringBuffer *sb, JSString *valstr)
     valstr = js_EscapeAttributeValue(cx, valstr, JS_TRUE);
     if (!valstr) {
         if (STRING_BUFFER_OK(sb)) {
-            free(sb->base);
+            cx->free(sb->base);
             sb->base = STRING_BUFFER_ERROR_BASE;
         }
         return;
@@ -2482,7 +2482,7 @@ GeneratePrefix(JSContext *cx, JSString *uri, JSXMLArray *decls)
     if (STARTS_WITH_XML(cp, length) || !IsXMLName(cp, length)) {
         newlength = length + 2 + (size_t) log10((double) decls->length);
         bp = (jschar *)
-             JS_malloc(cx, (newlength + 1) * sizeof(jschar));
+             cx->malloc((newlength + 1) * sizeof(jschar));
         if (!bp)
             return NULL;
 
@@ -2507,7 +2507,7 @@ GeneratePrefix(JSContext *cx, JSString *uri, JSXMLArray *decls)
                 if (bp == cp) {
                     newlength = length + 2 + (size_t) log10((double) n);
                     bp = (jschar *)
-                         JS_malloc(cx, (newlength + 1) * sizeof(jschar));
+                         cx->malloc((newlength + 1) * sizeof(jschar));
                     if (!bp)
                         return NULL;
                     js_strncpy(bp, cp, length);
@@ -2534,7 +2534,7 @@ GeneratePrefix(JSContext *cx, JSString *uri, JSXMLArray *decls)
     } else {
         prefix = js_NewString(cx, bp, newlength);
         if (!prefix)
-            JS_free(cx, bp);
+            cx->free(bp);
     }
     return prefix;
 }
@@ -5132,7 +5132,7 @@ xml_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
         if (length == 0) {
             cursor = NULL;
         } else {
-            cursor = (JSXMLArrayCursor *) JS_malloc(cx, sizeof *cursor);
+            cursor = (JSXMLArrayCursor *) cx->malloc(sizeof *cursor);
             if (!cursor)
                 return JS_FALSE;
             XMLArrayCursorInit(cursor, &xml->xml_kids);
@@ -5155,7 +5155,7 @@ xml_enumerate(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
         cursor = (JSXMLArrayCursor *) JSVAL_TO_PRIVATE(*statep);
         if (cursor) {
             XMLArrayCursorFinish(cursor);
-            JS_free(cx, cursor);
+            cx->free(cursor);
         }
         *statep = JSVAL_NULL;
         break;
@@ -5266,7 +5266,7 @@ js_EnumerateXMLValues(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
         if (length == 0) {
             cursor = NULL;
         } else {
-            cursor = (JSXMLArrayCursor *) JS_malloc(cx, sizeof *cursor);
+            cursor = (JSXMLArrayCursor *) cx->malloc(sizeof *cursor);
             if (!cursor)
                 return JS_FALSE;
             XMLArrayCursorInit(cursor, &xml->xml_kids);
@@ -5301,7 +5301,7 @@ js_EnumerateXMLValues(JSContext *cx, JSObject *obj, JSIterateOp enum_op,
         if (cursor) {
       destroy:
             XMLArrayCursorFinish(cursor);
-            JS_free(cx, cursor);
+            cx->free(cursor);
         }
         *statep = JSVAL_NULL;
         break;
@@ -7801,7 +7801,7 @@ js_AddAttributePart(JSContext *cx, JSBool isName, JSString *str, JSString *str2)
 
     str2->getCharsAndLength(chars2, len2);
     newlen = (isName) ? len + 1 + len2 : len + 2 + len2 + 1;
-    chars = (jschar *) JS_realloc(cx, chars, (newlen+1) * sizeof(jschar));
+    chars = (jschar *) cx->realloc(chars, (newlen+1) * sizeof(jschar));
     if (!chars)
         return NULL;
 
@@ -8114,7 +8114,7 @@ xmlfilter_finalize(JSContext *cx, JSObject *obj)
         return;
 
     XMLArrayCursorFinish(&filter->cursor);
-    JS_free(cx, filter);
+    cx->free(filter);
 }
 
 JSClass js_XMLFilterClass = {
@@ -8169,7 +8169,7 @@ js_StepXMLListFilter(JSContext *cx, JSBool initialized)
         if (!filterobj)
             return JS_FALSE;
 
-        filter = (JSXMLFilter *) JS_malloc(cx, sizeof *filter);
+        filter = (JSXMLFilter *) cx->malloc(sizeof *filter);
         if (!filter)
             return JS_FALSE;
 

From 102d0ced5271f9d05e030a72be7ab48ce6491e12 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Tue, 28 Jul 2009 04:00:35 -0500
Subject: [PATCH 29/61] Bug 506786 - JSScope::trace method. r=brendan.

---
 js/src/jsapi.cpp    |  4 ++--
 js/src/jsdbgapi.cpp |  2 +-
 js/src/jsgc.cpp     |  2 +-
 js/src/jsobj.cpp    | 47 ++----------------------------------
 js/src/jsscope.cpp  |  2 +-
 js/src/jsscope.h    | 58 ++++++++++++++++++++++++++++++++++++++-------
 6 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 00e8a6ec37b3..dd3ab2e83557 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4058,13 +4058,13 @@ prop_iter_trace(JSTracer *trc, JSObject *obj)
         /* Native case: just mark the next property to visit. */
         sprop = (JSScopeProperty *) JSVAL_TO_PRIVATE(v);
         if (sprop)
-            TRACE_SCOPE_PROPERTY(trc, sprop);
+            sprop->trace(trc);
     } else {
         /* Non-native case: mark each id in the JSIdArray private. */
         ida = (JSIdArray *) JSVAL_TO_PRIVATE(v);
         for (i = 0, n = ida->length; i < n; i++) {
             id = ida->vector[i];
-            TRACE_ID(trc, id);
+            js_TraceId(trc, id);
         }
     }
 }
diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index d9e9ed62a2fb..fd6af3ee7dc3 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -434,7 +434,7 @@ js_TraceWatchPoints(JSTracer *trc, JSObject *obj)
          &wp->links != &rt->watchPointList;
          wp = (JSWatchPoint *)wp->links.next) {
         if (wp->object == obj) {
-            TRACE_SCOPE_PROPERTY(trc, wp->sprop);
+            wp->sprop->trace(trc);
             if ((wp->sprop->attrs & JSPROP_SETTER) && wp->setter) {
                 JS_CALL_OBJECT_TRACER(trc, js_CastAsObject(wp->setter),
                                       "wp->setter");
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 386a65c83e83..d4a31a249df7 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3043,7 +3043,7 @@ js_TraceContext(JSTracer *trc, JSContext *acx)
             tvr->u.trace(trc, tvr);
             break;
           case JSTVU_SPROP:
-            TRACE_SCOPE_PROPERTY(trc, tvr->u.sprop);
+            tvr->u.sprop->trace(trc);
             break;
           case JSTVU_WEAK_ROOTS:
             TraceWeakRoots(trc, tvr->u.weakRoots);
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index ed62904eecdc..bf5f72b4e808 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -5085,7 +5085,7 @@ js_TraceNativeEnumerators(JSTracer *trc)
             cursor = ne->ids;
             end = cursor + ne->length;
             do {
-                TRACE_ID(trc, *cursor);
+                js_TraceId(trc, *cursor);
             } while (++cursor != end);
         } else if (doGC) {
             js_RemoveAsGCBytes(rt, NativeEnumeratorSize(ne->length));
@@ -5748,7 +5748,6 @@ js_TraceObject(JSTracer *trc, JSObject *obj)
 {
     JSContext *cx;
     JSScope *scope;
-    JSScopeProperty *sprop;
     JSClass *clasp;
     size_t nslots, i;
     jsval v;
@@ -5772,49 +5771,7 @@ js_TraceObject(JSTracer *trc, JSObject *obj)
     MeterEntryCount(scope->entryCount);
 #endif
 
-    sprop = scope->lastProp;
-    uint8 regenFlag = cx->runtime->gcRegenShapesScopeFlag;
-    if (IS_GC_MARKING_TRACER(trc) &&
-        cx->runtime->gcRegenShapes &&
-        scope->hasRegenFlag(regenFlag)) {
-        /*
-         * Either scope has its own shape, which must be regenerated, or it
-         * must have the same shape as its lastProp.
-         */
-        uint32 shape;
-
-        if (sprop) {
-            if (!(sprop->flags & SPROP_FLAG_SHAPE_REGEN)) {
-                sprop->shape = js_RegenerateShapeForGC(cx);
-                sprop->flags |= SPROP_FLAG_SHAPE_REGEN;
-            }
-            shape = sprop->shape;
-        }
-        if (!sprop || scope->hasOwnShape()) {
-            shape = js_RegenerateShapeForGC(cx);
-            JS_ASSERT_IF(sprop, shape != sprop->shape);
-        }
-        scope->shape = shape;
-        scope->flags ^= JSScope::SHAPE_REGEN;
-
-        /* Also regenerate the shapes of empty scopes, in case they are not shared. */
-        for (JSScope *empty = scope->emptyScope;
-             empty && empty->hasRegenFlag(regenFlag);
-             empty = empty->emptyScope) {
-            empty->shape = js_RegenerateShapeForGC(cx);
-            empty->flags ^= JSScope::SHAPE_REGEN;
-        }
-    }
-    if (sprop) {
-        JS_ASSERT(scope->has(sprop));
-
-        /* Trace scope's property tree ancestor line. */
-        do {
-            if (scope->hadMiddleDelete() && !scope->has(sprop))
-                continue;
-            TRACE_SCOPE_PROPERTY(trc, sprop);
-        } while ((sprop = sprop->parent) != NULL);
-    }
+    scope->trace(trc);
 
     if (!JS_CLIST_IS_EMPTY(&cx->runtime->watchPointList))
         js_TraceWatchPoints(trc, obj);
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 40c5add19fe3..02791e40cff0 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1649,7 +1649,7 @@ JSScopeProperty::trace(JSTracer *trc)
 {
     if (IS_GC_MARKING_TRACER(trc))
         flags |= SPROP_MARK;
-    TRACE_ID(trc, id);
+    js_TraceId(trc, id);
 
 #if JS_HAS_GETTER_SETTER
     if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index fe8b5798e4f1..211b88c9014b 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -265,6 +265,8 @@ struct JSScope {
 
     void extend(JSContext *cx, JSScopeProperty *sprop);
 
+    void trace(JSTracer *trc);
+
     void brandingShapeChange(JSContext *cx, uint32 slot, jsval v);
     void deletingShapeChange(JSContext *cx, JSScopeProperty *sprop);
     void methodShapeChange(JSContext *cx, uint32 slot, jsval toval);
@@ -501,6 +503,54 @@ JSScope::extend(JSContext *cx, JSScopeProperty *sprop)
     lastProp = sprop;
 }
 
+inline void
+JSScope::trace(JSTracer *trc)
+{
+    JSContext *cx = trc->context;
+    JSScopeProperty *sprop = lastProp;
+    uint8 regenFlag = cx->runtime->gcRegenShapesScopeFlag;
+    if (IS_GC_MARKING_TRACER(trc) && cx->runtime->gcRegenShapes && hasRegenFlag(regenFlag)) {
+        /*
+         * Either this scope has its own shape, which must be regenerated, or
+         * it must have the same shape as lastProp.
+         */
+        uint32 newShape;
+
+        if (sprop) {
+            if (!(sprop->flags & SPROP_FLAG_SHAPE_REGEN)) {
+                sprop->shape = js_RegenerateShapeForGC(cx);
+                sprop->flags |= SPROP_FLAG_SHAPE_REGEN;
+            }
+            newShape = sprop->shape;
+        }
+        if (!sprop || hasOwnShape()) {
+            newShape = js_RegenerateShapeForGC(cx);
+            JS_ASSERT_IF(sprop, newShape != sprop->shape);
+        }
+        shape = newShape;
+        flags ^= JSScope::SHAPE_REGEN;
+
+        /* Also regenerate the shapes of empty scopes, in case they are not shared. */
+        for (JSScope *empty = emptyScope;
+             empty && empty->hasRegenFlag(regenFlag);
+             empty = empty->emptyScope) {
+            empty->shape = js_RegenerateShapeForGC(cx);
+            empty->flags ^= JSScope::SHAPE_REGEN;
+        }
+    }
+    if (sprop) {
+        JS_ASSERT(has(sprop));
+
+        /* Trace scope's property tree ancestor line. */
+        do {
+            if (hadMiddleDelete() && !has(sprop))
+                continue;
+            sprop->trace(trc);
+        } while ((sprop = sprop->parent) != NULL);
+    }
+}
+
+
 static JS_INLINE bool
 js_GetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
 {
@@ -553,14 +603,6 @@ js_SetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
 extern JSScope *
 js_GetMutableScope(JSContext *cx, JSObject *obj);
 
-/*
- * These macros used to inline short code sequences, but they grew over time.
- * We retain them for internal backward compatibility, and in case one or both
- * ever shrink to inline-able size.
- */
-#define TRACE_ID(trc, id)                js_TraceId(trc, id)
-#define TRACE_SCOPE_PROPERTY(trc, sprop) sprop->trace(trc)
-
 extern void
 js_TraceId(JSTracer *trc, jsid id);
 

From aa70cca682c9dcefa88f7010d0757e9ed0656567 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Tue, 28 Jul 2009 04:39:40 -0500
Subject: [PATCH 30/61] Bug 506880 - Deadlock on exit in threadsafe shell.
 r=gal.

---
 js/src/jstask.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/jstask.cpp b/js/src/jstask.cpp
index 2814b953292d..9071e632efdf 100644
--- a/js/src/jstask.cpp
+++ b/js/src/jstask.cpp
@@ -87,7 +87,7 @@ void
 JSBackgroundThread::work()
 {
     PR_Lock(lock);
-    do {
+    while (!shutdown) {
         PR_WaitCondVar(wakeup, PR_INTERVAL_NO_TIMEOUT);
         JSBackgroundTask* t;
         while ((t = stack) != NULL) {
@@ -97,7 +97,7 @@ JSBackgroundThread::work()
             delete t;
             PR_Lock(lock);
         }
-    } while (!shutdown);
+    }
     PR_Unlock(lock);
 }
 

From 3431af1c47e251d584e4b576ea919ba270b51d96 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Tue, 21 Jul 2009 12:13:21 -0500
Subject: [PATCH 31/61] Bug 505522 - Support building with C++ exceptions.
 r=bsmedberg.

---
 config/autoconf.mk.in        | 1 +
 configure.in                 | 2 ++
 js/src/config/autoconf.mk.in | 1 +
 js/src/configure.in          | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index f46c76edcc89..51f26fba0bf8 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -297,6 +297,7 @@ MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
 MOZ_OPTIMIZE_SIZE_TWEAK = @MOZ_OPTIMIZE_SIZE_TWEAK@
 
 MOZ_RTTI_FLAGS_ON = @_MOZ_RTTI_FLAGS_ON@
+MOZ_EXCEPTIONS_FLAGS_ON = @_MOZ_EXCEPTIONS_FLAGS_ON@
 
 MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE = @MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE@
 PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
diff --git a/configure.in b/configure.in
index b903ce5a5490..f70021719e83 100644
--- a/configure.in
+++ b/configure.in
@@ -7330,6 +7330,8 @@ else
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_OFF
 fi
 
+AC_SUBST(_MOZ_EXCEPTIONS_FLAGS_ON)
+
 # Irix & OSF native compilers do not like exception declarations 
 # when exceptions are disabled
 if test -n "$MIPSPRO_CXX" -o -n "$COMPAQ_CXX" -o -n "$VACPP"; then
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index 0ff86b970134..9f5f9cfed8e6 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -162,6 +162,7 @@ MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
 MOZ_OPTIMIZE_SIZE_TWEAK = @MOZ_OPTIMIZE_SIZE_TWEAK@
 
 MOZ_RTTI_FLAGS_ON = @_MOZ_RTTI_FLAGS_ON@
+MOZ_EXCEPTIONS_FLAGS_ON = @_MOZ_EXCEPTIONS_FLAGS_ON@
 
 MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE = @MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE@
 PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
diff --git a/js/src/configure.in b/js/src/configure.in
index 4d28a3fbd7cd..3e3abb43b74d 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4737,6 +4737,8 @@ else
     _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_OFF
 fi
 
+AC_SUBST(_MOZ_EXCEPTIONS_FLAGS_ON)
+
 # Irix & OSF native compilers do not like exception declarations 
 # when exceptions are disabled
 if test -n "$MIPSPRO_CXX" -o -n "$COMPAQ_CXX" -o -n "$VACPP"; then

From 69bd6c8514f5fe993bd0117bf3df78a90fc6557f Mon Sep 17 00:00:00 2001
From: Neil Deakin <neil@mozilla.com>
Date: Wed, 29 Jul 2009 14:33:53 -0400
Subject: [PATCH 32/61] Bug 478416, replace chromedir attribute with
 :moz-locale-dir pseudoclass, r=neil,dao,dbaron,sr=dbaron

---
 browser/base/content/browser-context.inc      |   2 -
 browser/base/content/browser-doctype.inc      |   2 -
 browser/base/content/browser-menubar.inc      |   2 -
 browser/base/content/browser-places.js        |   4 +-
 browser/base/content/browser.css              |   2 +-
 browser/base/content/browser.js               |   4 +-
 browser/base/content/browser.xul              |  20 +-
 browser/base/content/pageinfo/pageInfo.xul    |   5 +-
 browser/base/content/tabbrowser.xml           |  23 +-
 browser/base/content/web-panels.xul           |   2 -
 browser/components/places/content/places.xml  |   5 -
 browser/components/places/content/places.xul  |   8 +-
 browser/components/places/content/toolbar.xml |   3 -
 browser/components/search/content/search.xml  |   8 +-
 .../themes/gnomestripe/browser/browser.css    |  42 ++--
 .../gnomestripe/browser/places/organizer.css  |   8 +-
 .../themes/gnomestripe/browser/searchbar.css  |   2 +-
 browser/themes/pinstripe/browser/browser.css  |  92 ++++----
 .../pinstripe/browser/places/organizer.css    |  28 +--
 .../themes/pinstripe/browser/searchbar.css    |  24 +-
 .../themes/winstripe/browser/browser-aero.css |  10 +-
 browser/themes/winstripe/browser/browser.css  | 124 +++++-----
 .../winstripe/browser/places/organizer.css    |  18 +-
 .../themes/winstripe/browser/searchbar.css    |   6 +-
 content/base/public/nsIDocument.h             |  13 +-
 content/base/src/nsGkAtomList.h               |   1 +
 content/xul/content/src/nsXULElement.cpp      |  21 +-
 content/xul/document/public/nsIXULDocument.h  |   5 +
 content/xul/document/src/Makefile.in          |   3 +
 content/xul/document/src/nsXULDocument.cpp    | 104 +++++++++
 content/xul/document/src/nsXULDocument.h      |  18 +-
 layout/style/nsCSSParser.cpp                  |   8 +
 layout/style/nsCSSPseudoClassList.h           |   4 +
 layout/style/nsCSSPseudoClasses.cpp           |   3 +-
 layout/style/nsCSSRuleProcessor.cpp           |  29 +++
 layout/style/test/test_selectors.html         |  10 +
 modules/libpref/src/init/all.js               |   5 +
 .../components/console/content/console.xul    |   5 +-
 toolkit/components/help/content/help.xul      |  10 +-
 .../help/content/helpContextOverlay.xul       |   4 -
 .../printing/content/printPreviewBindings.xml |  10 +-
 toolkit/content/tests/chrome/Makefile.in      |   4 +
 .../content/tests/chrome/rtltest/Makefile.in  |  49 ++++
 .../content/tests/chrome/rtltest/dirtest.xul  |  25 ++
 .../tests/chrome/rtltest/righttoleft.manifest |   3 +
 .../content/tests/chrome/test_righttoleft.xul | 217 ++++++++++++++++++
 toolkit/content/textbox.css                   |   4 +-
 toolkit/content/widgets/datetimepicker.xml    |  22 +-
 toolkit/content/widgets/findbar.xml           |   5 -
 toolkit/content/widgets/menu.xml              |  12 +-
 toolkit/content/widgets/resizer.xml           |  15 --
 toolkit/content/widgets/scrollbox.xml         |  13 +-
 toolkit/content/widgets/tabbox.xml            |   7 +-
 toolkit/content/widgets/textbox.xml           |  14 +-
 toolkit/content/widgets/toolbarbutton.xml     |   9 +-
 toolkit/content/widgets/tree.xml              |  11 +-
 toolkit/content/widgets/wizard.xml            |  14 +-
 toolkit/content/xul.css                       |   6 +-
 .../mozapps/extensions/content/extensions.xml |   2 -
 .../mozapps/extensions/content/extensions.xul |   4 +-
 toolkit/themes/faststripe/global/tabbox.css   |  18 +-
 toolkit/themes/faststripe/global/textbox.css  |   2 +-
 toolkit/themes/gnomestripe/global/button.css  |   8 +-
 toolkit/themes/gnomestripe/global/findBar.css |   8 +-
 .../gnomestripe/global/printPreview.css       |   8 +-
 toolkit/themes/gnomestripe/global/textbox.css |   2 +-
 toolkit/themes/gnomestripe/global/tree.css    |   8 +-
 toolkit/themes/gnomestripe/help/help.css      |  16 +-
 .../pinstripe/global/datetimepicker.css       |   2 +-
 toolkit/themes/pinstripe/global/findBar.css   |   8 +-
 toolkit/themes/pinstripe/global/resizer.css   |   4 +-
 toolkit/themes/pinstripe/global/tree.css      |   8 +-
 .../themes/pinstripe/global/viewbuttons.css   |  16 +-
 .../winstripe/global/datetimepicker.css       |  12 +-
 .../themes/winstripe/global/printPreview.css  |  16 +-
 toolkit/themes/winstripe/global/resizer.css   |   6 +-
 toolkit/themes/winstripe/global/scrollbox.css |  16 +-
 toolkit/themes/winstripe/global/tabbox.css    |  18 +-
 toolkit/themes/winstripe/global/textbox.css   |   2 +-
 toolkit/themes/winstripe/global/tree-aero.css |   8 +-
 toolkit/themes/winstripe/global/tree.css      |   8 +-
 toolkit/themes/winstripe/help/help.css        |   2 +-
 82 files changed, 857 insertions(+), 472 deletions(-)
 create mode 100644 toolkit/content/tests/chrome/rtltest/Makefile.in
 create mode 100644 toolkit/content/tests/chrome/rtltest/dirtest.xul
 create mode 100644 toolkit/content/tests/chrome/rtltest/righttoleft.manifest
 create mode 100644 toolkit/content/tests/chrome/test_righttoleft.xul

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index ddd1f60ec434..93979c16369d 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -167,13 +167,11 @@
       <menuitem id="context-back"
                 label="&backCmd.label;"
                 accesskey="&backCmd.accesskey;"
-                chromedir="&locale.dir;"
                 command="Browser:BackOrBackDuplicate"
                 onclick="checkForMiddleClick(this, event);"/>
       <menuitem id="context-forward"
                 label="&forwardCmd.label;"
                 accesskey="&forwardCmd.accesskey;"
-                chromedir="&locale.dir;"
                 command="Browser:ForwardOrForwardDuplicate"
                 onclick="checkForMiddleClick(this, event);"/>
       <menuitem id="context-reload"
diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc
index 6a331330c33c..7e17b6a9cf86 100644
--- a/browser/base/content/browser-doctype.inc
+++ b/browser/base/content/browser-doctype.inc
@@ -3,8 +3,6 @@
 %brandDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
 %globalRegionDTD;
 <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index e186a1af9555..485c041c639a 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -474,7 +474,6 @@
 #else
                           key="goBackKb"
 #endif
-                          chromedir="&locale.dir;"
                           command="Browser:BackOrBackDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuForward"
@@ -484,7 +483,6 @@
 #else
                           key="goForwardKb"
 #endif
-                          chromedir="&locale.dir;"
                           command="Browser:ForwardOrForwardDuplicate"
                           onclick="checkForMiddleClick(this, event);"/>
                 <menuitem id="historyMenuHome"
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 1fa8f3caf5cc..6bbe55b30964 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -432,9 +432,7 @@ var PlacesCommandHook = {
       if (starIcon && isElementVisible(starIcon)) {
         // Make sure the bookmark properties dialog hangs toward the middle of
         // the location bar in RTL builds
-        var position = "after_end";
-        if (gURLBar.getAttribute("chromedir") == "rtl")
-          position = "after_start";
+        var position = (getComputedStyle(gNavToolbox, "").direction == "rtl") ? 'after_start' : 'after_end';
         if (aShowEditUI)
           StarUI.showEditBookmarkPopup(itemId, starIcon, position);
 #ifdef ADVANCED_STARRING_UI
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 4984d7baa913..d0b9af3fc7d3 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -45,7 +45,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] {
   display: none;
 }
 
-#feed-menu[chromedir="rtl"] > menuitem {
+#feed-menu:-moz-locale-dir(rtl) > menuitem {
   direction: rtl;
 }
 
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2cae4f4b2d51..12f78515ddd6 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6628,9 +6628,7 @@ var gIdentityHandler = {
     
     // Make sure the identity popup hangs toward the middle of the location bar
     // in RTL builds
-    var position = 'after_start';
-    if (gURLBar.getAttribute("chromedir") == "rtl")
-      position = 'after_end';
+    var position = (getComputedStyle(gNavToolbox, "").direction == "rtl") ? 'after_end' : 'after_start';
 
     // Add the "open" attribute to the identity box for styling
     this._identityBox.setAttribute("open", "true");
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index de65307112f0..d8a9a5022e7f 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -104,17 +104,16 @@
 
   <popupset id="mainPopupSet">
     <menupopup id="backForwardMenu"
-               chromedir="&locale.dir;"
                onpopupshowing="return FillHistoryMenu(event.target);"
                oncommand="gotoHistoryIndex(event);"
                onclick="checkForMiddleClick(this, event);"/>
     <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
 
     <!-- for search and content formfill/pw manager -->
-    <panel type="autocomplete" chromedir="&locale.dir;" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 
     <!-- for url bar autocomplete -->
-    <panel type="autocomplete-richlistbox" chromedir="&locale.dir;" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
     <panel id="editBookmarkPanel"
            orient="vertical"
@@ -205,8 +204,7 @@
     <!-- Popup for site identity information -->
     <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
            onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
-           level="top"
-           chromedir="&locale.dir;">
+           level="top">
       <hbox id="identity-popup-container" align="top">
         <image id="identity-popup-icon"/>
         <vbox id="identity-popup-content-box">
@@ -318,18 +316,16 @@
       <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
                    context="backForwardMenu">
         <toolbarbutton id="back-button" class="toolbarbutton-1"
-                       chromedir="&locale.dir;"
                        label="&backCmd.label;"
                        command="Browser:BackOrBackDuplicate"
                        onclick="checkForMiddleClick(this, event);"
                        tooltiptext="&backButton.tooltip;"/>
         <toolbarbutton id="forward-button" class="toolbarbutton-1"
-                       chromedir="&locale.dir;"
                        label="&forwardCmd.label;"
                        command="Browser:ForwardOrForwardDuplicate"
                        onclick="checkForMiddleClick(this, event);"
                        tooltiptext="&forwardButton.tooltip;"/>
-        <toolbarbutton id="back-forward-dropmarker" type="menu" chromedir="&locale.dir;"
+        <toolbarbutton id="back-forward-dropmarker" type="menu"
                        disabled="true" tooltiptext="&backForwardMenu.tooltip;"
                        onbroadcast="if (this.disabled) this.disabled =
                                       document.getElementById('Browser:Back').hasAttribute('disabled') &amp;&amp;
@@ -337,7 +333,6 @@
           <!-- bug 415444: event.stopPropagation is here for the cloned version of
                this menupopup -->
           <menupopup context=""
-                     chromedir="&locale.dir;"
                      position="after_start"
                      onpopupshowing="return FillHistoryMenu(event.target);"
                      oncommand="gotoHistoryIndex(event); event.stopPropagation();"
@@ -374,7 +369,6 @@
                  bookmarkemptytext="&urlbar.bookmark.emptyText;"
                  historyemptytext="&urlbar.history.emptyText;"
                  noneemptytext="&urlbar.none.emptyText;"
-                 chromedir="&locale.dir;"
                  type="autocomplete"
                  autocompletesearch="history"
                  autocompletepopup="PopupAutoCompleteRichResult"
@@ -398,7 +392,6 @@
                We only add the identity-box button to the tab order when the location bar
                has focus, otherwise pressing F6 focuses it instead of the location bar -->
           <box id="identity-box" role="button"
-               chromedir="&locale.dir;"
                onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
                onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
             <hbox align="center">
@@ -418,13 +411,11 @@
                     style="-moz-user-focus: none"
                     class="plain urlbar-icon"
                     id="feed-button"
-                    chromedir="&locale.dir;"
                     collapsed="true"
                     tooltiptext="&feedButton.tooltip;"
                     onclick="return FeedHandler.onFeedButtonClick(event);">
               <menupopup position="after_end"
                          id="feed-menu"
-                         chromedir="&locale.dir;"
                          onpopupshowing="return FeedHandler.buildFeedList(this);"
                          oncommand="return FeedHandler.subscribeToFeed(null, event);"
                          onclick="checkForMiddleClick(this, event);"/>
@@ -433,7 +424,6 @@
                    class="urlbar-icon"
                    onclick="PlacesStarButton.onClick(event);"/>
             <image id="go-button"
-                   chromedir="&locale.dir;"
                    class="urlbar-icon"
                    tooltiptext="&goEndCap.tooltip;"
                    onclick="gURLBar.handleCommand(event);"/>
@@ -444,7 +434,7 @@
       <toolbaritem id="search-container" title="&searchItem.title;"
                    align="center" class="chromeclass-toolbar-additional"
                    flex="100" persist="width">
-        <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
+        <searchbar id="searchbar" flex="1"/>
       </toolbaritem>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
diff --git a/browser/base/content/pageinfo/pageInfo.xul b/browser/base/content/pageinfo/pageInfo.xul
index c89419f0e190..a4e237f0d574 100644
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/browser/base/content/pageinfo/pageInfo.xul
@@ -48,8 +48,6 @@
 <!DOCTYPE window [
   <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
   %pageInfoDTD;
-  <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
-  %global;
 ]>
 
 #ifdef XP_MACOSX
@@ -117,8 +115,7 @@
   </menupopup>
 
   <windowdragbox id="topBar" class="viewGroupWrapper">
-    <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal"
-                chromedir="&locale.dir;">
+    <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal">
       <radio id="generalTab"  label="&generalTab;"  accesskey="&generalTab.accesskey;"
            oncommand="showTab('general');"/>
       <radio id="mediaTab"    label="&mediaTab;"    accesskey="&mediaTab.accesskey;"
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 50c7698010cd..6128d722ca13 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -50,8 +50,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % tabBrowserDTD SYSTEM "chrome://browser/locale/tabbrowser.dtd" >
 %tabBrowserDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="tabBrowserBindings"
@@ -68,7 +66,7 @@
       <xul:stringbundle anonid="tbstringbundle" src="chrome://browser/locale/tabbrowser.properties"/>
       <xul:tabbox anonid="tabbox" flex="1" eventnode="document" xbl:inherits="handleCtrlPageUpDown"
                   onselect="if (!('updateCurrentBrowser' in this.parentNode) || event.target.localName != 'tabpanels') return; this.parentNode.updateCurrentBrowser();">
-        <xul:hbox class="tab-drop-indicator-bar" collapsed="true" chromedir="&locale.dir;"
+        <xul:hbox class="tab-drop-indicator-bar" collapsed="true"
                   ondragover="this.parentNode.parentNode._onDragOver(event);"
                   ondragleave="this.parentNode.parentNode._onDragLeave(event);"
                   ondrop="this.parentNode.parentNode._onDrop(event);">
@@ -2812,8 +2810,7 @@
                          onmousedown="_startScroll(-1);"
                          onmouseover="_continueScroll(-1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
       <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
         <children/>
       </xul:scrollbox>
@@ -2829,8 +2826,7 @@
                            onmousedown="_startScroll(1);"
                            onmouseover="_continueScroll(1);"
                            onmouseup="_stopScroll();"
-                           onmouseout="_pauseScroll();"
-                           chromedir="&locale.dir;"/>
+                           onmouseout="_pauseScroll();"/>
       </xul:stack>
     </content>
 #endif
@@ -2851,7 +2847,7 @@
           </xul:stack>
 #endif
           <xul:arrowscrollbox anonid="arrowscrollbox" orient="horizontal" flex="1"
-                              style="min-width: 1px;" chromedir="&locale.dir;"
+                              style="min-width: 1px;"
 #ifndef XP_MACOSX
                               clicktoscroll="true"
 #endif
@@ -2863,13 +2859,13 @@
 # button, necessary due to the previous hack.
             <children/>
             <xul:toolbarbutton class="tabs-newtab-button"
-                               command="cmd_newNavigatorTab" chromedir="&locale.dir;"
+                               command="cmd_newNavigatorTab"
                                tooltiptext="&newTabButton.tooltip;"/>
           </xul:arrowscrollbox>
           <xul:toolbarbutton class="tabs-newtab-button" anonid="newtab-button"
-                             command="cmd_newNavigatorTab" chromedir="&locale.dir;"
+                             command="cmd_newNavigatorTab"
                              tooltiptext="&newTabButton.tooltip;"/>
-          <xul:stack align="center" pack="end" chromedir="&locale.dir;">
+          <xul:stack align="center" pack="end">
             <xul:hbox flex="1" class="tabs-alltabs-box-animate" anonid="alltabs-box-animate"/>
             <xul:toolbarbutton class="tabs-alltabs-button" anonid="alltabs-button"
                                type="menu"
@@ -2879,7 +2875,7 @@
             </xul:toolbarbutton>
           </xul:stack>
           <xul:toolbarbutton anonid="tabs-closebutton"
-                             class="close-button tabs-closebutton" chromedir="&locale.dir;"/>
+                             class="close-button tabs-closebutton"/>
         </xul:hbox>
       </xul:stack>
     </content>
@@ -3235,8 +3231,7 @@
 
   <binding id="tabbrowser-tab" display="xul:hbox"
            extends="chrome://global/content/bindings/tabbox.xml#tab">
-    <content chromedir="&locale.dir;"
-             closetabtext="&closeTab.label;">
+    <content closetabtext="&closeTab.label;">
       <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
       <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" class="tab-text"/>
       <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button"/>
diff --git a/browser/base/content/web-panels.xul b/browser/base/content/web-panels.xul
index 4e5e3d4bf58f..b590371a0031 100644
--- a/browser/base/content/web-panels.xul
+++ b/browser/base/content/web-panels.xul
@@ -47,8 +47,6 @@
 %browserDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
 %textcontextDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <page id="webpanels-window"
diff --git a/browser/components/places/content/places.xml b/browser/components/places/content/places.xml
index 784dbba1e045..66740bd4f088 100644
--- a/browser/components/places/content/places.xml
+++ b/browser/components/places/content/places.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-]>
-
 <bindings id="placesBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index aa1708dae84b..315906bd1398 100644
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -62,8 +62,6 @@
 %placesDTD;
 <!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 %editMenuOverlayDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
 ]>
@@ -187,24 +185,22 @@
   </popupset>
 
   <toolbox id="placesToolbox">
-    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center" chromedir="&locale.dir;">
+    <toolbar class="chromeclass-toolbar" id="placesToolbar" align="center">
       <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      command="OrganizerCommand:Back"
                      tooltiptext="&backButton.tooltip;"
-                     chromedir="&locale.dir;"
                      disabled="true"/>
 
       <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      command="OrganizerCommand:Forward"
                      tooltiptext="&forwardButton.tooltip;"
-                     chromedir="&locale.dir;"
                      disabled="true"/>
 
 #ifdef XP_MACOSX
         <toolbarbutton type="menu" class="tabbable"
               onpopupshowing="document.getElementById('placeContent').focus()"
 #else
-      <menubar id="placesMenu" chromedir="&locale.dir;">
+      <menubar id="placesMenu">
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
 #endif
               id="organizeButton" label="&organize.label;">
diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 7638d6baa656..ec06ddb933aa 100644
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -41,8 +41,6 @@
 
 
 <!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
 ]>
@@ -80,7 +78,6 @@
                            mousethrough="never"
                            collapsed="true"
                            tooltiptext="&bookmarksToolbarChevron.tooltip;"
-                           chromedir="&locale.dir;"
                            onpopupshowing="chevronPopupShowing(event);">
           <xul:menupopup anonid="chevronPopup"
                          xbl:inherits="tooltip"
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 6b858d29db4a..c6dbcd61201a 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -45,8 +45,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % searchBarDTD SYSTEM "chrome://browser/locale/searchbar.dtd" >
 %searchBarDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
 ]>
@@ -80,8 +78,7 @@
                    xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines">
         <xul:button class="searchbar-engine-button"
                     type="menu"
-                    anonid="searchbar-engine-button"
-                    chromedir="&locale.dir;">
+                    anonid="searchbar-engine-button">
           <xul:image class="searchbar-engine-image" xbl:inherits="src"/>
           <xul:image class="searchbar-dropmarker-image"/>
           <xul:menupopup class="searchbar-popup"
@@ -93,10 +90,9 @@
                           oncommand="openManager(event);"/>
           </xul:menupopup>
         </xul:button>
-        <xul:hbox class="search-go-container" chromedir="&locale.dir;">
+        <xul:hbox class="search-go-container">
           <xul:image class="search-go-button"
                      anonid="search-go-button"
-                     chromedir="&locale.dir;"
                      onclick="handleSearchCommand(event);"
                      tooltiptext="&searchEndCap.label;" />
         </xul:hbox>
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index d1196ad6f883..5669fb879a3a 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -401,13 +401,13 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-#historyMenuBack[chromedir="rtl"],
-#context-back[chromedir="rtl"] {
+#historyMenuBack:-moz-locale-dir(rtl),
+#context-back:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
-#historyMenuBack[disabled][chromedir="rtl"],
-#context-back[disabled][chromedir="rtl"] {
+#historyMenuBack[disabled]:-moz-locale-dir(rtl),
+#context-back[disabled]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -421,13 +421,13 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-#historyMenuForward[chromedir="rtl"],
-#context-forward[chromedir="rtl"] {
+#historyMenuForward:-moz-locale-dir(rtl),
+#context-forward:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
-#historyMenuForward[disabled][chromedir="rtl"],
-#context-forward[disabled][chromedir="rtl"] {
+#historyMenuForward[disabled]:-moz-locale-dir(rtl),
+#context-forward[disabled]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -522,10 +522,10 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -536,10 +536,10 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
@@ -648,13 +648,13 @@ toolbar[iconsize="small"] #back-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu") !important;
 }
-toolbar[iconsize="small"] #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -668,13 +668,13 @@ toolbar[iconsize="small"] #forward-button[disabled="true"] {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important;
 }
-toolbar[iconsize="small"] #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -833,7 +833,7 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   direction: ltr !important;
 }
 
-#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
+#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
   direction: rtl;
 }
 
@@ -875,7 +875,7 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   -moz-border-end: 1px solid ThreeDShadow;
 }
 
-#identity-box[chromedir="rtl"] {
+#identity-box:-moz-locale-dir(rtl) {
   -moz-border-start: 1px solid ThreeDShadow;
 }
 
@@ -1338,7 +1338,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/toolbar/chevron-rtl.gif") !important;
 }
 
diff --git a/browser/themes/gnomestripe/browser/places/organizer.css b/browser/themes/gnomestripe/browser/places/organizer.css
index ca7b67f3f219..f9a3afba1f79 100644
--- a/browser/themes/gnomestripe/browser/places/organizer.css
+++ b/browser/themes/gnomestripe/browser/places/organizer.css
@@ -13,10 +13,10 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -29,10 +29,10 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css
index d034e68922ad..5c2d6cc1db7e 100644
--- a/browser/themes/gnomestripe/browser/searchbar.css
+++ b/browser/themes/gnomestripe/browser/searchbar.css
@@ -73,7 +73,7 @@
   cursor: pointer;
 }
 
-.search-go-button[chromedir="rtl"] {
+.search-go-button:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 7a9ce2268aae..eb205da1db4b 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -124,12 +124,12 @@ toolbarbutton.bookmark-item[type=menu] > .toolbarbutton-menu-dropmarker {
   -moz-padding-end: 7px;
 }
 
-toolbarbutton.bookmark-item[type=menu][chromedir="rtl"] > .toolbarbutton-menu-dropmarker {
+toolbarbutton.bookmark-item[type=menu]:-moz-locale-dir(rtl) > .toolbarbutton-menu-dropmarker {
   -moz-padding-start: 4px;
   -moz-padding-end: 2px;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"] {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl) {
   -moz-padding-start: 0px;
   -moz-padding-end: 7px;
 }
@@ -150,7 +150,7 @@ toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text {
   -moz-padding-end: 7px;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"] > .toolbarbutton-text {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl) > .toolbarbutton-text {
   -moz-padding-end: 0;
   -moz-padding-start: 7px;
 }
@@ -170,14 +170,14 @@ toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-d
 }
 
 toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text,
-toolbarbutton.bookmark-item[container][chromedir="rtl"]:not([open]):hover > .toolbarbutton-menu-dropmarker,
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl):not([open]):hover > .toolbarbutton-menu-dropmarker,
 #home-button.bookmark-item:hover > .toolbarbutton-icon,
-#home-button.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
+#home-button.bookmark-item:-moz-locale-dir(rtl):hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
 }
 
-#home-button.bookmark-item:hover[chromedir="rtl"] > .toolbarbutton-icon,
-toolbarbutton.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
+#home-button.bookmark-item:hover:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl):hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right top;
 }
 
@@ -190,15 +190,15 @@ toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropma
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-text,
 toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-text,
 #home-button.bookmark-item:hover:active > .toolbarbutton-icon,
-toolbarbutton.bookmark-item[container][chromedir="rtl"]:hover:active > .toolbarbutton-menu-dropmarker,
-toolbarbutton.bookmark-item[container][chromedir="rtl"][open="true"] > .toolbarbutton-menu-dropmarker,
-#home-button.bookmark-item:hover:active[chromedir="rtl"] > .toolbarbutton-text {
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl):hover:active > .toolbarbutton-menu-dropmarker,
+toolbarbutton.bookmark-item[container]:-moz-locale-dir(rtl)[open="true"] > .toolbarbutton-menu-dropmarker,
+#home-button.bookmark-item:hover:active:-moz-locale-dir(rtl) > .toolbarbutton-text {
   background: url("chrome://browser/skin/bookmark-open-mid.png") repeat-x !important;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"][container]:hover:active > .toolbarbutton-text,
-toolbarbutton.bookmark-item[chromedir="rtl"][container][open] > .toolbarbutton-text,
-#home-button.bookmark-item[chromedir="rtl"]:hover:active > .toolbarbutton-icon {
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl)[container]:hover:active > .toolbarbutton-text,
+toolbarbutton.bookmark-item:-moz-locale-dir(rtl)[container][open] > .toolbarbutton-text,
+#home-button.bookmark-item:-moz-locale-dir(rtl):hover:active > .toolbarbutton-icon {
   background: url("chrome://browser/skin/bookmark-open-right.png") no-repeat right top !important;
 }
 
@@ -290,8 +290,8 @@ toolbarbutton.bookmark-item-microsummarized {
   -moz-box-orient: vertical;
 }
 
-.toolbarbutton-1[chromedir="rtl"],
-#back-forward-dropmarker[chromedir="rtl"] {
+.toolbarbutton-1:-moz-locale-dir(rtl),
+#back-forward-dropmarker:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
 }
 
@@ -375,7 +375,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button {
   border-right: none;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 571px, 33px, 540px);
 }
 
@@ -383,7 +383,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true
  -moz-image-region: rect(33px, 535px, 66px, 504px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(33px, 571px, 66px, 540px);
 }
 
@@ -392,8 +392,8 @@ toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"] {
   -moz-image-region: rect(66px, 535px, 99px, 504px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active[chromedir="rtl"]:not([disabled]),
-toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #back-button:hover:active:-moz-locale-dir(rtl):not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(66px, 571px, 99px, 540px);
 }
 
@@ -407,7 +407,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button {
   border-right: none;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 540px, 33px, 514px);
 }
 
@@ -415,7 +415,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="t
  -moz-image-region: rect(33px, 560px, 66px, 535px);
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(33px, 540px, 66px, 514px);
 }
 
@@ -425,8 +425,8 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"
   -moz-margin-start: -5px;
 }
 
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(99px, 545px, 132px, 514px);
 }
 
@@ -440,7 +440,7 @@ toolbar[mode="icons"] #unified-back-forward-button > #forward-button[open="true"
   border-right: none;
 }
 
-#back-forward-dropmarker[chromedir="rtl"] {
+#back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 514px, 33px, 504px);
 }
 
@@ -458,7 +458,7 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
  -moz-image-region: rect(33px, 571px, 66px, 560px);
 }
 
-#back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+#back-forward-dropmarker[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(33px, 514px, 66px, 504px);
 }
 
@@ -467,18 +467,18 @@ toolbar[mode="icons"] #back-forward-dropmarker > dropmarker {
   -moz-image-region: rect(66px, 571px, 99px, 560px);
 }
 
-#back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
-#back-forward-dropmarker[open="true"][chromedir="rtl"] {
+#back-forward-dropmarker:-moz-locale-dir(rtl):hover:active:not([disabled]),
+#back-forward-dropmarker[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(66px, 514px, 99px, 504px);
 }
 
 .unified-nav-back[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
 .unified-nav-forward[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
@@ -493,7 +493,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   border-right: none;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 648px, 23px, 614px);
 }
 
@@ -501,7 +501,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   -moz-image-region: rect(23px, 605px, 46px, 571px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(23px, 648px, 46px, 614px);
 }
 
@@ -510,8 +510,8 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-but
   -moz-image-region: rect(46px, 605px, 69px, 571px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 648px, 69px, 614px);
 }
 
@@ -525,7 +525,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
   border-right: none;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 614px, 23px, 580px);
 }
 
@@ -533,7 +533,7 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
  -moz-image-region: rect(23px, 638px, 46px, 605px);
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 614px, 46px, 580px);
 }
 
@@ -543,8 +543,8 @@ toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-
   -moz-margin-start: 0;
 }
 
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"][chromedir="rtl"] {
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[mode="icons"][iconsize="small"] #unified-back-forward-button > #forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 614px, 69px, 580px);
 }
 
@@ -554,7 +554,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-image-region: rect(0px, 648px, 23px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 580px, 23px, 571px);
 }
 
@@ -562,7 +562,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
  -moz-image-region: rect(23px, 648px, 46px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 580px, 46px, 571px);
 }
 
@@ -571,8 +571,8 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke
   -moz-image-region: rect(46px, 648px, 69px, 638px);
 }
 
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[chromedir="rtl"]:hover:active:not([disabled]),
-toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"][chromedir="rtl"] {
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker:-moz-locale-dir(rtl):hover:active:not([disabled]),
+toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarker[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 580px, 69px, 571px);
 }
 
@@ -1461,7 +1461,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/icons/chevron.png") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/icons/chevron-rtl.png") !important;
 }
 
@@ -1663,15 +1663,15 @@ tabbrowser > tabbox > tabpanels {
   border: none;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="ltr"],
-.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:-moz-locale-dir(rtl) {
   border-right: 2px solid;
   -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[chromedir="ltr"],
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:-moz-locale-dir(ltr),
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
   border-left: 2px solid;
   -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
diff --git a/browser/themes/pinstripe/browser/places/organizer.css b/browser/themes/pinstripe/browser/places/organizer.css
index a997a0e6a4ad..a5805a922109 100644
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -96,7 +96,7 @@
   border-right: none;
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 67px, 23px, 34px);
 }
 
@@ -104,7 +104,7 @@
  -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
-#back-button[disabled="true"][chromedir="rtl"] {
+#back-button[disabled="true"]:-moz-locale-dir(rtl) {
  -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
 }
 
@@ -114,9 +114,9 @@
   -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
-#back-button:hover:active[chromedir="rtl"],
-#back-button[buttondown="true"][chromedir="rtl"],
-#back-button[open="true"][chromedir="rtl"] {
+#back-button:hover:active:-moz-locale-dir(rtl),
+#back-button[buttondown="true"]:-moz-locale-dir(rtl),
+#back-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
@@ -136,7 +136,7 @@
   border-right: none;
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 34px, 23px, 0px);
 }
 
@@ -144,7 +144,7 @@
   -moz-image-region: rect(23px, 67px, 46px, 34px) !important;
 }
 
-#forward-button[disabled="true"][chromedir="rtl"] {
+#forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(23px, 34px, 46px, 0px) !important;
 }
 
@@ -154,9 +154,9 @@
   -moz-image-region: rect(46px, 67px, 69px, 34px);
 }
 
-#forward-button:hover:active[chromedir="rtl"],
-#forward-button[buttondown="true"][chromedir="rtl"],
-#forward-button[open="true"][chromedir="rtl"] {
+#forward-button:hover:active:-moz-locale-dir(rtl),
+#forward-button[buttondown="true"]:-moz-locale-dir(rtl),
+#forward-button[open="true"]:-moz-locale-dir(rtl) {
   -moz-image-region: rect(46px, 34px, 69px, 0px);
 }
 
@@ -169,10 +169,10 @@
   background: url("chrome://browser/skin/places/menubutton-end-pressed.png") right center no-repeat;
 }
 
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"] {
   background: url("chrome://browser/skin/places/menubutton-end-rtl.png") left center no-repeat;
 }
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"][open="true"] {
   background: url("chrome://browser/skin/places/menubutton-end-pressed-rtl.png") left center no-repeat;
 }
 
@@ -192,10 +192,10 @@
   background: url("chrome://browser/skin/places/menubutton-start-pressed.png") left center no-repeat;
 }
 
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"] > .toolbarbutton-icon {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"] > .toolbarbutton-icon {
   background: url("chrome://browser/skin/places/menubutton-start-rtl.png") right center no-repeat;
 }
-#placesToolbar[chromedir="rtl"] > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
+#placesToolbar:-moz-locale-dir(rtl) > toolbarbutton[type="menu"][open="true"] > .toolbarbutton-icon {
   background: url("chrome://browser/skin/places/menubutton-start-pressed-rtl.png") right center no-repeat;
 }
 
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index ef80b3b52770..59a7325afb57 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -45,7 +45,7 @@
   padding: 0;
 }
 
-.searchbar-engine-button[chromedir="rtl"] {
+.searchbar-engine-button:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-rtl.png");
 }
 
@@ -53,7 +53,7 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused.png");
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png");
 }
 
@@ -61,7 +61,7 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite.png");
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/startcap-focused-graphite-rtl.png");
 }
 
@@ -70,8 +70,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
 }
 
-.searchbar-engine-button:hover:active[chromedir="rtl"],
-.searchbar-engine-button[open="true"][chromedir="rtl"] {
+.searchbar-engine-button:hover:active:-moz-locale-dir(rtl),
+.searchbar-engine-button[open="true"]:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-rtl.png") !important;
 }
 
@@ -80,8 +80,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important;
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active,
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):active,
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important;
 }
 
@@ -90,8 +90,8 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite.png") !important;
 }
 
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active:-moz-system-metric(mac-graphite-theme),
-.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:-moz-locale-dir(rtl):active:-moz-system-metric(mac-graphite-theme),
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"]:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-graphite-rtl.png") !important;
 }
 
@@ -118,7 +118,7 @@
   -moz-padding-end: 5px;
 }
 
-.search-go-container[chromedir="rtl"] {
+.search-go-container:-moz-locale-dir(rtl) {
   background-image: url("chrome://browser/skin/urlbar/endcap-rtl.png");
 }
 
@@ -126,7 +126,7 @@
   background-image: url("chrome://browser/skin/urlbar/endcap-focused.png");
 }
 
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"] {
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-locale-dir(rtl) {
   background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top;
 }
 
@@ -134,7 +134,7 @@
   background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite.png");
 }
 
-.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"]:-moz-system-metric(mac-graphite-theme) {
+.searchbar-textbox[focused="true"] > .search-go-container:-moz-locale-dir(rtl):-moz-system-metric(mac-graphite-theme) {
   background-image: url("chrome://browser/skin/urlbar/endcap-focused-graphite-rtl.png");
 }
 
diff --git a/browser/themes/winstripe/browser/browser-aero.css b/browser/themes/winstripe/browser/browser-aero.css
index c56d77198b51..8b4176cbfef1 100644
--- a/browser/themes/winstripe/browser/browser-aero.css
+++ b/browser/themes/winstripe/browser/browser-aero.css
@@ -18,20 +18,20 @@
 
 /* ::::: Identity Indicator Styling ::::: */
 
-#urlbar[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#urlbar:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 9px;
 }
 
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: -7px;
 }
 
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-border-radius: 11px 0 2px 11px / 15px 0 2px 15px;
 }
 
-/* Match #identity-box[chromedir="ltr"]'s -moz-margin-start */
-#identity-popup[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+/* Match #identity-box:-moz-locale-dir(ltr)'s -moz-margin-start */
+#identity-popup:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 7px;
 }
 
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index aad9b4beab69..1b0af9a5a714 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -248,16 +248,16 @@ toolbar[iconsize="large"][mode="icons"] #back-button:not([disabled="true"]):hove
 
 /* unified back button with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 516px 34px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(34px 516px 68px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(68px 516px 102px 480px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(102px 516px 136px 480px);
 }
 
@@ -284,16 +284,16 @@ toolbar[iconsize="large"][mode="icons"] #forward-button:not([disabled="true"]):h
 
 /* unified forward button with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(3px 480px 31px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(37px 480px 65px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(71px 480px 99px 454px);
 }
-toolbar[iconsize="large"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 480px 133px 454px);
 }
 
@@ -331,16 +331,16 @@ toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:not([disabled="
 
 /* unified dropmarker with keyhole icons, RTL version */
 
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(3px 454px 31px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(37px 454px 65px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(71px 454px 99px 438px);
 }
-toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="large"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(105px 454px 133px 438px);
 }
 
@@ -368,16 +368,16 @@ toolbar[iconsize="small"][mode="icons"] #back-button:not([disabled="true"]):hove
 
 /* unified back button with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 362px 24px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 362px 48px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 362px 72px 338px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 362px 96px 338px);
 }
 
@@ -398,16 +398,16 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:not([disabled="true"]):h
 
 /* unified forward button with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 338px 24px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 338px 48px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 338px 72px 314px);
 }
-toolbar[iconsize="small"][mode="icons"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 338px 96px 314px);
 }
 
@@ -429,16 +429,16 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:not([disabled="
 
 /* unified dropmarker with keyhole icons, small icons mode, RTL version */
 
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"] {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 314px 24px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover {
   -moz-image-region: rect(24px 314px 48px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 314px 72px 301px);
 }
-toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(72px 314px 96px 301px);
 }
 
@@ -460,17 +460,17 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"
   -moz-image-region: rect(96px 24px 120px 0px);
 }
 
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
-#back-button[chromedir="rtl"]:not([disabled="true"]):hover,
-#back-button[chromedir="rtl"][buttonover="true"] {
+#back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+#back-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(24px 48px 48px 24px);
 }
-#back-button[chromedir="rtl"][disabled="true"] {
+#back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 48px 72px 24px);
 }
-#back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+#back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(96px 48px 120px 24px);
 }
 
@@ -490,17 +490,17 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[chromedir="rtl"
   -moz-image-region: rect(96px 48px 120px 24px);
 }
 
-#forward-button[chromedir="rtl"] {
+#forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 24px 24px 0px); 
 }
-#forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
-#forward-button[chromedir="rtl"][buttonover="true"] {
+#forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+#forward-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(24px 24px 48px 0px);
 }
-#forward-button[chromedir="rtl"][disabled="true"] {
+#forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px 24px 72px 0px);
 }
-#forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+#forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(96px 24px 120px 0px);
 }
 
@@ -727,21 +727,21 @@ toolbar[iconsize="small"] #back-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 
-toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover,
-toolbar[iconsize="small"] #back-button[chromedir="rtl"][buttonover="true"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(32px 32px 48px 16px);
 }
-toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] #back-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 .unified-nav-back[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-forward[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-forward[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
@@ -764,21 +764,21 @@ toolbar[iconsize="small"] #forward-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px 16px 16px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"][buttonover="true"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover,
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl)[buttonover="true"] {
   -moz-image-region: rect(16px 16px 32px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"][disabled="true"] {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(32px 16px 48px 0px);
 }
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] #forward-button:-moz-locale-dir(rtl):not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 .unified-nav-forward[_moz-menuactive],
-menupopup[chromedir="rtl"] > .unified-nav-back[_moz-menuactive] {
+menupopup:-moz-locale-dir(rtl) > .unified-nav-back[_moz-menuactive] {
   list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
@@ -1101,7 +1101,7 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   direction: ltr !important;
 }
 
-#PopupAutoComplete[chromedir="rtl"] > tree > treerows {
+#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
   direction: rtl;
 }
 
@@ -1508,7 +1508,7 @@ tabpanels {
   -moz-border-radius-topright: 2px;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) {
   border-left-style: solid;
   border-right-style: none;
   -moz-border-radius-topleft: 2px;
@@ -1527,16 +1527,16 @@ tabpanels {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-right.png");
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down[chromedir="rtl"],
-.tabs-container > .tabs-newtab-button[chromedir="rtl"],
-.tabs-container > stack[chromedir="rtl"] > .tabs-alltabs-button {
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl),
+.tabs-container > .tabs-newtab-button:-moz-locale-dir(rtl),
+.tabs-container > stack:-moz-locale-dir(rtl) > .tabs-alltabs-button {
   border-left-style: none;
   border-right-style: solid;
   -moz-border-radius-topleft: 0px;
   -moz-border-radius-topright: 2px;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-down[chromedir="rtl"] {
+.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
 }
 
@@ -1592,7 +1592,7 @@ tabpanels {
   opacity: 0.0;
 }
 
-stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
+stack:-moz-locale-dir(rtl) > hbox > .tabs-alltabs-box-animate {
   background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-start-bkgnd-animate.png");
 }
 
@@ -1643,7 +1643,7 @@ stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate {
   -moz-border-radius-topleft: 2px;
 }
 
-.tabs-container > .tabs-closebutton[chromedir="rtl"] {
+.tabs-container > .tabs-closebutton:-moz-locale-dir(rtl) {
   border-left: none;
   border-right: 1px solid threedshadow;
   -moz-border-radius-topleft: 0px;
@@ -1660,7 +1660,7 @@ toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
-toolbarbutton.chevron[chromedir="rtl"] {
+toolbarbutton.chevron:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/toolbar/chevron-rtl.gif") !important;
 }
 
@@ -1712,13 +1712,13 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
   -moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker {
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker {
   border-left: 1px solid;
   -moz-border-left-colors: transparent;
 }
 
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker:hover ,
-#urlbar[chromedir="ltr"] > .autocomplete-history-dropmarker[open="true"] {
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker:hover ,
+#urlbar:-moz-locale-dir(ltr) > .autocomplete-history-dropmarker[open="true"] {
   -moz-border-left-colors: ButtonShadow;
 }
 
@@ -1802,7 +1802,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 /* ::::: Identity Indicator Styling ::::: */
 /* Location bar visuals*/
 
-#urlbar[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#urlbar:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 6px;
 }
 
@@ -1818,10 +1818,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-box-shadow: 1px 1px 0 rgba(255,255,255,.3) inset,
                    0 -1px 0 rgba(255,255,255,.2) inset;
 }
-#identity-box[chromedir="rtl"] {
+#identity-box:-moz-locale-dir(ltr) {
   -moz-border-start-style: solid;
 }
-#identity-box[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-box:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-border-radius: 6px 0 2px 6px / 15px 0 2px 15px;
   margin: -1px 0;
   -moz-margin-start: -4px;
@@ -1980,7 +1980,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 /* Bug 413060, comment 14: Match #identity-box's -moz-margin-start, less 1px */
-#identity-popup[chromedir="ltr"]:-moz-system-metric(windows-default-theme) {
+#identity-popup:-moz-locale-dir(ltr):-moz-system-metric(windows-default-theme) {
   -moz-margin-start: 3px;
 }
 
diff --git a/browser/themes/winstripe/browser/places/organizer.css b/browser/themes/winstripe/browser/places/organizer.css
index f2b5d494c1fe..6eb2e9d9c161 100644
--- a/browser/themes/winstripe/browser/places/organizer.css
+++ b/browser/themes/winstripe/browser/places/organizer.css
@@ -20,36 +20,36 @@
 }
 
 #back-button,
-#forward-button[chromedir="rtl"] {  
+#forward-button:-moz-locale-dir(rtl) {  
   -moz-image-region: rect(0px, 24px, 24px, 0px);
 }
 #back-button:not([disabled="true"]):hover,
-#forward-button:not([disabled="true"]):hover[chromedir="rtl"] {
+#forward-button:not([disabled="true"]):hover:-moz-locale-dir(rtl) {
   -moz-image-region: rect(24px, 24px, 48px, 0px);
 }
 #back-button[disabled="true"],
-#forward-button[chromedir="rtl"][disabled="true"] {
+#forward-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px, 24px, 72px, 0px) !important;
 }
 #back-button:not([disabled="true"]):hover:active,
-#forward-button:not([disabled="true"]):hover:active[chromedir="rtl"] {
+#forward-button:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) {
   -moz-image-region: rect(72px, 24px, 96px, 0px);
 }
 
 #forward-button,
-#back-button[chromedir="rtl"] {
+#back-button:-moz-locale-dir(rtl) {
   -moz-image-region: rect(0px, 48px, 24px, 24px);
 }
 #forward-button:not([disabled="true"]):hover,
-#back-button:not([disabled="true"]):hover[chromedir="rtl"] {
+#back-button:not([disabled="true"]):hover:-moz-locale-dir(rtl) {
   -moz-image-region: rect(24px, 48px, 48px, 24px);
 }
 #forward-button[disabled="true"],
-#back-button[chromedir="rtl"][disabled="true"] {
+#back-button:-moz-locale-dir(rtl)[disabled="true"] {
   -moz-image-region: rect(48px, 48px, 72px, 24px) !important;
 }
 #forward-button:not([disabled="true"]):hover:active,
-#back-button:not([disabled="true"]):hover:active[chromedir="rtl"] {
+#back-button:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) {
   -moz-image-region: rect(72px, 48px, 96px, 24px);
 }
 
@@ -94,7 +94,7 @@
   background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat;
 }
 
-#placesMenu[chromedir="rtl"] > menu > label {
+#placesMenu:-moz-locale-dir(rtl) > menu > label {
   background-position: left center;
 }
 
diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css
index 7684ba79fa6d..6656a4b5044a 100644
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -45,7 +45,7 @@
                    0 -1px 0 rgba(255,255,255,.4) inset;
 }
 
-.searchbar-engine-button:-moz-system-metric(windows-default-theme)[chromedir="ltr"] {
+.searchbar-engine-button:-moz-system-metric(windows-default-theme):-moz-locale-dir(ltr) {
   -moz-border-right-colors: rgba(0,0,0,.05);
 }
 
@@ -68,7 +68,7 @@
   background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat right center;
 }
 
-.searchbar-engine-button[addengines="true"][chromedir="rtl"] > .button-box {
+.searchbar-engine-button[addengines="true"]:-moz-locale-dir(rtl) > .button-box {
   background-position: left center;
 }
 
@@ -94,7 +94,7 @@
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
-.search-go-button[chromedir="rtl"] {
+.search-go-button:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 37197b9228ec..ea075f5599e1 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -105,8 +105,8 @@ class nsIBoxObject;
 
 // IID for the nsIDocument interface
 #define NS_IDOCUMENT_IID      \
-  { 0x46003091, 0x7f99, 0x420f, \
-  { 0x95, 0xbc, 0x28, 0xd7, 0xd5, 0x01, 0x5a, 0x41 } }
+{ 0xe0ca6723, 0x1efa, 0x4819, \
+  { 0x84, 0xbb, 0xfa, 0x48, 0x39, 0xe8, 0xef, 0x19 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -1156,6 +1156,15 @@ public:
    */
   virtual void MaybePreLoadImage(nsIURI* uri) = 0;
 
+  /**
+   * Returns true if the locale used for the document specifies a direction of
+   * right to left. For chrome documents, this comes from the chrome registry.
+   * This is used to determine the current state for the :-moz-locale-dir pseudoclass
+   * so once can know whether a document is expected to be rendered left-to-right
+   * or right-to-left.
+   */
+  virtual PRBool IsDocumentRightToLeft() { return PR_FALSE; }
+
 protected:
   ~nsIDocument()
   {
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index d2b6957323c2..ac97d1d4043d 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -503,6 +503,7 @@ GK_ATOM(listing, "listing")
 GK_ATOM(listitem, "listitem")
 GK_ATOM(listrows, "listrows")
 GK_ATOM(load, "load")
+GK_ATOM(localedir, "localedir")
 GK_ATOM(localName, "local-name")
 GK_ATOM(longdesc, "longdesc")
 #ifdef MOZ_MEDIA
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 3bb92cfc1c7a..6ed33863613c 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1119,6 +1119,15 @@ nsXULElement::AfterSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
             SetTitlebarColor(color, aName == nsGkAtoms::activetitlebarcolor);
         }
 
+        // if the localedir changed on the root element, reset the document direction
+        if (aName == nsGkAtoms::localedir &&
+            document && document->GetRootContent() == this) {
+            nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
+            if (xuldoc) {
+                xuldoc->ResetDocumentDirection();
+            }
+        }
+
         if (aName == nsGkAtoms::src && document) {
             LoadSrc();
         }
@@ -1365,6 +1374,15 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify)
             SetTitlebarColor(NS_RGBA(0, 0, 0, 0), aName == nsGkAtoms::activetitlebarcolor);
         }
 
+        // if the localedir changed on the root element, reset the document direction
+        if (aName == nsGkAtoms::localedir &&
+            doc && doc->GetRootContent() == this) {
+            nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
+            if (xuldoc) {
+                xuldoc->ResetDocumentDirection();
+            }
+        }
+
         // If the accesskey attribute is removed, unregister it here
         // Also see nsXULLabelFrame, nsBoxFrame and nsTextBoxFrame's AttributeChanged
         if (aName == nsGkAtoms::accesskey || aName == nsGkAtoms::control) {
@@ -1793,8 +1811,7 @@ nsXULElement::GetAttributeChangeHint(const nsIAtom* aAttribute,
         retval = NS_STYLE_HINT_FRAMECHANGE;
     } else {
         // if left or top changes we reflow. This will happen in xul
-        // containers that manage positioned children such as a
-        // bulletinboard.
+        // containers that manage positioned children such as a stack.
         if (nsGkAtoms::left == aAttribute || nsGkAtoms::top == aAttribute)
             retval = NS_STYLE_HINT_REFLOW;
     }
diff --git a/content/xul/document/public/nsIXULDocument.h b/content/xul/document/public/nsIXULDocument.h
index bcc30d03a723..a6b04e85d3d7 100644
--- a/content/xul/document/public/nsIXULDocument.h
+++ b/content/xul/document/public/nsIXULDocument.h
@@ -122,6 +122,11 @@ public:
    * Callback notifying when a document could not be parsed properly.
    */
   virtual PRBool OnDocumentParserError() = 0;
+
+  /**
+   * Reset the document direction so that it is recomputed.
+   */
+  virtual void ResetDocumentDirection() = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULDocument, NS_IXULDOCUMENT_IID)
diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in
index f7db62fb4941..f205e1b8772f 100644
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -95,7 +95,10 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
+		  -I$(srcdir)/../../../../layout/base \
+		  -I$(srcdir)/../../../../layout/generic \
 		  -I$(srcdir)/../../../../layout/style \
+		  -I$(srcdir)/../../../../layout/xul/base/src \
 		  -I$(srcdir)/../../../xml/document/src \
 		  -I$(srcdir)/../../../events/src \
 		  $(NULL)
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index 51535642bf01..b3be0dd04bdb 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -126,6 +126,7 @@
 #include "nsXULPopupManager.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsURILoader.h"
+#include "nsCSSFrameConstructor.h"
 
 //----------------------------------------------------------------------
 //
@@ -222,6 +223,7 @@ nsRefMapEntry::RemoveContent(nsIContent* aContent)
 
 nsXULDocument::nsXULDocument(void)
     : nsXMLDocument("application/vnd.mozilla.xul+xml"),
+      mDocDirection(Direction_Uninitialized),
       mState(eState_Master),
       mResolutionPhase(nsForwardReference::eStart)
 {
@@ -260,6 +262,10 @@ nsXULDocument::~nsXULDocument()
 
     delete mTemplateBuilderTable;
 
+    nsContentUtils::UnregisterPrefCallback("intl.uidirection.",
+                                           nsXULDocument::DirectionChanged,
+                                           this);
+
     if (--gRefCnt == 0) {
         NS_IF_RELEASE(gRDFService);
 
@@ -1989,6 +1995,10 @@ nsXULDocument::Init()
         }
     }
 
+    nsContentUtils::RegisterPrefCallback("intl.uidirection.",
+                                         nsXULDocument::DirectionChanged,
+                                         this);
+
 #ifdef PR_LOGGING
     if (! gXULLog)
         gXULLog = PR_NewLogModule("nsXULDocument");
@@ -4627,6 +4637,100 @@ nsXULDocument::GetFocusController(nsIFocusController** aFocusController)
         *aFocusController = nsnull;
 }
 
+PRBool
+nsXULDocument::IsDocumentRightToLeft()
+{
+    if (mDocDirection == Direction_Uninitialized) {
+        mDocDirection = Direction_LeftToRight; // default to ltr on failure
+
+        // setting the localedir attribute on the root element forces a
+        // specific direction for the document.
+        nsIContent* content = GetRootContent();
+        if (content) {
+            static nsIContent::AttrValuesArray strings[] =
+                {&nsGkAtoms::ltr, &nsGkAtoms::rtl, nsnull};
+            switch (content->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::localedir,
+                                             strings, eCaseMatters)) {
+                case 0: mDocDirection = Direction_LeftToRight; return PR_FALSE;
+                case 1: mDocDirection = Direction_RightToLeft; return PR_TRUE;
+                default: break;// otherwise, not a valid value, so fall through
+            }
+        }
+
+        // otherwise, get the locale from the chrome registry and
+        // look up the intl.uidirection.<locale> preference
+        nsCOMPtr<nsIXULChromeRegistry> reg =
+            do_GetService(NS_CHROMEREGISTRY_CONTRACTID);
+        if (reg) {
+            nsCAutoString package;
+            PRBool isChrome;
+            if (NS_SUCCEEDED(mDocumentURI->SchemeIs("chrome", &isChrome)) &&
+                isChrome) {
+                mDocumentURI->GetHostPort(package);
+            }
+            else {
+                // use the 'global' package for about and resource uris.
+                // otherwise, just default to left-to-right.
+                PRBool isAbout, isResource;
+                if (NS_SUCCEEDED(mDocumentURI->SchemeIs("about", &isAbout)) &&
+                    isAbout) {
+                    package.AssignLiteral("global");
+                }
+                else if (NS_SUCCEEDED(mDocumentURI->SchemeIs("resource", &isResource)) &&
+                    isResource) {
+                    package.AssignLiteral("global");
+                }
+                else {
+                    return PR_FALSE;
+                }
+            }
+
+            nsCAutoString locale;
+            reg->GetSelectedLocale(package, locale);
+            if (locale.Length() >= 2) {
+                // first check the intl.uidirection.<locale> preference,
+                // and if that is not set, check the same preference but
+                // with just the first two characters of the locale. If
+                // that isn't set, default to left-to-right.
+                nsCAutoString prefString =
+                    NS_LITERAL_CSTRING("intl.uidirection.") + locale;
+                nsAdoptingCString dir = nsContentUtils::GetCharPref(prefString.get());
+                if (dir.IsEmpty()) {
+                    PRInt32 hyphen = prefString.FindChar('-');
+                    if (hyphen >= 1) {
+                        nsCAutoString shortPref(Substring(prefString, 0, hyphen));
+                        dir = nsContentUtils::GetCharPref(shortPref.get());
+                    }
+                }
+
+                mDocDirection = dir.EqualsLiteral("rtl") ?
+                                Direction_RightToLeft : Direction_LeftToRight;
+            }
+        }
+    }
+
+    return (mDocDirection == Direction_RightToLeft);
+}
+
+int
+nsXULDocument::DirectionChanged(const char* aPrefName, void* aData)
+{
+  // reset the direction and reflow the document. This will happen if
+  // the direction isn't actually being used, but that doesn't really
+  // matter too much
+  nsXULDocument* doc = (nsXULDocument *)aData;
+  if (doc)
+      doc->ResetDocumentDirection();
+
+  nsIPresShell *shell = doc->GetPrimaryShell();
+  if (shell) {
+      shell->FrameConstructor()->
+          PostRestyleEvent(doc->GetRootContent(), eReStyle_Self, NS_STYLE_HINT_NONE);
+  }
+
+  return 0;
+}
+
 NS_IMETHODIMP
 nsXULDocument::GetBoxObjectFor(nsIDOMElement* aElement, nsIBoxObject** aResult)
 {
diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h
index 447aa843ecca..48c26ccd080e 100644
--- a/content/xul/document/src/nsXULDocument.h
+++ b/content/xul/document/src/nsXULDocument.h
@@ -182,6 +182,10 @@ public:
 
     virtual void EndUpdate(nsUpdateType aUpdateType);
 
+    virtual PRBool IsDocumentRightToLeft();
+
+    virtual void ResetDocumentDirection() { mDocDirection = Direction_Uninitialized; }
+
     static PRBool
     MatchAttribute(nsIContent* aContent,
                    PRInt32 aNameSpaceID,
@@ -244,7 +248,8 @@ protected:
         return kNameSpaceID_XUL;
     }
 
-protected:
+    static NS_HIDDEN_(int) DirectionChanged(const char* aPrefName, void* aData);
+
     // pseudo constants
     static PRInt32 gRefCnt;
 
@@ -326,6 +331,17 @@ protected:
 
     nsCOMPtr<nsIDOMNode>    mTooltipNode;          // [OWNER] element triggering the tooltip
 
+    /**
+     * document direction for use with the -moz-locale-dir property
+     */
+    enum DocumentDirection {
+      Direction_Uninitialized, // not determined yet
+      Direction_LeftToRight,
+      Direction_RightToLeft
+    };
+
+    DocumentDirection               mDocDirection;
+
     /**
      * Context stack, which maintains the state of the Builder and allows
      * it to be interrupted.
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 4c340b795fe4..e30a329af8b7 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -3313,6 +3313,14 @@ CSSParserImpl::ParsePseudoClassWithIdentArg(nsCSSSelector& aSelector,
     return eSelectorParsingStatus_Error;
   }
 
+  // -moz-locale-dir can only have values of 'ltr' or 'rtl'.
+  if (aPseudo == nsCSSPseudoClasses::mozLocaleDir) {
+    if (!mToken.mIdent.EqualsLiteral("ltr") &&
+        !mToken.mIdent.EqualsLiteral("rtl")) {
+      return eSelectorParsingStatus_Error;
+    }
+  }
+
   // Add the pseudo with the language parameter
   aSelector.AddPseudoClass(aPseudo, mToken.mIdent.get());
 
diff --git a/layout/style/nsCSSPseudoClassList.h b/layout/style/nsCSSPseudoClassList.h
index 113b67fbb45f..d61c97bddd3a 100644
--- a/layout/style/nsCSSPseudoClassList.h
+++ b/layout/style/nsCSSPseudoClassList.h
@@ -104,6 +104,10 @@ CSS_PSEUDO_CLASS(mozIsHTML, ":-moz-is-html")
 // Matches anything when the specified look-and-feel metric is set
 CSS_PSEUDO_CLASS(mozSystemMetric, ":-moz-system-metric")
 
+// -moz-locale-dir(ltr) and -moz-locale-dir(rtl) may be used
+// to match based on the locale's chrome direction
+CSS_PSEUDO_CLASS(mozLocaleDir, ":-moz-locale-dir")
+
 #ifdef MOZ_MATHML
 CSS_PSEUDO_CLASS(mozMathIncrementScriptLevel, ":-moz-math-increment-script-level")
 #endif
diff --git a/layout/style/nsCSSPseudoClasses.cpp b/layout/style/nsCSSPseudoClasses.cpp
index bff32293bc67..a37e17f1585f 100644
--- a/layout/style/nsCSSPseudoClasses.cpp
+++ b/layout/style/nsCSSPseudoClasses.cpp
@@ -73,7 +73,8 @@ nsCSSPseudoClasses::HasStringArg(nsIAtom* aAtom)
 {
   return aAtom == nsCSSPseudoClasses::lang ||
          aAtom == nsCSSPseudoClasses::mozEmptyExceptChildrenWithLocalname ||
-         aAtom == nsCSSPseudoClasses::mozSystemMetric;
+         aAtom == nsCSSPseudoClasses::mozSystemMetric ||
+         aAtom == nsCSSPseudoClasses::mozLocaleDir;
 }
 
 PRBool
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 30323316a7f3..a25fcafc9e76 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -1558,6 +1558,27 @@ static PRBool SelectorMatches(RuleProcessorData &data,
     else if (nsCSSPseudoClasses::mozIsHTML == pseudoClass->mAtom) {
       result = data.mIsHTMLContent && data.mContent->IsInHTMLDocument();
     }
+    else if (nsCSSPseudoClasses::mozLocaleDir == pseudoClass->mAtom) {
+      nsIDocument* doc = data.mContent ? data.mContent->GetDocument() :
+                                         data.mPresContext->Document();
+
+      if (doc) {
+        PRBool docIsRTL = doc && doc->IsDocumentRightToLeft();
+
+        nsDependentString dirString(pseudoClass->u.mString);
+        NS_ASSERTION(dirString.EqualsLiteral("ltr") || dirString.EqualsLiteral("rtl"),
+                     "invalid value for -moz-locale-dir");
+
+        if (dirString.EqualsLiteral("rtl")) {
+          result = docIsRTL;
+        } else if (dirString.EqualsLiteral("ltr")) {
+          result = !docIsRTL;
+        }
+      }
+      else {
+        result = PR_FALSE;
+      }
+    }
 #ifdef MOZ_MATHML
     else if (nsCSSPseudoClasses::mozMathIncrementScriptLevel == pseudoClass->mAtom) {
       stateToCheck = NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL;
@@ -2069,6 +2090,14 @@ nsCSSRuleProcessor::HasAttributeDependentStyle(AttributeRuleProcessorData* aData
   // XXXbz now that :link and :visited are also states, do we need a
   // similar optimization in HasStateDependentStyle?
 
+  // check for the localedir attribute on root XUL elements
+  if (aData->mAttribute == nsGkAtoms::localedir &&
+      aData->mNameSpaceID == kNameSpaceID_XUL &&
+      aData->mContent == aData->mContent->GetOwnerDoc()->GetRootContent())
+  {
+    data.change = nsReStyleHint(data.change | eReStyle_Self);
+  }
+
   RuleCascadeData* cascade = GetRuleCascade(aData->mPresContext);
 
   // We do the same thing for attributes that we do for state selectors
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index 63b72a8b2612..d7a477066e21 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -632,6 +632,16 @@ function run() {
     test_selector_in_html("html|a:not(*|a)", single_a, empty_set, set_single,
                           xul_default_ns + html_ns);
 
+    // Test -moz-locale-dir
+    test_parseable(":-moz-locale-dir(ltr)");
+    test_parseable(":-moz-locale-dir(rtl)");
+
+    test_balanced_unparseable(":-moz-locale-dir(other)");
+    test_balanced_unparseable(":-moz-locale-dir()");
+    test_balanced_unparseable(":-moz-locale-dir('ltr')");
+    test_balanced_unparseable(":-moz-locale-dir(ltr, other)");
+    test_balanced_unparseable(":-moz-locale-dir");
+
     run_deferred_tests();
 }
 
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index a5bae40372b3..4bd02803f00e 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -910,6 +910,11 @@ pref("intl.locale.matchOS",                 false);
 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
 pref("font.language.group",                 "chrome://global/locale/intl.properties");
 
+// these locales have right-to-left UI
+pref("intl.uidirection.ar", "rtl");
+pref("intl.uidirection.he", "rtl");
+pref("intl.uidirection.fa", "rtl");
+
 pref("font.mathfont-family", "STIXNonUnicode, STIXSize1, STIXGeneral, Standard Symbols L, DejaVu Sans, Cambria Math");
 
 // Some CJK fonts have bad underline offset, their CJK character glyphs are overlapped (or adjoined)  to its underline.
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0492b1855877..9a8a78e50cad 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -45,7 +45,6 @@
 
 <!DOCTYPE window [
   <!ENTITY % console SYSTEM "chrome://global/locale/console.dtd"> %console;
-  <!ENTITY % global SYSTEM "chrome://global/locale/global.dtd"> %global;
 ]>
 
 <window id="JSConsoleWindow"
@@ -93,9 +92,9 @@
     </popup>
   </popupset>
   
-  <toolbox id="console-toolbox" chromedir="&locale.dir;">
+  <toolbox id="console-toolbox">
     <toolbar class="chromeclass-toolbar" id="ToolbarMode">
-      <hbox id="viewGroup" chromedir="&locale.dir;">
+      <hbox id="viewGroup">
         <toolbarbutton type="radio" group="mode" id="Console:modeAll" 
                        label="&all.label;" accesskey="&all.accesskey;"
                        oncommand="changeMode('All');"/>
diff --git a/toolkit/components/help/content/help.xul b/toolkit/components/help/content/help.xul
index fab7524a2eb7..cf3a766cfae4 100644
--- a/toolkit/components/help/content/help.xul
+++ b/toolkit/components/help/content/help.xul
@@ -46,8 +46,6 @@
     %brandDTD;
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
-    <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-    %globalDTD;
 ]>
 
 <window id="help"
@@ -153,20 +151,18 @@
                 src="chrome://help/locale/help.properties"/>
 
     <toolbox id="help-toolbox" class="toolbox-top">
-      <toolbar id="HelpToolbar" class="chromeclass-toolbar" chromedir="&locale.dir;">
+      <toolbar id="HelpToolbar" class="chromeclass-toolbar">
         <toolbarbutton id="help-back-button" type="menu-button"
                        label="&backButton.label;"
                        oncommand="if (event.target == this) goBack(); else gotoHistoryIndex(event);"
                        observes="canGoBack" context="backMenu"
-                       tooltiptext="&backButton.tooltip;"
-                       chromedir="&locale.dir;">
+                       tooltiptext="&backButton.tooltip;">
           <menupopup context="" onpopupshowing="createBackMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="help-forward-button" type="menu-button"
                        oncommand="if (event.target == this) goForward(); else gotoHistoryIndex(event);"
                        tooltiptext="&forwardButton.tooltip;"
-                       observes="canGoForward"
-                       chromedir="&locale.dir;">
+                       observes="canGoForward">
           <menupopup context="" onpopupshowing="createForwardMenu(event);"/>
         </toolbarbutton>
         <toolbarbutton id="help-home-button"
diff --git a/toolkit/components/help/content/helpContextOverlay.xul b/toolkit/components/help/content/helpContextOverlay.xul
index 4dff985f32a1..9f9af91e75a4 100644
--- a/toolkit/components/help/content/helpContextOverlay.xul
+++ b/toolkit/components/help/content/helpContextOverlay.xul
@@ -38,8 +38,6 @@
 <!DOCTYPE overlay [
     <!ENTITY % helpDTD SYSTEM "chrome://help/locale/help.dtd">
     %helpDTD;
-    <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-    %globalDTD;
 ]>
 <overlay id="contentAreaContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -52,13 +50,11 @@
                 label="&backButton.label;"
                 accesskey="&backButton.accesskey;"
                 observes="canGoBack"
-                chromedir="&locale.dir;"
                 oncommand="goBack()"/>
       <menuitem id="context-forward"
                 label="&forwardButton.label;"
                 accesskey="&forwardButton.accesskey;"
                 observes="canGoForward"
-                chromedir="&locale.dir;"
                 oncommand="goForward()"/>
       <menuseparator/>
       <menuitem id="context-copy"
diff --git a/toolkit/components/printing/content/printPreviewBindings.xml b/toolkit/components/printing/content/printPreviewBindings.xml
index 55ddc116425b..94d597fea40e 100644
--- a/toolkit/components/printing/content/printPreviewBindings.xml
+++ b/toolkit/components/printing/content/printPreviewBindings.xml
@@ -42,8 +42,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % printPreviewDTD SYSTEM "chrome://global/locale/printPreview.dtd" >
 %printPreviewDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="printPreviewBindings"
@@ -66,9 +64,9 @@
       <xul:vbox align="center" pack="center">
         <xul:label value="&page.label;" accesskey="&page.accesskey;" control="pageNumber"/>
       </xul:vbox>
-      <xul:toolbarbutton class="home-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="home-arrow tabbable"
         oncommand="parentNode.navigate(0, 0, 'home');" tooltiptext="&homearrow.tooltip;"/>
-      <xul:toolbarbutton class="left-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="left-arrow tabbable"
         oncommand="parentNode.navigate(-1, 0, 0);" tooltiptext="&leftarrow.tooltip;"/>
       <xul:hbox align="center" pack="center">
         <xul:textbox id="pageNumber" size="3" value="1" lastvalid="1"
@@ -76,9 +74,9 @@
         <xul:label value="&of.label;"/>
         <xul:label value="1"/>
       </xul:hbox>
-      <xul:toolbarbutton class="right-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="right-arrow tabbable"
         oncommand="parentNode.navigate(1, 0, 0);" tooltiptext="&rightarrow.tooltip;"/>
-      <xul:toolbarbutton class="end-arrow tabbable" chromedir="&locale.dir;"
+      <xul:toolbarbutton class="end-arrow tabbable"
         oncommand="parentNode.navigate(0, 0, 'end');" tooltiptext="&endarrow.tooltip;"/>
 
       <xul:toolbarseparator class="toolbarseparator-primary"/>
diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in
index eb3b95defd48..24415d55f440 100644
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -42,6 +42,9 @@ VPATH		= @srcdir@
 relativesrcdir  = toolkit/content/tests/chrome
 
 include $(DEPTH)/config/autoconf.mk
+
+DIRS = rtltest
+
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = 	findbar_window.xul \
@@ -86,6 +89,7 @@ _TEST_FILES = 	findbar_window.xul \
 		test_keys.xul \
 		window_keys.xul \
 		test_showcaret.xul \
+		test_righttoleft.xul \
 		$(NULL)
 
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in
new file mode 100644
index 000000000000..6bfec3fc2036
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/Makefile.in
@@ -0,0 +1,49 @@
+#
+# ***** 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) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir  = toolkit/content/tests/chrome/rtltest
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+libs:: righttoleft.manifest dirtest.xul
+	$(INSTALL) @srcdir@/righttoleft.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/
+	$(INSTALL) @srcdir@/dirtest.xul $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/content/
diff --git a/toolkit/content/tests/chrome/rtltest/dirtest.xul b/toolkit/content/tests/chrome/rtltest/dirtest.xul
new file mode 100644
index 000000000000..b75d41eaa3ad
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/dirtest.xul
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<html:style>
+hbox, vbox { background-color: white; }
+hbox:-moz-locale-dir(ltr) { background-color: yellow; }
+vbox:-moz-locale-dir(rtl) { background-color: green; }
+</html:style>
+
+<hbox id="hbox">
+  <button label="One"/>
+  <button label="Two"/>
+  <button label="Three"/>
+</hbox>
+<vbox id="vbox">
+  <button label="One"/>
+  <button label="Two"/>
+  <button label="Three"/>
+</vbox>
+
+</window>
diff --git a/toolkit/content/tests/chrome/rtltest/righttoleft.manifest b/toolkit/content/tests/chrome/rtltest/righttoleft.manifest
new file mode 100644
index 000000000000..db98656bce2d
--- /dev/null
+++ b/toolkit/content/tests/chrome/rtltest/righttoleft.manifest
@@ -0,0 +1,3 @@
+content ltrtest content/
+content rtltest content/
+locale rtltest ar-QA content/
diff --git a/toolkit/content/tests/chrome/test_righttoleft.xul b/toolkit/content/tests/chrome/test_righttoleft.xul
new file mode 100644
index 000000000000..3deb6d0140e2
--- /dev/null
+++ b/toolkit/content/tests/chrome/test_righttoleft.xul
@@ -0,0 +1,217 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet 
+  href="chrome://mochikit/content/tests/SimpleTest/test.css"
+  type="text/css"?>
+
+<window title="Right to Left UI Test"
+        onload="runTest()"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+  <body  xmlns="http://www.w3.org/1999/xhtml">
+    <p id="display"></p>
+    <div id="content" style="display: none">
+    </div>
+    <pre id="test">
+    </pre>
+  </body>
+
+  <iframe id="subframe" width="100" height="100" onload="frameLoaded();"/>
+
+  <script type="application/javascript">
+    <![CDATA[
+
+      /* This code is mostly copied from chrome/test/unit/head_crtestutils.js */
+      const NS_CHROME_MANIFESTS_FILE_LIST = "ChromeML";
+
+      const Cc = Components.classes;
+      const Ci = Components.interfaces;
+      const Cr = Components.results;
+
+      function ArrayEnumerator(array)
+      {
+        this.array = array;
+      }
+
+      ArrayEnumerator.prototype = {
+        pos: 0,
+        
+        hasMoreElements: function() {
+          return this.pos < this.array.length;
+        },
+        
+        getNext: function() {
+          if (this.pos < this.array.length)
+            return this.array[this.pos++];
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        QueryInterface: function(iid) {
+          if (iid.equals(Ci.nsISimpleEnumerator)
+           || iid.equals(Ci.nsISupports))
+            return this;
+
+          throw Cr.NS_ERROR_NO_INTERFACE;
+        }
+      };
+
+      function ChromeProvider(manifests)
+      {
+        this._manifests = manifests;
+      }
+
+      ChromeProvider.prototype = {
+        getFile: function(prop, persistent) {
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        getFiles: function(prop) {
+          if (prop == NS_CHROME_MANIFESTS_FILE_LIST) {
+            return new ArrayEnumerator(this._manifests);
+          }
+          throw Cr.NS_ERROR_FAILURE;
+        },
+
+        QueryInterface: function(iid) {
+          if (iid.equals(Ci.nsIDirectoryServiceProvider)
+           || iid.equals(Ci.nsIDirectoryServiceProvider2)
+           || iid.equals(Ci.nsISupports))
+            return this;
+
+          throw Cr.NS_ERROR_NO_INTERFACE;
+        }
+      };
+
+      let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
+                   getService(Ci.nsIDirectoryService);
+      function registerManifests(manifests)
+      {
+        let provider = new ChromeProvider(manifests);
+        dirSvc.registerProvider(provider);
+        return provider;
+      }
+
+      SimpleTest.waitForExplicitFinish();
+
+      // Disable XUL cache temporarily
+      let prefs = Cc["@mozilla.org/preferences-service;1"].
+                  getService(Ci.nsIPrefBranch);
+      const XUL_CACHE_PREF = "nglayout.debug.disable_xul_cache";
+      const UI_DIRECTION_PREF = "intl.uidirection.ar";
+      prefs.setBoolPref(XUL_CACHE_PREF, true);
+      prefs.setCharPref(UI_DIRECTION_PREF, "rtl");
+
+      // Register our manifest
+      let cr = Cc["@mozilla.org/chrome/chrome-registry;1"].
+               getService(Ci.nsIXULChromeRegistry);
+      let manifests = [];
+      let currentManifests = dirSvc.QueryInterface(Ci.nsIProperties)
+                                   .get(NS_CHROME_MANIFESTS_FILE_LIST,
+                                        Ci.nsISimpleEnumerator);
+      while (currentManifests.hasMoreElements())
+        manifests.push(currentManifests.getNext());
+
+      let ioService = Cc["@mozilla.org/network/io-service;1"].
+                        getService(Ci.nsIIOService);
+
+      let uri = ioService.newURI("chrome://mochikit/content/chrome/toolkit/content/tests/chrome/rtltest/", null, null);
+      uri = cr.convertChromeURL(uri);
+      let newChromePath = uri.QueryInterface(Ci.nsIFileURL).file;
+      manifests.push(newChromePath);
+      let provider = registerManifests(manifests);
+      cr.checkForNewChrome();
+      cr.refreshSkins();
+
+      function runTest()
+      {
+        var subframe = document.getElementById("subframe");
+        subframe.setAttribute("src", "chrome://ltrtest/content/dirtest.xul");
+      }
+
+      function frameLoaded()
+      {
+        var subframe = document.getElementById("subframe");
+        var subwin = subframe.contentWindow;
+        var subdoc = subframe.contentDocument;
+        var url = String(subwin.location);
+        if (url.indexOf("chrome://ltrtest") == 0) {
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "left to right with :-moz-locale-dir(ltr)");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(rtl)");
+
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction");
+
+          subdoc.documentElement.setAttribute("localedir", "rtl");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(ltr) and localedir='rtl'");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(0, 128, 0)", "left to right with :-moz-locale-dir(rtl) and localedir='rtl'");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "left to right direction with localedir='rtl'");
+
+          subdoc.documentElement.removeAttribute("localedir");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "left to right with :-moz-locale-dir(ltr) and localedir removed");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "left to right with :-moz-locale-dir(rtl) and localedir removed");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction with localedir removed");
+
+          subframe.setAttribute("src", "chrome://rtltest/content/dirtest.xul");
+        }
+        else if (url.indexOf("chrome://rtltest") == 0) {
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "right to left with :-moz-locale-dir(ltr)");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(0, 128, 0)", "right to left with :-moz-locale-dir(rtl)");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction");
+
+          subdoc.documentElement.setAttribute("localedir", "ltr");
+
+          is(subwin.getComputedStyle(subdoc.getElementById("hbox"), "").backgroundColor,
+             "rgb(255, 255, 0)", "right to left with :-moz-locale-dir(ltr) and localedir='ltr'");
+          is(subwin.getComputedStyle(subdoc.getElementById("vbox"), "").backgroundColor,
+             "rgb(255, 255, 255)", "right to left with :-moz-locale-dir(rtl) and localedir='ltr'");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "right to left direction with localedir='ltr'");
+
+          subdoc.documentElement.removeAttribute("localedir");
+
+          prefs.setCharPref(UI_DIRECTION_PREF, "");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction with no preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF + "-QA", "rtl");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction with more specific preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF, "ltr");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "rtl",
+             "right to left direction with less specific and more specific preference set");
+          prefs.setCharPref(UI_DIRECTION_PREF, "rtl");
+          prefs.setCharPref(UI_DIRECTION_PREF + "-QA", "ltr");
+          is(subwin.getComputedStyle(subdoc.documentElement, "").direction, "ltr",
+             "left to right direction specific preference overrides");
+          prefs.clearUserPref(UI_DIRECTION_PREF + "-QA");
+
+          dirSvc.unregisterProvider(provider);
+          cr.checkForNewChrome();
+          cr.refreshSkins();
+          prefs.clearUserPref(XUL_CACHE_PREF);
+          prefs.clearUserPref(UI_DIRECTION_PREF);
+
+          SimpleTest.finish();
+        }
+      }
+    ]]>
+  </script>
+
+</window>
diff --git a/toolkit/content/textbox.css b/toolkit/content/textbox.css
index e6bfa93770ae..daf885d028d4 100644
--- a/toolkit/content/textbox.css
+++ b/toolkit/content/textbox.css
@@ -20,8 +20,8 @@ textbox[isempty="true"] html|*.textbox-textarea {
   direction: ltr;
 }
 
-textbox[isempty="true"][chromedir="rtl"] html|*.textbox-input ,
-textbox[isempty="true"][chromedir="rtl"] html|*.textbox-textarea {
+textbox[isempty="true"]:-moz-locale-dir(rtl) html|*.textbox-input ,
+textbox[isempty="true"]:-moz-locale-dir(rtl) html|*.textbox-textarea {
   text-align: right;
   direction: rtl;
 }
diff --git a/toolkit/content/widgets/datetimepicker.xml b/toolkit/content/widgets/datetimepicker.xml
index 594672242f18..9119ec84041e 100644
--- a/toolkit/content/widgets/datetimepicker.xml
+++ b/toolkit/content/widgets/datetimepicker.xml
@@ -39,8 +39,6 @@
 <!DOCTYPE bindings [
   <!ENTITY % datetimepickerDTD SYSTEM "chrome://global/locale/datetimepicker.dtd">
   %datetimepickerDTD;
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
 ]>
 
 <bindings id="timepickerBindings"
@@ -64,24 +62,24 @@
                 xbl:inherits="context">
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="textbox-input-box datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
@@ -853,7 +851,7 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
         <hbox class="datepicker-monthbox" align="center">
           <button class="datepicker-previous datepicker-button" type="repeat"
-                  chromedir="&locale.dir;" xbl:inherits="disabled"
+                  xbl:inherits="disabled"
                   oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(-1);"/>
           <spacer flex="1"/>
           <deck anonid="monthlabeldeck">
@@ -873,7 +871,7 @@
           <label anonid="yearlabel" class="datepicker-gridlabel"/>
           <spacer flex="1"/>
           <button class="datepicker-next datepicker-button" type="repeat"
-                  chromedir="&locale.dir;" xbl:inherits="disabled"
+                  xbl:inherits="disabled"
                   oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(1);"/>
         </hbox>
         <grid class="datepicker-grid" role="grid">
@@ -1207,24 +1205,24 @@
                 allowevents="true" xbl:inherits="context">
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-one"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-first" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="baseline">
           <html:input class="datetimepicker-input textbox-input" anonid="input-two"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:label anonid="sep-second" class="datetimepicker-separator" value=":"/>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-three"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;"
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
         <xul:hbox class="datetimepicker-input-subbox" align="center">
           <html:input class="datetimepicker-input textbox-input" anonid="input-ampm"
-                      size="2" maxlength="2" flex="1" chromedir="&locale.dir;" 
+                      size="2" maxlength="2" flex="1"
                       xbl:inherits="disabled,readonly"/>
         </xul:hbox>
       </xul:hbox>
diff --git a/toolkit/content/widgets/findbar.xml b/toolkit/content/widgets/findbar.xml
index 07ead86fd4f6..42afb4e661d6 100644
--- a/toolkit/content/widgets/findbar.xml
+++ b/toolkit/content/widgets/findbar.xml
@@ -46,8 +46,6 @@
 <!DOCTYPE bindings [
 <!ENTITY % findBarDTD SYSTEM "chrome://global/locale/findbar.dtd" >
 %findBarDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 ]>
 
 <bindings id="findbarBindings"
@@ -219,7 +217,6 @@
                          tooltiptext="&previous.tooltip;"
                          oncommand="onFindAgainCommand(true);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findpreviousaccesskey"/>
 #endif
       <xul:toolbarbutton anonid="find-next"
@@ -229,7 +226,6 @@
                          tooltiptext="&next.tooltip;"
                          oncommand="onFindAgainCommand(false);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findnextaccesskey"/>
 #ifndef MOZ_WIDGET_GTK2
       <xul:toolbarbutton anonid="find-previous"
@@ -239,7 +235,6 @@
                          tooltiptext="&previous.tooltip;"
                          oncommand="onFindAgainCommand(true);"
                          disabled="true"
-                         chromedir="&locale.dir;"
                          xbl:inherits="accesskey=findpreviousaccesskey"/>
 #endif
       <xul:toolbarbutton anonid="highlight"
diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml
index 4e2f626eb283..449e5c8a7c9f 100644
--- a/toolkit/content/widgets/menu.xml
+++ b/toolkit/content/widgets/menu.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="menuitemBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -176,8 +171,7 @@
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
-      <xul:hbox align="center" class="menu-right" chromedir="&locale.dir;"
-                xbl:inherits="_moz-menuactive,disabled">
+      <xul:hbox align="center" class="menu-right" xbl:inherits="_moz-menuactive,disabled">
         <xul:image/>
       </xul:hbox>
       <children includes="menupopup"/>
@@ -254,8 +248,8 @@
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-iconic-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
-      <xul:hbox class="menu-right" chromedir="&locale.dir;"
-                xbl:inherits="_moz-menuactive,disabled" align="center" pack="center">
+      <xul:hbox class="menu-right" xbl:inherits="_moz-menuactive,disabled"
+                align="center" pack="center">
         <xul:image/>
       </xul:hbox>
       <children includes="menupopup|template"/>
diff --git a/toolkit/content/widgets/resizer.xml b/toolkit/content/widgets/resizer.xml
index 5ffca7726fa2..0ab1f5358250 100644
--- a/toolkit/content/widgets/resizer.xml
+++ b/toolkit/content/widgets/resizer.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-]>
-
 <bindings id="resizerBindings"
    xmlns="http://www.mozilla.org/xbl">
 
   <binding id="resizer">
-    <content chromedir="&locale.dir;">
-      <children/>
-    </content>
     <resources>
       <stylesheet src="chrome://global/skin/resizer.css"/>
     </resources>
-    <implementation>
-      <constructor><![CDATA[
-        // Bindings that extend this one wouldn't inherit the
-        // chromedir attribute if it would only be set in <content>.
-        this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-      ]]></constructor>
-    </implementation>
   </binding>
 
 </bindings>
diff --git a/toolkit/content/widgets/scrollbox.xml b/toolkit/content/widgets/scrollbox.xml
index 7669e1bcdd90..e252c2b2caed 100644
--- a/toolkit/content/widgets/scrollbox.xml
+++ b/toolkit/content/widgets/scrollbox.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="arrowscrollboxBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -521,7 +516,7 @@
   </binding>
 
   <binding id="autorepeatbutton" extends="chrome://global/content/bindings/scrollbox.xml#scrollbox-base">
-    <content repeat="hover" chromedir="&locale.dir;">
+    <content repeat="hover">
       <xul:image class="autorepeatbutton-icon"/>
     </content>
   </binding>
@@ -535,8 +530,7 @@
                          onmousedown="_startScroll(-1);"
                          onmouseover="_continueScroll(-1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
       <xul:scrollbox xbl:inherits="orient,align,pack,dir" flex="1" anonid="scrollbox">
         <children/>
       </xul:scrollbox>
@@ -547,8 +541,7 @@
                          onmousedown="_startScroll(1);"
                          onmouseover="_continueScroll(1);"
                          onmouseup="_stopScroll();"
-                         onmouseout="_pauseScroll();"
-                         chromedir="&locale.dir;"/>
+                         onmouseout="_pauseScroll();"/>
     </content>
     <implementation implements="nsITimerCallback, nsIDOMEventListener">
       <constructor><![CDATA[
diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml
index bad131d5262c..3a5927d50540 100644
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="tabBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -583,7 +578,7 @@
       <stylesheet src="chrome://global/skin/tabbox.css"/>
     </resources>
 
-    <content chromedir="&locale.dir;">
+    <content>
       <xul:hbox class="tab-middle box-inherit" xbl:inherits="align,dir,pack,orient,selected" flex="1">
         <xul:image class="tab-icon" xbl:inherits="validate,src=image"/>
         <xul:label class="tab-text" xbl:inherits="value=label,accesskey,crop,disabled" flex="1"/>
diff --git a/toolkit/content/widgets/textbox.xml b/toolkit/content/widgets/textbox.xml
index 7994d9094737..cf1b8e552a86 100644
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
   %textcontextDTD;
 ]>
@@ -212,10 +210,6 @@
           this.boxObject.removeProperty("value");
         }
 
-        // Bindings that extend this one wouldn't inherit the
-        // chromedir attribute if it would only be set in <content>.
-        this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-
         this._updateVisibleText();
         this._setNewlineHandling();
       ]]></constructor>
@@ -383,12 +377,10 @@
         <xul:deck class="textbox-search-icons" anonid="search-icons">
           <xul:image class="textbox-search-icon"
                      onclick="document.getBindingParent(this)._iconClick();"
-                     xbl:inherits="src=image,searchbutton,disabled"
-                     chromedir="&locale.dir;"/>
+                     xbl:inherits="src=image,searchbutton,disabled"/>
           <xul:image class="textbox-search-clear"
                      onclick="document.getBindingParent(this)._clearSearch();"
-                     xbl:inherits="disabled"
-                     chromedir="&locale.dir;"/>
+                     xbl:inherits="disabled"/>
         </xul:deck>
       </xul:hbox>
     </content>
@@ -521,7 +513,6 @@
       <children/>
       <xul:menupopup anonid="input-box-contextmenu"
                      class="textbox-contextmenu"
-                     chromedir="&locale.dir;"
                      onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
                                        this.parentNode.firstChild.focus();
                                      this.parentNode._doPopupItemEnabling(this);"
@@ -584,7 +575,6 @@
       <children/>
       <xul:menupopup anonid="input-box-contextmenu"
                      class="textbox-contextmenu"
-                     chromedir="&locale.dir;"
                      onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
                                        this.parentNode.firstChild.focus();
                                      this.parentNode._doPopupItemEnablingSpell(this);"
diff --git a/toolkit/content/widgets/toolbarbutton.xml b/toolkit/content/widgets/toolbarbutton.xml
index e4932183830b..4befb7bb02dc 100644
--- a/toolkit/content/widgets/toolbarbutton.xml
+++ b/toolkit/content/widgets/toolbarbutton.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
-]>
-
 <bindings id="toolbarbuttonBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -16,7 +11,7 @@
       <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
     </resources>
     
-    <content chromedir="&locale.dir;">
+    <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle,label"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
@@ -34,7 +29,7 @@
 
   <binding id="menu" display="xul:menu" 
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-    <content chromedir="&locale.dir;">
+    <content>
       <children includes="observes|template|menupopup|panel|tooltip"/>
       <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle,label,type"/>
       <xul:label class="toolbarbutton-text" crop="right" flex="1"
diff --git a/toolkit/content/widgets/tree.xml b/toolkit/content/widgets/tree.xml
index 4c7418869174..96eddde2881d 100644
--- a/toolkit/content/widgets/tree.xml
+++ b/toolkit/content/widgets/tree.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
 <!ENTITY % treeDTD SYSTEM "chrome://global/locale/tree.dtd">
 %treeDTD;
 ]>
@@ -32,7 +30,7 @@
   </binding>
 
   <binding id="tree" extends="chrome://global/content/bindings/tree.xml#tree-base">
-    <content hidevscroll="true" hidehscroll="true" chromedir="&locale.dir;">
+    <content hidevscroll="true" hidehscroll="true">
       <children includes="treecols"/>
       <xul:stack class="tree-stack" flex="1">
         <xul:treerows class="tree-rows" flex="1" xbl:inherits="hidevscroll">
@@ -276,13 +274,6 @@
         </getter>
       </property>
 
-      <constructor><![CDATA[
-          // Bindings that extend this one wouldn't inherit the
-          // chromedir attribute if it would only be set in <content>.
-          this.setAttribute("chromedir", "]]>&locale.dir;<![CDATA[");
-        ]]>
-      </constructor>
-
       <method name="_getNextColumn">
         <parameter name="row"/>
         <parameter name="left"/>
diff --git a/toolkit/content/widgets/wizard.xml b/toolkit/content/widgets/wizard.xml
index 566e12c83b10..60170a43a033 100644
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-  %globalDTD;
   <!ENTITY % wizardDTD SYSTEM "chrome://global/locale/wizard.dtd">
   %wizardDTD;
 ]>
@@ -20,7 +18,7 @@
   
   <binding id="wizard" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
     <content>
-      <xul:hbox class="wizard-header" chromedir="&locale.dir;" anonid="Header"/>
+      <xul:hbox class="wizard-header" anonid="Header"/>
       
       <xul:deck class="wizard-page-box" flex="1" anonid="Deck">
         <children includes="wizardpage"/>
@@ -539,8 +537,7 @@
                       dlgtype="cancel" icon="cancel"/>
           <xul:spacer style="width: 24px"/>
           <xul:button label="&button-back-unix.label;" accesskey="&button-back-unix.accesskey;"
-                      class="wizard-button" dlgtype="back" icon="go-back"
-                      chromedir="&locale.dir;"/>
+                      class="wizard-button" dlgtype="back" icon="go-back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-unix.label;" class="wizard-button"
@@ -549,13 +546,12 @@
             <xul:hbox>
               <xul:button label="&button-next-unix.label;" accesskey="&button-next-unix.accesskey;"
                           class="wizard-button" dlgtype="next" icon="go-forward" 
-                          chromedir="&locale.dir;" default="true" flex="1"/>
+                          default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
 #else
           <xul:button label="&button-back-win.label;" accesskey="&button-back-win.accesskey;"
-                      class="wizard-button" dlgtype="back" icon="go-back"
-                      chromedir="&locale.dir;"/>
+                      class="wizard-button" dlgtype="back" icon="go-back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:hbox>
               <xul:button label="&button-finish-win.label;" class="wizard-button"
@@ -564,7 +560,7 @@
             <xul:hbox>
               <xul:button label="&button-next-win.label;" accesskey="&button-next-win.accesskey;"
                           class="wizard-button" dlgtype="next" icon="go-forward" 
-                          chromedir="&locale.dir;" default="true" flex="1"/>
+                          default="true" flex="1"/>
             </xul:hbox>
           </xul:deck>
           <xul:button label="&button-cancel-win.label;" class="wizard-button"
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index f50099a4a607..ded48058b7ac 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -21,6 +21,10 @@
   text-rendering: optimizeLegibility;
 }
 
+:root:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
+
 /* hide the content and destroy the frame */
 [hidden="true"] {
   display: none;
@@ -692,7 +696,7 @@ textbox[type="number"] {
   -moz-binding: url("chrome://global/content/bindings/numberbox.xml#numberbox");
 }
 
-.textbox-contextmenu[chromedir="rtl"] {
+.textbox-contextmenu:-moz-locale-dir(rtl) {
   direction: rtl;
 }
 
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index e5d69fdadc35..a208ea2fd61d 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -43,10 +43,8 @@
 
 <!DOCTYPE bindings [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-  <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd" >
   %brandDTD;
-  %globalDTD;
   %extensionsDTD;
 ]>
 
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 32b98ef1187a..e4e60565c4cd 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -48,8 +48,6 @@
 %brandDTD;
 <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
 %extensionsDTD;
-<!ENTITY % global SYSTEM "chrome://global/locale/global.dtd">
-%global;
 ]>
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -164,7 +162,7 @@
     <deck flex="1">
       <hbox class="viewGroupWrapper">
         <radiogroup id="viewGroup" xhtml:role="listbox" persist="last-selected"
-                    orient="horizontal" chromedir="&locale.dir;">
+                    orient="horizontal">
           <radio id="search-view" label="&search.label;" oncommand="showView('search');" persist="last-selected"/>
           <radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
           <radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>
diff --git a/toolkit/themes/faststripe/global/tabbox.css b/toolkit/themes/faststripe/global/tabbox.css
index 3e360e78f27d..cf5c60dbbffa 100644
--- a/toolkit/themes/faststripe/global/tabbox.css
+++ b/toolkit/themes/faststripe/global/tabbox.css
@@ -76,7 +76,7 @@ tab
   color: -moz-DialogText;
 }
 
-tab[chromedir="rtl"] {
+tab:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 1px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -96,14 +96,14 @@ tab:focus > .tab-middle {
   outline: 1px dotted;
 }
 
-tab[beforeselected="true"]:not([chromedir="rtl"]),
-tab[selected="true"][chromedir="rtl"] + tab {
+tab[beforeselected="true"]:not(:-moz-locale-dir(rtl)),
+tab[selected="true"]:-moz-locale-dir(rtl) + tab {
   border-right: none;
   -moz-border-radius-topright: 0;
 }
 
-tab[selected="true"]:not([chromedir="rtl"]) + tab,
-tab[beforeselected="true"][chromedir="rtl"] {
+tab[selected="true"]:not(:-moz-locale-dir(rtl)) + tab,
+tab[beforeselected="true"]:-moz-locale-dir(rtl) {
   border-left: none;
   -moz-border-radius-topleft: 0;
 }
@@ -136,13 +136,13 @@ tab:first-of-type[selected="true"] {
   padding: 4px 6px 1px 6px;
 }
 
-.tab-bottom[beforeselected="true"]:not([chromedir="rtl"]),
-.tab-bottom[selected="true"][chromedir="rtl"] + .tab-bottom {
+.tab-bottom[beforeselected="true"]:not(:-moz-locale-dir(rtl)),
+.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom {
   -moz-border-radius-bottomright: 0;
 }
 
-.tab-bottom[selected="true"]:not([chromedir="rtl"]) + .tab-bottom,
-.tab-bottom[beforeselected="true"][chromedir="rtl"] {
+.tab-bottom[selected="true"]:not(:-moz-locale-dir(rtl)) + .tab-bottom,
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 0;
 }
 
diff --git a/toolkit/themes/faststripe/global/textbox.css b/toolkit/themes/faststripe/global/textbox.css
index 117da51c0ecb..fff167878b8b 100644
--- a/toolkit/themes/faststripe/global/textbox.css
+++ b/toolkit/themes/faststripe/global/textbox.css
@@ -104,7 +104,7 @@ textbox.plain {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/gnomestripe/global/button.css b/toolkit/themes/gnomestripe/global/button.css
index 0bf0ad37a539..d012fbe0b662 100644
--- a/toolkit/themes/gnomestripe/global/button.css
+++ b/toolkit/themes/gnomestripe/global/button.css
@@ -326,11 +326,11 @@ button[icon="go-forward"][disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=button&state=disabled");
 }
 
-button[icon="go-forward"][chromedir="rtl"] .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl) .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button");
 }
 
-button[icon="go-forward"][chromedir="rtl"][disabled="true"] .button-icon {
+button[icon="go-forward"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button&state=disabled");
 }
 
@@ -342,11 +342,11 @@ button[icon="go-back"][disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=button&state=disabled");
 }
 
-button[icon="go-back"][chromedir="rtl"] .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl) .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button");
 }
 
-button[icon="go-back"][chromedir="rtl"][disabled="true"] .button-icon {
+button[icon="go-back"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button&state=disabled");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/findBar.css b/toolkit/themes/gnomestripe/global/findBar.css
index 2e0d05e7dd53..b1ef0b76981a 100644
--- a/toolkit/themes/gnomestripe/global/findBar.css
+++ b/toolkit/themes/gnomestripe/global/findBar.css
@@ -21,11 +21,11 @@ findbar {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-.findbar-find-next[chromedir="rtl"] {
+.findbar-find-next:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
-.findbar-find-next[disabled="true"][chromedir="rtl"] {
+.findbar-find-next[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
@@ -39,11 +39,11 @@ findbar {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-.findbar-find-previous[chromedir="rtl"] {
+.findbar-find-previous:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
-.findbar-find-previous[disabled="true"][chromedir="rtl"] {
+.findbar-find-previous[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/printPreview.css b/toolkit/themes/gnomestripe/global/printPreview.css
index acdfecb06f8d..d352f6a32517 100644
--- a/toolkit/themes/gnomestripe/global/printPreview.css
+++ b/toolkit/themes/gnomestripe/global/printPreview.css
@@ -4,7 +4,7 @@
   list-style-image: url("moz-icon://stock/gtk-goto-first-ltr?size=menu");
 }
 
-.home-arrow[chromedir="rtl"] {
+.home-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-goto-first-rtl?size=menu");
 }
 
@@ -12,7 +12,7 @@
   list-style-image: url("moz-icon://stock/gtk-goto-last-ltr?size=menu");
 }
 
-.end-arrow[chromedir="rtl"] {
+.end-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-goto-last-rtl?size=menu");
 }
 
@@ -20,7 +20,7 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
 }
 
-.left-arrow[chromedir="rtl"] {
+.left-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
@@ -28,7 +28,7 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
 }
 
-.right-arrow[chromedir="rtl"] {
+.right-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
diff --git a/toolkit/themes/gnomestripe/global/textbox.css b/toolkit/themes/gnomestripe/global/textbox.css
index acedd6bb77b9..6a684000f3ae 100644
--- a/toolkit/themes/gnomestripe/global/textbox.css
+++ b/toolkit/themes/gnomestripe/global/textbox.css
@@ -109,7 +109,7 @@ textbox.plain {
   list-style-image: url(chrome://global/skin/icons/Search-glass.png);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/gnomestripe/global/tree.css b/toolkit/themes/gnomestripe/global/tree.css
index 2501d41edbe5..60b29d1de609 100644
--- a/toolkit/themes/gnomestripe/global/tree.css
+++ b/toolkit/themes/gnomestripe/global/tree.css
@@ -302,13 +302,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/gnomestripe/help/help.css b/toolkit/themes/gnomestripe/help/help.css
index ff11cfa13098..578ce6413795 100644
--- a/toolkit/themes/gnomestripe/help/help.css
+++ b/toolkit/themes/gnomestripe/help/help.css
@@ -52,11 +52,11 @@
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=toolbar&state=disabled");
 }
 
-#help-back-button[chromedir="rtl"] {
+#help-back-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar");
 }
 
-#help-back-button[disabled="true"][chromedir="rtl"] {
+#help-back-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
 }
 
@@ -68,11 +68,11 @@
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
 }
 
-#help-forward-button[chromedir="rtl"] {
+#help-forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
 }
 
-#help-forward-button[disabled="true"][chromedir="rtl"] {
+#help-forward-button[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
 }
 
@@ -120,7 +120,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu");
 }
 
-#context-back[chromedir="rtl"] {
+#context-back:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu");
 }
 
@@ -128,7 +128,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled");
 }
 
-#context-back[disabled="true"][chromedir="rtl"] {
+#context-back[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled");
 }
 
@@ -136,7 +136,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu");
 }
 
-#context-forward[chromedir="rtl"] {
+#context-forward:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu");
 }
 
@@ -144,7 +144,7 @@ menuitem:not([type]) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled");
 }
 
-#context-forward[disabled="true"][chromedir="rtl"] {
+#context-forward[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled");
 }
 
diff --git a/toolkit/themes/pinstripe/global/datetimepicker.css b/toolkit/themes/pinstripe/global/datetimepicker.css
index 827b68856043..474518494937 100644
--- a/toolkit/themes/pinstripe/global/datetimepicker.css
+++ b/toolkit/themes/pinstripe/global/datetimepicker.css
@@ -72,7 +72,7 @@ html|*.datetimepicker-input {
   text-align: right;
 }
 
-html|*.datetimepicker-input[chromedir="rtl"] {
+html|*.datetimepicker-input:-moz-locale-dir(rtl) {
   text-align: left;
 }
 
diff --git a/toolkit/themes/pinstripe/global/findBar.css b/toolkit/themes/pinstripe/global/findBar.css
index 3452ef344e97..39b752b1f615 100644
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@@ -160,8 +160,8 @@ findbar {
   -moz-margin-end: 0 !important;
 }
 
-.findbar-find-next[chromedir="ltr"],
-.findbar-find-previous[chromedir="rtl"] {
+.findbar-find-next:-moz-locale-dir(ltr),
+.findbar-find-previous:-moz-locale-dir(rtl) {
   -moz-border-radius-topright: 0px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -172,8 +172,8 @@ findbar {
   -moz-margin-start: 0 !important;
 }
 
-.findbar-find-previous[chromedir="ltr"],
-.findbar-find-next[chromedir="rtl"] {
+.findbar-find-previous:-moz-locale-dir(ltr),
+.findbar-find-next:-moz-locale-dir(rtl) {
   -moz-border-radius-topleft: 0px;
   -moz-border-radius-bottomleft: 0px;
 }
diff --git a/toolkit/themes/pinstripe/global/resizer.css b/toolkit/themes/pinstripe/global/resizer.css
index 728f7b1da855..02648398ddc2 100644
--- a/toolkit/themes/pinstripe/global/resizer.css
+++ b/toolkit/themes/pinstripe/global/resizer.css
@@ -15,7 +15,7 @@ resizer[dir="topleft"] {
 }
 
 resizer[dir="bottomright"],
-resizer[dir="bottomend"][chromedir="ltr"] {
+resizer[dir="bottomend"]:-moz-locale-dir(ltr) {
   cursor: se-resize;
 }
 
@@ -24,6 +24,6 @@ resizer[dir="topright"] {
 }
 
 resizer[dir="bottomleft"],
-resizer[dir="bottomend"][chromedir="rtl"] {
+resizer[dir="bottomend"]:-moz-locale-dir(rtl) {
   cursor: sw-resize;
 }
diff --git a/toolkit/themes/pinstripe/global/tree.css b/toolkit/themes/pinstripe/global/tree.css
index 216771f429e5..e355c61c0b28 100644
--- a/toolkit/themes/pinstripe/global/tree.css
+++ b/toolkit/themes/pinstripe/global/tree.css
@@ -266,13 +266,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/pinstripe/global/viewbuttons.css b/toolkit/themes/pinstripe/global/viewbuttons.css
index dba5917b74b9..df67b091b332 100644
--- a/toolkit/themes/pinstripe/global/viewbuttons.css
+++ b/toolkit/themes/pinstripe/global/viewbuttons.css
@@ -101,19 +101,19 @@
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 5px;
 }
 
-#viewGroup:not([chromedir=rtl]) > :first-child,
-#viewGroup:not([chromedir=rtl]) > [first-visible],
-#viewGroup[chromedir=rtl] > :last-child,
-#viewGroup[chromedir=rtl] > [last-visible] {
+#viewGroup:-moz-locale-dir(ltr) > :first-child,
+#viewGroup:-moz-locale-dir(ltr) > [first-visible],
+#viewGroup:-moz-locale-dir(rtl) > :last-child,
+#viewGroup:-moz-locale-dir(rtl) > [last-visible] {
   -moz-border-radius-topleft: 2px;
   -moz-border-radius-bottomleft: 2px;
   border-left: none !important;
 }
 
-#viewGroup:not([chromedir=rtl]) > :last-child,
-#viewGroup:not([chromedir=rtl]) > [last-visible],
-#viewGroup[chromedir=rtl] > :first-child,
-#viewGroup[chromedir=rtl] > [first-visible] {
+#viewGroup:-moz-locale-dir(ltr) > :last-child,
+#viewGroup:-moz-locale-dir(ltr) > [last-visible],
+#viewGroup:-moz-locale-dir(rtl) > :first-child,
+#viewGroup:-moz-locale-dir(rtl) > [first-visible] {
   -moz-border-radius-topright: 2px;
   -moz-border-radius-bottomright: 2px;
 }
diff --git a/toolkit/themes/winstripe/global/datetimepicker.css b/toolkit/themes/winstripe/global/datetimepicker.css
index eec51ea07091..7713dc981d7e 100644
--- a/toolkit/themes/winstripe/global/datetimepicker.css
+++ b/toolkit/themes/winstripe/global/datetimepicker.css
@@ -154,26 +154,26 @@ timepicker[disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
 }
 
-.datepicker-previous[chromedir="rtl"] {
+.datepicker-previous:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
 }
 
-.datepicker-next[chromedir="rtl"] {
+.datepicker-next:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
 }
 
-.datepicker-previous[chromedir="rtl"] {
+.datepicker-previous:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif");
 }
 
-.datepicker-next[chromedir="rtl"]:hover {
+.datepicker-next:-moz-locale-dir(rtl):hover {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif");
 }
 
-.datepicker-previous[disabled="true"][chromedir="rtl"] {
+.datepicker-previous[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
 }
 
-.datepicker-next[disabled="true"][chromedir="rtl"] {
+.datepicker-next[disabled="true"]:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
 }
diff --git a/toolkit/themes/winstripe/global/printPreview.css b/toolkit/themes/winstripe/global/printPreview.css
index 2d080be6705e..936a3d3bce68 100644
--- a/toolkit/themes/winstripe/global/printPreview.css
+++ b/toolkit/themes/winstripe/global/printPreview.css
@@ -1,46 +1,46 @@
 /* ..... page navigation ..... */
 
 .home-arrow,
-.end-arrow[chromedir="rtl"] {
+.end-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-left-end.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .home-arrow:hover,
-.end-arrow[chromedir="rtl"]:hover {
+.end-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .end-arrow,
-.home-arrow[chromedir="rtl"] {
+.home-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-right-end.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .end-arrow:hover,
-.home-arrow[chromedir="rtl"]:hover {
+.home-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .left-arrow,
-.right-arrow[chromedir="rtl"] {
+.right-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-left.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .left-arrow:hover,
-.right-arrow[chromedir="rtl"]:hover {
+.right-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .right-arrow,
-.left-arrow[chromedir="rtl"] {
+.left-arrow:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/printpreview/arrow-right.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .right-arrow:hover,
-.left-arrow[chromedir="rtl"]:hover {
+.left-arrow:-moz-locale-dir(rtl):hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
diff --git a/toolkit/themes/winstripe/global/resizer.css b/toolkit/themes/winstripe/global/resizer.css
index cf1fb39c4e64..7f398d74e7fe 100644
--- a/toolkit/themes/winstripe/global/resizer.css
+++ b/toolkit/themes/winstripe/global/resizer.css
@@ -15,7 +15,7 @@ resizer[dir="topleft"] {
 }
 
 resizer[dir="bottomright"],
-resizer[dir="bottomend"][chromedir="ltr"] {
+resizer[dir="bottomend"]:-moz-locale-dir(ltr) {
   cursor: se-resize;
 }
 
@@ -24,11 +24,11 @@ resizer[dir="topright"] {
 }
 
 resizer[dir="bottomleft"],
-resizer[dir="bottomend"][chromedir="rtl"] {
+resizer[dir="bottomend"]:-moz-locale-dir(rtl) {
   cursor: sw-resize;
 }
 
-resizer[dir="bottomright"][chromedir="ltr"],
+resizer[dir="bottomright"]:-moz-locale-dir(ltr),
 resizer[dir="bottomend"] {
   -moz-appearance: resizer;
 }
diff --git a/toolkit/themes/winstripe/global/scrollbox.css b/toolkit/themes/winstripe/global/scrollbox.css
index a79de5f7d852..5ac4b5d9c974 100644
--- a/toolkit/themes/winstripe/global/scrollbox.css
+++ b/toolkit/themes/winstripe/global/scrollbox.css
@@ -6,34 +6,34 @@
 
 /* Horizontal enabled */
 .autorepeatbutton-up[orient="horizontal"],
-.autorepeatbutton-down[chromedir="rtl"][orient="horizontal"],
+.autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"],
 .scrollbutton-up[orient="horizontal"],
-.scrollbutton-down[chromedir="rtl"][orient="horizontal"] {
+.scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
 .autorepeatbutton-down[orient="horizontal"],
-.autorepeatbutton-up[chromedir="rtl"][orient="horizontal"],
+.autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"],
 .scrollbutton-down[orient="horizontal"],
-.scrollbutton-up[chromedir="rtl"][orient="horizontal"] {
+.scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
  /* Horizontal disabled */
 .autorepeatbutton-up[orient="horizontal"][disabled="true"],
-.autorepeatbutton-down[chromedir="rtl"][orient="horizontal"][disabled="true"],
+.autorepeatbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"],
 .scrollbutton-up[orient="horizontal"][disabled="true"],
-.scrollbutton-down[chromedir="rtl"][orient="horizontal"][disabled="true"] {
+.scrollbutton-down:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
 
 .autorepeatbutton-down[orient="horizontal"][disabled="true"],
-.autorepeatbutton-up[chromedir="rtl"][orient="horizontal"][disabled="true"],
+.autorepeatbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"],
 .scrollbutton-down[orient="horizontal"][disabled="true"],
-.scrollbutton-up[chromedir="rtl"][orient="horizontal"][disabled="true"] {
+.scrollbutton-up:-moz-locale-dir(rtl)[orient="horizontal"][disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
   -moz-image-region: auto; /* cut off inheritance */
 }
diff --git a/toolkit/themes/winstripe/global/tabbox.css b/toolkit/themes/winstripe/global/tabbox.css
index 271f5221b3d2..c0db5e42701b 100644
--- a/toolkit/themes/winstripe/global/tabbox.css
+++ b/toolkit/themes/winstripe/global/tabbox.css
@@ -85,7 +85,7 @@ tab
   color: -moz-DialogText;
 }
 
-tab[chromedir="rtl"] {
+tab:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 1px;
   -moz-border-radius-bottomright: 0px;
 }
@@ -105,14 +105,14 @@ tab:focus > .tab-middle {
   outline: 1px dotted;
 }
 
-tab[beforeselected="true"]:not([chromedir="rtl"]),
-tab[selected="true"][chromedir="rtl"] + tab {
+tab[beforeselected="true"]:-moz-locale-dir(ltr),
+tab[selected="true"]:-moz-locale-dir(rtl) + tab {
   border-right: none;
   -moz-border-radius-topright: 0;
 }
 
-tab[selected="true"]:not([chromedir="rtl"]) + tab,
-tab[beforeselected="true"][chromedir="rtl"] {
+tab[selected="true"]:-moz-locale-dir(ltr) + tab,
+tab[beforeselected="true"]:-moz-locale-dir(rtl) {
   border-left: none;
   -moz-border-radius-topleft: 0;
 }
@@ -147,13 +147,13 @@ tab:first-of-type[selected="true"] {
   padding: 4px 6px 1px 6px;
 }
 
-.tab-bottom[beforeselected="true"]:not([chromedir="rtl"]),
-.tab-bottom[selected="true"][chromedir="rtl"] + .tab-bottom {
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(ltr),
+.tab-bottom[selected="true"]:-moz-locale-dir(rtl) + .tab-bottom {
   -moz-border-radius-bottomright: 0;
 }
 
-.tab-bottom[selected="true"]:not([chromedir="rtl"]) + .tab-bottom,
-.tab-bottom[beforeselected="true"][chromedir="rtl"] {
+.tab-bottom[selected="true"]:-moz-locale-dir(ltr) + .tab-bottom,
+.tab-bottom[beforeselected="true"]:-moz-locale-dir(rtl) {
   -moz-border-radius-bottomleft: 0;
 }
 
diff --git a/toolkit/themes/winstripe/global/textbox.css b/toolkit/themes/winstripe/global/textbox.css
index ccfed2c5e46f..4d29bfcb3d9e 100644
--- a/toolkit/themes/winstripe/global/textbox.css
+++ b/toolkit/themes/winstripe/global/textbox.css
@@ -110,7 +110,7 @@ textbox.plain {
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-.textbox-search-icon[chromedir="rtl"] {
+.textbox-search-icon:-moz-locale-dir(rtl) {
   -moz-transform: scaleX(-1);
 }
 
diff --git a/toolkit/themes/winstripe/global/tree-aero.css b/toolkit/themes/winstripe/global/tree-aero.css
index d3cf4c227f74..536264e95354 100644
--- a/toolkit/themes/winstripe/global/tree-aero.css
+++ b/toolkit/themes/winstripe/global/tree-aero.css
@@ -28,18 +28,18 @@ treechildren::-moz-tree-twisty(hover, open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty {
   list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(open) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(hover) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(hover) {
   list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
 }
 
-tree[chromedir="rtl"] > treechildren::-moz-tree-twisty(hover, open) {
+tree:-moz-locale-dir(rtl) > treechildren::-moz-tree-twisty(hover, open) {
   list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
 }
diff --git a/toolkit/themes/winstripe/global/tree.css b/toolkit/themes/winstripe/global/tree.css
index 2ba926a441ff..65afb1f31876 100644
--- a/toolkit/themes/winstripe/global/tree.css
+++ b/toolkit/themes/winstripe/global/tree.css
@@ -296,13 +296,13 @@ treecol[dragging="true"] {
   color: ThreeDHighlight !important;
 }
 
-tree[chromedir="ltr"] treecol[insertafter="true"],
-tree[chromedir="rtl"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(ltr) treecol[insertafter="true"],
+tree:-moz-locale-dir(rtl) treecol[insertbefore="true"] {
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
-tree[chromedir="rtl"] treecol[insertafter="true"],
-tree[chromedir="ltr"] treecol[insertbefore="true"] {
+tree:-moz-locale-dir(rtl) treecol[insertafter="true"],
+tree:-moz-locale-dir(ltr) treecol[insertbefore="true"] {
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
 }
 
diff --git a/toolkit/themes/winstripe/help/help.css b/toolkit/themes/winstripe/help/help.css
index 5eb8a609380e..0fcc4c5970fc 100644
--- a/toolkit/themes/winstripe/help/help.css
+++ b/toolkit/themes/winstripe/help/help.css
@@ -45,7 +45,7 @@
   padding: 4px 5px;
 }
 
-#HelpToolbar[chromedir="rtl"] toolbarbutton {
+#HelpToolbar:-moz-locale-dir(rtl) toolbarbutton {
   list-style-image: url("chrome://help/skin/Toolbar-rtl.png");
 }
 

From 6d6fb5d462b479eb693accdfcbec329735fde35e Mon Sep 17 00:00:00 2001
From: Siddharth Agarwal <sid.bugzilla@gmail.com>
Date: Thu, 30 Jul 2009 00:05:05 +0530
Subject: [PATCH 33/61] Part of bug 503756 -- Rename the js/ mozilla-config.h
 to js-confdefs.h. r=bsmedberg, jimb

--HG--
extra : rebase_source : 8b0956fef406cde43c329c76bf63594a882216e4
---
 js/src/Makefile.in               |  2 +-
 js/src/configure.in              | 28 ++++++++++++++--------------
 js/src/xpconnect/src/Makefile.in |  6 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 1653c69c0e45..00bf8509ca07 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -343,7 +343,7 @@ endif
 
 DIST_GARBAGE = config.cache config.log config.status \
    config/myrules.mk config/myconfig.mk \
-   unallmakefiles js-config js-config.h mozilla-config.h
+   unallmakefiles js-config js-config.h js-confdefs.h
 
 distclean::
 	cat unallmakefiles | $(XARGS) rm -f
diff --git a/js/src/configure.in b/js/src/configure.in
index 69d8e1e40b66..dc68057bd1b9 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1251,7 +1251,7 @@ if test "$GNU_CC"; then
     fi
 
 
-    _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='-include $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 elif test "$SOLARIS_SUNPRO_CC"; then
     MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
@@ -1270,7 +1270,7 @@ elif test "$SOLARIS_SUNPRO_CC"; then
     else
         DSO_PIC_CFLAGS='-KPIC'
     fi
-    _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 else
     MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
     MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
@@ -1283,7 +1283,7 @@ else
 
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-KPIC'
-    _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+    _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 fi
 
 if test "$GNU_CXX"; then
@@ -1303,7 +1303,7 @@ if test "$GNU_CXX"; then
        esac
     fi
 
-    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/mozilla-config.h'
+    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -include $(DEPTH)/js-confdefs.h'
     _USE_CPP_INCLUDE_FLAG=1
 
     AC_CACHE_CHECK(whether the compiler supports -Wno-invalid-offsetof,
@@ -1342,7 +1342,7 @@ if test "$GNU_CXX"; then
         _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-variadic-macros"
     fi
 else
-    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -D_MOZILLA_CONFIG_H_ $(ACDEFINES)'
+    _DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -D_JS_CONFDEFS_H_ $(ACDEFINES)'
 fi
 
 dnl gcc can come with its own linker so it is better to use the pass-thru calls
@@ -2129,8 +2129,8 @@ case "$target" in
 	USE_PTHREADS=1
 	_PEDANTIC=
 	LIBS="$LIBS -lsocket -lstdc++"
-	_DEFINES_CFLAGS='-Wp,-include -Wp,$(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
-	_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(DEPTH)/mozilla-config.h -D_POSIX_C_SOURCE=199506'
+	_DEFINES_CFLAGS='-Wp,-include -Wp,$(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT -D_POSIX_C_SOURCE=199506'
+	_DEFINES_CXXFLAGS='-DMOZILLA_CLIENT -Wp,-include -Wp,$(DEPTH)/js-confdefs.h -D_POSIX_C_SOURCE=199506'
 	if test "$with_x" != "yes"
 	then
 		_PLATFORM_DEFAULT_TOOLKIT="photon"
@@ -4798,8 +4798,8 @@ if test "$_cpp_md_flag"; then
 else
   COMPILER_DEPEND=
   _USE_CPP_INCLUDE_FLAG=
-  _DEFINES_CFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
-  _DEFINES_CXXFLAGS='$(ACDEFINES) -D_MOZILLA_CONFIG_H_ -DMOZILLA_CLIENT'
+  _DEFINES_CFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
+  _DEFINES_CXXFLAGS='$(ACDEFINES) -D_JS_CONFDEFS_H_ -DMOZILLA_CLIENT'
 fi
 fi # MOZ_AUTO_DEPS
 MDDEPDIR='.deps'
@@ -5178,7 +5178,7 @@ dnl ========================================================
 # Save the defines header file before autoconf removes it.
 # (Do not add AC_DEFINE calls after this line.)
   _CONFIG_TMP=confdefs-tmp.h
-  _CONFIG_DEFS_H=mozilla-config.h
+  _CONFIG_DEFS_H=js-confdefs.h
 
   cat > $_CONFIG_TMP <<\EOF
 /* List of defines generated by configure. Included with preprocessor flag,
@@ -5186,8 +5186,8 @@ dnl ========================================================
  * Do not edit.
  */
 
-#ifndef _MOZILLA_CONFIG_H_
-#define _MOZILLA_CONFIG_H_
+#ifndef _JS_CONFDEFS_H_
+#define _JS_CONFDEFS_H_
 EOF
 
 _EGREP_PATTERN='^#define ('
@@ -5202,11 +5202,11 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
 
   cat >> $_CONFIG_TMP <<\EOF
 
-#endif /* _MOZILLA_CONFIG_H_ */
+#endif /* _JS_CONFDEFS_H_ */
 
 EOF
 
-  # Only write mozilla-config.h when something changes (or it doesn't exist)
+  # Only write js-confdefs.h when something changes (or it doesn't exist)
   if cmp -s $_CONFIG_TMP $_CONFIG_DEFS_H; then
     rm $_CONFIG_TMP
   else
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index 162bd6a55926..030bc6477cdd 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -156,13 +156,13 @@ DEFINES += \
   -DEXPORT_XPC_API \
   $(NULL)
 
-CONFIG := $(shell cat $(DEPTH)/js/src/mozilla-config.h)
+CONFIG := $(shell cat $(DEPTH)/js/src/js-confdefs.h)
 
 ENABLE_JIT = $(filter JS_TRACER, $(CONFIG))
 
 ifneq (,$(ENABLE_JIT))
 
-# Ugly! We need the AVMPLUS defines out of js/src/mozilla-config.h to make the
+# Ugly! We need the AVMPLUS defines out of js/src/js-confdefs.h to make the
 # nanojit headers happy. Gotta figure out a better way to get them, bug 483677.
 DEFINES += \
   -DJS_TRACER=1 \
@@ -211,7 +211,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
                     $(srcdir)/qsgen.py \
                     $(topsrcdir)/xpcom/idl-parser/header.py \
                     $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-                    $(DEPTH)/js/src/mozilla-config.h
+                    $(DEPTH)/js/src/js-confdefs.h
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py \
 	  -I$(topsrcdir)/other-licenses/ply \
 	  -I$(topsrcdir)/xpcom/idl-parser \

From ba4bfdba0382b8b6806cd646098cb911c31c1da3 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sun, 26 Jul 2009 21:27:33 -0400
Subject: [PATCH 34/61] Bug 495176.  Improve security error reporting when
 document.domain is involved.  r=jst,pike sr=jst

---
 caps/src/nsScriptSecurityManager.cpp          |  85 ++++++++++++---
 .../en-US/chrome/security/caps.properties     | 103 +++++++++++++++++-
 2 files changed, 169 insertions(+), 19 deletions(-)

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index b03383edddb2..8496f37bdef5 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -139,8 +139,7 @@ PRUint32 nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin;
 
 static
 nsresult
-GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
-                         nsACString& aOrigin)
+GetOriginFromURI(nsIURI* aURI, nsACString& aOrigin)
 {
   if (nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin > 1) {
       // Allow a single recursive call to GetPrincipalDomainOrigin, since that
@@ -151,16 +150,8 @@ GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
   }
 
   nsAutoInPrincipalDomainOriginSetter autoSetter;
-  aOrigin.Truncate();
 
-  nsCOMPtr<nsIURI> uri;
-  aPrincipal->GetDomain(getter_AddRefs(uri));
-  if (!uri) {
-    aPrincipal->GetURI(getter_AddRefs(uri));
-  }
-  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
-
-  uri = NS_GetInnermostURI(uri);
+  nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
   NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
 
   nsCAutoString hostPort;
@@ -182,6 +173,22 @@ GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
   return NS_OK;
 }
 
+static
+nsresult
+GetPrincipalDomainOrigin(nsIPrincipal* aPrincipal,
+                         nsACString& aOrigin)
+{
+
+  nsCOMPtr<nsIURI> uri;
+  aPrincipal->GetDomain(getter_AddRefs(uri));
+  if (!uri) {
+    aPrincipal->GetURI(getter_AddRefs(uri));
+  }
+  NS_ENSURE_TRUE(uri, NS_ERROR_UNEXPECTED);
+
+  return GetOriginFromURI(uri, aOrigin);
+}
+
 // Inline copy of JS_GetPrivate() for better inlining and optimization
 // possibilities. Also doesn't take a cx argument as it's not
 // needed. We access the private data only on objects whose private
@@ -831,35 +838,81 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
 
         NS_ConvertUTF8toUTF16 className(classInfoData.GetName());
         nsCAutoString subjectOrigin;
+        nsCAutoString subjectDomain;
         if (!nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin) {
-            GetPrincipalDomainOrigin(subjectPrincipal, subjectOrigin);
+            nsCOMPtr<nsIURI> uri, domain;
+            subjectPrincipal->GetURI(getter_AddRefs(uri));
+            // Subject can't be system if we failed the security
+            // check, so |uri| is non-null.
+            NS_ASSERTION(uri, "How did that happen?");
+            GetOriginFromURI(uri, subjectOrigin);
+            subjectPrincipal->GetDomain(getter_AddRefs(domain));
+            if (domain) {
+                GetOriginFromURI(domain, subjectDomain);
+            }
         } else {
             subjectOrigin.AssignLiteral("the security manager");
         }
         NS_ConvertUTF8toUTF16 subjectOriginUnicode(subjectOrigin);
+        NS_ConvertUTF8toUTF16 subjectDomainUnicode(subjectDomain);
 
         nsCAutoString objectOrigin;
+        nsCAutoString objectDomain;
         if (!nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin &&
             objectPrincipal) {
-            GetPrincipalDomainOrigin(objectPrincipal, objectOrigin);
+            nsCOMPtr<nsIURI> uri, domain;
+            objectPrincipal->GetURI(getter_AddRefs(uri));
+            if (uri) { // Object principal might be system
+                GetOriginFromURI(uri, objectOrigin);
+            }
+            objectPrincipal->GetDomain(getter_AddRefs(domain));
+            if (domain) {
+                GetOriginFromURI(domain, objectDomain);
+            }
         }
         NS_ConvertUTF8toUTF16 objectOriginUnicode(objectOrigin);
-            
+        NS_ConvertUTF8toUTF16 objectDomainUnicode(objectDomain);
+
         nsXPIDLString errorMsg;
         const PRUnichar *formatStrings[] =
         {
             subjectOriginUnicode.get(),
             className.get(),
             JSValIDToString(cx, aProperty),
-            objectOriginUnicode.get()
+            objectOriginUnicode.get(),
+            subjectDomainUnicode.get(),
+            objectDomainUnicode.get()
         };
 
         PRUint32 length = NS_ARRAY_LENGTH(formatStrings);
 
+        // XXXbz Our localization system is stupid and can't handle not showing
+        // some strings that get passed in.  Which means that we have to get
+        // our length precisely right: it has to be exactly the number of
+        // strings our format string wants.  This means we'll have to move
+        // strings in the array as needed, sadly...
         if (nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin ||
             !objectPrincipal) {
             stringName.AppendLiteral("OnlySubject");
-            --length;
+            length -= 3;
+        } else {
+            // default to a length that doesn't include the domains, then
+            // increase it as needed.
+            length -= 2;
+            if (!subjectDomainUnicode.IsEmpty()) {
+                stringName.AppendLiteral("SubjectDomain");
+                length += 1;
+            }
+            if (!objectDomainUnicode.IsEmpty()) {
+                stringName.AppendLiteral("ObjectDomain");
+                length += 1;
+                if (length != NS_ARRAY_LENGTH(formatStrings)) {
+                    // We have an object domain but not a subject domain.
+                    // Scoot our string over one slot.  See the XXX comment
+                    // above for why we need to do this.
+                    formatStrings[length-1] = formatStrings[length];
+                }
+            }
         }
         
         // We need to keep our existing failure rv and not override it
diff --git a/dom/locales/en-US/chrome/security/caps.properties b/dom/locales/en-US/chrome/security/caps.properties
index 09aa7c39318c..5628acdfaf52 100644
--- a/dom/locales/en-US/chrome/security/caps.properties
+++ b/dom/locales/en-US/chrome/security/caps.properties
@@ -43,9 +43,106 @@ EnableCapabilityQuery = A script from "%S" is requesting enhanced abilities that
 EnableCapabilityDenied = A script from "%S" was denied %S privileges.
 CheckLoadURIError = Security Error: Content at %S may not load or link to %S.
 CheckSameOriginError = Security Error: Content at %S may not load data from %S.
-GetPropertyDeniedOrigins = Permission denied for <%S> to get property %S.%S from <%S>.
-SetPropertyDeniedOrigins = Permission denied for <%S> to set property %S.%S on <%S>.
-CallMethodDeniedOrigins = Permission denied for <%S> to call method %S.%S on <%S>.
+
+# LOCALIZATION NOTE (GetPropertyDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+GetPropertyDeniedOrigins = Permission denied for <%1$S> to get property %2$S.%3$S from <%4$S>.
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to get property %2$S.%3$S from <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (GetPropertyDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+GetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to get property %2$S.%3$S from <%4$S> (document.domain=<%6$S>).
+
+# LOCALIZATION NOTE (SetPropertyDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+SetPropertyDeniedOrigins = Permission denied for <%1$S> to set property %2$S.%3$S on <%4$S>.
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to set property %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (SetPropertyDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the property of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+SetPropertyDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to set property %2$S.%3$S on <%4$S> (document.domain=<%6$S>).
+
+# LOCALIZATION NOTE (CallMethodDeniedOrigins):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+CallMethodDeniedOrigins = Permission denied for <%1$S> to call method %2$S.%3$S on <%4$S>.
+# LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsSubjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain has not been set).
+# LOCALIZATION NOTE (CallMethodDeniedOriginsObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsObjectDomain = Permission denied for <%1$S> (document.domain has not been set) to call method %2$S.%3$S on <%4$S> (document.domain=<%5$S>).
+# LOCALIZATION NOTE (CallMethodDeniedOriginsSubjectDomainObjectDomain):
+# %1$S is the origin of the script which was denied access.
+# %2$S is the origin of the object access was denied to.
+# %3$S is the type of object it was.
+# %4$S is the method of that object that access was denied for.
+# %5$S is the value of document.domain for the script which was denied access;
+#      don't translate "document.domain"
+# %6$S is the value of document.domain for the object being accessed;
+#      don't translate "document.domain".
+CallMethodDeniedOriginsSubjectDomainObjectDomain = Permission denied for <%1$S> (document.domain=<%5$S>) to call method %2$S.%3$S on <%4$S> (document.domain=<%6$S>).
+
 GetPropertyDeniedOriginsOnlySubject = Permission denied for <%S> to get property %S.%S
 SetPropertyDeniedOriginsOnlySubject = Permission denied for <%S> to set property %S.%S
 CallMethodDeniedOriginsOnlySubject = Permission denied for <%S> to call method %S.%S

From 43dbee74727d2dc24900ca7c3b85c42310a4727c Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 28 Jul 2009 12:19:00 -0700
Subject: [PATCH 35/61] Bug 506894 - Crash - e4x/GC/regress-357063-01.js. 
 r=gal

---
 js/src/jsxml.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/src/jsxml.cpp b/js/src/jsxml.cpp
index 1e8d73f9a892..ad662c10029b 100644
--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@@ -932,8 +932,12 @@ XMLArraySetCapacity(JSContext *cx, JSXMLArray *array, uint32 capacity)
 
     if (capacity == 0) {
         /* We could let realloc(p, 0) free this, but purify gets confused. */
-        if (array->vector)
-            cx->free(array->vector);
+        if (array->vector) {
+            if (cx)
+                cx->free(array->vector);
+            else
+                js_free(array->vector);
+        }
         vector = NULL;
     } else {
         if (

From 19c9082e3373fc0ca5984ecdfbb2172baec3b549 Mon Sep 17 00:00:00 2001
From: Brendan Eich <brendan@mozilla.org>
Date: Tue, 28 Jul 2009 13:20:14 -0700
Subject: [PATCH 36/61] Bug 471214 - Join function objects transparently, clone
 via read barrier to satisfy de-facto standard (r=igor).

---
 js/src/imacros.c.out  |   2 +
 js/src/jsapi.cpp      |   2 +-
 js/src/jsarray.cpp    |   2 +-
 js/src/jsbuiltins.cpp |   4 +-
 js/src/jsemit.cpp     |  10 +-
 js/src/jsinterp.cpp   | 282 +++++++++++++++++++++++++++---------------
 js/src/jsiter.cpp     |   2 +-
 js/src/jsobj.cpp      | 121 ++++++++++++------
 js/src/jsobj.h        |  23 +++-
 js/src/jsopcode.cpp   |   2 +
 js/src/jsopcode.tbl   |   8 +-
 js/src/jsparse.cpp    |  12 ++
 js/src/jsscope.cpp    |  26 +++-
 js/src/jsscope.h      | 168 ++++++++++++++++++++-----
 js/src/jstracer.cpp   |  74 ++++++-----
 js/src/jstypes.h      |   8 ++
 js/src/jsxdrapi.h     |   2 +-
 17 files changed, 535 insertions(+), 213 deletions(-)

diff --git a/js/src/imacros.c.out b/js/src/imacros.c.out
index 8871bb8001e4..d7d4d9f73629 100644
--- a/js/src/imacros.c.out
+++ b/js/src/imacros.c.out
@@ -964,6 +964,8 @@ uint8 js_opcode2extra[JSOP_LIMIT] = {
     0,  /* JSOP_DEFFUN_DBGFC */
     0,  /* JSOP_DEFLOCALFUN_DBGFC */
     0,  /* JSOP_LAMBDA_DBGFC */
+    0,  /* JSOP_SETMETHOD */
+    0,  /* JSOP_INITMETHOD */
 };
 #define JSOP_IS_IMACOP(x) (0 \
  || x == JSOP_BITOR \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index dd3ab2e83557..b987d291e389 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3544,7 +3544,7 @@ JS_GetMethodById(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
                  jsval *vp)
 {
     CHECK_REQUEST(cx);
-    if (!js_GetMethod(cx, obj, id, false, vp))
+    if (!js_GetMethod(cx, obj, id, JSGET_METHOD_BARRIER, vp))
         return JS_FALSE;
     if (objp)
         *objp = obj;
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index f4b1039efab6..debe0d8a2ba7 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -792,7 +792,7 @@ array_getProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
         if (prop) {
             if (OBJ_IS_NATIVE(obj2)) {
                 sprop = (JSScopeProperty *) prop;
-                if (!js_NativeGet(cx, obj, obj2, sprop, vp))
+                if (!js_NativeGet(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, vp))
                     return JS_FALSE;
             }
             OBJ_DROP_PROPERTY(cx, obj2, prop);
diff --git a/js/src/jsbuiltins.cpp b/js/src/jsbuiltins.cpp
index 1f1408bf460c..0f97db750322 100644
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -337,9 +337,9 @@ JS_DEFINE_CALLINFO_3(extern, BOOL, js_HasNamedPropertyInt32, CONTEXT, OBJECT, IN
 jsval FASTCALL
 js_CallGetter(JSContext* cx, JSObject* obj, JSScopeProperty* sprop)
 {
-    JS_ASSERT(!SPROP_HAS_STUB_GETTER(sprop));
+    JS_ASSERT(!SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop));
     jsval v;
-    if (!js_GetSprop(cx, sprop, obj, &v))
+    if (!sprop->get(cx, obj, &v))
         return JSVAL_ERROR_COOKIE;
     return v;
 }
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index 5105d8bba498..2b63635620e8 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -6529,7 +6529,15 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
                 ale = cg->atomList.add(cg->compiler, pn3->pn_atom);
                 if (!ale)
                     return JS_FALSE;
-                EMIT_INDEX_OP(JSOP_INITPROP, ALE_INDEX(ale));
+
+                JSOp initOp = (PN_OP(pn2->pn_right) == JSOP_LAMBDA
+#if JS_HAS_GETTER_SETTER
+                               && op != JSOP_GETTER && op != JSOP_SETTER
+#endif
+                               )
+                              ? JSOP_INITMETHOD
+                              : JSOP_INITPROP;
+                EMIT_INDEX_OP(initOp, ALE_INDEX(ale));
             }
         }
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 0d9a50ba5ad1..13089d7a7d39 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=79:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -184,46 +184,61 @@ js_FillPropertyCache(JSContext *cx, JSObject *obj,
          * is a plain old method? It's a function-valued property with stub
          * getter, so get of a function is idempotent.
          */
-        if ((cs->format & JOF_CALLOP) &&
-            SPROP_HAS_STUB_GETTER(sprop) &&
-            SPROP_HAS_VALID_SLOT(sprop, scope)) {
+        if (cs->format & JOF_CALLOP) {
             jsval v;
 
-            v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
-            if (VALUE_IS_FUNCTION(cx, v)) {
+            if (sprop->isMethod()) {
                 /*
-                 * Great, we have a function-valued prototype property where
-                 * the getter is JS_PropertyStub. The type id in pobj's scope
-                 * does not evolve with changes to property values, however.
-                 *
-                 * So here, on first cache fill for this method, we brand the
-                 * scope with a new shape and set the SCOPE_BRANDED flag. Once
-                 * this scope flag is set, any write to a function-valued plain
-                 * old property in pobj will result in shape being regenerated.
+                 * A compiler-created function object, AKA a method, already
+                 * memoized in the property tree.
                  */
-                if (!scope->branded()) {
-                    PCMETER(cache->brandfills++);
-#ifdef DEBUG_notme
-                    fprintf(stderr,
-                            "branding %p (%s) for funobj %p (%s), shape %lu\n",
-                            pobj, LOCKED_OBJ_GET_CLASS(pobj)->name,
-                            JSVAL_TO_OBJECT(v),
-                            JS_GetFunctionName(GET_FUNCTION_PRIVATE(cx, JSVAL_TO_OBJECT(v))),
-                            OBJ_SHAPE(obj));
-#endif
-                    scope->brandingShapeChange(cx, sprop->slot, v);
-                    if (js_IsPropertyCacheDisabled(cx))  /* check for rt->shapeGen overflow */
-                        return JS_NO_PROP_CACHE_FILL;
-                    scope->setBranded();
-                }
+                JS_ASSERT(scope->hasMethodBarrier());
+                v = sprop->methodValue();
+                JS_ASSERT(VALUE_IS_FUNCTION(cx, v));
                 vword = JSVAL_OBJECT_TO_PCVAL(v);
                 break;
             }
+
+            if (SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
+                SPROP_HAS_VALID_SLOT(sprop, scope)) {
+                v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
+                if (VALUE_IS_FUNCTION(cx, v)) {
+                    /*
+                     * Great, we have a function-valued prototype property
+                     * where the getter is JS_PropertyStub. The type id in
+                     * pobj's scope does not evolve with changes to property
+                     * values, however.
+                     *
+                     * So here, on first cache fill for this method, we brand
+                     * the scope with a new shape and set the SCOPE_BRANDED
+                     * flag. Once this scope flag is set, any write that adds
+                     * or deletes a function-valued plain old property in
+                     * scope->object will result in shape being regenerated.
+                     */
+                    if (!scope->branded()) {
+                        PCMETER(cache->brandfills++);
+#ifdef DEBUG_notme
+                        fprintf(stderr,
+                                "branding %p (%s) for funobj %p (%s), shape %lu\n",
+                                pobj, LOCKED_OBJ_GET_CLASS(pobj)->name,
+                                JSVAL_TO_OBJECT(v),
+                                JS_GetFunctionName(GET_FUNCTION_PRIVATE(cx, JSVAL_TO_OBJECT(v))),
+                                OBJ_SHAPE(obj));
+#endif
+                        scope->brandingShapeChange(cx, sprop->slot, v);
+                        if (js_IsPropertyCacheDisabled(cx))  /* check for rt->shapeGen overflow */
+                            return JS_NO_PROP_CACHE_FILL;
+                        scope->setBranded();
+                    }
+                    vword = JSVAL_OBJECT_TO_PCVAL(v);
+                    break;
+                }
+            }
         }
 
         /* If getting a value via a stub getter, we can cache the slot. */
         if (!(cs->format & (JOF_SET | JOF_INCDEC | JOF_FOR)) &&
-            SPROP_HAS_STUB_GETTER(sprop) &&
+            SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
             SPROP_HAS_VALID_SLOT(sprop, scope)) {
             /* Great, let's cache sprop's slot and use it on cache hit. */
             vword = SLOT_TO_PCVAL(sprop->slot);
@@ -235,30 +250,30 @@ js_FillPropertyCache(JSContext *cx, JSObject *obj,
                 scope->shape == sprop->shape) {
                 /*
                  * Our caller added a new property. We also know that a setter
-                 * that js_NativeSet could have run has not mutated the scope
-                 * so the added property is still the last one added and the
+                 * that js_NativeSet could have run has not mutated the scope,
+                 * so the added property is still the last one added, and the
                  * scope is not branded.
                  *
                  * We want to cache under scope's shape before the property
                  * addition to bias for the case when the mutator opcode
-                 * always adds the same property. It allows to optimize
-                 * periodic execution of object initializers or explicit
-                 * initialization sequences like
+                 * always adds the same property. This allows us to optimize
+                 * periodic execution of object initializers or other explicit
+                 * initialization sequences such as
                  *
                  *   obj = {}; obj.x = 1; obj.y = 2;
                  *
                  * We assume that on average the win from this optimization is
-                 * bigger that the cost of an extra mismatch per loop due to
+                 * greater than the cost of an extra mismatch per loop owing to
                  * the bias for the following case:
                  *
                  *   obj = {}; ... for (...) { ... obj.x = ... }
                  *
-                 * On the first iteration JSOP_SETPROP fills the cache with
-                 * the shape of newly created object, not the shape after
-                 * obj.x is assigned. That mismatches obj's shape on the
-                 * second iteration. Note that on third and the following
-                 * iterations the cache will be hit since the shape no longer
-                 * mutates.
+                 * On the first iteration of such a for loop, JSOP_SETPROP
+                 * fills the cache with the shape of the newly created object
+                 * obj, not the shape of obj after obj.x has been assigned.
+                 * That mismatches obj's shape on the second iteration. Note
+                 * that on the third and subsequent iterations the cache will
+                 * be hit because the shape is no longer updated.
                  */
                 JS_ASSERT(scope->owned());
                 if (sprop->parent) {
@@ -989,7 +1004,7 @@ js_OnUnknownMethod(JSContext *cx, jsval *vp)
 
     MUST_FLOW_THROUGH("out");
     id = ATOM_TO_JSID(cx->runtime->atomState.noSuchMethodAtom);
-    ok = js_GetMethod(cx, obj, id, false, &tvr.u.value);
+    ok = js_GetMethod(cx, obj, id, 0, &tvr.u.value);
     if (!ok)
         goto out;
     if (JSVAL_IS_PRIMITIVE(tvr.u.value)) {
@@ -2132,9 +2147,9 @@ js_TraceOpcode(JSContext *cx)
                                 fp->script, cx->tracePrevPc);
 
         /*
-         * If there aren't that many elements on the stack, then
-         * we have probably entered a new frame, and printing output
-         * would just be misleading.
+         * If there aren't that many elements on the stack, then we have
+         * probably entered a new frame, and printing output would just be
+         * misleading.
          */
         if (ndefs != 0 &&
             ndefs < regs->sp - fp->slots) {
@@ -2600,7 +2615,7 @@ AssertValidPropertyCacheHit(JSContext *cx, JSScript *script, JSFrameRegs& regs,
         JS_ASSERT(PCVAL_IS_OBJECT(entry->vword));
         JS_ASSERT(entry->vword != PCVAL_NULL);
         JS_ASSERT(OBJ_SCOPE(pobj)->branded());
-        JS_ASSERT(SPROP_HAS_STUB_GETTER(sprop));
+        JS_ASSERT(SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop));
         JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)));
         v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
         JS_ASSERT(VALUE_IS_FUNCTION(cx, v));
@@ -2637,9 +2652,11 @@ JS_STATIC_ASSERT(JSOP_DEFFUN_FC_LENGTH == JSOP_DEFFUN_DBGFC_LENGTH);
 
 /*
  * Same for JSOP_SETNAME and JSOP_SETPROP, which differ only slightly but
- * remain distinct for the decompiler.
+ * remain distinct for the decompiler. Likewise for JSOP_INIT{PROP,METHOD}.
  */
 JS_STATIC_ASSERT(JSOP_SETNAME_LENGTH == JSOP_SETPROP_LENGTH);
+JS_STATIC_ASSERT(JSOP_SETNAME_LENGTH == JSOP_SETMETHOD_LENGTH);
+JS_STATIC_ASSERT(JSOP_INITPROP_LENGTH == JSOP_INITMETHOD_LENGTH);
 
 /* See TRY_BRANCH_AFTER_COND. */
 JS_STATIC_ASSERT(JSOP_IFNE_LENGTH == JSOP_IFEQ_LENGTH);
@@ -2700,14 +2717,6 @@ js_Interpret(JSContext *cx)
 #endif
     JSAutoResolveFlags rf(cx, JSRESOLVE_INFER);
 
-#ifdef __GNUC__
-# define JS_EXTENSION __extension__
-# define JS_EXTENSION_(s) __extension__ ({ s; })
-#else
-# define JS_EXTENSION
-# define JS_EXTENSION_(s) s
-#endif
-
 # ifdef DEBUG
     /*
      * We call this macro from BEGIN_CASE in threaded interpreters,
@@ -3610,7 +3619,7 @@ js_Interpret(JSContext *cx)
             goto error;                                                       \
     JS_END_MACRO
 
-#define NATIVE_GET(cx,obj,pobj,sprop,vp)                                      \
+#define NATIVE_GET(cx,obj,pobj,sprop,getHow,vp)                               \
     JS_BEGIN_MACRO                                                            \
         if (SPROP_HAS_STUB_GETTER(sprop)) {                                   \
             /* Fast path for Object instance properties. */                   \
@@ -3620,7 +3629,7 @@ js_Interpret(JSContext *cx)
                   ? LOCKED_OBJ_GET_SLOT(pobj, (sprop)->slot)                  \
                   : JSVAL_VOID;                                               \
         } else {                                                              \
-            if (!js_NativeGet(cx, obj, pobj, sprop, vp))                      \
+            if (!js_NativeGet(cx, obj, pobj, sprop, getHow, vp))              \
                 goto error;                                                   \
         }                                                                     \
     JS_END_MACRO
@@ -4481,7 +4490,7 @@ js_Interpret(JSContext *cx)
                         } else {
                             JS_ASSERT(PCVAL_IS_SPROP(entry->vword));
                             sprop = PCVAL_TO_SPROP(entry->vword);
-                            NATIVE_GET(cx, obj, obj2, sprop, &rval);
+                            NATIVE_GET(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, &rval);
                         }
                         JS_UNLOCK_OBJ(cx, obj2);
                         break;
@@ -4495,7 +4504,9 @@ js_Interpret(JSContext *cx)
                 }
                 id = ATOM_TO_JSID(atom);
                 if (entry
-                    ? !js_GetPropertyHelper(cx, obj, id, true, &rval)
+                    ? !js_GetPropertyHelper(cx, obj, id,
+                                            JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
+                                            &rval)
                     : !OBJ_GET_PROPERTY(cx, obj, id, &rval)) {
                     goto error;
                 }
@@ -4572,7 +4583,7 @@ js_Interpret(JSContext *cx)
                     } else {
                         JS_ASSERT(PCVAL_IS_SPROP(entry->vword));
                         sprop = PCVAL_TO_SPROP(entry->vword);
-                        NATIVE_GET(cx, obj, obj2, sprop, &rval);
+                        NATIVE_GET(cx, obj, obj2, sprop, 0, &rval);
                     }
                     JS_UNLOCK_OBJ(cx, obj2);
                     STORE_OPND(-1, rval);
@@ -4591,13 +4602,13 @@ js_Interpret(JSContext *cx)
             id = ATOM_TO_JSID(atom);
             PUSH(JSVAL_NULL);
             if (!JSVAL_IS_PRIMITIVE(lval)) {
-                if (!js_GetMethod(cx, obj, id, !!entry, &rval))
+                if (!js_GetMethod(cx, obj, id, entry ? JSGET_CACHE_RESULT : 0, &rval))
                     goto error;
                 STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
                 STORE_OPND(-2, rval);
             } else {
                 JS_ASSERT(obj->map->ops->getProperty == js_GetProperty);
-                if (!js_GetPropertyHelper(cx, obj, id, true, &rval))
+                if (!js_GetPropertyHelper(cx, obj, id, JSGET_CACHE_RESULT, &rval))
                     goto error;
                 STORE_OPND(-1, lval);
                 STORE_OPND(-2, rval);
@@ -4628,9 +4639,12 @@ js_Interpret(JSContext *cx)
 
           BEGIN_CASE(JSOP_SETNAME)
           BEGIN_CASE(JSOP_SETPROP)
+          BEGIN_CASE(JSOP_SETMETHOD)
+          do_setprop:
             rval = FETCH_OPND(-1);
+            JS_ASSERT_IF(op == JSOP_SETMETHOD, VALUE_IS_FUNCTION(cx, rval));
             lval = FETCH_OPND(-2);
-            JS_ASSERT(!JSVAL_IS_PRIMITIVE(lval) || op == JSOP_SETPROP);
+            JS_ASSERT_IF(op == JSOP_SETNAME, !JSVAL_IS_PRIMITIVE(lval));
             VALUE_TO_OBJECT(cx, -2, lval, obj);
 
             do {
@@ -4784,9 +4798,21 @@ js_Interpret(JSContext *cx)
                                     sprop = sprop2;
                                 } else {
                                     scope->extend(cx, sprop);
+
+                                    jsuint index;
+                                    if (js_IdIsIndex(sprop->id, &index))
+                                        scope->setIndexedProperties();
+
+                                    if (sprop->isMethod())
+                                        scope->setMethodBarrier();
                                 }
 
-                                LOCKED_OBJ_WRITE_BARRIER(cx, obj, slot, rval);
+                                /*
+                                 * No LOCKED_OBJ_WRITE_BARRIER because here we
+                                 * are adding a new property, not updating an
+                                 * existing slot's value that might contain a
+                                 * method of a branded scope.
+                                 */
                                 TRACE_2(SetPropHit, entry, sprop);
                                 LOCKED_OBJ_SET_SLOT(obj, slot, rval);
                                 JS_UNLOCK_SCOPE(cx, scope);
@@ -4830,7 +4856,10 @@ js_Interpret(JSContext *cx)
                     LOAD_ATOM(0);
                 id = ATOM_TO_JSID(atom);
                 if (entry) {
-                    if (!js_SetPropertyHelper(cx, obj, id, true, &rval))
+                    uintN defineHow = (op == JSOP_SETMETHOD)
+                                      ? JSDNP_CACHE_RESULT | JSDNP_SET_METHOD
+                                      : JSDNP_CACHE_RESULT;
+                    if (!js_SetPropertyHelper(cx, obj, id, defineHow, &rval))
                         goto error;
                 } else {
                     if (!OBJ_SET_PROPERTY(cx, obj, id, &rval))
@@ -4887,7 +4916,7 @@ js_Interpret(JSContext *cx)
           END_CASE(JSOP_GETELEM)
 
           BEGIN_CASE(JSOP_CALLELEM)
-            ELEMENT_OP(-1, js_GetMethod(cx, obj, id, false, &rval));
+            ELEMENT_OP(-1, js_GetMethod(cx, obj, id, 0, &rval));
 #if JS_HAS_NO_SUCH_METHOD
             if (JS_UNLIKELY(JSVAL_IS_VOID(rval))) {
                 regs.sp[-2] = regs.sp[-1];
@@ -5341,7 +5370,7 @@ js_Interpret(JSContext *cx)
             } else {
                 sprop = (JSScopeProperty *)prop;
           do_native_get:
-                NATIVE_GET(cx, obj, obj2, sprop, &rval);
+                NATIVE_GET(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, &rval);
                 OBJ_DROP_PROPERTY(cx, obj2, (JSProperty *) sprop);
             }
 
@@ -5922,7 +5951,7 @@ js_Interpret(JSContext *cx)
                 sprop = (JSScopeProperty *) prop;
                 if ((sprop->attrs & JSPROP_PERMANENT) &&
                     SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) &&
-                    SPROP_HAS_STUB_GETTER(sprop) &&
+                    SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
                     SPROP_HAS_STUB_SETTER(sprop)) {
                     /*
                      * Fast globals use frame variables to map the global
@@ -6216,24 +6245,65 @@ js_Interpret(JSContext *cx)
             obj = FUN_OBJECT(fun);
 
             if (FUN_NULL_CLOSURE(fun)) {
-                obj = js_CloneFunctionObject(cx, fun, fp->scopeChain);
-                if (!obj)
-                    goto error;
+                parent = fp->scopeChain;
+
+                if (OBJ_GET_PARENT(cx, obj) == parent) {
+                    JSScope *scope;
+
+                    lval = FETCH_OPND(-1);
+                    op = JSOp(regs.pc[JSOP_LAMBDA_LENGTH]);
+
+                    /*
+                     * Optimize ({method: function () { ... }, ...}) and
+                     * this.method = function () { ... }; bytecode sequences.
+                     *
+                     * Note that we jump to the entry points for JSOP_SETPROP
+                     * and JSOP_INITPROP without calling the trace recorder,
+                     * because the record hooks for those ops are essentially
+                     * no-ops (this can't change given the predictive shape
+                     * guarding the recorder must do).
+                     */
+                    if (op == JSOP_SETMETHOD) {
+#ifdef DEBUG
+                        op2 = JSOp(regs.pc[JSOP_LAMBDA_LENGTH + JSOP_SETMETHOD_LENGTH]);
+                        JS_ASSERT(op2 == JSOP_POP || op2 == JSOP_POPV);
+#endif
+
+                        if (JSVAL_IS_OBJECT(lval) &&
+                            (obj2 = JSVAL_TO_OBJECT(lval)) &&
+                            OBJ_GET_CLASS(cx, obj2) == &js_ObjectClass) {
+                            scope = OBJ_SCOPE(obj2);
+                            if (scope->object == obj2) {
+                                PUSH_OPND(OBJECT_TO_JSVAL(obj));
+                                regs.pc += JSOP_LAMBDA_LENGTH;
+                                goto do_setprop;
+                            }
+                        }
+                    } else if (op == JSOP_INITMETHOD) {
+                        JS_ASSERT(!JSVAL_IS_PRIMITIVE(lval));
+                        obj2 = JSVAL_TO_OBJECT(lval);
+                        scope = OBJ_SCOPE(obj2);
+
+                        /*
+                         * JSOP_NEWINIT gave the new object it created (obj2
+                         * here) its own scope.
+                         */
+                        JS_ASSERT(scope->object == obj2);
+                        PUSH_OPND(OBJECT_TO_JSVAL(obj));
+                        regs.pc += JSOP_LAMBDA_LENGTH;
+                        goto do_initprop;
+                    }
+                }
             } else {
                 parent = js_GetScopeChain(cx, fp);
                 if (!parent)
                     goto error;
-
-                /*
-                 * FIXME: bug 471214, Cloning here even when the compiler saw
-                 * the right parent is wasteful but we don't fully support
-                 * joined function objects, yet.
-                 */
-                obj = js_CloneFunctionObject(cx, fun, parent);
-                if (!obj)
-                    goto error;
             }
 
+            obj = js_CloneFunctionObject(cx, fun, parent);
+            if (!obj)
+                goto error;
+
             PUSH_OPND(OBJECT_TO_JSVAL(obj));
           END_CASE(JSOP_LAMBDA)
 
@@ -6379,11 +6449,26 @@ js_Interpret(JSContext *cx)
           BEGIN_CASE(JSOP_NEWINIT)
             i = GET_INT8(regs.pc);
             JS_ASSERT(i == JSProto_Array || i == JSProto_Object);
-            obj = (i == JSProto_Array)
-                  ? js_NewArrayObject(cx, 0, NULL)
-                  : js_NewObject(cx, &js_ObjectClass, NULL, NULL);
-            if (!obj)
-                goto error;
+            if (i == JSProto_Array) {
+                obj = js_NewArrayObject(cx, 0, NULL);
+                if (!obj)
+                    goto error;
+            } else {
+                obj = js_NewObject(cx, &js_ObjectClass, NULL, NULL);
+                if (!obj)
+                    goto error;
+
+                if (regs.pc[JSOP_NEWINIT_LENGTH] != JSOP_ENDINIT) {
+                    JS_LOCK_OBJ(cx, obj);
+                    JSScope *scope = js_GetMutableScope(cx, obj);
+                    if (!scope) {
+                        JS_UNLOCK_OBJ(cx, obj);
+                        goto error;
+                    }
+                    JS_UNLOCK_SCOPE(cx, scope);
+                }
+            }
+
             PUSH_OPND(OBJECT_TO_JSVAL(obj));
             fp->sharpDepth++;
             CHECK_INTERRUPT_HANDLER();
@@ -6401,6 +6486,8 @@ js_Interpret(JSContext *cx)
           END_CASE(JSOP_ENDINIT)
 
           BEGIN_CASE(JSOP_INITPROP)
+          BEGIN_CASE(JSOP_INITMETHOD)
+          do_initprop:
             /* Load the property's initial value into rval. */
             JS_ASSERT(regs.sp - StackBase(fp) >= 2);
             rval = FETCH_OPND(-1);
@@ -6421,6 +6508,7 @@ js_Interpret(JSContext *cx)
 
                 JS_LOCK_OBJ(cx, obj);
                 scope = OBJ_SCOPE(obj);
+                JS_ASSERT(scope->object == obj);
                 JS_ASSERT(!scope->sealed());
                 kshape = scope->shape;
                 cache = &JS_PROPERTY_CACHE(cx);
@@ -6450,14 +6538,6 @@ js_Interpret(JSContext *cx)
                     if (!SPROP_HAS_STUB_SETTER(sprop))
                         goto do_initprop_miss;
 
-                    if (!scope->owned()) {
-                        scope = js_GetMutableScope(cx, obj);
-                        if (!scope) {
-                            JS_UNLOCK_OBJ(cx, obj);
-                            goto error;
-                        }
-                    }
-
                     /*
                      * Detect a repeated property name and force a miss to
                      * share the strict warning code and cope with complexity
@@ -6508,7 +6588,11 @@ js_Interpret(JSContext *cx)
                         scope->lastProp = sprop;
                     }
 
-                    LOCKED_OBJ_WRITE_BARRIER(cx, obj, slot, rval);
+                    /*
+                     * No LOCKED_OBJ_WRITE_BARRIER because here we are adding a
+                     * new property, not updating an existing slot's value that
+                     * might contain a method of a branded scope.
+                     */
                     TRACE_2(SetPropHit, entry, sprop);
                     LOCKED_OBJ_SET_SLOT(obj, slot, rval);
                     JS_UNLOCK_SCOPE(cx, scope);
@@ -6529,12 +6613,16 @@ js_Interpret(JSContext *cx)
                     goto error;
                 }
 
+                uintN defineHow = (op == JSOP_INITMETHOD)
+                                  ? JSDNP_CACHE_RESULT | JSDNP_SET_METHOD
+                                  : JSDNP_CACHE_RESULT;
                 if (!(JS_UNLIKELY(atom == cx->runtime->atomState.protoAtom)
-                      ? js_SetPropertyHelper(cx, obj, id, true, &rval)
+                      ? js_SetPropertyHelper(cx, obj, id, defineHow, &rval)
                       : js_DefineNativeProperty(cx, obj, id, rval, NULL, NULL,
                                                 JSPROP_ENUMERATE, 0, 0, NULL,
-                                                JSDNP_CACHE_RESULT)))
+                                                defineHow))) {
                     goto error;
+                }
             } while (0);
 
             /* Common tail for property cache hit and miss cases. */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index a9c3473f9775..b87662baf415 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -376,7 +376,7 @@ js_ValueToIterator(JSContext *cx, uintN flags, jsval *vp)
         *vp = OBJECT_TO_JSVAL(iterobj);
     } else {
         atom = cx->runtime->atomState.iteratorAtom;
-        if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), false, vp))
+        if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), 0, vp))
             goto bad;
         if (JSVAL_IS_VOID(*vp)) {
           default_iter:
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index bf5f72b4e808..8e6fc5ee6f33 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -418,7 +418,7 @@ MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
                     JSScopeProperty *sprop = (JSScopeProperty *) prop;
                     val = JSVAL_NULL;
                     if (attrs & JSPROP_GETTER)
-                        val = js_CastAsObjectJSVal(sprop->getter);
+                        val = sprop->getterValue();
                     if (attrs & JSPROP_SETTER) {
                         if (val != JSVAL_NULL) {
                             /* Mark the getter, then set val to setter. */
@@ -426,7 +426,7 @@ MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
                                                    NULL)
                                   != NULL);
                         }
-                        val = js_CastAsObjectJSVal(sprop->setter);
+                        val = sprop->setterValue();
                     }
                 } else {
                     ok = OBJ_GET_PROPERTY(cx, obj, id, &val);
@@ -782,7 +782,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
                 (attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
                 JSScopeProperty *sprop = (JSScopeProperty *) prop;
                 if (attrs & JSPROP_GETTER) {
-                    val[valcnt] = js_CastAsObjectJSVal(sprop->getter);
+                    val[valcnt] = sprop->getterValue();
                     gsopold[valcnt] =
                         ATOM_TO_STRING(cx->runtime->atomState.getterAtom);
                     gsop[valcnt] =
@@ -791,7 +791,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
                     valcnt++;
                 }
                 if (attrs & JSPROP_SETTER) {
-                    val[valcnt] = js_CastAsObjectJSVal(sprop->setter);
+                    val[valcnt] = sprop->setterValue();
                     gsopold[valcnt] =
                         ATOM_TO_STRING(cx->runtime->atomState.setterAtom);
                     gsop[valcnt] =
@@ -1905,7 +1905,7 @@ obj_lookupGetter(JSContext *cx, uintN argc, jsval *vp)
         if (OBJ_IS_NATIVE(pobj)) {
             sprop = (JSScopeProperty *) prop;
             if (sprop->attrs & JSPROP_GETTER)
-                *vp = js_CastAsObjectJSVal(sprop->getter);
+                *vp = sprop->getterValue();
         }
         OBJ_DROP_PROPERTY(cx, pobj, prop);
     }
@@ -1930,7 +1930,7 @@ obj_lookupSetter(JSContext *cx, uintN argc, jsval *vp)
         if (OBJ_IS_NATIVE(pobj)) {
             sprop = (JSScopeProperty *) prop;
             if (sprop->attrs & JSPROP_SETTER)
-                *vp = js_CastAsObjectJSVal(sprop->setter);
+                *vp = sprop->setterValue();
         }
         OBJ_DROP_PROPERTY(cx, pobj, prop);
     }
@@ -3557,6 +3557,8 @@ js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,
     JSScope *scope;
     JSScopeProperty *sprop;
 
+    JS_ASSERT(!(flags & SPROP_IS_METHOD));
+
     /*
      * Purge the property cache of now-shadowed id in obj's scope chain. Do
      * this optimistically (assuming no failure below) before locking obj, so
@@ -3638,7 +3640,7 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
     JSScopeProperty *sprop;
     JSBool added;
 
-    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_DONT_PURGE)) == 0);
+    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_DONT_PURGE | JSDNP_SET_METHOD)) == 0);
     js_LeaveTraceIfGlobalObject(cx, obj);
 
     /* Convert string indices to integers if appropriate. */
@@ -3710,10 +3712,12 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
 
     /* Use the object's class getter and setter by default. */
     clasp = LOCKED_OBJ_GET_CLASS(obj);
-    if (!getter)
-        getter = clasp->getProperty;
-    if (!setter)
-        setter = clasp->setProperty;
+    if (!(defineHow & JSDNP_SET_METHOD)) {
+        if (!getter)
+            getter = clasp->getProperty;
+        if (!setter)
+            setter = clasp->setProperty;
+    }
 
     /* Get obj's own scope if it has one, or create a new one for obj. */
     scope = js_GetMutableScope(cx, obj);
@@ -3725,6 +3729,16 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
         /* Add a new property, or replace an existing one of the same id. */
         if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
             attrs |= JSPROP_SHARED;
+
+        if (defineHow & JSDNP_SET_METHOD) {
+            JS_ASSERT(LOCKED_OBJ_GET_CLASS(obj) == &js_ObjectClass);
+            JS_ASSERT(VALUE_IS_FUNCTION(cx, value));
+            JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
+            JS_ASSERT(!getter && !setter);
+            flags |= SPROP_IS_METHOD;
+            getter = js_CastAsPropertyOp(JSVAL_TO_OBJECT(value));
+        }
+
         sprop = scope->add(cx, id, getter, setter, SPROP_INVALID_SLOT, attrs,
                            flags, shortid);
         if (!sprop)
@@ -3733,8 +3747,12 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
     }
 
     /* Store value before calling addProperty, in case the latter GC's. */
-    if (SPROP_HAS_VALID_SLOT(sprop, scope))
-        LOCKED_OBJ_WRITE_SLOT(cx, obj, sprop->slot, value);
+    if (SPROP_HAS_VALID_SLOT(sprop, scope)) {
+        if (added)
+            LOCKED_OBJ_SET_SLOT(obj, sprop->slot, value);
+        else 
+            LOCKED_OBJ_WRITE_BARRIER(cx, obj, sprop->slot, value);
+    }
 
     /* XXXbe called with lock held */
     ADD_PROPERTY_HELPER(cx, clasp, obj, scope, sprop, &value,
@@ -4138,7 +4156,7 @@ js_FindIdentifierBase(JSContext *cx, JSObject *scopeChain, jsid id)
 
 JSBool
 js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
-             JSScopeProperty *sprop, jsval *vp)
+             JSScopeProperty *sprop, uintN getHow, jsval *vp)
 {
     js_LeaveTraceIfGlobalObject(cx, pobj);
 
@@ -4157,17 +4175,20 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
           ? LOCKED_OBJ_GET_SLOT(pobj, slot)
           : JSVAL_VOID;
     if (SPROP_HAS_STUB_GETTER(sprop))
-        return JS_TRUE;
+        return true;
+
+    if (JS_UNLIKELY(sprop->isMethod()) && !(getHow & JSGET_METHOD_BARRIER))
+        return true;
 
     sample = cx->runtime->propertyRemovals;
     JS_UNLOCK_SCOPE(cx, scope);
     JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
     JS_PUSH_TEMP_ROOT_OBJECT(cx, pobj, &tvr2);
-    ok = js_GetSprop(cx, sprop, obj, vp);
+    ok = sprop->get(cx, obj, vp);
     JS_POP_TEMP_ROOT(cx, &tvr2);
     JS_POP_TEMP_ROOT(cx, &tvr);
     if (!ok)
-        return JS_FALSE;
+        return false;
 
     JS_LOCK_SCOPE(cx, scope);
     if (SLOT_IN_SCOPE(slot, scope) &&
@@ -4176,7 +4197,7 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
         LOCKED_OBJ_SET_SLOT(pobj, slot, *vp);
     }
 
-    return JS_TRUE;
+    return true;
 }
 
 JSBool
@@ -4220,7 +4241,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
     sample = cx->runtime->propertyRemovals;
     JS_UNLOCK_SCOPE(cx, scope);
     JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
-    ok = js_SetSprop(cx, sprop, obj, vp);
+    ok = sprop->set(cx, obj, vp);
     JS_POP_TEMP_ROOT(cx, &tvr);
     if (!ok)
         return JS_FALSE;
@@ -4237,7 +4258,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
 }
 
 JSBool
-js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
                      jsval *vp)
 {
     JSObject *aobj, *obj2;
@@ -4245,7 +4266,8 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
     JSProperty *prop;
     JSScopeProperty *sprop;
 
-    JS_ASSERT_IF(cacheResult, !JS_ON_TRACE(cx));
+    JS_ASSERT_IF(getHow & JSGET_CACHE_RESULT, !JS_ON_TRACE(cx));
+
     /* Convert string indices to integers if appropriate. */
     id = js_CheckForStringIndex(id);
 
@@ -4260,7 +4282,7 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
         if (!OBJ_GET_CLASS(cx, obj)->getProperty(cx, obj, ID_TO_VALUE(id), vp))
             return JS_FALSE;
 
-        PCMETER(cacheResult && JS_PROPERTY_CACHE(cx).nofills++);
+        PCMETER(getHow & JSGET_CACHE_RESULT && JS_PROPERTY_CACHE(cx).nofills++);
 
         /*
          * Give a strict warning if foo.bar is evaluated by a script for an
@@ -4321,12 +4343,12 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
 
     sprop = (JSScopeProperty *) prop;
 
-    if (cacheResult) {
+    if (getHow & JSGET_CACHE_RESULT) {
         JS_ASSERT_NOT_ON_TRACE(cx);
         js_FillPropertyCache(cx, aobj, 0, protoIndex, obj2, sprop, false);
     }
 
-    if (!js_NativeGet(cx, obj, obj2, sprop, vp))
+    if (!js_NativeGet(cx, obj, obj2, sprop, getHow, vp))
         return JS_FALSE;
 
     JS_UNLOCK_OBJ(cx, obj2);
@@ -4336,20 +4358,19 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
 JSBool
 js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
-    return js_GetPropertyHelper(cx, obj, id, false, vp);
+    return js_GetPropertyHelper(cx, obj, id, JSGET_METHOD_BARRIER, vp);
 }
 
 JSBool
-js_GetMethod(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
-             jsval *vp)
+js_GetMethod(JSContext *cx, JSObject *obj, jsid id, uintN getHow, jsval *vp)
 {
     JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
 
     if (obj->map->ops == &js_ObjectOps ||
         obj->map->ops->getProperty == js_GetProperty) {
-        return js_GetPropertyHelper(cx, obj, id, cacheResult, vp);
+        return js_GetPropertyHelper(cx, obj, id, getHow, vp);
     }
-    JS_ASSERT_IF(cacheResult, OBJ_IS_DENSE_ARRAY(cx, obj));
+    JS_ASSERT_IF(getHow & JSGET_CACHE_RESULT, OBJ_IS_DENSE_ARRAY(cx, obj));
 #if JS_HAS_XML_SUPPORT
     if (OBJECT_IS_XML(cx, obj))
         return js_GetXMLMethod(cx, obj, id, vp);
@@ -4380,10 +4401,11 @@ js_CheckUndeclaredVarAssignment(JSContext *cx)
 
 /*
  * Note: all non-error exits in this function must notify the tracer using
- * SetPropHit when called from the interpreter loop (cacheResult is true).
+ * SetPropHit when called from the interpreter, which is detected by testing
+ * (defineHow & JSDNP_CACHE_RESULT).
  */
 JSBool
-js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
                      jsval *vp)
 {
     int protoIndex;
@@ -4397,7 +4419,8 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
     JSPropertyOp getter, setter;
     bool added;
 
-    if (cacheResult)
+    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_SET_METHOD)) == 0);
+    if (defineHow & JSDNP_CACHE_RESULT)
         JS_ASSERT_NOT_ON_TRACE(cx);
 
     /* Convert string indices to integers if appropriate. */
@@ -4470,8 +4493,8 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
             if (attrs & JSPROP_READONLY) {
                 if (!JS_HAS_STRICT_OPTION(cx)) {
                     /* Just return true per ECMA if not in strict mode. */
-                    PCMETER(cacheResult && JS_PROPERTY_CACHE(cx).rofills++);
-                    if (cacheResult)
+                    PCMETER((defineHow & JSDNP_CACHE_RESULT) && JS_PROPERTY_CACHE(cx).rofills++);
+                    if (defineHow & JSDNP_CACHE_RESULT)
                         TRACE_2(SetPropHit, JS_NO_PROP_CACHE_FILL, sprop);
                     return JS_TRUE;
                 error: // TRACE_2 jumps here in case of error.
@@ -4484,7 +4507,10 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
             goto read_only_error;
         }
 
-        if (pobj != obj) {
+        if (pobj == obj) {
+            if (!(defineHow & JSDNP_SET_METHOD) != !sprop->isMethod())
+                sprop = NULL;
+        } else {
             /*
              * We found id in a prototype object: prepare to share or shadow.
              *
@@ -4496,7 +4522,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
 
             /* Don't clone a shared prototype property. */
             if (attrs & JSPROP_SHARED) {
-                if (cacheResult) {
+                if (defineHow & JSDNP_CACHE_RESULT) {
                     JSPropCacheEntry *entry;
                     entry = js_FillPropertyCache(cx, obj, 0, protoIndex, pobj, sprop, false);
                     TRACE_2(SetPropHit, entry, sprop);
@@ -4507,7 +4533,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
                     return JS_TRUE;
                 }
 
-                return js_SetSprop(cx, sprop, obj, vp);
+                return sprop->set(cx, obj, vp);
             }
 
             /* Restore attrs to the ECMA default for new properties. */
@@ -4554,8 +4580,23 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
             JS_UNLOCK_OBJ(cx, obj);
             return JS_FALSE;
         }
+
         if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
             attrs |= JSPROP_SHARED;
+
+        /*
+         * Check for Object class here to avoid defining a method on a class
+         * with magic resolve, addProperty, getProperty, etc. hooks.
+         */
+        if ((defineHow & JSDNP_SET_METHOD) &&
+            LOCKED_OBJ_GET_CLASS(obj) == &js_ObjectClass) {
+            JS_ASSERT(VALUE_IS_FUNCTION(cx, *vp));
+            JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
+            flags |= SPROP_IS_METHOD;
+            getter = JS_EXTENSION (JSPropertyOp) JSVAL_TO_OBJECT(*vp);
+            setter = NULL;
+        }
+
         sprop = scope->add(cx, id, getter, setter, SPROP_INVALID_SLOT, attrs,
                            flags, shortid);
         if (!sprop) {
@@ -4579,7 +4620,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
         added = true;
     }
 
-    if (cacheResult) {
+    if (defineHow & JSDNP_CACHE_RESULT) {
         JSPropCacheEntry *entry;
         entry = js_FillPropertyCache(cx, obj, 0, 0, obj, sprop, added);
         TRACE_2(SetPropHit, entry, sprop);
@@ -4758,7 +4799,7 @@ js_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp)
             }
 
             if (sprop &&
-                SPROP_HAS_STUB_GETTER(sprop) &&
+                SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
                 SPROP_HAS_VALID_SLOT(sprop, scope)) {
                 jsval fval = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
 
@@ -5548,7 +5589,7 @@ js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
     older = JS_SetErrorReporter(cx, NULL);
     id = ATOM_TO_JSID(atom);
     fval = JSVAL_VOID;
-    ok = js_GetMethod(cx, obj, id, false, &fval);
+    ok = js_GetMethod(cx, obj, id, 0, &fval);
     if (!ok)
         JS_ClearPendingException(cx);
     JS_SetErrorReporter(cx, older);
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 57058c9f1d6a..c553f3c37501 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -664,6 +664,9 @@ js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
  */
 const uintN JSDNP_CACHE_RESULT = 1; /* an interpreter call from JSOP_INITPROP */
 const uintN JSDNP_DONT_PURGE   = 2; /* suppress js_PurgeScopeChain */
+const uintN JSDNP_SET_METHOD   = 4; /* js_{DefineNativeProperty,SetPropertyHelper}
+                                       must pass the SPROP_IS_METHOD flag on to
+                                       js_AddScopeProperty */
 
 extern JSBool
 js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
@@ -712,6 +715,17 @@ js_FindIdentifierBase(JSContext *cx, JSObject *scopeChain, jsid id);
 extern JSObject *
 js_FindVariableScope(JSContext *cx, JSFunction **funp);
 
+/*
+ * JSGET_CACHE_RESULT is the analogue of JSDNP_CACHE_RESULT for js_GetMethod.
+ *
+ * JSGET_METHOD_BARRIER enables a read barrier that preserves standard function
+ * object semantics (by default we assume our caller won't leak a joined callee
+ * to script, where it would create hazardous mutable object sharing as well as
+ * observable identity according to == and ===.
+ */
+const uintN JSGET_CACHE_RESULT   = 1; // call from a caching interpreter opcode
+const uintN JSGET_METHOD_BARRIER = 2; // caller may leak shared function object
+
 /*
  * NB: js_NativeGet and js_NativeSet are called with the scope containing sprop
  * (pobj's scope for Get, obj's for Set) locked, and on successful return, that
@@ -720,21 +734,20 @@ js_FindVariableScope(JSContext *cx, JSFunction **funp);
  */
 extern JSBool
 js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
-             JSScopeProperty *sprop, jsval *vp);
+             JSScopeProperty *sprop, uintN getHow, jsval *vp);
 
 extern JSBool
 js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp);
 
 extern JSBool
-js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
                      jsval *vp);
 
 extern JSBool
 js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 
 extern JSBool
-js_GetMethod(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
-             jsval *vp);
+js_GetMethod(JSContext *cx, JSObject *obj, jsid id, uintN getHow, jsval *vp);
 
 /*
  * Check whether it is OK to assign an undeclared property of the global
@@ -744,7 +757,7 @@ extern JS_FRIEND_API(JSBool)
 js_CheckUndeclaredVarAssignment(JSContext *cx);
 
 extern JSBool
-js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
                      jsval *vp);
 
 extern JSBool
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 28376ee0076b..a2c63c9b0cbb 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -3823,6 +3823,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 goto do_getprop;
 
               case JSOP_SETPROP:
+              case JSOP_SETMETHOD:
                 LOAD_ATOM(0);
                 GET_QUOTE_AND_FMT("%s[%s] %s= %s", "%s.%s %s= %s", xval);
                 rval = POP_STR();
@@ -4484,6 +4485,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 break;
 
               case JSOP_INITPROP:
+              case JSOP_INITMETHOD:
                 LOAD_ATOM(0);
                 xval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
                                    (jschar)
diff --git a/js/src/jsopcode.tbl b/js/src/jsopcode.tbl
index 6981a1edf309..13129d2fb3e5 100644
--- a/js/src/jsopcode.tbl
+++ b/js/src/jsopcode.tbl
@@ -582,10 +582,16 @@ OPDEF(JSOP_OBJTOP,        227,"objtop",        NULL,  3,  0,  0,  0,  JOF_UINT16
 OPDEF(JSOP_LOOP,          228, "loop",         NULL,  1,  0,  0,  0,  JOF_BYTE)
 
 /*
- * Debugger versions of JSOP_{GET,CALL}UPVAR.
+ * Debugger versions of JSOP_{GET,CALL}UPVAR and the flat closure (_FC) ops.
  */
 OPDEF(JSOP_GETUPVAR_DBG,  229,"getupvar_dbg",  NULL,  3,  0,  1, 19,  JOF_UINT16|JOF_NAME)
 OPDEF(JSOP_CALLUPVAR_DBG, 230,"callupvar_dbg", NULL,  3,  0,  2, 19,  JOF_UINT16|JOF_NAME|JOF_CALLOP)
 OPDEF(JSOP_DEFFUN_DBGFC,     231,"deffun_dbgfc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
 OPDEF(JSOP_DEFLOCALFUN_DBGFC,232,"deflocalfun_dbgfc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING)
 OPDEF(JSOP_LAMBDA_DBGFC,     233,"lambda_dbgfc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
+
+/*
+ * Joined function object as method optimization support.
+ */
+OPDEF(JSOP_SETMETHOD,     234,"setmethod",     NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
+OPDEF(JSOP_INITMETHOD,    235,"initprop",      NULL,  3,  1,  0,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 35cd45dd9d63..cc2d2213c7ab 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -5508,6 +5508,18 @@ Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
         pn->pn_type = TOK_SEMI;
         pn->pn_pos = pn2->pn_pos;
         pn->pn_kid = pn2;
+
+        /*
+         * Specialize JSOP_SETPROP into JSOP_SETMETHOD to defer or avoid null
+         * closure cloning. Do this here rather than in AssignExpr as only now
+         * do we know that the uncloned (unjoined in ES3 terms) function object
+         * result of the assignment expression can't escape.
+         */
+        if (PN_TYPE(pn2) == TOK_ASSIGN && PN_OP(pn2) == JSOP_NOP &&
+            PN_OP(pn2->pn_left) == JSOP_SETPROP &&
+            PN_OP(pn2->pn_right) == JSOP_LAMBDA) {
+            pn2->pn_left->pn_op = JSOP_SETMETHOD;
+        }
         break;
     }
 
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 02791e40cff0..3d691274b563 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -444,12 +444,13 @@ js_HashScopeProperty(JSDHashTable *table, const void *key)
 
     /* Accumulate from least to most random so the low bits are most random. */
     hash = 0;
+    JS_ASSERT_IF(sprop->isMethod(), !sprop->setter);
     gsop = sprop->getter;
     if (gsop)
-        hash = JS_ROTATE_LEFT32(hash, 4) ^ (jsword)gsop;
+        hash = JS_ROTATE_LEFT32(hash, 4) ^ jsword(gsop);
     gsop = sprop->setter;
     if (gsop)
-        hash = JS_ROTATE_LEFT32(hash, 4) ^ (jsword)gsop;
+        hash = JS_ROTATE_LEFT32(hash, 4) ^ jsword(gsop);
 
     hash = JS_ROTATE_LEFT32(hash, 4)
            ^ (sprop->flags & ~SPROP_FLAGS_NOT_MATCHED);
@@ -1054,6 +1055,9 @@ JSScope::add(JSContext *cx, jsid id,
     JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, this));
     CHECK_ANCESTOR_LINE(this, true);
 
+    JS_ASSERT_IF(attrs & JSPROP_GETTER, getter);
+    JS_ASSERT_IF(attrs & JSPROP_SETTER, setter);
+
     /*
      * You can't add properties to a sealed scope.  But note well that you can
      * change property attributes in a sealed scope, even though that replaces
@@ -1069,10 +1073,17 @@ JSScope::add(JSContext *cx, jsid id,
      * Normalize stub getter and setter values for faster is-stub testing in
      * the SPROP_CALL_[GS]ETTER macros.
      */
-    if (getter == JS_PropertyStub)
-        getter = NULL;
     if (setter == JS_PropertyStub)
         setter = NULL;
+    if (flags & SPROP_IS_METHOD) {
+        /* Here, getter is the method, a function object reference. */
+        JS_ASSERT(getter);
+        JS_ASSERT(!setter);
+        JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
+    } else {
+        if (getter == JS_PropertyStub)
+            getter = NULL;
+    }
 
     /*
      * Search for id in order to claim its entry, allocating a property tree
@@ -1354,6 +1365,9 @@ JSScope::add(JSContext *cx, jsid id,
     if (js_IdIsIndex(sprop->id, &index))
         setIndexedProperties();
 
+    if (sprop->isMethod())
+        setMethodBarrier();
+
     METER(adds);
     return sprop;
 
@@ -1655,11 +1669,11 @@ JSScopeProperty::trace(JSTracer *trc)
     if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
         if (attrs & JSPROP_GETTER) {
             JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 0);
-            JS_CallTracer(trc, js_CastAsObject(getter), JSTRACE_OBJECT);
+            JS_CallTracer(trc, getterObject(), JSTRACE_OBJECT);
         }
         if (attrs & JSPROP_SETTER) {
             JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 1);
-            JS_CallTracer(trc, js_CastAsObject(setter), JSTRACE_OBJECT);
+            JS_CallTracer(trc, setterObject(), JSTRACE_OBJECT);
         }
     }
 #endif /* JS_HAS_GETTER_SETTER */
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 211b88c9014b..346f6e368eff 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
+ * vim: set ts=8 sw=4 et tw=99:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -286,12 +286,13 @@ struct JSScope {
         BRANDED                 = 0x0004,
         INDEXED_PROPERTIES      = 0x0008,
         OWN_SHAPE               = 0x0010,
+        METHOD_BARRIER          = 0x0020,
 
         /*
          * This flag toggles with each shape-regenerating GC cycle.
          * See JSRuntime::gcRegenShapesScopeFlag.
          */
-        SHAPE_REGEN             = 0x0020
+        SHAPE_REGEN             = 0x0040
     };
 
     bool hadMiddleDelete()      { return flags & MIDDLE_DELETE; }
@@ -322,6 +323,42 @@ struct JSScope {
 
     bool hasRegenFlag(uint8 regenFlag) { return (flags & SHAPE_REGEN) == regenFlag; }
 
+    /*
+     * A scope has a method barrier when some compiler-created "null closure"
+     * function objects (functions that do not use lexical bindings above their
+     * scope, only free variable names) that have a correct JSSLOT_PARENT value
+     * thanks to the COMPILE_N_GO optimization are stored as newly added direct
+     * property values.
+     *
+     * The de-facto standard JS language requires each evaluation of such a
+     * closure to result in a unique (according to === and observable effects)
+     * function object. ES3 tried to allow implementations to "join" such
+     * objects to a single compiler-created object, but this makes an overt
+     * mutation hazard, also an "identity hazard" against interoperation among
+     * implementations that join and do not join.
+     *
+     * To stay compatible with the de-facto standard, we store the compiler-
+     * created function object as the method value, set the METHOD_BARRIER
+     * flag, and brand the scope with a predictable shape that reflects its
+     * method values, which are cached and traced without being loaded, based
+     * on shape-qualified cache hit logic and equivalent trace guards. See
+     * BRANDED above.
+     *
+     * This means scope->hasMethodBarrier() => scope->branded(), but of course
+     * not the other way around.
+     *
+     * Then when reading from a scope for which scope->hasMethodBarrier() is
+     * true, we count on the scope's qualified/guarded shape being unique and
+     * add a read barrier that clones the compiler-created function object on
+     * demand, reshaping the scope.
+     *
+     * This read barrier is bypassed when evaluating the callee sub-expression
+     * of a call expression (see the JOF_CALLOP opcodes in jsopcode.tbl), since
+     * such ops do not present an identity or mutation hazard.
+     */
+    bool hasMethodBarrier()     { return flags & METHOD_BARRIER; }
+    void setMethodBarrier()     { flags |= METHOD_BARRIER | BRANDED; }
+
     bool owned()                { return object != NULL; }
 };
 
@@ -363,7 +400,8 @@ js_CastAsPropertyOp(JSObject *object)
 struct JSScopeProperty {
     jsid            id;                 /* int-tagged jsval/untagged JSAtom* */
     JSPropertyOp    getter;             /* getter and setter hooks or objects */
-    JSPropertyOp    setter;
+    JSPropertyOp    setter;             /* getter is JSObject* and setter is 0
+                                           if sprop->isMethod() */
     uint32          slot;               /* abstract index in object slots */
     uint8           attrs;              /* attributes, see jsapi.h JSPROP_* */
     uint8           flags;              /* flags, see below for defines */
@@ -373,6 +411,53 @@ struct JSScopeProperty {
                                            to many-kids data structure */
     uint32          shape;              /* property cache shape identifier */
 
+/* Bits stored in sprop->flags. */
+#define SPROP_MARK                      0x01
+#define SPROP_IS_ALIAS                  0x02
+#define SPROP_HAS_SHORTID               0x04
+#define SPROP_FLAG_SHAPE_REGEN          0x08
+#define SPROP_IS_METHOD                 0x10
+
+    bool isMethod() const {
+        return flags & SPROP_IS_METHOD;
+    }
+    JSObject *method() const {
+        JS_ASSERT(isMethod());
+        return js_CastAsObject(getter);
+    }
+    jsval methodValue() const {
+        JS_ASSERT(isMethod());
+        return js_CastAsObjectJSVal(getter);
+    }
+
+    bool hasGetter() const {
+        return attrs & JSPROP_GETTER;
+    }
+    JSObject *getterObject() const {
+        JS_ASSERT(hasGetter());
+        return js_CastAsObject(getter);
+    }
+    jsval getterValue() const {
+        JS_ASSERT(hasGetter());
+        return js_CastAsObjectJSVal(getter);
+    }
+
+    bool hasSetter() const {
+        return attrs & JSPROP_SETTER;
+    }
+    JSObject *setterObject() const {
+        JS_ASSERT(hasSetter());
+        return js_CastAsObject(setter);
+    }
+    jsval setterValue() const {
+        JS_ASSERT(hasSetter());
+        return js_CastAsObjectJSVal(setter);
+    }
+
+    bool methodBarrier(JSContext *cx, JSObject *obj, jsval *vp);
+    bool get(JSContext* cx, JSObject* obj, jsval* vp);
+    bool set(JSContext* cx, JSObject* obj, jsval* vp);
+
     void trace(JSTracer *trc);
 };
 
@@ -408,12 +493,6 @@ JSScope::has(JSScopeProperty *sprop)
     return lookup(sprop->id) == sprop;
 }
 
-/* Bits stored in sprop->flags. */
-#define SPROP_MARK                      0x01
-#define SPROP_IS_ALIAS                  0x02
-#define SPROP_HAS_SHORTID               0x04
-#define SPROP_FLAG_SHAPE_REGEN          0x08
-
 /*
  * If SPROP_HAS_SHORTID is set in sprop->flags, we use sprop->shortid rather
  * than id when calling sprop's getter or setter.
@@ -430,6 +509,9 @@ JSScope::has(JSScopeProperty *sprop)
 #define SPROP_HAS_STUB_GETTER(sprop)    (!(sprop)->getter)
 #define SPROP_HAS_STUB_SETTER(sprop)    (!(sprop)->setter)
 
+#define SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop)                             \
+    (SPROP_HAS_STUB_GETTER(sprop) || (sprop)->isMethod())
+
 #ifndef JS_THREADSAFE
 # define js_GenerateShape(cx, gcLocked)    js_GenerateShape (cx)
 #endif
@@ -551,15 +633,47 @@ JSScope::trace(JSTracer *trc)
 }
 
 
-static JS_INLINE bool
-js_GetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
+/*
+ * Read barrier for deferred cloning of compiler-created function objects
+ * optimized as typically non-escaping, ad-hoc methods in obj.
+ */
+JS_ALWAYS_INLINE bool
+JSScopeProperty::methodBarrier(JSContext *cx, JSObject *obj, jsval *vp)
 {
-    JS_ASSERT(!SPROP_HAS_STUB_GETTER(sprop));
+    JSScope *scope = OBJ_SCOPE(obj);
+#ifdef JS_THREADSAFE
+    JS_ASSERT(scope->title.ownercx == cx);
+#endif
 
-    if (sprop->attrs & JSPROP_GETTER) {
-        jsval fval = js_CastAsObjectJSVal(sprop->getter);
-        return js_InternalGetOrSet(cx, obj, sprop->id, fval, JSACC_READ,
-                                   0, 0, vp);
+    if (scope->hasMethodBarrier()) {
+        JSObject *funobj = JSVAL_TO_OBJECT(*vp);
+        JSFunction *fun = GET_FUNCTION_PRIVATE(cx, funobj);
+
+        if (FUN_OBJECT(fun) == funobj && FUN_INTERPRETED(fun)) {
+            funobj = js_CloneFunctionObject(cx, fun, OBJ_GET_PARENT(cx, funobj));
+            if (!funobj)
+                return false;
+            *vp = OBJECT_TO_JSVAL(funobj);
+            return js_SetPropertyHelper(cx, obj, id, 0, vp);
+        }
+    }
+    return true;
+}
+
+JS_ALWAYS_INLINE bool
+JSScopeProperty::get(JSContext* cx, JSObject* obj, jsval* vp)
+{
+    JS_ASSERT(!SPROP_HAS_STUB_GETTER(this));
+
+    if (attrs & JSPROP_GETTER) {
+        JS_ASSERT(!isMethod());
+        jsval fval = getterValue();
+        return js_InternalGetOrSet(cx, obj, id, fval, JSACC_READ, 0, 0, vp);
+    }
+
+    if (isMethod()) {
+        *vp = methodValue();
+        return methodBarrier(cx, obj, vp);
     }
 
     /*
@@ -570,30 +684,28 @@ js_GetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
      */
     if (STOBJ_GET_CLASS(obj) == &js_WithClass)
         obj = obj->map->ops->thisObject(cx, obj);
-    return sprop->getter(cx, obj, SPROP_USERID(sprop), vp);
+    return getter(cx, obj, SPROP_USERID(this), vp);
 }
 
-static JS_INLINE bool
-js_SetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
+JS_ALWAYS_INLINE bool
+JSScopeProperty::set(JSContext* cx, JSObject* obj, jsval* vp)
 {
-    JS_ASSERT(!(SPROP_HAS_STUB_SETTER(sprop) &&
-                !(sprop->attrs & JSPROP_GETTER)));
+    JS_ASSERT_IF(SPROP_HAS_STUB_SETTER(this), attrs & JSPROP_GETTER);
 
-    if (sprop->attrs & JSPROP_SETTER) {
-        jsval fval = js_CastAsObjectJSVal(sprop->setter);
-        return js_InternalGetOrSet(cx, obj, (sprop)->id, fval, JSACC_WRITE,
-                                   1, vp, vp);
+    if (attrs & JSPROP_SETTER) {
+        jsval fval = setterValue();
+        return js_InternalGetOrSet(cx, obj, id, fval, JSACC_WRITE, 1, vp, vp);
     }
 
-    if (sprop->attrs & JSPROP_GETTER) {
+    if (attrs & JSPROP_GETTER) {
         js_ReportGetterOnlyAssignment(cx);
         return JS_FALSE;
     }
 
-    /* See the comment in js_GetSprop as to why we can check for 'with'. */
+    /* See the comment in JSScopeProperty::get as to why we can check for With. */
     if (STOBJ_GET_CLASS(obj) == &js_WithClass)
         obj = obj->map->ops->thisObject(cx, obj);
-    return sprop->setter(cx, obj, SPROP_USERID(sprop), vp);
+    return setter(cx, obj, SPROP_USERID(this), vp);
 }
 
 /* Macro for common expression to test for shared permanent attributes. */
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 90c0fd2bd082..4f142149bfa6 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2636,8 +2636,9 @@ TraceRecorder::isValidSlot(JSScope* scope, JSScopeProperty* sprop)
         if (sprop->attrs & JSPROP_READONLY)
             ABORT_TRACE_RV("writing to a read-only property", false);
     }
+
     /* This check applies even when setflags == 0. */
-    if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER(sprop))
+    if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop))
         ABORT_TRACE_RV("non-stub getter", false);
 
     if (!SPROP_HAS_VALID_SLOT(sprop, scope))
@@ -4100,7 +4101,7 @@ TraceRecorder::hasMethod(JSObject* obj, jsid id)
         JSScope* scope = OBJ_SCOPE(pobj);
         JSScopeProperty* sprop = (JSScopeProperty*) prop;
 
-        if (SPROP_HAS_STUB_GETTER(sprop) &&
+        if (SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
             SPROP_HAS_VALID_SLOT(sprop, scope)) {
             jsval v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
             if (VALUE_IS_FUNCTION(cx, v)) {
@@ -10485,32 +10486,33 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
         if (setflags && (sprop->attrs & JSPROP_READONLY))
             ABORT_TRACE("writing to a readonly property");
         if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER(sprop)) {
-            // FIXME 450335: generalize this away from regexp built-in getters.
-            if (setflags == 0 &&
-                sprop->getter == js_RegExpClass.getProperty &&
-                sprop->shortid < 0) {
-                if (sprop->shortid == REGEXP_LAST_INDEX)
-                    ABORT_TRACE("can't trace RegExp.lastIndex yet");
-                LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
-                v_ins = lir->insCall(&js_CallGetter_ci, args);
-                guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
-                /*
-                 * BIG FAT WARNING: This snapshot cannot be a BRANCH_EXIT, since
-                 * the value to the top of the stack is not the value we unbox.
-                 */
-                unbox_jsval((sprop->shortid == REGEXP_SOURCE) ? JSVAL_STRING : JSVAL_BOOLEAN,
-                            v_ins,
-                            snapshot(MISMATCH_EXIT));
-                return JSRS_CONTINUE;
-            }
-            if (setflags == 0 &&
-                sprop->getter == js_StringClass.getProperty &&
-                sprop->id == ATOM_KEY(cx->runtime->atomState.lengthAtom)) {
-                if (!guardClass(obj, obj_ins, &js_StringClass, snapshot(MISMATCH_EXIT)))
-                    ABORT_TRACE("can't trace String.length on non-String objects");
-                LIns* str_ins = stobj_get_private(obj_ins, JSVAL_TAGMASK);
-                v_ins = lir->ins1(LIR_i2f, getStringLength(str_ins));
-                return JSRS_CONTINUE;
+            if (setflags == 0) {
+                // FIXME 450335: generalize this away from regexp built-in getters.
+                if (sprop->getter == js_RegExpClass.getProperty &&
+                    sprop->shortid < 0) {
+                    if (sprop->shortid == REGEXP_LAST_INDEX)
+                        ABORT_TRACE("can't trace RegExp.lastIndex yet");
+                    LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
+                    v_ins = lir->insCall(&js_CallGetter_ci, args);
+                    guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
+
+                    /*
+                     * BIG FAT WARNING: This snapshot cannot be a BRANCH_EXIT, since
+                     * the value to the top of the stack is not the value we unbox.
+                     */
+                    unbox_jsval((sprop->shortid == REGEXP_SOURCE) ? JSVAL_STRING : JSVAL_BOOLEAN,
+                                v_ins,
+                                snapshot(MISMATCH_EXIT));
+                    return JSRS_CONTINUE;
+                }
+                if (sprop->getter == js_StringClass.getProperty &&
+                    sprop->id == ATOM_KEY(cx->runtime->atomState.lengthAtom)) {
+                    if (!guardClass(obj, obj_ins, &js_StringClass, snapshot(MISMATCH_EXIT)))
+                        ABORT_TRACE("can't trace String.length on non-String objects");
+                    LIns* str_ins = stobj_get_private(obj_ins, JSVAL_TAGMASK);
+                    v_ins = lir->ins1(LIR_i2f, getStringLength(str_ins));
+                    return JSRS_CONTINUE;
+                }
             }
             ABORT_TRACE("non-stub getter");
         }
@@ -11862,7 +11864,9 @@ TraceRecorder::record_JSOP_CALLPROP()
         } else if (JSVAL_TAG(l) == JSVAL_BOOLEAN) {
             if (l == JSVAL_VOID)
                 ABORT_TRACE("callprop on void");
-            guard(false, lir->ins2i(LIR_eq, get(&l), JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_VOID)), MISMATCH_EXIT);
+            guard(false,
+                  lir->ins2i(LIR_eq, get(&l), JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_VOID)),
+                  MISMATCH_EXIT);
             i = JSProto_Boolean;
             debug_only_stmt(protoname = "Boolean.prototype";)
         } else {
@@ -12374,6 +12378,18 @@ DBG_STUB(JSOP_DEFFUN_DBGFC)
 DBG_STUB(JSOP_DEFLOCALFUN_DBGFC)
 DBG_STUB(JSOP_LAMBDA_DBGFC)
 
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::record_JSOP_SETMETHOD()
+{
+    return record_JSOP_SETPROP();
+}
+
+JS_REQUIRES_STACK JSRecordingStatus
+TraceRecorder::record_JSOP_INITMETHOD()
+{
+    return record_JSOP_INITPROP();
+}
+
 #ifdef JS_JIT_SPEW
 /* Prints information about entry typemaps and unstable exits for all peers at a PC */
 void
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index 3a5a958ba8b6..17183e24c5f6 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -456,6 +456,14 @@ typedef JSUintPtr JSUword;
 # define JS_DATA_TO_FUNC_PTR(type, ptr) ((type) (void *) (ptr))
 #endif
 
+#ifdef __GNUC__
+# define JS_EXTENSION __extension__
+# define JS_EXTENSION_(s) __extension__ ({ s; })
+#else
+# define JS_EXTENSION
+# define JS_EXTENSION_(s) s
+#endif
+
 JS_END_EXTERN_C
 
 #endif /* jstypes_h___ */
diff --git a/js/src/jsxdrapi.h b/js/src/jsxdrapi.h
index f20bc57b3ee9..930d7aa74144 100644
--- a/js/src/jsxdrapi.h
+++ b/js/src/jsxdrapi.h
@@ -204,7 +204,7 @@ JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
  * before deserialization of bytecode.  If the saved version does not match
  * the current version, abort deserialization and invalidate the file.
  */
-#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 49)
+#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 50)
 
 /*
  * Library-private functions.

From d366588e38f12fefd44a130de01746f08bdc2998 Mon Sep 17 00:00:00 2001
From: Robert Sayre <sayrer@gmail.com>
Date: Tue, 28 Jul 2009 18:51:35 -0400
Subject: [PATCH 37/61] Backed out changeset e09130fcb013

---
 js/src/imacros.c.out  |   2 -
 js/src/jsapi.cpp      |   2 +-
 js/src/jsarray.cpp    |   2 +-
 js/src/jsbuiltins.cpp |   4 +-
 js/src/jsemit.cpp     |  10 +-
 js/src/jsinterp.cpp   | 282 +++++++++++++++---------------------------
 js/src/jsiter.cpp     |   2 +-
 js/src/jsobj.cpp      | 121 ++++++------------
 js/src/jsobj.h        |  23 +---
 js/src/jsopcode.cpp   |   2 -
 js/src/jsopcode.tbl   |   8 +-
 js/src/jsparse.cpp    |  12 --
 js/src/jsscope.cpp    |  26 +---
 js/src/jsscope.h      | 168 +++++--------------------
 js/src/jstracer.cpp   |  74 +++++------
 js/src/jstypes.h      |   8 --
 js/src/jsxdrapi.h     |   2 +-
 17 files changed, 213 insertions(+), 535 deletions(-)

diff --git a/js/src/imacros.c.out b/js/src/imacros.c.out
index d7d4d9f73629..8871bb8001e4 100644
--- a/js/src/imacros.c.out
+++ b/js/src/imacros.c.out
@@ -964,8 +964,6 @@ uint8 js_opcode2extra[JSOP_LIMIT] = {
     0,  /* JSOP_DEFFUN_DBGFC */
     0,  /* JSOP_DEFLOCALFUN_DBGFC */
     0,  /* JSOP_LAMBDA_DBGFC */
-    0,  /* JSOP_SETMETHOD */
-    0,  /* JSOP_INITMETHOD */
 };
 #define JSOP_IS_IMACOP(x) (0 \
  || x == JSOP_BITOR \
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index b987d291e389..dd3ab2e83557 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3544,7 +3544,7 @@ JS_GetMethodById(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
                  jsval *vp)
 {
     CHECK_REQUEST(cx);
-    if (!js_GetMethod(cx, obj, id, JSGET_METHOD_BARRIER, vp))
+    if (!js_GetMethod(cx, obj, id, false, vp))
         return JS_FALSE;
     if (objp)
         *objp = obj;
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index debe0d8a2ba7..f4b1039efab6 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -792,7 +792,7 @@ array_getProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
         if (prop) {
             if (OBJ_IS_NATIVE(obj2)) {
                 sprop = (JSScopeProperty *) prop;
-                if (!js_NativeGet(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, vp))
+                if (!js_NativeGet(cx, obj, obj2, sprop, vp))
                     return JS_FALSE;
             }
             OBJ_DROP_PROPERTY(cx, obj2, prop);
diff --git a/js/src/jsbuiltins.cpp b/js/src/jsbuiltins.cpp
index 0f97db750322..1f1408bf460c 100644
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -337,9 +337,9 @@ JS_DEFINE_CALLINFO_3(extern, BOOL, js_HasNamedPropertyInt32, CONTEXT, OBJECT, IN
 jsval FASTCALL
 js_CallGetter(JSContext* cx, JSObject* obj, JSScopeProperty* sprop)
 {
-    JS_ASSERT(!SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop));
+    JS_ASSERT(!SPROP_HAS_STUB_GETTER(sprop));
     jsval v;
-    if (!sprop->get(cx, obj, &v))
+    if (!js_GetSprop(cx, sprop, obj, &v))
         return JSVAL_ERROR_COOKIE;
     return v;
 }
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index 2b63635620e8..5105d8bba498 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -6529,15 +6529,7 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
                 ale = cg->atomList.add(cg->compiler, pn3->pn_atom);
                 if (!ale)
                     return JS_FALSE;
-
-                JSOp initOp = (PN_OP(pn2->pn_right) == JSOP_LAMBDA
-#if JS_HAS_GETTER_SETTER
-                               && op != JSOP_GETTER && op != JSOP_SETTER
-#endif
-                               )
-                              ? JSOP_INITMETHOD
-                              : JSOP_INITPROP;
-                EMIT_INDEX_OP(initOp, ALE_INDEX(ale));
+                EMIT_INDEX_OP(JSOP_INITPROP, ALE_INDEX(ale));
             }
         }
 
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 13089d7a7d39..0d9a50ba5ad1 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sw=4 et tw=79:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -184,61 +184,46 @@ js_FillPropertyCache(JSContext *cx, JSObject *obj,
          * is a plain old method? It's a function-valued property with stub
          * getter, so get of a function is idempotent.
          */
-        if (cs->format & JOF_CALLOP) {
+        if ((cs->format & JOF_CALLOP) &&
+            SPROP_HAS_STUB_GETTER(sprop) &&
+            SPROP_HAS_VALID_SLOT(sprop, scope)) {
             jsval v;
 
-            if (sprop->isMethod()) {
+            v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
+            if (VALUE_IS_FUNCTION(cx, v)) {
                 /*
-                 * A compiler-created function object, AKA a method, already
-                 * memoized in the property tree.
+                 * Great, we have a function-valued prototype property where
+                 * the getter is JS_PropertyStub. The type id in pobj's scope
+                 * does not evolve with changes to property values, however.
+                 *
+                 * So here, on first cache fill for this method, we brand the
+                 * scope with a new shape and set the SCOPE_BRANDED flag. Once
+                 * this scope flag is set, any write to a function-valued plain
+                 * old property in pobj will result in shape being regenerated.
                  */
-                JS_ASSERT(scope->hasMethodBarrier());
-                v = sprop->methodValue();
-                JS_ASSERT(VALUE_IS_FUNCTION(cx, v));
+                if (!scope->branded()) {
+                    PCMETER(cache->brandfills++);
+#ifdef DEBUG_notme
+                    fprintf(stderr,
+                            "branding %p (%s) for funobj %p (%s), shape %lu\n",
+                            pobj, LOCKED_OBJ_GET_CLASS(pobj)->name,
+                            JSVAL_TO_OBJECT(v),
+                            JS_GetFunctionName(GET_FUNCTION_PRIVATE(cx, JSVAL_TO_OBJECT(v))),
+                            OBJ_SHAPE(obj));
+#endif
+                    scope->brandingShapeChange(cx, sprop->slot, v);
+                    if (js_IsPropertyCacheDisabled(cx))  /* check for rt->shapeGen overflow */
+                        return JS_NO_PROP_CACHE_FILL;
+                    scope->setBranded();
+                }
                 vword = JSVAL_OBJECT_TO_PCVAL(v);
                 break;
             }
-
-            if (SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
-                SPROP_HAS_VALID_SLOT(sprop, scope)) {
-                v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
-                if (VALUE_IS_FUNCTION(cx, v)) {
-                    /*
-                     * Great, we have a function-valued prototype property
-                     * where the getter is JS_PropertyStub. The type id in
-                     * pobj's scope does not evolve with changes to property
-                     * values, however.
-                     *
-                     * So here, on first cache fill for this method, we brand
-                     * the scope with a new shape and set the SCOPE_BRANDED
-                     * flag. Once this scope flag is set, any write that adds
-                     * or deletes a function-valued plain old property in
-                     * scope->object will result in shape being regenerated.
-                     */
-                    if (!scope->branded()) {
-                        PCMETER(cache->brandfills++);
-#ifdef DEBUG_notme
-                        fprintf(stderr,
-                                "branding %p (%s) for funobj %p (%s), shape %lu\n",
-                                pobj, LOCKED_OBJ_GET_CLASS(pobj)->name,
-                                JSVAL_TO_OBJECT(v),
-                                JS_GetFunctionName(GET_FUNCTION_PRIVATE(cx, JSVAL_TO_OBJECT(v))),
-                                OBJ_SHAPE(obj));
-#endif
-                        scope->brandingShapeChange(cx, sprop->slot, v);
-                        if (js_IsPropertyCacheDisabled(cx))  /* check for rt->shapeGen overflow */
-                            return JS_NO_PROP_CACHE_FILL;
-                        scope->setBranded();
-                    }
-                    vword = JSVAL_OBJECT_TO_PCVAL(v);
-                    break;
-                }
-            }
         }
 
         /* If getting a value via a stub getter, we can cache the slot. */
         if (!(cs->format & (JOF_SET | JOF_INCDEC | JOF_FOR)) &&
-            SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
+            SPROP_HAS_STUB_GETTER(sprop) &&
             SPROP_HAS_VALID_SLOT(sprop, scope)) {
             /* Great, let's cache sprop's slot and use it on cache hit. */
             vword = SLOT_TO_PCVAL(sprop->slot);
@@ -250,30 +235,30 @@ js_FillPropertyCache(JSContext *cx, JSObject *obj,
                 scope->shape == sprop->shape) {
                 /*
                  * Our caller added a new property. We also know that a setter
-                 * that js_NativeSet could have run has not mutated the scope,
-                 * so the added property is still the last one added, and the
+                 * that js_NativeSet could have run has not mutated the scope
+                 * so the added property is still the last one added and the
                  * scope is not branded.
                  *
                  * We want to cache under scope's shape before the property
                  * addition to bias for the case when the mutator opcode
-                 * always adds the same property. This allows us to optimize
-                 * periodic execution of object initializers or other explicit
-                 * initialization sequences such as
+                 * always adds the same property. It allows to optimize
+                 * periodic execution of object initializers or explicit
+                 * initialization sequences like
                  *
                  *   obj = {}; obj.x = 1; obj.y = 2;
                  *
                  * We assume that on average the win from this optimization is
-                 * greater than the cost of an extra mismatch per loop owing to
+                 * bigger that the cost of an extra mismatch per loop due to
                  * the bias for the following case:
                  *
                  *   obj = {}; ... for (...) { ... obj.x = ... }
                  *
-                 * On the first iteration of such a for loop, JSOP_SETPROP
-                 * fills the cache with the shape of the newly created object
-                 * obj, not the shape of obj after obj.x has been assigned.
-                 * That mismatches obj's shape on the second iteration. Note
-                 * that on the third and subsequent iterations the cache will
-                 * be hit because the shape is no longer updated.
+                 * On the first iteration JSOP_SETPROP fills the cache with
+                 * the shape of newly created object, not the shape after
+                 * obj.x is assigned. That mismatches obj's shape on the
+                 * second iteration. Note that on third and the following
+                 * iterations the cache will be hit since the shape no longer
+                 * mutates.
                  */
                 JS_ASSERT(scope->owned());
                 if (sprop->parent) {
@@ -1004,7 +989,7 @@ js_OnUnknownMethod(JSContext *cx, jsval *vp)
 
     MUST_FLOW_THROUGH("out");
     id = ATOM_TO_JSID(cx->runtime->atomState.noSuchMethodAtom);
-    ok = js_GetMethod(cx, obj, id, 0, &tvr.u.value);
+    ok = js_GetMethod(cx, obj, id, false, &tvr.u.value);
     if (!ok)
         goto out;
     if (JSVAL_IS_PRIMITIVE(tvr.u.value)) {
@@ -2147,9 +2132,9 @@ js_TraceOpcode(JSContext *cx)
                                 fp->script, cx->tracePrevPc);
 
         /*
-         * If there aren't that many elements on the stack, then we have
-         * probably entered a new frame, and printing output would just be
-         * misleading.
+         * If there aren't that many elements on the stack, then
+         * we have probably entered a new frame, and printing output
+         * would just be misleading.
          */
         if (ndefs != 0 &&
             ndefs < regs->sp - fp->slots) {
@@ -2615,7 +2600,7 @@ AssertValidPropertyCacheHit(JSContext *cx, JSScript *script, JSFrameRegs& regs,
         JS_ASSERT(PCVAL_IS_OBJECT(entry->vword));
         JS_ASSERT(entry->vword != PCVAL_NULL);
         JS_ASSERT(OBJ_SCOPE(pobj)->branded());
-        JS_ASSERT(SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop));
+        JS_ASSERT(SPROP_HAS_STUB_GETTER(sprop));
         JS_ASSERT(SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(pobj)));
         v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
         JS_ASSERT(VALUE_IS_FUNCTION(cx, v));
@@ -2652,11 +2637,9 @@ JS_STATIC_ASSERT(JSOP_DEFFUN_FC_LENGTH == JSOP_DEFFUN_DBGFC_LENGTH);
 
 /*
  * Same for JSOP_SETNAME and JSOP_SETPROP, which differ only slightly but
- * remain distinct for the decompiler. Likewise for JSOP_INIT{PROP,METHOD}.
+ * remain distinct for the decompiler.
  */
 JS_STATIC_ASSERT(JSOP_SETNAME_LENGTH == JSOP_SETPROP_LENGTH);
-JS_STATIC_ASSERT(JSOP_SETNAME_LENGTH == JSOP_SETMETHOD_LENGTH);
-JS_STATIC_ASSERT(JSOP_INITPROP_LENGTH == JSOP_INITMETHOD_LENGTH);
 
 /* See TRY_BRANCH_AFTER_COND. */
 JS_STATIC_ASSERT(JSOP_IFNE_LENGTH == JSOP_IFEQ_LENGTH);
@@ -2717,6 +2700,14 @@ js_Interpret(JSContext *cx)
 #endif
     JSAutoResolveFlags rf(cx, JSRESOLVE_INFER);
 
+#ifdef __GNUC__
+# define JS_EXTENSION __extension__
+# define JS_EXTENSION_(s) __extension__ ({ s; })
+#else
+# define JS_EXTENSION
+# define JS_EXTENSION_(s) s
+#endif
+
 # ifdef DEBUG
     /*
      * We call this macro from BEGIN_CASE in threaded interpreters,
@@ -3619,7 +3610,7 @@ js_Interpret(JSContext *cx)
             goto error;                                                       \
     JS_END_MACRO
 
-#define NATIVE_GET(cx,obj,pobj,sprop,getHow,vp)                               \
+#define NATIVE_GET(cx,obj,pobj,sprop,vp)                                      \
     JS_BEGIN_MACRO                                                            \
         if (SPROP_HAS_STUB_GETTER(sprop)) {                                   \
             /* Fast path for Object instance properties. */                   \
@@ -3629,7 +3620,7 @@ js_Interpret(JSContext *cx)
                   ? LOCKED_OBJ_GET_SLOT(pobj, (sprop)->slot)                  \
                   : JSVAL_VOID;                                               \
         } else {                                                              \
-            if (!js_NativeGet(cx, obj, pobj, sprop, getHow, vp))              \
+            if (!js_NativeGet(cx, obj, pobj, sprop, vp))                      \
                 goto error;                                                   \
         }                                                                     \
     JS_END_MACRO
@@ -4490,7 +4481,7 @@ js_Interpret(JSContext *cx)
                         } else {
                             JS_ASSERT(PCVAL_IS_SPROP(entry->vword));
                             sprop = PCVAL_TO_SPROP(entry->vword);
-                            NATIVE_GET(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, &rval);
+                            NATIVE_GET(cx, obj, obj2, sprop, &rval);
                         }
                         JS_UNLOCK_OBJ(cx, obj2);
                         break;
@@ -4504,9 +4495,7 @@ js_Interpret(JSContext *cx)
                 }
                 id = ATOM_TO_JSID(atom);
                 if (entry
-                    ? !js_GetPropertyHelper(cx, obj, id,
-                                            JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
-                                            &rval)
+                    ? !js_GetPropertyHelper(cx, obj, id, true, &rval)
                     : !OBJ_GET_PROPERTY(cx, obj, id, &rval)) {
                     goto error;
                 }
@@ -4583,7 +4572,7 @@ js_Interpret(JSContext *cx)
                     } else {
                         JS_ASSERT(PCVAL_IS_SPROP(entry->vword));
                         sprop = PCVAL_TO_SPROP(entry->vword);
-                        NATIVE_GET(cx, obj, obj2, sprop, 0, &rval);
+                        NATIVE_GET(cx, obj, obj2, sprop, &rval);
                     }
                     JS_UNLOCK_OBJ(cx, obj2);
                     STORE_OPND(-1, rval);
@@ -4602,13 +4591,13 @@ js_Interpret(JSContext *cx)
             id = ATOM_TO_JSID(atom);
             PUSH(JSVAL_NULL);
             if (!JSVAL_IS_PRIMITIVE(lval)) {
-                if (!js_GetMethod(cx, obj, id, entry ? JSGET_CACHE_RESULT : 0, &rval))
+                if (!js_GetMethod(cx, obj, id, !!entry, &rval))
                     goto error;
                 STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
                 STORE_OPND(-2, rval);
             } else {
                 JS_ASSERT(obj->map->ops->getProperty == js_GetProperty);
-                if (!js_GetPropertyHelper(cx, obj, id, JSGET_CACHE_RESULT, &rval))
+                if (!js_GetPropertyHelper(cx, obj, id, true, &rval))
                     goto error;
                 STORE_OPND(-1, lval);
                 STORE_OPND(-2, rval);
@@ -4639,12 +4628,9 @@ js_Interpret(JSContext *cx)
 
           BEGIN_CASE(JSOP_SETNAME)
           BEGIN_CASE(JSOP_SETPROP)
-          BEGIN_CASE(JSOP_SETMETHOD)
-          do_setprop:
             rval = FETCH_OPND(-1);
-            JS_ASSERT_IF(op == JSOP_SETMETHOD, VALUE_IS_FUNCTION(cx, rval));
             lval = FETCH_OPND(-2);
-            JS_ASSERT_IF(op == JSOP_SETNAME, !JSVAL_IS_PRIMITIVE(lval));
+            JS_ASSERT(!JSVAL_IS_PRIMITIVE(lval) || op == JSOP_SETPROP);
             VALUE_TO_OBJECT(cx, -2, lval, obj);
 
             do {
@@ -4798,21 +4784,9 @@ js_Interpret(JSContext *cx)
                                     sprop = sprop2;
                                 } else {
                                     scope->extend(cx, sprop);
-
-                                    jsuint index;
-                                    if (js_IdIsIndex(sprop->id, &index))
-                                        scope->setIndexedProperties();
-
-                                    if (sprop->isMethod())
-                                        scope->setMethodBarrier();
                                 }
 
-                                /*
-                                 * No LOCKED_OBJ_WRITE_BARRIER because here we
-                                 * are adding a new property, not updating an
-                                 * existing slot's value that might contain a
-                                 * method of a branded scope.
-                                 */
+                                LOCKED_OBJ_WRITE_BARRIER(cx, obj, slot, rval);
                                 TRACE_2(SetPropHit, entry, sprop);
                                 LOCKED_OBJ_SET_SLOT(obj, slot, rval);
                                 JS_UNLOCK_SCOPE(cx, scope);
@@ -4856,10 +4830,7 @@ js_Interpret(JSContext *cx)
                     LOAD_ATOM(0);
                 id = ATOM_TO_JSID(atom);
                 if (entry) {
-                    uintN defineHow = (op == JSOP_SETMETHOD)
-                                      ? JSDNP_CACHE_RESULT | JSDNP_SET_METHOD
-                                      : JSDNP_CACHE_RESULT;
-                    if (!js_SetPropertyHelper(cx, obj, id, defineHow, &rval))
+                    if (!js_SetPropertyHelper(cx, obj, id, true, &rval))
                         goto error;
                 } else {
                     if (!OBJ_SET_PROPERTY(cx, obj, id, &rval))
@@ -4916,7 +4887,7 @@ js_Interpret(JSContext *cx)
           END_CASE(JSOP_GETELEM)
 
           BEGIN_CASE(JSOP_CALLELEM)
-            ELEMENT_OP(-1, js_GetMethod(cx, obj, id, 0, &rval));
+            ELEMENT_OP(-1, js_GetMethod(cx, obj, id, false, &rval));
 #if JS_HAS_NO_SUCH_METHOD
             if (JS_UNLIKELY(JSVAL_IS_VOID(rval))) {
                 regs.sp[-2] = regs.sp[-1];
@@ -5370,7 +5341,7 @@ js_Interpret(JSContext *cx)
             } else {
                 sprop = (JSScopeProperty *)prop;
           do_native_get:
-                NATIVE_GET(cx, obj, obj2, sprop, JSGET_METHOD_BARRIER, &rval);
+                NATIVE_GET(cx, obj, obj2, sprop, &rval);
                 OBJ_DROP_PROPERTY(cx, obj2, (JSProperty *) sprop);
             }
 
@@ -5951,7 +5922,7 @@ js_Interpret(JSContext *cx)
                 sprop = (JSScopeProperty *) prop;
                 if ((sprop->attrs & JSPROP_PERMANENT) &&
                     SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) &&
-                    SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
+                    SPROP_HAS_STUB_GETTER(sprop) &&
                     SPROP_HAS_STUB_SETTER(sprop)) {
                     /*
                      * Fast globals use frame variables to map the global
@@ -6245,64 +6216,23 @@ js_Interpret(JSContext *cx)
             obj = FUN_OBJECT(fun);
 
             if (FUN_NULL_CLOSURE(fun)) {
-                parent = fp->scopeChain;
-
-                if (OBJ_GET_PARENT(cx, obj) == parent) {
-                    JSScope *scope;
-
-                    lval = FETCH_OPND(-1);
-                    op = JSOp(regs.pc[JSOP_LAMBDA_LENGTH]);
-
-                    /*
-                     * Optimize ({method: function () { ... }, ...}) and
-                     * this.method = function () { ... }; bytecode sequences.
-                     *
-                     * Note that we jump to the entry points for JSOP_SETPROP
-                     * and JSOP_INITPROP without calling the trace recorder,
-                     * because the record hooks for those ops are essentially
-                     * no-ops (this can't change given the predictive shape
-                     * guarding the recorder must do).
-                     */
-                    if (op == JSOP_SETMETHOD) {
-#ifdef DEBUG
-                        op2 = JSOp(regs.pc[JSOP_LAMBDA_LENGTH + JSOP_SETMETHOD_LENGTH]);
-                        JS_ASSERT(op2 == JSOP_POP || op2 == JSOP_POPV);
-#endif
-
-                        if (JSVAL_IS_OBJECT(lval) &&
-                            (obj2 = JSVAL_TO_OBJECT(lval)) &&
-                            OBJ_GET_CLASS(cx, obj2) == &js_ObjectClass) {
-                            scope = OBJ_SCOPE(obj2);
-                            if (scope->object == obj2) {
-                                PUSH_OPND(OBJECT_TO_JSVAL(obj));
-                                regs.pc += JSOP_LAMBDA_LENGTH;
-                                goto do_setprop;
-                            }
-                        }
-                    } else if (op == JSOP_INITMETHOD) {
-                        JS_ASSERT(!JSVAL_IS_PRIMITIVE(lval));
-                        obj2 = JSVAL_TO_OBJECT(lval);
-                        scope = OBJ_SCOPE(obj2);
-
-                        /*
-                         * JSOP_NEWINIT gave the new object it created (obj2
-                         * here) its own scope.
-                         */
-                        JS_ASSERT(scope->object == obj2);
-                        PUSH_OPND(OBJECT_TO_JSVAL(obj));
-                        regs.pc += JSOP_LAMBDA_LENGTH;
-                        goto do_initprop;
-                    }
-                }
+                obj = js_CloneFunctionObject(cx, fun, fp->scopeChain);
+                if (!obj)
+                    goto error;
             } else {
                 parent = js_GetScopeChain(cx, fp);
                 if (!parent)
                     goto error;
-            }
 
-            obj = js_CloneFunctionObject(cx, fun, parent);
-            if (!obj)
-                goto error;
+                /*
+                 * FIXME: bug 471214, Cloning here even when the compiler saw
+                 * the right parent is wasteful but we don't fully support
+                 * joined function objects, yet.
+                 */
+                obj = js_CloneFunctionObject(cx, fun, parent);
+                if (!obj)
+                    goto error;
+            }
 
             PUSH_OPND(OBJECT_TO_JSVAL(obj));
           END_CASE(JSOP_LAMBDA)
@@ -6449,26 +6379,11 @@ js_Interpret(JSContext *cx)
           BEGIN_CASE(JSOP_NEWINIT)
             i = GET_INT8(regs.pc);
             JS_ASSERT(i == JSProto_Array || i == JSProto_Object);
-            if (i == JSProto_Array) {
-                obj = js_NewArrayObject(cx, 0, NULL);
-                if (!obj)
-                    goto error;
-            } else {
-                obj = js_NewObject(cx, &js_ObjectClass, NULL, NULL);
-                if (!obj)
-                    goto error;
-
-                if (regs.pc[JSOP_NEWINIT_LENGTH] != JSOP_ENDINIT) {
-                    JS_LOCK_OBJ(cx, obj);
-                    JSScope *scope = js_GetMutableScope(cx, obj);
-                    if (!scope) {
-                        JS_UNLOCK_OBJ(cx, obj);
-                        goto error;
-                    }
-                    JS_UNLOCK_SCOPE(cx, scope);
-                }
-            }
-
+            obj = (i == JSProto_Array)
+                  ? js_NewArrayObject(cx, 0, NULL)
+                  : js_NewObject(cx, &js_ObjectClass, NULL, NULL);
+            if (!obj)
+                goto error;
             PUSH_OPND(OBJECT_TO_JSVAL(obj));
             fp->sharpDepth++;
             CHECK_INTERRUPT_HANDLER();
@@ -6486,8 +6401,6 @@ js_Interpret(JSContext *cx)
           END_CASE(JSOP_ENDINIT)
 
           BEGIN_CASE(JSOP_INITPROP)
-          BEGIN_CASE(JSOP_INITMETHOD)
-          do_initprop:
             /* Load the property's initial value into rval. */
             JS_ASSERT(regs.sp - StackBase(fp) >= 2);
             rval = FETCH_OPND(-1);
@@ -6508,7 +6421,6 @@ js_Interpret(JSContext *cx)
 
                 JS_LOCK_OBJ(cx, obj);
                 scope = OBJ_SCOPE(obj);
-                JS_ASSERT(scope->object == obj);
                 JS_ASSERT(!scope->sealed());
                 kshape = scope->shape;
                 cache = &JS_PROPERTY_CACHE(cx);
@@ -6538,6 +6450,14 @@ js_Interpret(JSContext *cx)
                     if (!SPROP_HAS_STUB_SETTER(sprop))
                         goto do_initprop_miss;
 
+                    if (!scope->owned()) {
+                        scope = js_GetMutableScope(cx, obj);
+                        if (!scope) {
+                            JS_UNLOCK_OBJ(cx, obj);
+                            goto error;
+                        }
+                    }
+
                     /*
                      * Detect a repeated property name and force a miss to
                      * share the strict warning code and cope with complexity
@@ -6588,11 +6508,7 @@ js_Interpret(JSContext *cx)
                         scope->lastProp = sprop;
                     }
 
-                    /*
-                     * No LOCKED_OBJ_WRITE_BARRIER because here we are adding a
-                     * new property, not updating an existing slot's value that
-                     * might contain a method of a branded scope.
-                     */
+                    LOCKED_OBJ_WRITE_BARRIER(cx, obj, slot, rval);
                     TRACE_2(SetPropHit, entry, sprop);
                     LOCKED_OBJ_SET_SLOT(obj, slot, rval);
                     JS_UNLOCK_SCOPE(cx, scope);
@@ -6613,16 +6529,12 @@ js_Interpret(JSContext *cx)
                     goto error;
                 }
 
-                uintN defineHow = (op == JSOP_INITMETHOD)
-                                  ? JSDNP_CACHE_RESULT | JSDNP_SET_METHOD
-                                  : JSDNP_CACHE_RESULT;
                 if (!(JS_UNLIKELY(atom == cx->runtime->atomState.protoAtom)
-                      ? js_SetPropertyHelper(cx, obj, id, defineHow, &rval)
+                      ? js_SetPropertyHelper(cx, obj, id, true, &rval)
                       : js_DefineNativeProperty(cx, obj, id, rval, NULL, NULL,
                                                 JSPROP_ENUMERATE, 0, 0, NULL,
-                                                defineHow))) {
+                                                JSDNP_CACHE_RESULT)))
                     goto error;
-                }
             } while (0);
 
             /* Common tail for property cache hit and miss cases. */
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index b87662baf415..a9c3473f9775 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -376,7 +376,7 @@ js_ValueToIterator(JSContext *cx, uintN flags, jsval *vp)
         *vp = OBJECT_TO_JSVAL(iterobj);
     } else {
         atom = cx->runtime->atomState.iteratorAtom;
-        if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), 0, vp))
+        if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), false, vp))
             goto bad;
         if (JSVAL_IS_VOID(*vp)) {
           default_iter:
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 8e6fc5ee6f33..bf5f72b4e808 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -418,7 +418,7 @@ MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
                     JSScopeProperty *sprop = (JSScopeProperty *) prop;
                     val = JSVAL_NULL;
                     if (attrs & JSPROP_GETTER)
-                        val = sprop->getterValue();
+                        val = js_CastAsObjectJSVal(sprop->getter);
                     if (attrs & JSPROP_SETTER) {
                         if (val != JSVAL_NULL) {
                             /* Mark the getter, then set val to setter. */
@@ -426,7 +426,7 @@ MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
                                                    NULL)
                                   != NULL);
                         }
-                        val = sprop->setterValue();
+                        val = js_CastAsObjectJSVal(sprop->setter);
                     }
                 } else {
                     ok = OBJ_GET_PROPERTY(cx, obj, id, &val);
@@ -782,7 +782,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
                 (attrs & (JSPROP_GETTER | JSPROP_SETTER))) {
                 JSScopeProperty *sprop = (JSScopeProperty *) prop;
                 if (attrs & JSPROP_GETTER) {
-                    val[valcnt] = sprop->getterValue();
+                    val[valcnt] = js_CastAsObjectJSVal(sprop->getter);
                     gsopold[valcnt] =
                         ATOM_TO_STRING(cx->runtime->atomState.getterAtom);
                     gsop[valcnt] =
@@ -791,7 +791,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)
                     valcnt++;
                 }
                 if (attrs & JSPROP_SETTER) {
-                    val[valcnt] = sprop->setterValue();
+                    val[valcnt] = js_CastAsObjectJSVal(sprop->setter);
                     gsopold[valcnt] =
                         ATOM_TO_STRING(cx->runtime->atomState.setterAtom);
                     gsop[valcnt] =
@@ -1905,7 +1905,7 @@ obj_lookupGetter(JSContext *cx, uintN argc, jsval *vp)
         if (OBJ_IS_NATIVE(pobj)) {
             sprop = (JSScopeProperty *) prop;
             if (sprop->attrs & JSPROP_GETTER)
-                *vp = sprop->getterValue();
+                *vp = js_CastAsObjectJSVal(sprop->getter);
         }
         OBJ_DROP_PROPERTY(cx, pobj, prop);
     }
@@ -1930,7 +1930,7 @@ obj_lookupSetter(JSContext *cx, uintN argc, jsval *vp)
         if (OBJ_IS_NATIVE(pobj)) {
             sprop = (JSScopeProperty *) prop;
             if (sprop->attrs & JSPROP_SETTER)
-                *vp = sprop->setterValue();
+                *vp = js_CastAsObjectJSVal(sprop->setter);
         }
         OBJ_DROP_PROPERTY(cx, pobj, prop);
     }
@@ -3557,8 +3557,6 @@ js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,
     JSScope *scope;
     JSScopeProperty *sprop;
 
-    JS_ASSERT(!(flags & SPROP_IS_METHOD));
-
     /*
      * Purge the property cache of now-shadowed id in obj's scope chain. Do
      * this optimistically (assuming no failure below) before locking obj, so
@@ -3640,7 +3638,7 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
     JSScopeProperty *sprop;
     JSBool added;
 
-    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_DONT_PURGE | JSDNP_SET_METHOD)) == 0);
+    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_DONT_PURGE)) == 0);
     js_LeaveTraceIfGlobalObject(cx, obj);
 
     /* Convert string indices to integers if appropriate. */
@@ -3712,12 +3710,10 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
 
     /* Use the object's class getter and setter by default. */
     clasp = LOCKED_OBJ_GET_CLASS(obj);
-    if (!(defineHow & JSDNP_SET_METHOD)) {
-        if (!getter)
-            getter = clasp->getProperty;
-        if (!setter)
-            setter = clasp->setProperty;
-    }
+    if (!getter)
+        getter = clasp->getProperty;
+    if (!setter)
+        setter = clasp->setProperty;
 
     /* Get obj's own scope if it has one, or create a new one for obj. */
     scope = js_GetMutableScope(cx, obj);
@@ -3729,16 +3725,6 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
         /* Add a new property, or replace an existing one of the same id. */
         if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
             attrs |= JSPROP_SHARED;
-
-        if (defineHow & JSDNP_SET_METHOD) {
-            JS_ASSERT(LOCKED_OBJ_GET_CLASS(obj) == &js_ObjectClass);
-            JS_ASSERT(VALUE_IS_FUNCTION(cx, value));
-            JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
-            JS_ASSERT(!getter && !setter);
-            flags |= SPROP_IS_METHOD;
-            getter = js_CastAsPropertyOp(JSVAL_TO_OBJECT(value));
-        }
-
         sprop = scope->add(cx, id, getter, setter, SPROP_INVALID_SLOT, attrs,
                            flags, shortid);
         if (!sprop)
@@ -3747,12 +3733,8 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
     }
 
     /* Store value before calling addProperty, in case the latter GC's. */
-    if (SPROP_HAS_VALID_SLOT(sprop, scope)) {
-        if (added)
-            LOCKED_OBJ_SET_SLOT(obj, sprop->slot, value);
-        else 
-            LOCKED_OBJ_WRITE_BARRIER(cx, obj, sprop->slot, value);
-    }
+    if (SPROP_HAS_VALID_SLOT(sprop, scope))
+        LOCKED_OBJ_WRITE_SLOT(cx, obj, sprop->slot, value);
 
     /* XXXbe called with lock held */
     ADD_PROPERTY_HELPER(cx, clasp, obj, scope, sprop, &value,
@@ -4156,7 +4138,7 @@ js_FindIdentifierBase(JSContext *cx, JSObject *scopeChain, jsid id)
 
 JSBool
 js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
-             JSScopeProperty *sprop, uintN getHow, jsval *vp)
+             JSScopeProperty *sprop, jsval *vp)
 {
     js_LeaveTraceIfGlobalObject(cx, pobj);
 
@@ -4175,20 +4157,17 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
           ? LOCKED_OBJ_GET_SLOT(pobj, slot)
           : JSVAL_VOID;
     if (SPROP_HAS_STUB_GETTER(sprop))
-        return true;
-
-    if (JS_UNLIKELY(sprop->isMethod()) && !(getHow & JSGET_METHOD_BARRIER))
-        return true;
+        return JS_TRUE;
 
     sample = cx->runtime->propertyRemovals;
     JS_UNLOCK_SCOPE(cx, scope);
     JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
     JS_PUSH_TEMP_ROOT_OBJECT(cx, pobj, &tvr2);
-    ok = sprop->get(cx, obj, vp);
+    ok = js_GetSprop(cx, sprop, obj, vp);
     JS_POP_TEMP_ROOT(cx, &tvr2);
     JS_POP_TEMP_ROOT(cx, &tvr);
     if (!ok)
-        return false;
+        return JS_FALSE;
 
     JS_LOCK_SCOPE(cx, scope);
     if (SLOT_IN_SCOPE(slot, scope) &&
@@ -4197,7 +4176,7 @@ js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
         LOCKED_OBJ_SET_SLOT(pobj, slot, *vp);
     }
 
-    return true;
+    return JS_TRUE;
 }
 
 JSBool
@@ -4241,7 +4220,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
     sample = cx->runtime->propertyRemovals;
     JS_UNLOCK_SCOPE(cx, scope);
     JS_PUSH_TEMP_ROOT_SPROP(cx, sprop, &tvr);
-    ok = sprop->set(cx, obj, vp);
+    ok = js_SetSprop(cx, sprop, obj, vp);
     JS_POP_TEMP_ROOT(cx, &tvr);
     if (!ok)
         return JS_FALSE;
@@ -4258,7 +4237,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp)
 }
 
 JSBool
-js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
+js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
                      jsval *vp)
 {
     JSObject *aobj, *obj2;
@@ -4266,8 +4245,7 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
     JSProperty *prop;
     JSScopeProperty *sprop;
 
-    JS_ASSERT_IF(getHow & JSGET_CACHE_RESULT, !JS_ON_TRACE(cx));
-
+    JS_ASSERT_IF(cacheResult, !JS_ON_TRACE(cx));
     /* Convert string indices to integers if appropriate. */
     id = js_CheckForStringIndex(id);
 
@@ -4282,7 +4260,7 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
         if (!OBJ_GET_CLASS(cx, obj)->getProperty(cx, obj, ID_TO_VALUE(id), vp))
             return JS_FALSE;
 
-        PCMETER(getHow & JSGET_CACHE_RESULT && JS_PROPERTY_CACHE(cx).nofills++);
+        PCMETER(cacheResult && JS_PROPERTY_CACHE(cx).nofills++);
 
         /*
          * Give a strict warning if foo.bar is evaluated by a script for an
@@ -4343,12 +4321,12 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
 
     sprop = (JSScopeProperty *) prop;
 
-    if (getHow & JSGET_CACHE_RESULT) {
+    if (cacheResult) {
         JS_ASSERT_NOT_ON_TRACE(cx);
         js_FillPropertyCache(cx, aobj, 0, protoIndex, obj2, sprop, false);
     }
 
-    if (!js_NativeGet(cx, obj, obj2, sprop, getHow, vp))
+    if (!js_NativeGet(cx, obj, obj2, sprop, vp))
         return JS_FALSE;
 
     JS_UNLOCK_OBJ(cx, obj2);
@@ -4358,19 +4336,20 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
 JSBool
 js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
-    return js_GetPropertyHelper(cx, obj, id, JSGET_METHOD_BARRIER, vp);
+    return js_GetPropertyHelper(cx, obj, id, false, vp);
 }
 
 JSBool
-js_GetMethod(JSContext *cx, JSObject *obj, jsid id, uintN getHow, jsval *vp)
+js_GetMethod(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+             jsval *vp)
 {
     JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
 
     if (obj->map->ops == &js_ObjectOps ||
         obj->map->ops->getProperty == js_GetProperty) {
-        return js_GetPropertyHelper(cx, obj, id, getHow, vp);
+        return js_GetPropertyHelper(cx, obj, id, cacheResult, vp);
     }
-    JS_ASSERT_IF(getHow & JSGET_CACHE_RESULT, OBJ_IS_DENSE_ARRAY(cx, obj));
+    JS_ASSERT_IF(cacheResult, OBJ_IS_DENSE_ARRAY(cx, obj));
 #if JS_HAS_XML_SUPPORT
     if (OBJECT_IS_XML(cx, obj))
         return js_GetXMLMethod(cx, obj, id, vp);
@@ -4401,11 +4380,10 @@ js_CheckUndeclaredVarAssignment(JSContext *cx)
 
 /*
  * Note: all non-error exits in this function must notify the tracer using
- * SetPropHit when called from the interpreter, which is detected by testing
- * (defineHow & JSDNP_CACHE_RESULT).
+ * SetPropHit when called from the interpreter loop (cacheResult is true).
  */
 JSBool
-js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
+js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
                      jsval *vp)
 {
     int protoIndex;
@@ -4419,8 +4397,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
     JSPropertyOp getter, setter;
     bool added;
 
-    JS_ASSERT((defineHow & ~(JSDNP_CACHE_RESULT | JSDNP_SET_METHOD)) == 0);
-    if (defineHow & JSDNP_CACHE_RESULT)
+    if (cacheResult)
         JS_ASSERT_NOT_ON_TRACE(cx);
 
     /* Convert string indices to integers if appropriate. */
@@ -4493,8 +4470,8 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
             if (attrs & JSPROP_READONLY) {
                 if (!JS_HAS_STRICT_OPTION(cx)) {
                     /* Just return true per ECMA if not in strict mode. */
-                    PCMETER((defineHow & JSDNP_CACHE_RESULT) && JS_PROPERTY_CACHE(cx).rofills++);
-                    if (defineHow & JSDNP_CACHE_RESULT)
+                    PCMETER(cacheResult && JS_PROPERTY_CACHE(cx).rofills++);
+                    if (cacheResult)
                         TRACE_2(SetPropHit, JS_NO_PROP_CACHE_FILL, sprop);
                     return JS_TRUE;
                 error: // TRACE_2 jumps here in case of error.
@@ -4507,10 +4484,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
             goto read_only_error;
         }
 
-        if (pobj == obj) {
-            if (!(defineHow & JSDNP_SET_METHOD) != !sprop->isMethod())
-                sprop = NULL;
-        } else {
+        if (pobj != obj) {
             /*
              * We found id in a prototype object: prepare to share or shadow.
              *
@@ -4522,7 +4496,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
 
             /* Don't clone a shared prototype property. */
             if (attrs & JSPROP_SHARED) {
-                if (defineHow & JSDNP_CACHE_RESULT) {
+                if (cacheResult) {
                     JSPropCacheEntry *entry;
                     entry = js_FillPropertyCache(cx, obj, 0, protoIndex, pobj, sprop, false);
                     TRACE_2(SetPropHit, entry, sprop);
@@ -4533,7 +4507,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
                     return JS_TRUE;
                 }
 
-                return sprop->set(cx, obj, vp);
+                return js_SetSprop(cx, sprop, obj, vp);
             }
 
             /* Restore attrs to the ECMA default for new properties. */
@@ -4580,23 +4554,8 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
             JS_UNLOCK_OBJ(cx, obj);
             return JS_FALSE;
         }
-
         if (clasp->flags & JSCLASS_SHARE_ALL_PROPERTIES)
             attrs |= JSPROP_SHARED;
-
-        /*
-         * Check for Object class here to avoid defining a method on a class
-         * with magic resolve, addProperty, getProperty, etc. hooks.
-         */
-        if ((defineHow & JSDNP_SET_METHOD) &&
-            LOCKED_OBJ_GET_CLASS(obj) == &js_ObjectClass) {
-            JS_ASSERT(VALUE_IS_FUNCTION(cx, *vp));
-            JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
-            flags |= SPROP_IS_METHOD;
-            getter = JS_EXTENSION (JSPropertyOp) JSVAL_TO_OBJECT(*vp);
-            setter = NULL;
-        }
-
         sprop = scope->add(cx, id, getter, setter, SPROP_INVALID_SLOT, attrs,
                            flags, shortid);
         if (!sprop) {
@@ -4620,7 +4579,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
         added = true;
     }
 
-    if (defineHow & JSDNP_CACHE_RESULT) {
+    if (cacheResult) {
         JSPropCacheEntry *entry;
         entry = js_FillPropertyCache(cx, obj, 0, 0, obj, sprop, added);
         TRACE_2(SetPropHit, entry, sprop);
@@ -4799,7 +4758,7 @@ js_DefaultValue(JSContext *cx, JSObject *obj, JSType hint, jsval *vp)
             }
 
             if (sprop &&
-                SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
+                SPROP_HAS_STUB_GETTER(sprop) &&
                 SPROP_HAS_VALID_SLOT(sprop, scope)) {
                 jsval fval = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
 
@@ -5589,7 +5548,7 @@ js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
     older = JS_SetErrorReporter(cx, NULL);
     id = ATOM_TO_JSID(atom);
     fval = JSVAL_VOID;
-    ok = js_GetMethod(cx, obj, id, 0, &fval);
+    ok = js_GetMethod(cx, obj, id, false, &fval);
     if (!ok)
         JS_ClearPendingException(cx);
     JS_SetErrorReporter(cx, older);
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index c553f3c37501..57058c9f1d6a 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -664,9 +664,6 @@ js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
  */
 const uintN JSDNP_CACHE_RESULT = 1; /* an interpreter call from JSOP_INITPROP */
 const uintN JSDNP_DONT_PURGE   = 2; /* suppress js_PurgeScopeChain */
-const uintN JSDNP_SET_METHOD   = 4; /* js_{DefineNativeProperty,SetPropertyHelper}
-                                       must pass the SPROP_IS_METHOD flag on to
-                                       js_AddScopeProperty */
 
 extern JSBool
 js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
@@ -715,17 +712,6 @@ js_FindIdentifierBase(JSContext *cx, JSObject *scopeChain, jsid id);
 extern JSObject *
 js_FindVariableScope(JSContext *cx, JSFunction **funp);
 
-/*
- * JSGET_CACHE_RESULT is the analogue of JSDNP_CACHE_RESULT for js_GetMethod.
- *
- * JSGET_METHOD_BARRIER enables a read barrier that preserves standard function
- * object semantics (by default we assume our caller won't leak a joined callee
- * to script, where it would create hazardous mutable object sharing as well as
- * observable identity according to == and ===.
- */
-const uintN JSGET_CACHE_RESULT   = 1; // call from a caching interpreter opcode
-const uintN JSGET_METHOD_BARRIER = 2; // caller may leak shared function object
-
 /*
  * NB: js_NativeGet and js_NativeSet are called with the scope containing sprop
  * (pobj's scope for Get, obj's for Set) locked, and on successful return, that
@@ -734,20 +720,21 @@ const uintN JSGET_METHOD_BARRIER = 2; // caller may leak shared function object
  */
 extern JSBool
 js_NativeGet(JSContext *cx, JSObject *obj, JSObject *pobj,
-             JSScopeProperty *sprop, uintN getHow, jsval *vp);
+             JSScopeProperty *sprop, jsval *vp);
 
 extern JSBool
 js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, jsval *vp);
 
 extern JSBool
-js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN getHow,
+js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
                      jsval *vp);
 
 extern JSBool
 js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
 
 extern JSBool
-js_GetMethod(JSContext *cx, JSObject *obj, jsid id, uintN getHow, jsval *vp);
+js_GetMethod(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
+             jsval *vp);
 
 /*
  * Check whether it is OK to assign an undeclared property of the global
@@ -757,7 +744,7 @@ extern JS_FRIEND_API(JSBool)
 js_CheckUndeclaredVarAssignment(JSContext *cx);
 
 extern JSBool
-js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
+js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
                      jsval *vp);
 
 extern JSBool
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index a2c63c9b0cbb..28376ee0076b 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -3823,7 +3823,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 goto do_getprop;
 
               case JSOP_SETPROP:
-              case JSOP_SETMETHOD:
                 LOAD_ATOM(0);
                 GET_QUOTE_AND_FMT("%s[%s] %s= %s", "%s.%s %s= %s", xval);
                 rval = POP_STR();
@@ -4485,7 +4484,6 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 break;
 
               case JSOP_INITPROP:
-              case JSOP_INITMETHOD:
                 LOAD_ATOM(0);
                 xval = QuoteString(&ss->sprinter, ATOM_TO_STRING(atom),
                                    (jschar)
diff --git a/js/src/jsopcode.tbl b/js/src/jsopcode.tbl
index 13129d2fb3e5..6981a1edf309 100644
--- a/js/src/jsopcode.tbl
+++ b/js/src/jsopcode.tbl
@@ -582,16 +582,10 @@ OPDEF(JSOP_OBJTOP,        227,"objtop",        NULL,  3,  0,  0,  0,  JOF_UINT16
 OPDEF(JSOP_LOOP,          228, "loop",         NULL,  1,  0,  0,  0,  JOF_BYTE)
 
 /*
- * Debugger versions of JSOP_{GET,CALL}UPVAR and the flat closure (_FC) ops.
+ * Debugger versions of JSOP_{GET,CALL}UPVAR.
  */
 OPDEF(JSOP_GETUPVAR_DBG,  229,"getupvar_dbg",  NULL,  3,  0,  1, 19,  JOF_UINT16|JOF_NAME)
 OPDEF(JSOP_CALLUPVAR_DBG, 230,"callupvar_dbg", NULL,  3,  0,  2, 19,  JOF_UINT16|JOF_NAME|JOF_CALLOP)
 OPDEF(JSOP_DEFFUN_DBGFC,     231,"deffun_dbgfc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
 OPDEF(JSOP_DEFLOCALFUN_DBGFC,232,"deflocalfun_dbgfc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING)
 OPDEF(JSOP_LAMBDA_DBGFC,     233,"lambda_dbgfc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
-
-/*
- * Joined function object as method optimization support.
- */
-OPDEF(JSOP_SETMETHOD,     234,"setmethod",     NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
-OPDEF(JSOP_INITMETHOD,    235,"initprop",      NULL,  3,  1,  0,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index cc2d2213c7ab..35cd45dd9d63 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -5508,18 +5508,6 @@ Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
         pn->pn_type = TOK_SEMI;
         pn->pn_pos = pn2->pn_pos;
         pn->pn_kid = pn2;
-
-        /*
-         * Specialize JSOP_SETPROP into JSOP_SETMETHOD to defer or avoid null
-         * closure cloning. Do this here rather than in AssignExpr as only now
-         * do we know that the uncloned (unjoined in ES3 terms) function object
-         * result of the assignment expression can't escape.
-         */
-        if (PN_TYPE(pn2) == TOK_ASSIGN && PN_OP(pn2) == JSOP_NOP &&
-            PN_OP(pn2->pn_left) == JSOP_SETPROP &&
-            PN_OP(pn2->pn_right) == JSOP_LAMBDA) {
-            pn2->pn_left->pn_op = JSOP_SETMETHOD;
-        }
         break;
     }
 
diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 3d691274b563..02791e40cff0 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -444,13 +444,12 @@ js_HashScopeProperty(JSDHashTable *table, const void *key)
 
     /* Accumulate from least to most random so the low bits are most random. */
     hash = 0;
-    JS_ASSERT_IF(sprop->isMethod(), !sprop->setter);
     gsop = sprop->getter;
     if (gsop)
-        hash = JS_ROTATE_LEFT32(hash, 4) ^ jsword(gsop);
+        hash = JS_ROTATE_LEFT32(hash, 4) ^ (jsword)gsop;
     gsop = sprop->setter;
     if (gsop)
-        hash = JS_ROTATE_LEFT32(hash, 4) ^ jsword(gsop);
+        hash = JS_ROTATE_LEFT32(hash, 4) ^ (jsword)gsop;
 
     hash = JS_ROTATE_LEFT32(hash, 4)
            ^ (sprop->flags & ~SPROP_FLAGS_NOT_MATCHED);
@@ -1055,9 +1054,6 @@ JSScope::add(JSContext *cx, jsid id,
     JS_ASSERT(JS_IS_SCOPE_LOCKED(cx, this));
     CHECK_ANCESTOR_LINE(this, true);
 
-    JS_ASSERT_IF(attrs & JSPROP_GETTER, getter);
-    JS_ASSERT_IF(attrs & JSPROP_SETTER, setter);
-
     /*
      * You can't add properties to a sealed scope.  But note well that you can
      * change property attributes in a sealed scope, even though that replaces
@@ -1073,17 +1069,10 @@ JSScope::add(JSContext *cx, jsid id,
      * Normalize stub getter and setter values for faster is-stub testing in
      * the SPROP_CALL_[GS]ETTER macros.
      */
+    if (getter == JS_PropertyStub)
+        getter = NULL;
     if (setter == JS_PropertyStub)
         setter = NULL;
-    if (flags & SPROP_IS_METHOD) {
-        /* Here, getter is the method, a function object reference. */
-        JS_ASSERT(getter);
-        JS_ASSERT(!setter);
-        JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
-    } else {
-        if (getter == JS_PropertyStub)
-            getter = NULL;
-    }
 
     /*
      * Search for id in order to claim its entry, allocating a property tree
@@ -1365,9 +1354,6 @@ JSScope::add(JSContext *cx, jsid id,
     if (js_IdIsIndex(sprop->id, &index))
         setIndexedProperties();
 
-    if (sprop->isMethod())
-        setMethodBarrier();
-
     METER(adds);
     return sprop;
 
@@ -1669,11 +1655,11 @@ JSScopeProperty::trace(JSTracer *trc)
     if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
         if (attrs & JSPROP_GETTER) {
             JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 0);
-            JS_CallTracer(trc, getterObject(), JSTRACE_OBJECT);
+            JS_CallTracer(trc, js_CastAsObject(getter), JSTRACE_OBJECT);
         }
         if (attrs & JSPROP_SETTER) {
             JS_SET_TRACING_DETAILS(trc, PrintPropertyGetterOrSetter, this, 1);
-            JS_CallTracer(trc, setterObject(), JSTRACE_OBJECT);
+            JS_CallTracer(trc, js_CastAsObject(setter), JSTRACE_OBJECT);
         }
     }
 #endif /* JS_HAS_GETTER_SETTER */
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 346f6e368eff..211b88c9014b 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=99:
+ * vim: set ts=8 sw=4 et tw=78:
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -286,13 +286,12 @@ struct JSScope {
         BRANDED                 = 0x0004,
         INDEXED_PROPERTIES      = 0x0008,
         OWN_SHAPE               = 0x0010,
-        METHOD_BARRIER          = 0x0020,
 
         /*
          * This flag toggles with each shape-regenerating GC cycle.
          * See JSRuntime::gcRegenShapesScopeFlag.
          */
-        SHAPE_REGEN             = 0x0040
+        SHAPE_REGEN             = 0x0020
     };
 
     bool hadMiddleDelete()      { return flags & MIDDLE_DELETE; }
@@ -323,42 +322,6 @@ struct JSScope {
 
     bool hasRegenFlag(uint8 regenFlag) { return (flags & SHAPE_REGEN) == regenFlag; }
 
-    /*
-     * A scope has a method barrier when some compiler-created "null closure"
-     * function objects (functions that do not use lexical bindings above their
-     * scope, only free variable names) that have a correct JSSLOT_PARENT value
-     * thanks to the COMPILE_N_GO optimization are stored as newly added direct
-     * property values.
-     *
-     * The de-facto standard JS language requires each evaluation of such a
-     * closure to result in a unique (according to === and observable effects)
-     * function object. ES3 tried to allow implementations to "join" such
-     * objects to a single compiler-created object, but this makes an overt
-     * mutation hazard, also an "identity hazard" against interoperation among
-     * implementations that join and do not join.
-     *
-     * To stay compatible with the de-facto standard, we store the compiler-
-     * created function object as the method value, set the METHOD_BARRIER
-     * flag, and brand the scope with a predictable shape that reflects its
-     * method values, which are cached and traced without being loaded, based
-     * on shape-qualified cache hit logic and equivalent trace guards. See
-     * BRANDED above.
-     *
-     * This means scope->hasMethodBarrier() => scope->branded(), but of course
-     * not the other way around.
-     *
-     * Then when reading from a scope for which scope->hasMethodBarrier() is
-     * true, we count on the scope's qualified/guarded shape being unique and
-     * add a read barrier that clones the compiler-created function object on
-     * demand, reshaping the scope.
-     *
-     * This read barrier is bypassed when evaluating the callee sub-expression
-     * of a call expression (see the JOF_CALLOP opcodes in jsopcode.tbl), since
-     * such ops do not present an identity or mutation hazard.
-     */
-    bool hasMethodBarrier()     { return flags & METHOD_BARRIER; }
-    void setMethodBarrier()     { flags |= METHOD_BARRIER | BRANDED; }
-
     bool owned()                { return object != NULL; }
 };
 
@@ -400,8 +363,7 @@ js_CastAsPropertyOp(JSObject *object)
 struct JSScopeProperty {
     jsid            id;                 /* int-tagged jsval/untagged JSAtom* */
     JSPropertyOp    getter;             /* getter and setter hooks or objects */
-    JSPropertyOp    setter;             /* getter is JSObject* and setter is 0
-                                           if sprop->isMethod() */
+    JSPropertyOp    setter;
     uint32          slot;               /* abstract index in object slots */
     uint8           attrs;              /* attributes, see jsapi.h JSPROP_* */
     uint8           flags;              /* flags, see below for defines */
@@ -411,53 +373,6 @@ struct JSScopeProperty {
                                            to many-kids data structure */
     uint32          shape;              /* property cache shape identifier */
 
-/* Bits stored in sprop->flags. */
-#define SPROP_MARK                      0x01
-#define SPROP_IS_ALIAS                  0x02
-#define SPROP_HAS_SHORTID               0x04
-#define SPROP_FLAG_SHAPE_REGEN          0x08
-#define SPROP_IS_METHOD                 0x10
-
-    bool isMethod() const {
-        return flags & SPROP_IS_METHOD;
-    }
-    JSObject *method() const {
-        JS_ASSERT(isMethod());
-        return js_CastAsObject(getter);
-    }
-    jsval methodValue() const {
-        JS_ASSERT(isMethod());
-        return js_CastAsObjectJSVal(getter);
-    }
-
-    bool hasGetter() const {
-        return attrs & JSPROP_GETTER;
-    }
-    JSObject *getterObject() const {
-        JS_ASSERT(hasGetter());
-        return js_CastAsObject(getter);
-    }
-    jsval getterValue() const {
-        JS_ASSERT(hasGetter());
-        return js_CastAsObjectJSVal(getter);
-    }
-
-    bool hasSetter() const {
-        return attrs & JSPROP_SETTER;
-    }
-    JSObject *setterObject() const {
-        JS_ASSERT(hasSetter());
-        return js_CastAsObject(setter);
-    }
-    jsval setterValue() const {
-        JS_ASSERT(hasSetter());
-        return js_CastAsObjectJSVal(setter);
-    }
-
-    bool methodBarrier(JSContext *cx, JSObject *obj, jsval *vp);
-    bool get(JSContext* cx, JSObject* obj, jsval* vp);
-    bool set(JSContext* cx, JSObject* obj, jsval* vp);
-
     void trace(JSTracer *trc);
 };
 
@@ -493,6 +408,12 @@ JSScope::has(JSScopeProperty *sprop)
     return lookup(sprop->id) == sprop;
 }
 
+/* Bits stored in sprop->flags. */
+#define SPROP_MARK                      0x01
+#define SPROP_IS_ALIAS                  0x02
+#define SPROP_HAS_SHORTID               0x04
+#define SPROP_FLAG_SHAPE_REGEN          0x08
+
 /*
  * If SPROP_HAS_SHORTID is set in sprop->flags, we use sprop->shortid rather
  * than id when calling sprop's getter or setter.
@@ -509,9 +430,6 @@ JSScope::has(JSScopeProperty *sprop)
 #define SPROP_HAS_STUB_GETTER(sprop)    (!(sprop)->getter)
 #define SPROP_HAS_STUB_SETTER(sprop)    (!(sprop)->setter)
 
-#define SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop)                             \
-    (SPROP_HAS_STUB_GETTER(sprop) || (sprop)->isMethod())
-
 #ifndef JS_THREADSAFE
 # define js_GenerateShape(cx, gcLocked)    js_GenerateShape (cx)
 #endif
@@ -633,47 +551,15 @@ JSScope::trace(JSTracer *trc)
 }
 
 
-/*
- * Read barrier for deferred cloning of compiler-created function objects
- * optimized as typically non-escaping, ad-hoc methods in obj.
- */
-JS_ALWAYS_INLINE bool
-JSScopeProperty::methodBarrier(JSContext *cx, JSObject *obj, jsval *vp)
+static JS_INLINE bool
+js_GetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
 {
-    JSScope *scope = OBJ_SCOPE(obj);
-#ifdef JS_THREADSAFE
-    JS_ASSERT(scope->title.ownercx == cx);
-#endif
+    JS_ASSERT(!SPROP_HAS_STUB_GETTER(sprop));
 
-    if (scope->hasMethodBarrier()) {
-        JSObject *funobj = JSVAL_TO_OBJECT(*vp);
-        JSFunction *fun = GET_FUNCTION_PRIVATE(cx, funobj);
-
-        if (FUN_OBJECT(fun) == funobj && FUN_INTERPRETED(fun)) {
-            funobj = js_CloneFunctionObject(cx, fun, OBJ_GET_PARENT(cx, funobj));
-            if (!funobj)
-                return false;
-            *vp = OBJECT_TO_JSVAL(funobj);
-            return js_SetPropertyHelper(cx, obj, id, 0, vp);
-        }
-    }
-    return true;
-}
-
-JS_ALWAYS_INLINE bool
-JSScopeProperty::get(JSContext* cx, JSObject* obj, jsval* vp)
-{
-    JS_ASSERT(!SPROP_HAS_STUB_GETTER(this));
-
-    if (attrs & JSPROP_GETTER) {
-        JS_ASSERT(!isMethod());
-        jsval fval = getterValue();
-        return js_InternalGetOrSet(cx, obj, id, fval, JSACC_READ, 0, 0, vp);
-    }
-
-    if (isMethod()) {
-        *vp = methodValue();
-        return methodBarrier(cx, obj, vp);
+    if (sprop->attrs & JSPROP_GETTER) {
+        jsval fval = js_CastAsObjectJSVal(sprop->getter);
+        return js_InternalGetOrSet(cx, obj, sprop->id, fval, JSACC_READ,
+                                   0, 0, vp);
     }
 
     /*
@@ -684,28 +570,30 @@ JSScopeProperty::get(JSContext* cx, JSObject* obj, jsval* vp)
      */
     if (STOBJ_GET_CLASS(obj) == &js_WithClass)
         obj = obj->map->ops->thisObject(cx, obj);
-    return getter(cx, obj, SPROP_USERID(this), vp);
+    return sprop->getter(cx, obj, SPROP_USERID(sprop), vp);
 }
 
-JS_ALWAYS_INLINE bool
-JSScopeProperty::set(JSContext* cx, JSObject* obj, jsval* vp)
+static JS_INLINE bool
+js_SetSprop(JSContext* cx, JSScopeProperty* sprop, JSObject* obj, jsval* vp)
 {
-    JS_ASSERT_IF(SPROP_HAS_STUB_SETTER(this), attrs & JSPROP_GETTER);
+    JS_ASSERT(!(SPROP_HAS_STUB_SETTER(sprop) &&
+                !(sprop->attrs & JSPROP_GETTER)));
 
-    if (attrs & JSPROP_SETTER) {
-        jsval fval = setterValue();
-        return js_InternalGetOrSet(cx, obj, id, fval, JSACC_WRITE, 1, vp, vp);
+    if (sprop->attrs & JSPROP_SETTER) {
+        jsval fval = js_CastAsObjectJSVal(sprop->setter);
+        return js_InternalGetOrSet(cx, obj, (sprop)->id, fval, JSACC_WRITE,
+                                   1, vp, vp);
     }
 
-    if (attrs & JSPROP_GETTER) {
+    if (sprop->attrs & JSPROP_GETTER) {
         js_ReportGetterOnlyAssignment(cx);
         return JS_FALSE;
     }
 
-    /* See the comment in JSScopeProperty::get as to why we can check for With. */
+    /* See the comment in js_GetSprop as to why we can check for 'with'. */
     if (STOBJ_GET_CLASS(obj) == &js_WithClass)
         obj = obj->map->ops->thisObject(cx, obj);
-    return setter(cx, obj, SPROP_USERID(this), vp);
+    return sprop->setter(cx, obj, SPROP_USERID(sprop), vp);
 }
 
 /* Macro for common expression to test for shared permanent attributes. */
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 4f142149bfa6..90c0fd2bd082 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2636,9 +2636,8 @@ TraceRecorder::isValidSlot(JSScope* scope, JSScopeProperty* sprop)
         if (sprop->attrs & JSPROP_READONLY)
             ABORT_TRACE_RV("writing to a read-only property", false);
     }
-
     /* This check applies even when setflags == 0. */
-    if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop))
+    if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER(sprop))
         ABORT_TRACE_RV("non-stub getter", false);
 
     if (!SPROP_HAS_VALID_SLOT(sprop, scope))
@@ -4101,7 +4100,7 @@ TraceRecorder::hasMethod(JSObject* obj, jsid id)
         JSScope* scope = OBJ_SCOPE(pobj);
         JSScopeProperty* sprop = (JSScopeProperty*) prop;
 
-        if (SPROP_HAS_STUB_GETTER_OR_IS_METHOD(sprop) &&
+        if (SPROP_HAS_STUB_GETTER(sprop) &&
             SPROP_HAS_VALID_SLOT(sprop, scope)) {
             jsval v = LOCKED_OBJ_GET_SLOT(pobj, sprop->slot);
             if (VALUE_IS_FUNCTION(cx, v)) {
@@ -10486,33 +10485,32 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
         if (setflags && (sprop->attrs & JSPROP_READONLY))
             ABORT_TRACE("writing to a readonly property");
         if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER(sprop)) {
-            if (setflags == 0) {
-                // FIXME 450335: generalize this away from regexp built-in getters.
-                if (sprop->getter == js_RegExpClass.getProperty &&
-                    sprop->shortid < 0) {
-                    if (sprop->shortid == REGEXP_LAST_INDEX)
-                        ABORT_TRACE("can't trace RegExp.lastIndex yet");
-                    LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
-                    v_ins = lir->insCall(&js_CallGetter_ci, args);
-                    guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
-
-                    /*
-                     * BIG FAT WARNING: This snapshot cannot be a BRANCH_EXIT, since
-                     * the value to the top of the stack is not the value we unbox.
-                     */
-                    unbox_jsval((sprop->shortid == REGEXP_SOURCE) ? JSVAL_STRING : JSVAL_BOOLEAN,
-                                v_ins,
-                                snapshot(MISMATCH_EXIT));
-                    return JSRS_CONTINUE;
-                }
-                if (sprop->getter == js_StringClass.getProperty &&
-                    sprop->id == ATOM_KEY(cx->runtime->atomState.lengthAtom)) {
-                    if (!guardClass(obj, obj_ins, &js_StringClass, snapshot(MISMATCH_EXIT)))
-                        ABORT_TRACE("can't trace String.length on non-String objects");
-                    LIns* str_ins = stobj_get_private(obj_ins, JSVAL_TAGMASK);
-                    v_ins = lir->ins1(LIR_i2f, getStringLength(str_ins));
-                    return JSRS_CONTINUE;
-                }
+            // FIXME 450335: generalize this away from regexp built-in getters.
+            if (setflags == 0 &&
+                sprop->getter == js_RegExpClass.getProperty &&
+                sprop->shortid < 0) {
+                if (sprop->shortid == REGEXP_LAST_INDEX)
+                    ABORT_TRACE("can't trace RegExp.lastIndex yet");
+                LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
+                v_ins = lir->insCall(&js_CallGetter_ci, args);
+                guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
+                /*
+                 * BIG FAT WARNING: This snapshot cannot be a BRANCH_EXIT, since
+                 * the value to the top of the stack is not the value we unbox.
+                 */
+                unbox_jsval((sprop->shortid == REGEXP_SOURCE) ? JSVAL_STRING : JSVAL_BOOLEAN,
+                            v_ins,
+                            snapshot(MISMATCH_EXIT));
+                return JSRS_CONTINUE;
+            }
+            if (setflags == 0 &&
+                sprop->getter == js_StringClass.getProperty &&
+                sprop->id == ATOM_KEY(cx->runtime->atomState.lengthAtom)) {
+                if (!guardClass(obj, obj_ins, &js_StringClass, snapshot(MISMATCH_EXIT)))
+                    ABORT_TRACE("can't trace String.length on non-String objects");
+                LIns* str_ins = stobj_get_private(obj_ins, JSVAL_TAGMASK);
+                v_ins = lir->ins1(LIR_i2f, getStringLength(str_ins));
+                return JSRS_CONTINUE;
             }
             ABORT_TRACE("non-stub getter");
         }
@@ -11864,9 +11862,7 @@ TraceRecorder::record_JSOP_CALLPROP()
         } else if (JSVAL_TAG(l) == JSVAL_BOOLEAN) {
             if (l == JSVAL_VOID)
                 ABORT_TRACE("callprop on void");
-            guard(false,
-                  lir->ins2i(LIR_eq, get(&l), JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_VOID)),
-                  MISMATCH_EXIT);
+            guard(false, lir->ins2i(LIR_eq, get(&l), JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_VOID)), MISMATCH_EXIT);
             i = JSProto_Boolean;
             debug_only_stmt(protoname = "Boolean.prototype";)
         } else {
@@ -12378,18 +12374,6 @@ DBG_STUB(JSOP_DEFFUN_DBGFC)
 DBG_STUB(JSOP_DEFLOCALFUN_DBGFC)
 DBG_STUB(JSOP_LAMBDA_DBGFC)
 
-JS_REQUIRES_STACK JSRecordingStatus
-TraceRecorder::record_JSOP_SETMETHOD()
-{
-    return record_JSOP_SETPROP();
-}
-
-JS_REQUIRES_STACK JSRecordingStatus
-TraceRecorder::record_JSOP_INITMETHOD()
-{
-    return record_JSOP_INITPROP();
-}
-
 #ifdef JS_JIT_SPEW
 /* Prints information about entry typemaps and unstable exits for all peers at a PC */
 void
diff --git a/js/src/jstypes.h b/js/src/jstypes.h
index 17183e24c5f6..3a5a958ba8b6 100644
--- a/js/src/jstypes.h
+++ b/js/src/jstypes.h
@@ -456,14 +456,6 @@ typedef JSUintPtr JSUword;
 # define JS_DATA_TO_FUNC_PTR(type, ptr) ((type) (void *) (ptr))
 #endif
 
-#ifdef __GNUC__
-# define JS_EXTENSION __extension__
-# define JS_EXTENSION_(s) __extension__ ({ s; })
-#else
-# define JS_EXTENSION
-# define JS_EXTENSION_(s) s
-#endif
-
 JS_END_EXTERN_C
 
 #endif /* jstypes_h___ */
diff --git a/js/src/jsxdrapi.h b/js/src/jsxdrapi.h
index 930d7aa74144..f20bc57b3ee9 100644
--- a/js/src/jsxdrapi.h
+++ b/js/src/jsxdrapi.h
@@ -204,7 +204,7 @@ JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
  * before deserialization of bytecode.  If the saved version does not match
  * the current version, abort deserialization and invalidate the file.
  */
-#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 50)
+#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 49)
 
 /*
  * Library-private functions.

From cbeb5ce96991b210ce18253bbb15f77473d5a23a Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Wed, 29 Jul 2009 07:48:06 -0500
Subject: [PATCH 38/61] Bug 504520 - TM: a >= b misbehaves if a and b are both
 Infinity at record time. r=Waldo.

--HG--
extra : rebase_source : 3debe2d9be81aa923e8d94081b189fd577a21287
---
 js/src/jstracer.cpp  | 20 +++++++-------------
 js/src/trace-test.js | 45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 90c0fd2bd082..5eb10f455d2e 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -7106,24 +7106,24 @@ TraceRecorder::incElem(jsint incr, bool pre)
 }
 
 static bool
-evalCmp(LOpcode op, double result)
+evalCmp(LOpcode op, double l, double r)
 {
     bool cond;
     switch (op) {
       case LIR_feq:
-        cond = (result == 0);
+        cond = (l == r);
         break;
       case LIR_flt:
-        cond = result < 0;
+        cond = l < r;
         break;
       case LIR_fgt:
-        cond = result > 0;
+        cond = l > r;
         break;
       case LIR_fle:
-        cond = result <= 0;
+        cond = l <= r;
         break;
       case LIR_fge:
-        cond = result >= 0;
+        cond = l >= r;
         break;
       default:
         JS_NOT_REACHED("unexpected comparison op");
@@ -7132,18 +7132,12 @@ evalCmp(LOpcode op, double result)
     return cond;
 }
 
-static bool
-evalCmp(LOpcode op, double l, double r)
-{
-    return evalCmp(op, l - r);
-}
-
 static bool
 evalCmp(LOpcode op, JSString* l, JSString* r)
 {
     if (op == LIR_feq)
         return js_EqualStrings(l, r);
-    return evalCmp(op, js_CompareStrings(l, r));
+    return evalCmp(op, js_CompareStrings(l, r), 0);
 }
 
 JS_REQUIRES_STACK void
diff --git a/js/src/trace-test.js b/js/src/trace-test.js
index 5525267faef4..00c2dc121483 100644
--- a/js/src/trace-test.js
+++ b/js/src/trace-test.js
@@ -3660,6 +3660,51 @@ function testComparisons()
 testComparisons.expected = "no failures reported!";
 test(testComparisons);
 
+function testBug504520() {
+    // A bug involving comparisons.
+    var arr = [1/0, 1/0, 1/0, 1/0, 1/0, 0];
+    assertEq(arr.length > RUNLOOP, true);
+
+    var s = '';
+    for (var i = 0; i < arr.length; i++)
+        arr[i] >= 1/0 ? null : (s += i);
+    assertEq(s, '5');
+}
+test(testBug504520);
+
+function testBug504520Harder() {
+    // test 1024 similar cases
+    var vals = [1/0, -1/0, 0, 0/0];
+    var ops = ["===", "!==", "==", "!=", "<", ">", "<=", ">="];
+    for each (var x in vals) {
+        for each (var y in vals) {
+            for each (var op in ops) {
+                for each (var z in vals) {
+                    // Assume eval is correct. This depends on the global
+                    // Infinity property not having been reassigned.
+                    var xz = eval(x + op + z);
+                    var yz = eval(y + op + z);
+
+                    var arr = [x, x, x, x, x, y];
+                    assertEq(arr.length > RUNLOOP, true);
+                    var expected = [xz, xz, xz, xz, xz, yz];
+
+                    // ?: looks superfluous but that's what we're testing here
+                    var fun = eval(
+                        '(function (arr, results) {\n' +
+                        '    for (let i = 0; i < arr.length; i++)\n' +
+                        '        results.push(arr[i]' + op + z + ' ? "true" : "false");\n' +
+                        '});\n');
+                    var actual = [];
+                    fun(arr, actual);
+                    assertEq("" + actual, "" + expected);
+                }
+            }
+        }
+    }
+}
+test(testBug504520Harder);
+
 function testCaseAbort()
 {
   var four = "4";

From 6e5e35f0ae00157744e3a842b7bab08199be9ef9 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Wed, 29 Jul 2009 11:58:19 -0500
Subject: [PATCH 39/61] Bug 506982 - Fix up jstracer style. r=Waldo.

---
 js/src/jsarray.h    |    4 +
 js/src/jsbuiltins.h |    3 +
 js/src/jsdate.h     |    4 +
 js/src/jsobj.h      |    4 +
 js/src/jstracer.cpp | 1740 ++++++++++++++++++++++++-------------------
 js/src/jstracer.h   |   46 +-
 6 files changed, 1023 insertions(+), 778 deletions(-)

diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index 4244a6017ad4..52a365fe3e91 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -207,6 +207,10 @@ JSBool
 js_GetDenseArrayElementValue(JSContext *cx, JSObject *obj, JSProperty *prop,
                              jsval *vp);
 
+/* Array constructor native. Exposed only so the JIT can know its address. */
+JSBool
+js_Array(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval);
+
 JS_END_EXTERN_C
 
 #endif /* jsarray_h___ */
diff --git a/js/src/jsbuiltins.h b/js/src/jsbuiltins.h
index 96a1c904f34f..197cd580d145 100644
--- a/js/src/jsbuiltins.h
+++ b/js/src/jsbuiltins.h
@@ -415,6 +415,9 @@ js_BooleanOrUndefinedToNumber(JSContext* cx, int32 unboxed);
 extern JS_FRIEND_API(void)
 js_SetTraceableNativeFailed(JSContext *cx);
 
+extern jsdouble FASTCALL
+js_dmod(jsdouble a, jsdouble b);
+
 #else
 
 #define JS_DEFINE_CALLINFO_1(linkage, rt, op, at0, cse, fold)
diff --git a/js/src/jsdate.h b/js/src/jsdate.h
index 85e49320422e..238994e2e09f 100644
--- a/js/src/jsdate.h
+++ b/js/src/jsdate.h
@@ -124,6 +124,10 @@ typedef uint32 JSIntervalTime;
 extern JS_FRIEND_API(JSIntervalTime)
 js_IntervalNow();
 
+/* Date constructor native. Exposed only so the JIT can know its address. */
+JSBool
+js_Date(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+
 JS_END_EXTERN_C
 
 #endif /* jsdate_h___ */
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 57058c9f1d6a..4bc58c64e90a 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -914,6 +914,10 @@ JS_FRIEND_API(void) js_DumpStackFrame(JSStackFrame *fp);
 extern uintN
 js_InferFlags(JSContext *cx, uintN defaultFlags);
 
+/* Object constructor native. Exposed only so the JIT can know its address. */
+JSBool
+js_Object(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+
 JS_END_EXTERN_C
 
 #endif /* jsobj_h___ */
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 5eb10f455d2e..7a899089cf97 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -80,6 +80,9 @@
 #include "jsautooplen.h"        // generated headers last
 #include "imacros.c.out"
 
+using namespace avmplus;
+using namespace nanojit;
+
 #if JS_HAS_XML_SUPPORT
 #define ABORT_IF_XML(v)                                                       \
     JS_BEGIN_MACRO                                                            \
@@ -87,12 +90,14 @@
         ABORT_TRACE("xml detected");                                          \
     JS_END_MACRO
 #else
-#define ABORT_IF_XML(cx, v) ((void) 0)
+#define ABORT_IF_XML(v) ((void) 0)
 #endif
 
-/* Never use JSVAL_IS_BOOLEAN because it restricts the value (true, false) and
-   the type. What you want to use is JSVAL_TAG(x) == JSVAL_BOOLEAN and then
-   handle the undefined case properly (bug 457363). */
+/*
+ * Never use JSVAL_IS_BOOLEAN because it restricts the value (true, false) and
+ * the type. What you want to use is JSVAL_TAG(x) == JSVAL_BOOLEAN and then
+ * handle the undefined case properly (bug 457363).
+ */
 #undef JSVAL_IS_BOOLEAN
 #define JSVAL_IS_BOOLEAN(x) JS_STATIC_ASSERT(0)
 
@@ -104,8 +109,10 @@ static const char tagChar[]  = "OIDISIBI";
 
 /* Blacklist parameters. */
 
-/* Number of iterations of a loop where we start tracing.  That is, we don't
-   start tracing until the beginning of the HOTLOOP-th iteration. */
+/*
+ * Number of iterations of a loop where we start tracing.  That is, we don't
+ * start tracing until the beginning of the HOTLOOP-th iteration.
+ */
 #define HOTLOOP 2
 
 /* Attempt recording this many times before blacklisting permanently. */
@@ -147,12 +154,12 @@ static const char tagChar[]  = "OIDISIBI";
 #define CHECK_STATUS(expr)                                                    \
     JS_BEGIN_MACRO                                                            \
         JSRecordingStatus _status = (expr);                                   \
-        if (_status != JSRS_CONTINUE)                                        \
+        if (_status != JSRS_CONTINUE)                                         \
           return _status;                                                     \
     JS_END_MACRO
 
 #ifdef JS_JIT_SPEW
-#define ABORT_TRACE_RV(msg, value)                                    \
+#define ABORT_TRACE_RV(msg, value)                                            \
     JS_BEGIN_MACRO                                                            \
         debug_only_printf(LC_TMAbort, "abort: %d: %s\n", __LINE__, (msg));    \
         return (value);                                                       \
@@ -250,38 +257,42 @@ js_InitJITStatsClass(JSContext *cx, JSObject *glob)
 #define INS_CONSTWORD(v)    addName(lir->insImmPtr((void *) v), #v)
 #define INS_VOID()          INS_CONST(JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_VOID))
 
-using namespace avmplus;
-using namespace nanojit;
-
 static GC gc = GC();
 static avmplus::AvmCore s_core = avmplus::AvmCore();
 static avmplus::AvmCore* core = &s_core;
 
 #ifdef JS_JIT_SPEW
-void
-js_DumpPeerStability(JSTraceMonitor* tm, const void* ip, JSObject* globalObj, uint32 globalShape, uint32 argc);
+static void
+DumpPeerStability(JSTraceMonitor* tm, const void* ip, JSObject* globalObj, uint32 globalShape, uint32 argc);
 #endif
 
-/* We really need a better way to configure the JIT. Shaver, where is
-   my fancy JIT object? */
-/* NB: this is raced on, if jstracer.cpp should ever be running MT.
-   I think it's harmless tho. */
+/*
+ * We really need a better way to configure the JIT. Shaver, where is
+ * my fancy JIT object?
+ *
+ * NB: this is raced on, if jstracer.cpp should ever be running MT.
+ * I think it's harmless tho.
+ */
 static bool did_we_check_processor_features = false;
 
 /* ------ Debug logging control ------ */
 
-/* All the logging control stuff lives in here.  It is shared between
-   all threads, but I think that's OK. */
+/*
+ * All the logging control stuff lives in here.  It is shared between
+ * all threads, but I think that's OK.
+ */
 LogControl js_LogController;
 
 #ifdef JS_JIT_SPEW
 
-/* NB: this is raced on too, if jstracer.cpp should ever be running MT.
-   Also harmless. */
+/*
+ * NB: this is raced on too, if jstracer.cpp should ever be running MT.
+ * Also harmless.
+ */
 static bool did_we_set_up_debug_logging = false;
 
 static void
-js_InitJITLogController ( void )
+InitJITLogController()
 {
     char *tm, *tmf;
     uint32_t bits;
@@ -298,6 +309,7 @@ js_InitJITLogController ( void )
     if (strstr(tmf, "help")) goto help;
 
     bits = 0;
+
     /* flags for jstracer.cpp */
     if (strstr(tmf, "minimal"))     bits |= LC_TMMinimal;
     if (strstr(tmf, "tracer"))      bits |= LC_TMTracer;
@@ -306,6 +318,7 @@ js_InitJITLogController ( void )
     if (strstr(tmf, "abort"))       bits |= LC_TMAbort;
     if (strstr(tmf, "stats"))       bits |= LC_TMStats;
     if (strstr(tmf, "regexp"))      bits |= LC_TMRegexp;
+
     /* flags for nanojit */
     if (strstr(tmf, "liveness"))    bits |= LC_Liveness;
     if (strstr(tmf, "readlir"))     bits |= LC_ReadLIR;
@@ -377,8 +390,10 @@ getExitName(ExitType type)
 }
 #endif
 
-/* The entire VM shares one oracle. Collisions and concurrent updates are tolerated and worst
-   case cause performance regressions. */
+/*
+ * The entire VM shares one oracle. Collisions and concurrent updates are
+ * tolerated and worst case cause performance regressions.
+ */
 static Oracle oracle;
 
 Tracker::Tracker()
@@ -462,17 +477,20 @@ Tracker::set(const void* v, LIns* i)
     p->map[(jsuword(v) & PAGEMASK) >> 2] = i;
 }
 
-static inline jsuint argSlots(JSStackFrame* fp)
+static inline jsuint
+argSlots(JSStackFrame* fp)
 {
     return JS_MAX(fp->argc, fp->fun->nargs);
 }
 
-static inline bool isNumber(jsval v)
+static inline bool
+isNumber(jsval v)
 {
     return JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v);
 }
 
-static inline jsdouble asNumber(jsval v)
+static inline jsdouble
+asNumber(jsval v)
 {
     JS_ASSERT(isNumber(v));
     if (JSVAL_IS_DOUBLE(v))
@@ -480,7 +498,8 @@ static inline jsdouble asNumber(jsval v)
     return (jsdouble)JSVAL_TO_INT(v);
 }
 
-static inline bool isInt32(jsval v)
+static inline bool
+isInt32(jsval v)
 {
     if (!isNumber(v))
         return false;
@@ -489,7 +508,8 @@ static inline bool isInt32(jsval v)
     return JSDOUBLE_IS_INT(d, i);
 }
 
-static inline jsint asInt32(jsval v)
+static inline jsint
+asInt32(jsval v)
 {
     JS_ASSERT(isNumber(v));
     if (JSVAL_IS_INT(v))
@@ -502,7 +522,8 @@ static inline jsint asInt32(jsval v)
 }
 
 /* Return TT_DOUBLE for all numbers (int and double) and the tag otherwise. */
-static inline JSTraceType getPromotedType(jsval v)
+static inline JSTraceType
+GetPromotedType(jsval v)
 {
     if (JSVAL_IS_INT(v))
         return TT_DOUBLE;
@@ -522,7 +543,8 @@ static inline JSTraceType getPromotedType(jsval v)
 }
 
 /* Return TT_INT32 for all whole numbers that fit into signed 32-bit and the tag otherwise. */
-static inline JSTraceType getCoercedType(jsval v)
+static inline JSTraceType
+getCoercedType(jsval v)
 {
     if (isInt32(v))
         return TT_INT32;
@@ -541,32 +563,34 @@ static inline JSTraceType getCoercedType(jsval v)
     return JSTraceType(tag);
 }
 
-/*
- * Constant seed and accumulate step borrowed from the DJB hash.
- */
+/* Constant seed and accumulate step borrowed from the DJB hash. */
 
-#define ORACLE_MASK (ORACLE_SIZE - 1)
-#define FRAGMENT_TABLE_MASK (FRAGMENT_TABLE_SIZE - 1)
-#define HASH_SEED 5381
+const uintptr_t ORACLE_MASK = ORACLE_SIZE - 1;
+JS_STATIC_ASSERT((ORACLE_MASK & ORACLE_SIZE) == 0);
+
+const uintptr_t FRAGMENT_TABLE_MASK = FRAGMENT_TABLE_SIZE - 1;
+JS_STATIC_ASSERT((FRAGMENT_TABLE_MASK & FRAGMENT_TABLE_SIZE) == 0);
+
+const uintptr_t HASH_SEED = 5381;
 
 static inline void
-hash_accum(uintptr_t& h, uintptr_t i, uintptr_t mask)
+HashAccum(uintptr_t& h, uintptr_t i, uintptr_t mask)
 {
     h = ((h << 5) + h + (mask & i)) & mask;
 }
 
-JS_REQUIRES_STACK static inline int
-stackSlotHash(JSContext* cx, unsigned slot)
+static JS_REQUIRES_STACK inline int
+StackSlotHash(JSContext* cx, unsigned slot)
 {
     uintptr_t h = HASH_SEED;
-    hash_accum(h, uintptr_t(cx->fp->script), ORACLE_MASK);
-    hash_accum(h, uintptr_t(cx->fp->regs->pc), ORACLE_MASK);
-    hash_accum(h, uintptr_t(slot), ORACLE_MASK);
+    HashAccum(h, uintptr_t(cx->fp->script), ORACLE_MASK);
+    HashAccum(h, uintptr_t(cx->fp->regs->pc), ORACLE_MASK);
+    HashAccum(h, uintptr_t(slot), ORACLE_MASK);
     return int(h);
 }
 
-JS_REQUIRES_STACK static inline int
-globalSlotHash(JSContext* cx, unsigned slot)
+static JS_REQUIRES_STACK inline int
+GlobalSlotHash(JSContext* cx, unsigned slot)
 {
     uintptr_t h = HASH_SEED;
     JSStackFrame* fp = cx->fp;
@@ -574,15 +598,14 @@ globalSlotHash(JSContext* cx, unsigned slot)
     while (fp->down)
         fp = fp->down;
 
-    hash_accum(h, uintptr_t(fp->script), ORACLE_MASK);
-    hash_accum(h, uintptr_t(OBJ_SHAPE(JS_GetGlobalForObject(cx, fp->scopeChain))),
-               ORACLE_MASK);
-    hash_accum(h, uintptr_t(slot), ORACLE_MASK);
+    HashAccum(h, uintptr_t(fp->script), ORACLE_MASK);
+    HashAccum(h, uintptr_t(OBJ_SHAPE(JS_GetGlobalForObject(cx, fp->scopeChain))), ORACLE_MASK);
+    HashAccum(h, uintptr_t(slot), ORACLE_MASK);
     return int(h);
 }
 
 static inline int
-pcHash(jsbytecode* pc)
+PCHash(jsbytecode* pc)
 {
     return int(uintptr_t(pc) & ORACLE_MASK);
 }
@@ -599,42 +622,42 @@ Oracle::Oracle()
 JS_REQUIRES_STACK void
 Oracle::markGlobalSlotUndemotable(JSContext* cx, unsigned slot)
 {
-    _globalDontDemote.set(&gc, globalSlotHash(cx, slot));
+    _globalDontDemote.set(&gc, GlobalSlotHash(cx, slot));
 }
 
 /* Consult with the oracle whether we shouldn't demote a certain global variable. */
 JS_REQUIRES_STACK bool
 Oracle::isGlobalSlotUndemotable(JSContext* cx, unsigned slot) const
 {
-    return _globalDontDemote.get(globalSlotHash(cx, slot));
+    return _globalDontDemote.get(GlobalSlotHash(cx, slot));
 }
 
 /* Tell the oracle that a certain slot at a certain stack slot should not be demoted. */
 JS_REQUIRES_STACK void
 Oracle::markStackSlotUndemotable(JSContext* cx, unsigned slot)
 {
-    _stackDontDemote.set(&gc, stackSlotHash(cx, slot));
+    _stackDontDemote.set(&gc, StackSlotHash(cx, slot));
 }
 
 /* Consult with the oracle whether we shouldn't demote a certain slot. */
 JS_REQUIRES_STACK bool
 Oracle::isStackSlotUndemotable(JSContext* cx, unsigned slot) const
 {
-    return _stackDontDemote.get(stackSlotHash(cx, slot));
+    return _stackDontDemote.get(StackSlotHash(cx, slot));
 }
 
 /* Tell the oracle that a certain slot at a certain bytecode location should not be demoted. */
 void
 Oracle::markInstructionUndemotable(jsbytecode* pc)
 {
-    _pcDontDemote.set(&gc, pcHash(pc));
+    _pcDontDemote.set(&gc, PCHash(pc));
 }
 
 /* Consult with the oracle whether we shouldn't demote a certain bytecode location. */
 bool
 Oracle::isInstructionUndemotable(jsbytecode* pc) const
 {
-    return _pcDontDemote.get(pcHash(pc));
+    return _pcDontDemote.get(PCHash(pc));
 }
 
 void
@@ -645,7 +668,6 @@ Oracle::clearDemotability()
     _pcDontDemote.reset();
 }
 
-
 struct PCHashEntry : public JSDHashEntryStub {
     size_t          count;
 };
@@ -653,7 +675,7 @@ struct PCHashEntry : public JSDHashEntryStub {
 #define PC_HASH_COUNT 1024
 
 static void
-js_Blacklist(jsbytecode* pc)
+Blacklist(jsbytecode* pc)
 {
     AUDIT(blacklisted);
     JS_ASSERT(*pc == JSOP_LOOP || *pc == JSOP_NOP);
@@ -661,7 +683,7 @@ js_Blacklist(jsbytecode* pc)
 }
 
 static void
-js_Backoff(JSContext *cx, jsbytecode* pc, Fragment* tree=NULL)
+Backoff(JSContext *cx, jsbytecode* pc, Fragment* tree = NULL)
 {
     JSDHashTable *table = &JS_TRACE_MONITOR(cx).recordAttempts;
 
@@ -677,7 +699,7 @@ js_Backoff(JSContext *cx, jsbytecode* pc, Fragment* tree=NULL)
             JS_ASSERT(JS_DHASH_ENTRY_IS_LIVE(&(entry->hdr)));
             if (entry->count++ > (BL_ATTEMPTS * MAXPEERS)) {
                 entry->count = 0;
-                js_Blacklist(pc);
+                Blacklist(pc);
                 return;
             }
         }
@@ -693,12 +715,12 @@ js_Backoff(JSContext *cx, jsbytecode* pc, Fragment* tree=NULL)
          * well.
          */
         if (++tree->recordAttempts > BL_ATTEMPTS)
-            js_Blacklist(pc);
+            Blacklist(pc);
     }
 }
 
 static void
-js_resetRecordingAttempts(JSContext *cx, jsbytecode* pc)
+ResetRecordingAttempts(JSContext *cx, jsbytecode* pc)
 {
     JSDHashTable *table = &JS_TRACE_MONITOR(cx).recordAttempts;
     if (table->ops) {
@@ -713,13 +735,13 @@ js_resetRecordingAttempts(JSContext *cx, jsbytecode* pc)
 }
 
 static inline size_t
-fragmentHash(const void *ip, JSObject* globalObj, uint32 globalShape, uint32 argc)
+FragmentHash(const void *ip, JSObject* globalObj, uint32 globalShape, uint32 argc)
 {
     uintptr_t h = HASH_SEED;
-    hash_accum(h, uintptr_t(ip), FRAGMENT_TABLE_MASK);
-    hash_accum(h, uintptr_t(globalObj), FRAGMENT_TABLE_MASK);
-    hash_accum(h, uintptr_t(globalShape), FRAGMENT_TABLE_MASK);
-    hash_accum(h, uintptr_t(argc), FRAGMENT_TABLE_MASK);
+    HashAccum(h, uintptr_t(ip), FRAGMENT_TABLE_MASK);
+    HashAccum(h, uintptr_t(globalObj), FRAGMENT_TABLE_MASK);
+    HashAccum(h, uintptr_t(globalShape), FRAGMENT_TABLE_MASK);
+    HashAccum(h, uintptr_t(argc), FRAGMENT_TABLE_MASK);
     return size_t(h);
 }
 
@@ -727,10 +749,10 @@ fragmentHash(const void *ip, JSObject* globalObj, uint32 globalShape, uint32 arg
  * argc is cx->fp->argc at the trace loop header, i.e., the number of arguments
  * pushed for the innermost JS frame. This is required as part of the fragment
  * key because the fragment will write those arguments back to the interpreter
- * stack when it exits, using its typemap, which implicitly incorporates a given
- * value of argc. Without this feature, a fragment could be called as an inner
- * tree with two different values of argc, and entry type checking or exit
- * frame synthesis could crash.
+ * stack when it exits, using its typemap, which implicitly incorporates a
+ * given value of argc. Without this feature, a fragment could be called as an
+ * inner tree with two different values of argc, and entry type checking or
+ * exit frame synthesis could crash.
  */
 struct VMFragment : public Fragment
 {
@@ -751,7 +773,7 @@ static VMFragment*
 getVMFragment(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 globalShape,
               uint32 argc)
 {
-    size_t h = fragmentHash(ip, globalObj, globalShape, argc);
+    size_t h = FragmentHash(ip, globalObj, globalShape, argc);
     VMFragment* vf = tm->vmfragments[h];
     while (vf &&
            ! (vf->globalObj == globalObj &&
@@ -764,15 +786,13 @@ getVMFragment(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 gl
 }
 
 static VMFragment*
-getLoop(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 globalShape,
-        uint32 argc)
+getLoop(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 globalShape, uint32 argc)
 {
     return getVMFragment(tm, ip, globalObj, globalShape, argc);
 }
 
 static Fragment*
-getAnchor(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 globalShape,
-          uint32 argc)
+getAnchor(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 globalShape, uint32 argc)
 {
     VMFragment *f = new (&gc) VMFragment(ip, globalObj, globalShape, argc);
     JS_ASSERT(f);
@@ -789,7 +809,7 @@ getAnchor(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 global
     } else {
         /* this is the first fragment */
         f->first = f;
-        size_t h = fragmentHash(ip, globalObj, globalShape, argc);
+        size_t h = FragmentHash(ip, globalObj, globalShape, argc);
         f->next = tm->vmfragments[h];
         tm->vmfragments[h] = f;
     }
@@ -801,9 +821,10 @@ getAnchor(JSTraceMonitor* tm, const void *ip, JSObject* globalObj, uint32 global
 
 #ifdef DEBUG
 static void
-ensureTreeIsUnique(JSTraceMonitor* tm, VMFragment* f, TreeInfo* ti)
+AssertTreeIsUnique(JSTraceMonitor* tm, VMFragment* f, TreeInfo* ti)
 {
     JS_ASSERT(f->root == f);
+
     /*
      * Check for duplicate entry type maps.  This is always wrong and hints at
      * trace explosion since we are trying to stabilize something without
@@ -823,21 +844,16 @@ ensureTreeIsUnique(JSTraceMonitor* tm, VMFragment* f, TreeInfo* ti)
 #endif
 
 static void
-js_AttemptCompilation(JSContext *cx, JSTraceMonitor* tm, JSObject* globalObj, jsbytecode* pc,
-                      uint32 argc)
+AttemptCompilation(JSContext *cx, JSTraceMonitor* tm, JSObject* globalObj, jsbytecode* pc,
+                   uint32 argc)
 {
-    /*
-     * If we already permanently blacklisted the location, undo that.
-     */
+    /* If we already permanently blacklisted the location, undo that. */
     JS_ASSERT(*(jsbytecode*)pc == JSOP_NOP || *(jsbytecode*)pc == JSOP_LOOP);
     *(jsbytecode*)pc = JSOP_LOOP;
-    js_resetRecordingAttempts(cx, pc);
+    ResetRecordingAttempts(cx, pc);
 
-    /*
-     * Breath new live into all peer fragments at the designated loop header.
-     */
-    Fragment* f = (VMFragment*)getLoop(tm, pc, globalObj, OBJ_SHAPE(globalObj),
-                                       argc);
+    /* Breathe new life into all peer fragments at the designated loop header. */
+    Fragment* f = (VMFragment*)getLoop(tm, pc, globalObj, OBJ_SHAPE(globalObj), argc);
     if (!f) {
         /*
          * If the global object's shape changed, we can't easily find the
@@ -861,7 +877,8 @@ js_AttemptCompilation(JSContext *cx, JSTraceMonitor* tm, JSObject* globalObj, js
 JS_DEFINE_CALLINFO_1(static, DOUBLE, i2f,  INT32, 1, 1)
 JS_DEFINE_CALLINFO_1(static, DOUBLE, u2f, UINT32, 1, 1)
 
-static bool isi2f(LInsp i)
+static bool
+isi2f(LIns* i)
 {
     if (i->isop(LIR_i2f))
         return true;
@@ -869,8 +886,7 @@ static bool isi2f(LInsp i)
     if (nanojit::AvmCore::config.soft_float &&
         i->isop(LIR_qjoin) &&
         i->oprnd1()->isop(LIR_call) &&
-        i->oprnd2()->isop(LIR_callh))
-    {
+        i->oprnd2()->isop(LIR_callh)) {
         if (i->oprnd1()->callInfo() == &i2f_ci)
             return true;
     }
@@ -878,7 +894,8 @@ static bool isi2f(LInsp i)
     return false;
 }
 
-static bool isu2f(LInsp i)
+static bool
+isu2f(LIns* i)
 {
     if (i->isop(LIR_u2f))
         return true;
@@ -886,8 +903,7 @@ static bool isu2f(LInsp i)
     if (nanojit::AvmCore::config.soft_float &&
         i->isop(LIR_qjoin) &&
         i->oprnd1()->isop(LIR_call) &&
-        i->oprnd2()->isop(LIR_callh))
-    {
+        i->oprnd2()->isop(LIR_callh)) {
         if (i->oprnd1()->callInfo() == &u2f_ci)
             return true;
     }
@@ -895,19 +911,19 @@ static bool isu2f(LInsp i)
     return false;
 }
 
-static LInsp iu2fArg(LInsp i)
+static LIns*
+iu2fArg(LIns* i)
 {
     if (nanojit::AvmCore::config.soft_float &&
-        i->isop(LIR_qjoin))
-    {
+        i->isop(LIR_qjoin)) {
         return i->oprnd1()->arg(0);
     }
 
     return i->oprnd1();
 }
 
-
-static LIns* demote(LirWriter *out, LInsp i)
+static LIns*
+demote(LirWriter *out, LIns* i)
 {
     if (i->isCall())
         return callArgN(i, 0);
@@ -921,7 +937,8 @@ static LIns* demote(LirWriter *out, LInsp i)
     return out->insImm(ci);
 }
 
-static bool isPromoteInt(LIns* i)
+static bool
+isPromoteInt(LIns* i)
 {
     if (isi2f(i) || i->isconst())
         return true;
@@ -931,7 +948,8 @@ static bool isPromoteInt(LIns* i)
     return d == jsdouble(jsint(d)) && !JSDOUBLE_IS_NEGZERO(d);
 }
 
-static bool isPromoteUint(LIns* i)
+static bool
+isPromoteUint(LIns* i)
 {
     if (isu2f(i) || i->isconst())
         return true;
@@ -941,12 +959,14 @@ static bool isPromoteUint(LIns* i)
     return d == jsdouble(jsuint(d)) && !JSDOUBLE_IS_NEGZERO(d);
 }
 
-static bool isPromote(LIns* i)
+static bool
+isPromote(LIns* i)
 {
     return isPromoteInt(i) || isPromoteUint(i);
 }
 
-static bool isconst(LIns* i, int32_t c)
+static bool
+IsConst(LIns* i, int32_t c)
 {
     return i->isconst() && i->imm32() == c;
 }
@@ -955,7 +975,8 @@ static bool isconst(LIns* i, int32_t c)
  * Determine whether this operand is guaranteed to not overflow the specified
  * integer operation.
  */
-static bool overflowSafe(LOpcode op, LIns* i)
+static bool
+IsOverflowSafe(LOpcode op, LIns* i)
 {
     LIns* c;
     switch (op) {
@@ -1066,7 +1087,7 @@ public:
     {
     }
 
-    LInsp quadCall(const CallInfo *ci, LInsp args[]) {
+    LIns* quadCall(const CallInfo *ci, LIns* args[]) {
         LInsp qlo, qhi;
 
         qlo = out->insCall(ci, args);
@@ -1074,7 +1095,7 @@ public:
         return out->qjoin(qlo, qhi);
     }
 
-    LInsp ins1(LOpcode v, LInsp s0)
+    LIns* ins1(LOpcode v, LIns* s0)
     {
         if (v == LIR_fneg)
             return quadCall(&fneg_ci, &s0);
@@ -1088,10 +1109,10 @@ public:
         return out->ins1(v, s0);
     }
 
-    LInsp ins2(LOpcode v, LInsp s0, LInsp s1)
+    LIns* ins2(LOpcode v, LIns* s0, LIns* s1)
     {
-        LInsp args[2];
-        LInsp bv;
+        LIns* args[2];
+        LIns* bv;
 
         // change the numeric value and order of these LIR opcodes and die
         if (LIR_fadd <= v && v <= LIR_fdiv) {
@@ -1116,10 +1137,10 @@ public:
         return out->ins2(v, s0, s1);
     }
 
-    LInsp insCall(const CallInfo *ci, LInsp args[])
+    LIns* insCall(const CallInfo *ci, LIns* args[])
     {
         // if the return type is ARGSIZE_F, we have
-        // to do a quadCall ( qjoin(call,callh) )
+        // to do a quadCall(qjoin(call,callh))
         if ((ci->_argtypes & 3) == ARGSIZE_F)
             return quadCall(ci, args);
 
@@ -1135,7 +1156,7 @@ public:
     {
     }
 
-    LInsp ins2(LOpcode v, LInsp s0, LInsp s1)
+    LIns* ins2(LOpcode v, LIns* s0, LIns* s1)
     {
         if (s0 == s1 && v == LIR_feq) {
             if (isPromote(s0)) {
@@ -1143,8 +1164,8 @@ public:
                 return insImm(1);
             }
             if (s0->isop(LIR_fmul) || s0->isop(LIR_fsub) || s0->isop(LIR_fadd)) {
-                LInsp lhs = s0->oprnd1();
-                LInsp rhs = s0->oprnd2();
+                LIns* lhs = s0->oprnd1();
+                LIns* rhs = s0->oprnd2();
                 if (isPromote(lhs) && isPromote(rhs)) {
                     // add/sub/mul promoted ints can't be nan
                     return insImm(1);
@@ -1163,8 +1184,8 @@ public:
                 return out->ins2(v, demote(out, s0), demote(out, s1));
             }
         } else if (v == LIR_or &&
-                   s0->isop(LIR_lsh) && isconst(s0->oprnd2(), 16) &&
-                   s1->isop(LIR_and) && isconst(s1->oprnd2(), 0xffff)) {
+                   s0->isop(LIR_lsh) && IsConst(s0->oprnd2(), 16) &&
+                   s1->isop(LIR_and) && IsConst(s1->oprnd2(), 0xffff)) {
             LIns* msw = s0->oprnd1();
             LIns* lsw = s1->oprnd1();
             LIns* x;
@@ -1172,16 +1193,16 @@ public:
             if (lsw->isop(LIR_add) &&
                 lsw->oprnd1()->isop(LIR_and) &&
                 lsw->oprnd2()->isop(LIR_and) &&
-                isconst(lsw->oprnd1()->oprnd2(), 0xffff) &&
-                isconst(lsw->oprnd2()->oprnd2(), 0xffff) &&
+                IsConst(lsw->oprnd1()->oprnd2(), 0xffff) &&
+                IsConst(lsw->oprnd2()->oprnd2(), 0xffff) &&
                 msw->isop(LIR_add) &&
                 msw->oprnd1()->isop(LIR_add) &&
                 msw->oprnd2()->isop(LIR_rsh) &&
                 msw->oprnd1()->oprnd1()->isop(LIR_rsh) &&
                 msw->oprnd1()->oprnd2()->isop(LIR_rsh) &&
-                isconst(msw->oprnd2()->oprnd2(), 16) &&
-                isconst(msw->oprnd1()->oprnd1()->oprnd2(), 16) &&
-                isconst(msw->oprnd1()->oprnd2()->oprnd2(), 16) &&
+                IsConst(msw->oprnd2()->oprnd2(), 16) &&
+                IsConst(msw->oprnd1()->oprnd1()->oprnd2(), 16) &&
+                IsConst(msw->oprnd1()->oprnd2()->oprnd2(), 16) &&
                 (x = lsw->oprnd1()->oprnd1()) == msw->oprnd1()->oprnd1()->oprnd1() &&
                 (y = lsw->oprnd2()->oprnd1()) == msw->oprnd1()->oprnd2()->oprnd1() &&
                 lsw == msw->oprnd2()->oprnd1()) {
@@ -1192,21 +1213,21 @@ public:
         return out->ins2(v, s0, s1);
     }
 
-    LInsp insCall(const CallInfo *ci, LInsp args[])
+    LIns* insCall(const CallInfo *ci, LIns* args[])
     {
         if (ci == &js_DoubleToUint32_ci) {
-            LInsp s0 = args[0];
+            LIns* s0 = args[0];
             if (s0->isconstq())
                 return out->insImm(js_DoubleToECMAUint32(s0->imm64f()));
             if (isi2f(s0) || isu2f(s0))
                 return iu2fArg(s0);
         } else if (ci == &js_DoubleToInt32_ci) {
-            LInsp s0 = args[0];
+            LIns* s0 = args[0];
             if (s0->isconstq())
                 return out->insImm(js_DoubleToECMAInt32(s0->imm64f()));
             if (s0->isop(LIR_fadd) || s0->isop(LIR_fsub)) {
-                LInsp lhs = s0->oprnd1();
-                LInsp rhs = s0->oprnd2();
+                LIns* lhs = s0->oprnd1();
+                LIns* rhs = s0->oprnd2();
                 if (isPromote(lhs) && isPromote(rhs)) {
                     LOpcode op = LOpcode(s0->opcode() & ~LIR64);
                     return out->ins2(op, demote(out, lhs), demote(out, rhs));
@@ -1214,6 +1235,7 @@ public:
             }
             if (isi2f(s0) || isu2f(s0))
                 return iu2fArg(s0);
+
             // XXX ARM -- check for qjoin(call(UnboxDouble),call(UnboxDouble))
             if (s0->isCall()) {
                 const CallInfo* ci2 = s0->callInfo();
@@ -1240,7 +1262,7 @@ public:
                 }
             }
         } else if (ci == &js_BoxDouble_ci) {
-            LInsp s0 = args[0];
+            LIns* s0 = args[0];
             JS_ASSERT(s0->isQuad());
             if (isPromoteInt(s0)) {
                 LIns* args2[] = { demote(out, s0), args[1] };
@@ -1254,15 +1276,15 @@ public:
 };
 
 /*
- * Visit the values in the given JSStackFrame that the tracer cares about. This visitor
- * function is (implicitly) the primary definition of the native stack area layout. There
- * are a few other independent pieces of code that must be maintained to assume the same
- * layout. They are marked like this:
+ * Visit the values in the given JSStackFrame that the tracer cares about. This
+ * visitor function is (implicitly) the primary definition of the native stack
+ * area layout. There are a few other independent pieces of code that must be
+ * maintained to assume the same layout. They are marked like this:
  *
  *   Duplicate native stack layout computation: see VisitFrameSlots header comment.
  */
 template <typename Visitor>
-JS_REQUIRES_STACK static bool
+static JS_REQUIRES_STACK bool
 VisitFrameSlots(Visitor &visitor, unsigned depth, JSStackFrame *fp,
                 JSStackFrame *up)
 {
@@ -1301,14 +1323,14 @@ VisitFrameSlots(Visitor &visitor, unsigned depth, JSStackFrame *fp,
 }
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE bool
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE bool
 VisitStackSlots(Visitor &visitor, JSContext *cx, unsigned callDepth)
 {
     return VisitFrameSlots(visitor, callDepth, cx->fp, NULL);
 }
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitGlobalSlots(Visitor &visitor, JSContext *cx, JSObject *globalObj,
                  unsigned ngslots, uint16 *gslots)
 {
@@ -1321,7 +1343,7 @@ VisitGlobalSlots(Visitor &visitor, JSContext *cx, JSObject *globalObj,
 class AdjustCallerTypeVisitor;
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitGlobalSlots(Visitor &visitor, JSContext *cx, SlotList &gslots)
 {
     VisitGlobalSlots(visitor, cx, JS_GetGlobalForObject(cx, cx->fp->scopeChain),
@@ -1330,7 +1352,7 @@ VisitGlobalSlots(Visitor &visitor, JSContext *cx, SlotList &gslots)
 
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitSlots(Visitor& visitor, JSContext* cx, JSObject* globalObj,
            unsigned callDepth, unsigned ngslots, uint16* gslots)
 {
@@ -1339,7 +1361,7 @@ VisitSlots(Visitor& visitor, JSContext* cx, JSObject* globalObj,
 }
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitSlots(Visitor& visitor, JSContext* cx, unsigned callDepth,
            unsigned ngslots, uint16* gslots)
 {
@@ -1348,7 +1370,7 @@ VisitSlots(Visitor& visitor, JSContext* cx, unsigned callDepth,
 }
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitSlots(Visitor &visitor, JSContext *cx, JSObject *globalObj,
            unsigned callDepth, const SlotList& slots)
 {
@@ -1357,7 +1379,7 @@ VisitSlots(Visitor &visitor, JSContext *cx, JSObject *globalObj,
 }
 
 template <typename Visitor>
-JS_REQUIRES_STACK static JS_ALWAYS_INLINE void
+static JS_REQUIRES_STACK JS_ALWAYS_INLINE void
 VisitSlots(Visitor &visitor, JSContext *cx, unsigned callDepth,
            const SlotList& slots)
 {
@@ -1417,16 +1439,21 @@ public:
     }
 };
 
-/* Calculate the total number of native frame slots we need from this frame
-   all the way back to the entry frame, including the current stack usage. */
+/*
+ * Calculate the total number of native frame slots we need from this frame all
+ * the way back to the entry frame, including the current stack usage.
+ */
 JS_REQUIRES_STACK unsigned
-js_NativeStackSlots(JSContext *cx, unsigned callDepth)
+NativeStackSlots(JSContext *cx, unsigned callDepth)
 {
     JSStackFrame* fp = cx->fp;
     unsigned slots = 0;
     unsigned depth = callDepth;
     for (;;) {
-        /* Duplicate native stack layout computation: see VisitFrameSlots header comment. */
+        /*
+         * Duplicate native stack layout computation: see VisitFrameSlots
+         * header comment.
+         */
         unsigned operands = fp->regs->sp - StackBase(fp);
         slots += operands;
         if (fp->callee)
@@ -1447,7 +1474,7 @@ js_NativeStackSlots(JSContext *cx, unsigned callDepth)
         if (missing > 0)
             slots += missing;
     }
-    JS_NOT_REACHED("js_NativeStackSlots");
+    JS_NOT_REACHED("NativeStackSlots");
 }
 
 class CaptureTypesVisitor : public SlotVisitorBase
@@ -1504,7 +1531,7 @@ public:
 JS_REQUIRES_STACK void
 TypeMap::captureTypes(JSContext* cx, JSObject* globalObj, SlotList& slots, unsigned callDepth)
 {
-    setLength(js_NativeStackSlots(cx, callDepth) + slots.length());
+    setLength(NativeStackSlots(cx, callDepth) + slots.length());
     CaptureTypesVisitor visitor(cx, data());
     VisitSlots(visitor, cx, globalObj, callDepth, slots);
     JS_ASSERT(visitor.length() == length());
@@ -1530,10 +1557,13 @@ TypeMap::matches(TypeMap& other) const
     return !memcmp(data(), other.data(), length());
 }
 
-/* Use the provided storage area to create a new type map that contains the partial type map
-   with the rest of it filled up from the complete type map. */
+/*
+ * Use the provided storage area to create a new type map that contains the
+ * partial type map with the rest of it filled up from the complete type
+ * map.
+ */
 static void
-mergeTypeMaps(JSTraceType** partial, unsigned* plength, JSTraceType* complete, unsigned clength, JSTraceType* mem)
+MergeTypeMaps(JSTraceType** partial, unsigned* plength, JSTraceType* complete, unsigned clength, JSTraceType* mem)
 {
     unsigned l = *plength;
     JS_ASSERT(l < clength);
@@ -1545,7 +1575,7 @@ mergeTypeMaps(JSTraceType** partial, unsigned* plength, JSTraceType* complete, u
 
 /* Specializes a tree to any missing globals, including any dependent trees. */
 static JS_REQUIRES_STACK void
-specializeTreesToMissingGlobals(JSContext* cx, JSObject* globalObj, TreeInfo* root)
+SpecializeTreesToMissingGlobals(JSContext* cx, JSObject* globalObj, TreeInfo* root)
 {
     TreeInfo* ti = root;
 
@@ -1554,19 +1584,38 @@ specializeTreesToMissingGlobals(JSContext* cx, JSObject* globalObj, TreeInfo* ro
 
     for (unsigned i = 0; i < root->dependentTrees.length(); i++) {
         ti = (TreeInfo*)root->dependentTrees[i]->vmprivate;
+
         /* ti can be NULL if we hit the recording tree in emitTreeCall; this is harmless. */
         if (ti && ti->nGlobalTypes() < ti->globalSlots->length())
-            specializeTreesToMissingGlobals(cx, globalObj, ti);
+            SpecializeTreesToMissingGlobals(cx, globalObj, ti);
     }
     for (unsigned i = 0; i < root->linkedTrees.length(); i++) {
         ti = (TreeInfo*)root->linkedTrees[i]->vmprivate;
         if (ti && ti->nGlobalTypes() < ti->globalSlots->length())
-            specializeTreesToMissingGlobals(cx, globalObj, ti);
+            SpecializeTreesToMissingGlobals(cx, globalObj, ti);
     }
 }
 
+static inline JSTraceType*
+GetStackTypeMap(nanojit::SideExit* exit)
+{
+    return (JSTraceType*)(((VMSideExit*)exit) + 1);
+}
+
+static inline JSTraceType*
+GetGlobalTypeMap(nanojit::SideExit* exit)
+{
+    return GetStackTypeMap(exit) + ((VMSideExit*)exit)->numStackSlots;
+}
+
+static inline JSTraceType*
+GetFullTypeMap(nanojit::SideExit* exit)
+{
+    return GetStackTypeMap(exit);
+}
+
 static void
-js_TrashTree(JSContext* cx, Fragment* f);
+TrashTree(JSContext* cx, Fragment* f);
 
 JS_REQUIRES_STACK
 TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* _anchor, Fragment* _fragment,
@@ -1636,7 +1685,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* _anchor, Fragment* _frag
 
     /* If we came from exit, we might not have enough global types. */
     if (ti->globalSlots->length() > ti->nGlobalTypes())
-        specializeTreesToMissingGlobals(cx, globalObj, ti);
+        SpecializeTreesToMissingGlobals(cx, globalObj, ti);
 
     /* read into registers all values on the stack and all globals we know so far */
     import(treeInfo, lirbuf->sp, stackSlots, ngslots, callDepth, typeMap);
@@ -1650,8 +1699,10 @@ TraceRecorder::TraceRecorder(JSContext* cx, VMSideExit* _anchor, Fragment* _frag
         guard(true, lir->ins_eq0(x), snapshot(TIMEOUT_EXIT));
     }
 
-    /* If we are attached to a tree call guard, make sure the guard the inner tree exited from
-       is what we expect it to be. */
+    /*
+     * If we are attached to a tree call guard, make sure the guard the inner
+     * tree exited from is what we expect it to be.
+     */
     if (_anchor && _anchor->exitType == NESTED_EXIT) {
         LIns* nested_ins = addName(lir->insLoad(LIR_ldp, lirbuf->state,
                                                 offsetof(InterpState, lastTreeExitGuard)),
@@ -1690,10 +1741,10 @@ TraceRecorder::~TraceRecorder()
         }
 
         if (trashSelf)
-            js_TrashTree(cx, fragment->root);
+            TrashTree(cx, fragment->root);
 
         for (unsigned int i = 0; i < whichTreesToTrash.length(); i++)
-            js_TrashTree(cx, whichTreesToTrash[i]);
+            TrashTree(cx, whichTreesToTrash[i]);
     } else if (wasRootFragment) {
         delete treeInfo;
     }
@@ -1708,12 +1759,14 @@ TraceRecorder::~TraceRecorder()
     delete generatedTraceableNative;
 }
 
-void TraceRecorder::removeFragmentoReferences()
+void
+TraceRecorder::removeFragmentoReferences()
 {
     fragment = NULL;
 }
 
-void TraceRecorder::deepAbort()
+void
+TraceRecorder::deepAbort()
 {
     debug_only_print0(LC_TMTracer|LC_TMAbort, "deep abort");
     deepAborted = true;
@@ -1724,8 +1777,10 @@ inline LIns*
 TraceRecorder::addName(LIns* ins, const char* name)
 {
 #ifdef JS_JIT_SPEW
-    /* We'll only ask for verbose Nanojit when .lcbits > 0, so
-       there's no point in adding names otherwise. */
+    /*
+     * We'll only ask for verbose Nanojit when .lcbits > 0, so there's no point
+     * in adding names otherwise.
+     */
     if (js_LogController.lcbits > 0)
         lirbuf->names->addName(ins, name);
 #endif
@@ -1739,7 +1794,7 @@ TraceRecorder::getCallDepth() const
     return callDepth;
 }
 
-/* Determine the offset in the native global frame for a jsval we track */
+/* Determine the offset in the native global frame for a jsval we track. */
 ptrdiff_t
 TraceRecorder::nativeGlobalOffset(jsval* p) const
 {
@@ -1749,7 +1804,7 @@ TraceRecorder::nativeGlobalOffset(jsval* p) const
     return sizeof(InterpState) + ((p - globalObj->dslots) + JS_INITIAL_NSLOTS) * sizeof(double);
 }
 
-/* Determine whether a value is a global stack slot */
+/* Determine whether a value is a global stack slot. */
 bool
 TraceRecorder::isGlobal(jsval* p) const
 {
@@ -1761,8 +1816,8 @@ TraceRecorder::isGlobal(jsval* p) const
  * Return the offset in the native stack for the given jsval. More formally,
  * |p| must be the address of a jsval that is represented in the native stack
  * area. The return value is the offset, from InterpState::stackBase, in bytes,
- * where the native representation of |*p| is stored. To get the offset relative
- * to InterpState::sp, subtract TreeInfo::nativeStackBase.
+ * where the native representation of |*p| is stored. To get the offset
+ * relative to InterpState::sp, subtract TreeInfo::nativeStackBase.
  */
 JS_REQUIRES_STACK ptrdiff_t
 TraceRecorder::nativeStackOffset(jsval* p) const
@@ -1770,9 +1825,10 @@ TraceRecorder::nativeStackOffset(jsval* p) const
     CountSlotsVisitor visitor(p);
     VisitStackSlots(visitor, cx, callDepth);
     size_t offset = visitor.count() * sizeof(double);
+
     /*
-     * If it's not in a pending frame, it must be on the stack of the current frame above
-     * sp but below fp->slots + script->nslots.
+     * If it's not in a pending frame, it must be on the stack of the current
+     * frame above sp but below fp->slots + script->nslots.
      */
     if (!visitor.stopped()) {
         JS_ASSERT(size_t(p - cx->fp->slots) < cx->fp->script->nslots);
@@ -1781,8 +1837,7 @@ TraceRecorder::nativeStackOffset(jsval* p) const
     return offset;
 }
 
-/* Track the maximum number of native frame slots we need during
-   execution. */
+/* Track the maximum number of native frame slots we need during execution. */
 void
 TraceRecorder::trackNativeStackUse(unsigned slots)
 {
@@ -1790,9 +1845,11 @@ TraceRecorder::trackNativeStackUse(unsigned slots)
         treeInfo->maxNativeStackSlots = slots;
 }
 
-/* Unbox a jsval into a slot. Slots are wide enough to hold double values directly (instead of
-   storing a pointer to them). We now assert instead of type checking, the caller must ensure the
-   types are compatible. */
+/*
+ * Unbox a jsval into a slot. Slots are wide enough to hold double values
+ * directly (instead of storing a pointer to them). We assert instead of
+ * type checking. The caller must ensure the types are compatible.
+ */
 static void
 ValueToNative(JSContext* cx, jsval v, JSTraceType type, double* slot)
 {
@@ -1808,6 +1865,7 @@ ValueToNative(JSContext* cx, jsval v, JSTraceType type, double* slot)
                           ? "null"
                           : STOBJ_GET_CLASS(JSVAL_TO_OBJECT(v))->name);
         return;
+
       case TT_INT32:
         jsint i;
         if (JSVAL_IS_INT(v))
@@ -1818,6 +1876,7 @@ ValueToNative(JSContext* cx, jsval v, JSTraceType type, double* slot)
             JS_ASSERT(JSVAL_IS_INT(v));
         debug_only_printf(LC_TMTracer, "int<%d> ", *(jsint*)slot);
         return;
+
       case TT_DOUBLE:
         jsdouble d;
         if (JSVAL_IS_INT(v))
@@ -1828,25 +1887,30 @@ ValueToNative(JSContext* cx, jsval v, JSTraceType type, double* slot)
         *(jsdouble*)slot = d;
         debug_only_printf(LC_TMTracer, "double<%g> ", d);
         return;
+
       case TT_JSVAL:
         JS_NOT_REACHED("found jsval type in an entry type map");
         return;
+
       case TT_STRING:
         JS_ASSERT(tag == JSVAL_STRING);
         *(JSString**)slot = JSVAL_TO_STRING(v);
         debug_only_printf(LC_TMTracer, "string<%p> ", (void*)(*(JSString**)slot));
         return;
+
       case TT_NULL:
         JS_ASSERT(tag == JSVAL_OBJECT);
         *(JSObject**)slot = NULL;
         debug_only_print0(LC_TMTracer, "null ");
         return;
+
       case TT_PSEUDOBOOLEAN:
         /* Watch out for pseudo-booleans. */
         JS_ASSERT(tag == JSVAL_BOOLEAN);
         *(JSBool*)slot = JSVAL_TO_PSEUDO_BOOLEAN(v);
         debug_only_printf(LC_TMTracer, "pseudoboolean<%d> ", *(JSBool*)slot);
         return;
+
       case TT_FUNCTION: {
         JS_ASSERT(tag == JSVAL_OBJECT);
         JSObject* obj = JSVAL_TO_OBJECT(v);
@@ -1866,8 +1930,10 @@ ValueToNative(JSContext* cx, jsval v, JSTraceType type, double* slot)
     JS_NOT_REACHED("unexpected type");
 }
 
-/* We maintain an emergency pool of doubles so we can recover safely if a trace runs
-   out of memory (doubles or objects). */
+/*
+ * We maintain an emergency pool of doubles so we can recover safely if a trace
+ * runs out of memory (doubles or objects).
+ */
 static jsval
 AllocateDoubleFromReservedPool(JSContext* cx)
 {
@@ -1877,7 +1943,7 @@ AllocateDoubleFromReservedPool(JSContext* cx)
 }
 
 static bool
-js_ReplenishReservedPool(JSContext* cx, JSTraceMonitor* tm)
+ReplenishReservedPool(JSContext* cx, JSTraceMonitor* tm)
 {
     /* We should not be called with a full pool. */
     JS_ASSERT((size_t) (tm->reservedDoublePoolPtr - tm->reservedDoublePool) <
@@ -1923,9 +1989,11 @@ oom:
     return false;
 }
 
-/* Box a value from the native stack back into the jsval format. Integers
-   that are too large to fit into a jsval are automatically boxed into
-   heap-allocated doubles. */
+/*
+ * Box a value from the native stack back into the jsval format. Integers that
+ * are too large to fit into a jsval are automatically boxed into
+ * heap-allocated doubles.
+ */
 static void
 NativeToValue(JSContext* cx, jsval& v, JSTraceType type, double* slot)
 {
@@ -1941,6 +2009,7 @@ NativeToValue(JSContext* cx, jsval& v, JSTraceType type, double* slot)
                           ? "null"
                           : STOBJ_GET_CLASS(JSVAL_TO_OBJECT(v))->name);
         break;
+
       case TT_INT32:
         i = *(jsint*)slot;
         debug_only_printf(LC_TMTracer, "int<%d> ", i);
@@ -1957,8 +2026,10 @@ NativeToValue(JSContext* cx, jsval& v, JSTraceType type, double* slot)
         if (JSDOUBLE_IS_INT(d, i))
             goto store_int;
       store_double: {
-        /* Its not safe to trigger the GC here, so use an emergency heap if we are out of
-           double boxes. */
+        /*
+         * It's not safe to trigger the GC here, so use an emergency heap if we
+         * are out of double boxes.
+         */
         if (cx->doubleFreeList) {
 #ifdef DEBUG
             JSBool ok =
@@ -1972,25 +2043,30 @@ NativeToValue(JSContext* cx, jsval& v, JSTraceType type, double* slot)
         *JSVAL_TO_DOUBLE(v) = d;
         return;
       }
+
       case TT_JSVAL:
         v = *(jsval*)slot;
         JS_ASSERT(v != JSVAL_ERROR_COOKIE); /* don't leak JSVAL_ERROR_COOKIE */
         debug_only_printf(LC_TMTracer, "box<%p> ", (void*)v);
         break;
+
       case TT_STRING:
         v = STRING_TO_JSVAL(*(JSString**)slot);
         debug_only_printf(LC_TMTracer, "string<%p> ", (void*)(*(JSString**)slot));
         break;
+
       case TT_NULL:
         JS_ASSERT(*(JSObject**)slot == NULL);
         v = JSVAL_NULL;
         debug_only_printf(LC_TMTracer, "null<%p> ", (void*)(*(JSObject**)slot));
         break;
+
       case TT_PSEUDOBOOLEAN:
         /* Watch out for pseudo-booleans. */
         v = PSEUDO_BOOLEAN_TO_JSVAL(*(JSBool*)slot);
         debug_only_printf(LC_TMTracer, "boolean<%d> ", *(JSBool*)slot);
         break;
+
       case TT_FUNCTION: {
         JS_ASSERT(HAS_FUNCTION_CLASS(*(JSObject**)slot));
         v = OBJECT_TO_JSVAL(*(JSObject**)slot);
@@ -2128,8 +2204,8 @@ FlushNativeGlobalFrame(JSContext *cx, double *global, unsigned ngslots,
  *     callDepth   Call depth of current point relative to trace entry
  */
 template<typename T>
-JSTraceType JS_INLINE
-js_GetUpvarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+inline JSTraceType
+GetUpvarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
 {
     InterpState* state = cx->interpState;
     FrameInfo** fip = state->rp + callDepth;
@@ -2191,9 +2267,9 @@ struct UpvarArgTraits {
 };
 
 uint32 JS_FASTCALL
-js_GetUpvarArgOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+GetUpvarArgOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
 {
-    return js_GetUpvarOnTrace<UpvarArgTraits>(cx, upvarLevel, slot, callDepth, result);
+    return GetUpvarOnTrace<UpvarArgTraits>(cx, upvarLevel, slot, callDepth, result);
 }
 
 // For this traits type, 'slot' is an index into the local slots array.
@@ -2208,15 +2284,15 @@ struct UpvarVarTraits {
 };
 
 uint32 JS_FASTCALL
-js_GetUpvarVarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+GetUpvarVarOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
 {
-    return js_GetUpvarOnTrace<UpvarVarTraits>(cx, upvarLevel, slot, callDepth, result);
+    return GetUpvarOnTrace<UpvarVarTraits>(cx, upvarLevel, slot, callDepth, result);
 }
 
 /*
- * For this traits type, 'slot' is an index into the stack area (within slots, after nfixed)
- * of a frame with no function. (On trace, the top-level frame is the only one that can have
- * no function.)
+ * For this traits type, 'slot' is an index into the stack area (within slots,
+ * after nfixed) of a frame with no function. (On trace, the top-level frame is
+ * the only one that can have no function.)
  */
 struct UpvarStackTraits {
     static jsval interp_get(JSStackFrame* fp, int32 slot) {
@@ -2225,8 +2301,8 @@ struct UpvarStackTraits {
 
     static uint32 native_slot(uint32 argc, int32 slot) {
         /*
-         * Locals are not imported by the tracer when the frame has no function, so
-         * we do not add fp->script->nfixed.
+         * Locals are not imported by the tracer when the frame has no
+         * function, so we do not add fp->script->nfixed.
          */
         JS_ASSERT(argc == 0);
         return slot;
@@ -2234,9 +2310,9 @@ struct UpvarStackTraits {
 };
 
 uint32 JS_FASTCALL
-js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
+GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 callDepth, double* result)
 {
-    return js_GetUpvarOnTrace<UpvarStackTraits>(cx, upvarLevel, slot, callDepth, result);
+    return GetUpvarOnTrace<UpvarStackTraits>(cx, upvarLevel, slot, callDepth, result);
 }
 
 /*
@@ -2248,9 +2324,9 @@ js_GetUpvarStackOnTrace(JSContext* cx, uint32 upvarLevel, int32 slot, uint32 cal
  *     callDepth    callDepth of current point relative to trace entry.
  */
 template<typename T>
-uint32 JS_INLINE
-js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
-                  double* result)
+inline uint32
+GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
+               double* result)
 {
     JS_ASSERT(scopeIndex >= 1);
     JS_ASSERT(OBJ_GET_CLASS(cx, callee) == &js_FunctionClass);
@@ -2298,32 +2374,32 @@ js_GetFromClosure(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slo
 
 struct ArgClosureTraits
 {
-    static JS_INLINE uint32 adj_slot(JSStackFrame* fp, uint32 slot) { return fp->argc + slot; }
-    static JS_INLINE jsval* slots(JSStackFrame* fp) { return fp->argv; }
+    static inline uint32 adj_slot(JSStackFrame* fp, uint32 slot) { return fp->argc + slot; }
+    static inline jsval* slots(JSStackFrame* fp) { return fp->argv; }
 private:
     ArgClosureTraits();
 };
 
 uint32 JS_FASTCALL
-js_GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
-                 double* result)
+GetClosureArg(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
+              double* result)
 {
-    return js_GetFromClosure<ArgClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
+    return GetFromClosure<ArgClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
 }
 
 struct VarClosureTraits
 {
-    static JS_INLINE uint32 adj_slot(JSStackFrame* fp, uint32 slot) { return slot; }
-    static JS_INLINE jsval* slots(JSStackFrame* fp) { return fp->slots; }
+    static inline uint32 adj_slot(JSStackFrame* fp, uint32 slot) { return slot; }
+    static inline jsval* slots(JSStackFrame* fp) { return fp->slots; }
 private:
     VarClosureTraits();
 };
 
 uint32 JS_FASTCALL
-js_GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
-                 double* result)
+GetClosureVar(JSContext* cx, JSObject* callee, uint32 scopeIndex, uint32 slot, uint32 callDepth,
+              double* result)
 {
-    return js_GetFromClosure<VarClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
+    return GetFromClosure<VarClosureTraits>(cx, callee, scopeIndex, slot, callDepth, result);
 }
 
 /**
@@ -2362,6 +2438,7 @@ FlushNativeStackFrame(JSContext* cx, unsigned callDepth, JSTraceType* mp, double
                 JS_ASSERT(n != 0);
                 --n;
             }
+
             // Skip over stopFrame itself.
             JS_ASSERT(n != 0);
             --n;
@@ -2397,7 +2474,7 @@ FlushNativeStackFrame(JSContext* cx, unsigned callDepth, JSTraceType* mp, double
                          * involves it calling the debugger hook.
                          *
                          * Allocating the Call object must not fail, so use an object
-                         * previously reserved by js_ExecuteTree if needed.
+                         * previously reserved by ExecuteTree if needed.
                          */
                         void* hookData = ((JSInlineFrame*)fp)->hookData;
                         ((JSInlineFrame*)fp)->hookData = NULL;
@@ -2430,10 +2507,13 @@ TraceRecorder::import(LIns* base, ptrdiff_t offset, jsval* p, JSTraceType t,
     LIns* ins;
     if (t == TT_INT32) { /* demoted */
         JS_ASSERT(isInt32(*p));
-        /* Ok, we have a valid demotion attempt pending, so insert an integer
-           read and promote it to double since all arithmetic operations expect
-           to see doubles on entry. The first op to use this slot will emit a
-           f2i cast which will cancel out the i2f we insert here. */
+
+        /*
+         * Ok, we have a valid demotion attempt pending, so insert an integer
+         * read and promote it to double since all arithmetic operations expect
+         * to see doubles on entry. The first op to use this slot will emit a
+         * f2i cast which will cancel out the i2f we insert here.
+         */
         ins = lir->insLoad(LIR_ld, base, offset);
         ins = lir->ins1(LIR_i2f, ins);
     } else {
@@ -2582,26 +2662,30 @@ JS_REQUIRES_STACK void
 TraceRecorder::import(TreeInfo* treeInfo, LIns* sp, unsigned stackSlots, unsigned ngslots,
                       unsigned callDepth, JSTraceType* typeMap)
 {
-    /* If we get a partial list that doesn't have all the types (i.e. recording from a side
-       exit that was recorded but we added more global slots later), merge the missing types
-       from the entry type map. This is safe because at the loop edge we verify that we
-       have compatible types for all globals (entry type and loop edge type match). While
-       a different trace of the tree might have had a guard with a different type map for
-       these slots we just filled in here (the guard we continue from didn't know about them),
-       since we didn't take that particular guard the only way we could have ended up here
-       is if that other trace had at its end a compatible type distribution with the entry
-       map. Since thats exactly what we used to fill in the types our current side exit
-       didn't provide, this is always safe to do. */
+    /*
+     * If we get a partial list that doesn't have all the types (i.e. recording
+     * from a side exit that was recorded but we added more global slots
+     * later), merge the missing types from the entry type map. This is safe
+     * because at the loop edge we verify that we have compatible types for all
+     * globals (entry type and loop edge type match). While a different trace
+     * of the tree might have had a guard with a different type map for these
+     * slots we just filled in here (the guard we continue from didn't know
+     * about them), since we didn't take that particular guard the only way we
+     * could have ended up here is if that other trace had at its end a
+     * compatible type distribution with the entry map. Since that's exactly
+     * what we used to fill in the types our current side exit didn't provide,
+     * this is always safe to do.
+     */
 
     JSTraceType* globalTypeMap = typeMap + stackSlots;
     unsigned length = treeInfo->nGlobalTypes();
 
     /*
-     * This is potentially the typemap of the side exit and thus shorter than the tree's
-     * global type map.
+     * This is potentially the typemap of the side exit and thus shorter than
+     * the tree's global type map.
      */
     if (ngslots < length) {
-        mergeTypeMaps(&globalTypeMap/*out param*/, &ngslots/*out param*/,
+        MergeTypeMaps(&globalTypeMap /* out param */, &ngslots /* out param */,
                       treeInfo->globalTypeMap(), length,
                       (JSTraceType*)alloca(sizeof(JSTraceType) * length));
     }
@@ -2609,9 +2693,8 @@ TraceRecorder::import(TreeInfo* treeInfo, LIns* sp, unsigned stackSlots, unsigne
     ptrdiff_t offset = -treeInfo->nativeStackBase;
 
     /*
-     * Check whether there are any values on the stack we have to unbox and
-     * do that first before we waste any time fetching the state from the
-     * stack.
+     * Check whether there are any values on the stack we have to unbox and do
+     * that first before we waste any time fetching the state from the stack.
      */
     ImportBoxedStackSlotVisitor boxedStackVisitor(*this, sp, offset, typeMap);
     VisitStackSlots(boxedStackVisitor, cx, callDepth);
@@ -2636,6 +2719,7 @@ TraceRecorder::isValidSlot(JSScope* scope, JSScopeProperty* sprop)
         if (sprop->attrs & JSPROP_READONLY)
             ABORT_TRACE_RV("writing to a read-only property", false);
     }
+
     /* This check applies even when setflags == 0. */
     if (setflags != JOF_SET && !SPROP_HAS_STUB_GETTER(sprop))
         ABORT_TRACE_RV("non-stub getter", false);
@@ -2652,9 +2736,10 @@ TraceRecorder::lazilyImportGlobalSlot(unsigned slot)
 {
     if (slot != uint16(slot)) /* we use a table of 16-bit ints, bail out if that's not enough */
         return false;
+
     /*
-     * If the global object grows too large, alloca in js_ExecuteTree might fail, so
-     * abort tracing on global objects with unreasonably many slots.
+     * If the global object grows too large, alloca in ExecuteTree might fail,
+     * so abort tracing on global objects with unreasonably many slots.
      */
     if (STOBJ_NSLOTS(globalObj) > MAX_GLOBAL_SLOTS)
         return false;
@@ -2662,6 +2747,7 @@ TraceRecorder::lazilyImportGlobalSlot(unsigned slot)
     if (known(vp))
         return true; /* we already have it */
     unsigned index = treeInfo->globalSlots->length();
+
     /* Add the slot to the list of interned global slots. */
     JS_ASSERT(treeInfo->nGlobalTypes() == treeInfo->globalSlots->length());
     treeInfo->globalSlots->add(slot);
@@ -2671,7 +2757,7 @@ TraceRecorder::lazilyImportGlobalSlot(unsigned slot)
     treeInfo->typeMap.add(type);
     import(lirbuf->state, sizeof(struct InterpState) + slot*sizeof(double),
            vp, type, "global", index, NULL);
-    specializeTreesToMissingGlobals(cx, globalObj, treeInfo);
+    SpecializeTreesToMissingGlobals(cx, globalObj, treeInfo);
     return true;
 }
 
@@ -2679,9 +2765,11 @@ TraceRecorder::lazilyImportGlobalSlot(unsigned slot)
 LIns*
 TraceRecorder::writeBack(LIns* i, LIns* base, ptrdiff_t offset)
 {
-    /* Sink all type casts targeting the stack into the side exit by simply storing the original
-       (uncasted) value. Each guard generates the side exit map based on the types of the
-       last stores to every stack location, so its safe to not perform them on-trace. */
+    /*
+     * Sink all type casts targeting the stack into the side exit by simply storing the original
+     * (uncasted) value. Each guard generates the side exit map based on the types of the
+     * last stores to every stack location, so it's safe to not perform them on-trace.
+     */
     if (isPromoteInt(i))
         i = ::demote(lir, i);
     return lir->insStorei(i, base, offset);
@@ -2695,9 +2783,13 @@ TraceRecorder::set(jsval* p, LIns* i, bool initializing)
     JS_ASSERT(initializing || known(p));
     checkForGlobalObjectReallocation();
     tracker.set(p, i);
-    /* If we are writing to this location for the first time, calculate the offset into the
-       native frame manually, otherwise just look up the last load or store associated with
-       the same source address (p) and use the same offset/base. */
+
+    /*
+     * If we are writing to this location for the first time, calculate the
+     * offset into the native frame manually. Otherwise just look up the last
+     * load or store associated with the same source address (p) and use the
+     * same offset/base.
+     */
     LIns* x = nativeFrameTracker.get(p);
     if (!x) {
         if (isGlobal(p))
@@ -2760,7 +2852,7 @@ TraceRecorder::checkForGlobalObjectReallocation()
 
 /* Determine whether the current branch is a loop edge (taken or not taken). */
 static JS_REQUIRES_STACK bool
-js_IsLoopEdge(jsbytecode* pc, jsbytecode* header)
+IsLoopEdge(jsbytecode* pc, jsbytecode* header)
 {
     switch (*pc) {
       case JSOP_IFEQ:
@@ -2805,8 +2897,11 @@ public:
         if (isPromote && *mTypeMap == TT_DOUBLE) {
             mLir->insStorei(mRecorder.get(vp), mLirbuf->state,
                             mRecorder.nativeGlobalOffset(vp));
-            /* Aggressively undo speculation so the inner tree will compile
-               if this fails. */
+
+            /*
+             * Aggressively undo speculation so the inner tree will compile
+             * if this fails.
+             */
             oracle.markGlobalSlotUndemotable(mCx, slot);
         }
         JS_ASSERT(!(!isPromote && *mTypeMap == TT_INT32));
@@ -2847,8 +2942,11 @@ public:
                 mLir->insStorei(mRecorder.get(vp), mLirbuf->sp,
                                 -mRecorder.treeInfo->nativeStackBase +
                                 mRecorder.nativeStackOffset(vp));
-                /* Aggressively undo speculation so the inner tree will
-                   compile if this fails. */
+
+                /*
+                 * Aggressively undo speculation so the inner tree will compile
+                 * if this fails.
+                 */
                 oracle.markStackSlotUndemotable(mCx, mSlotnum);
             }
             JS_ASSERT(!(!isPromote && *mTypeMap == TT_INT32));
@@ -2861,9 +2959,9 @@ public:
 };
 
 /*
- * Promote slots if necessary to match the called tree's type map. This function is
- * infallible and must only be called if we are certain that it is possible to
- * reconcile the types for each slot in the inner and outer trees.
+ * Promote slots if necessary to match the called tree's type map. This
+ * function is infallible and must only be called if we are certain that it is
+ * possible to reconcile the types for each slot in the inner and outer trees.
  */
 JS_REQUIRES_STACK void
 TraceRecorder::adjustCallerTypes(Fragment* f)
@@ -2939,13 +3037,16 @@ TraceRecorder::snapshot(ExitType exitType)
     JSFrameRegs* regs = fp->regs;
     jsbytecode* pc = regs->pc;
 
-    /* Check for a return-value opcode that needs to restart at the next instruction. */
+    /*
+     * Check for a return-value opcode that needs to restart at the next
+     * instruction.
+     */
     const JSCodeSpec& cs = js_CodeSpec[*pc];
 
     /*
      * When calling a _FAIL native, make the snapshot's pc point to the next
-     * instruction after the CALL or APPLY. Even on failure, a _FAIL native must not
-     * be called again from the interpreter.
+     * instruction after the CALL or APPLY. Even on failure, a _FAIL native
+     * must not be called again from the interpreter.
      */
     bool resumeAfter = (pendingTraceableNative &&
                         JSTN_ERRTYPE(pendingTraceableNative) == FAIL_STATUS);
@@ -2957,11 +3058,16 @@ TraceRecorder::snapshot(ExitType exitType)
         MUST_FLOW_THROUGH("restore_pc");
     }
 
-    /* Generate the entry map for the (possibly advanced) pc and stash it in the trace. */
-    unsigned stackSlots = js_NativeStackSlots(cx, callDepth);
+    /*
+     * Generate the entry map for the (possibly advanced) pc and stash it in
+     * the trace.
+     */
+    unsigned stackSlots = NativeStackSlots(cx, callDepth);
 
-    /* It's sufficient to track the native stack use here since all stores above the
-       stack watermark defined by guards are killed. */
+    /*
+     * It's sufficient to track the native stack use here since all stores
+     * above the stack watermark defined by guards are killed.
+     */
     trackNativeStackUse(stackSlots + 1);
 
     /* Capture the type map into a temporary location. */
@@ -2973,9 +3079,9 @@ TraceRecorder::snapshot(ExitType exitType)
 
     /*
      * Determine the type of a store by looking at the current type of the
-     * actual value the interpreter is using. For numbers we have to check
-     * what kind of store we used last (integer or double) to figure out
-     * what the side exit show reflect in its typemap.
+     * actual value the interpreter is using. For numbers we have to check what
+     * kind of store we used last (integer or double) to figure out what the
+     * side exit show reflect in its typemap.
      */
     DetermineTypesVisitor detVisitor(*this, typemap);
     VisitSlots(detVisitor, cx, callDepth, ngslots,
@@ -2984,8 +3090,9 @@ TraceRecorder::snapshot(ExitType exitType)
               ngslots + stackSlots);
 
     /*
-     * If we are currently executing a traceable native or we are attaching a second trace
-     * to it, the value on top of the stack is a jsval. Make a note of this in the typemap.
+     * If we are currently executing a traceable native or we are attaching a
+     * second trace to it, the value on top of the stack is a jsval. Make a
+     * note of this in the typemap.
      */
     if (pendingTraceableNative && (pendingTraceableNative->flags & JSTN_UNBOX_AFTER))
         typemap[stackSlots - 1] = TT_JSVAL;
@@ -2995,9 +3102,11 @@ TraceRecorder::snapshot(ExitType exitType)
         MUST_FLOW_LABEL(restore_pc);
         regs->pc = pc - cs.length;
     } else {
-        /* If we take a snapshot on a goto, advance to the target address. This avoids inner
-           trees returning on a break goto, which the outer recorder then would confuse with
-           a break in the outer tree. */
+        /*
+         * If we take a snapshot on a goto, advance to the target address. This
+         * avoids inner trees returning on a break goto, which the outer
+         * recorder then would confuse with a break in the outer tree.
+         */
         if (*pc == JSOP_GOTO)
             pc += GET_JUMP_OFFSET(pc);
         else if (*pc == JSOP_GOTOX)
@@ -3015,7 +3124,7 @@ TraceRecorder::snapshot(ExitType exitType)
             VMSideExit* e = exits[n];
             if (e->pc == pc && e->imacpc == fp->imacpc &&
                 ngslots == e->numGlobalSlots &&
-                !memcmp(getFullTypeMap(exits[n]), typemap, typemap_size)) {
+                !memcmp(GetFullTypeMap(exits[n]), typemap, typemap_size)) {
                 AUDIT(mergedLoopExits);
                 JS_ARENA_RELEASE(&cx->tempPool, mark);
                 return e;
@@ -3059,7 +3168,7 @@ TraceRecorder::snapshot(ExitType exitType)
     exit->rp_adj = exit->calldepth * sizeof(FrameInfo*);
     exit->nativeCalleeWord = 0;
     exit->lookupFlags = js_InferFlags(cx, 0);
-    memcpy(getFullTypeMap(exit), typemap, typemap_size);
+    memcpy(GetFullTypeMap(exit), typemap, typemap_size);
 
     JS_ARENA_RELEASE(&cx->tempPool, mark);
     return exit;
@@ -3138,16 +3247,21 @@ TraceRecorder::copy(VMSideExit* copy)
     return exit;
 }
 
-/* Emit a guard for condition (cond), expecting to evaluate to boolean result (expected)
-   and generate a side exit with type exitType to jump to if the condition does not hold. */
+/*
+ * Emit a guard for condition (cond), expecting to evaluate to boolean result
+ * (expected) and generate a side exit with type exitType to jump to if the
+ * condition does not hold.
+ */
 JS_REQUIRES_STACK void
 TraceRecorder::guard(bool expected, LIns* cond, ExitType exitType)
 {
     guard(expected, cond, snapshot(exitType));
 }
 
-/* Try to match the type of a slot to type t. checkType is used to verify that the type of
- * values flowing into the loop edge is compatible with the type we expect in the loop header.
+/*
+ * Try to match the type of a slot to type t. checkType is used to verify that
+ * the type of each value flowing into the loop edge is compatible with the
+ * type we expect in the loop header.
  *
  * @param v             Value.
  * @param t             Typemap entry for value.
@@ -3169,11 +3283,14 @@ TraceRecorder::checkType(jsval& v, JSTraceType t, jsval*& stage_val, LIns*& stag
         if (!isNumber(v))
             return false; /* not a number? type mismatch */
         LIns* i = get(&v);
+
         /* This is always a type mismatch, we can't close a double to an int. */
         if (!isPromoteInt(i))
             return false;
+
         /* Looks good, slot is an int32, the last instruction should be promotable. */
         JS_ASSERT(isInt32(v) && isPromoteInt(i));
+
         /* Overwrite the value in this slot with the argument promoted back to an integer. */
         stage_val = &v;
         stage_ins = f2i(i);
@@ -3190,8 +3307,12 @@ TraceRecorder::checkType(jsval& v, JSTraceType t, jsval*& stage_val, LIns*& stag
         if (!isNumber(v))
             return false; /* not a number? type mismatch */
         LIns* i = get(&v);
-        /* We sink i2f conversions into the side exit, but at the loop edge we have to make
-           sure we promote back to double if at loop entry we want a double. */
+
+        /*
+         * We sink i2f conversions into the side exit, but at the loop edge we
+         * have to make sure we promote back to double if at loop entry we want
+         * a double.
+         */
         if (isPromoteInt(i)) {
             stage_val = &v;
             stage_ins = lir->ins1(LIR_i2f, i);
@@ -3417,8 +3538,9 @@ public:
 };
 
 /**
- * Make sure that the current values in the given stack frame and all stack frames
- * up and including entryFrame are type-compatible with the entry map.
+ * Make sure that the current values in the given stack frame and all stack
+ * frames up to and including entryFrame are type-compatible with the entry
+ * map.
  *
  * @param root_peer         First fragment in peer list.
  * @param stable_peer       Outparam for first type stable peer.
@@ -3428,15 +3550,15 @@ public:
 JS_REQUIRES_STACK bool
 TraceRecorder::deduceTypeStability(Fragment* root_peer, Fragment** stable_peer, bool& demote)
 {
-    JS_ASSERT(treeInfo->globalSlots->length() ==
-              treeInfo->nGlobalTypes());
+    JS_ASSERT(treeInfo->globalSlots->length() == treeInfo->nGlobalTypes());
 
     if (stable_peer)
         *stable_peer = NULL;
 
     /*
-     * Rather than calculate all of this stuff twice, it gets cached locally.  The "stage" buffers
-     * are for calls to set() that will change the exit types.
+     * Rather than calculate all of this stuff twice, it gets cached locally.
+     * The "stage" buffers are for calls to set() that will change the exit
+     * types.
      */
     bool success;
     unsigned stage_count;
@@ -3465,8 +3587,9 @@ TraceRecorder::deduceTypeStability(Fragment* root_peer, Fragment** stable_peer,
 
     demote = false;
 
-    /* At this point the tree is about to be incomplete, so let's see if we can connect to any
-     * peer fragment that is type stable.
+    /*
+     * At this point the tree is about to be incomplete, so let's see if we can
+     * connect to any peer fragment that is type stable.
      */
     Fragment* f;
     TreeInfo* ti;
@@ -3477,6 +3600,7 @@ TraceRecorder::deduceTypeStability(Fragment* root_peer, Fragment** stable_peer,
         if (!f->code())
             continue;
         ti = (TreeInfo*)f->vmprivate;
+
         /* Don't allow varying stack depths */
         if ((ti->nStackTypes != treeInfo->nStackTypes) ||
             (ti->typeMap.length() != treeInfo->typeMap.length()) ||
@@ -3492,8 +3616,9 @@ TraceRecorder::deduceTypeStability(Fragment* root_peer, Fragment** stable_peer,
 
         if (success) {
             /*
-             * There was a successful match.  We don't care about restoring the saved staging, but
-             * we do need to clear the original undemote list.
+             * There was a successful match.  We don't care about restoring the
+             * saved staging, but we do need to clear the original undemote
+             * list.
              */
             for (unsigned i = 0; i < stage_count; i++)
                 set(stage_vals[i], stage_ins[i]);
@@ -3505,18 +3630,16 @@ TraceRecorder::deduceTypeStability(Fragment* root_peer, Fragment** stable_peer,
     }
 
     /*
-     * If this is a loop trace and it would be stable with demotions, build an undemote list
-     * and return true.  Our caller should sniff this and trash the tree, recording a new one
-     * that will assumedly stabilize.
+     * If this is a loop trace and it would be stable with demotions, build an
+     * undemote list and return true.  Our caller should sniff this and trash
+     * the tree, recording a new one that will assumedly stabilize.
      */
     if (demote && fragment->kind == LoopTrace) {
         UndemoteVisitor visitor(*this, treeInfo->stackTypeMap());
         VisitSlots(visitor, cx, 0, *treeInfo->globalSlots);
         return true;
-    } else {
-        demote = false;
     }
-
+    demote = false;
     return false;
 }
 
@@ -3538,8 +3661,7 @@ FlushJITCache(JSContext* cx)
     Fragmento* fragmento = tm->fragmento;
     if (fragmento) {
         if (tm->prohibitFlush) {
-            debug_only_print0(LC_TMTracer,
-                              "Deferring fragmento flush due to deep bail.\n");
+            debug_only_print0(LC_TMTracer, "Deferring fragmento flush due to deep bail.\n");
             tm->needFlush = JS_TRUE;
             return;
         }
@@ -3582,7 +3704,7 @@ TraceRecorder::compile(JSTraceMonitor* tm)
     Fragmento* fragmento = tm->fragmento;
     if (treeInfo->maxNativeStackSlots >= MAX_NATIVE_STACK_SLOTS) {
         debug_only_print0(LC_TMTracer, "Blacklist: excessive stack use.\n");
-        js_Blacklist((jsbytecode*) fragment->root->ip);
+        Blacklist((jsbytecode*) fragment->root->ip);
         return;
     }
     if (anchor && anchor->exitType != CASE_EXIT)
@@ -3596,11 +3718,11 @@ TraceRecorder::compile(JSTraceMonitor* tm)
         return;
     if (fragmento->assm()->error() != nanojit::None) {
         debug_only_print0(LC_TMTracer, "Blacklisted: error during compilation\n");
-        js_Blacklist((jsbytecode*) fragment->root->ip);
+        Blacklist((jsbytecode*) fragment->root->ip);
         return;
     }
-    js_resetRecordingAttempts(cx, (jsbytecode*) fragment->ip);
-    js_resetRecordingAttempts(cx, (jsbytecode*) fragment->root->ip);
+    ResetRecordingAttempts(cx, (jsbytecode*) fragment->ip);
+    ResetRecordingAttempts(cx, (jsbytecode*) fragment->root->ip);
     if (anchor) {
 #ifdef NANOJIT_IA32
         if (anchor->exitType == CASE_EXIT)
@@ -3613,6 +3735,7 @@ TraceRecorder::compile(JSTraceMonitor* tm)
     JS_ASSERT(!fragment->vmprivate);
     if (fragment == fragment->root)
         fragment->vmprivate = treeInfo;
+
     /* :TODO: windows support */
 #if defined DEBUG && !defined WIN32
     const char* filename = cx->fp->script->filename;
@@ -3626,14 +3749,14 @@ TraceRecorder::compile(JSTraceMonitor* tm)
 }
 
 static bool
-js_JoinPeersIfCompatible(Fragmento* frago, Fragment* stableFrag, TreeInfo* stableTree,
-                         VMSideExit* exit)
+JoinPeersIfCompatible(Fragmento* frago, Fragment* stableFrag, TreeInfo* stableTree,
+                      VMSideExit* exit)
 {
     JS_ASSERT(exit->numStackSlots == stableTree->nStackTypes);
 
     /* Must have a matching type unstable exit. */
     if ((exit->numGlobalSlots + exit->numStackSlots != stableTree->typeMap.length()) ||
-        memcmp(getFullTypeMap(exit), stableTree->typeMap.data(), stableTree->typeMap.length())) {
+        memcmp(GetFullTypeMap(exit), stableTree->typeMap.data(), stableTree->typeMap.length())) {
        return false;
     }
 
@@ -3651,9 +3774,9 @@ JS_REQUIRES_STACK void
 TraceRecorder::closeLoop(JSTraceMonitor* tm, bool& demote)
 {
     /*
-     * We should have arrived back at the loop header, and hence we don't want to be in an imacro
-     * here and the opcode should be either JSOP_LOOP, or in case this loop was blacklisted in the
-     * meantime JSOP_NOP.
+     * We should have arrived back at the loop header, and hence we don't want
+     * to be in an imacro here and the opcode should be either JSOP_LOOP or, in
+     * case this loop was blacklisted in the meantime, JSOP_NOP.
      */
     JS_ASSERT((*cx->fp->regs->pc == JSOP_LOOP || *cx->fp->regs->pc == JSOP_NOP) && !cx->fp->imacpc);
 
@@ -3665,7 +3788,7 @@ TraceRecorder::closeLoop(JSTraceMonitor* tm, bool& demote)
     if (callDepth != 0) {
         debug_only_print0(LC_TMTracer,
                           "Blacklisted: stack depth mismatch, possible recursion.\n");
-        js_Blacklist((jsbytecode*) fragment->root->ip);
+        Blacklist((jsbytecode*) fragment->root->ip);
         trashSelf = true;
         return;
     }
@@ -3739,14 +3862,14 @@ TraceRecorder::closeLoop(JSTraceMonitor* tm, bool& demote)
     debug_only_print0(LC_TMTracer,
                       "updating specializations on dependent and linked trees\n");
     if (fragment->root->vmprivate)
-        specializeTreesToMissingGlobals(cx, globalObj, (TreeInfo*)fragment->root->vmprivate);
+        SpecializeTreesToMissingGlobals(cx, globalObj, (TreeInfo*)fragment->root->vmprivate);
 
     /*
      * If this is a newly formed tree, and the outer tree has not been compiled yet, we
      * should try to compile the outer tree again.
      */
     if (outer)
-        js_AttemptCompilation(cx, tm, globalObj, outer, outerArgc);
+        AttemptCompilation(cx, tm, globalObj, outer, outerArgc);
 #ifdef JS_JIT_SPEW
     debug_only_printf(LC_TMMinimal,
                       "recording completed at  %s:%u@%u via closeLoop\n",
@@ -3776,7 +3899,7 @@ TraceRecorder::joinEdgesToEntry(Fragmento* fragmento, VMFragment* peer_root)
             uexit = ti->unstableExits;
             unext = &ti->unstableExits;
             while (uexit != NULL) {
-                bool remove = js_JoinPeersIfCompatible(fragmento, fragment, treeInfo, uexit->exit);
+                bool remove = JoinPeersIfCompatible(fragmento, fragment, treeInfo, uexit->exit);
                 JS_ASSERT(!remove || fragment != peer);
                 debug_only_stmt(
                     if (remove) {
@@ -3786,14 +3909,17 @@ TraceRecorder::joinEdgesToEntry(Fragmento* fragmento, VMFragment* peer_root)
                     }
                 )
                 if (!remove) {
-                    /* See if this exit contains mismatch demotions, which imply trashing a tree.
-                       This is actually faster than trashing the original tree as soon as the
-                       instability is detected, since we could have compiled a fairly stable
-                       tree that ran faster with integers. */
+                    /*
+                     * See if this exit contains mismatch demotions, which
+                     * imply trashing a tree.  This is actually faster than
+                     * trashing the original tree as soon as the instability is
+                     * detected, since we could have compiled a fairly stable
+                     * tree that ran faster with integers.
+                     */
                     unsigned stackCount = 0;
                     unsigned globalCount = 0;
                     t1 = treeInfo->stackTypeMap();
-                    t2 = getStackTypeMap(uexit->exit);
+                    t2 = GetStackTypeMap(uexit->exit);
                     for (unsigned i = 0; i < uexit->exit->numStackSlots; i++) {
                         if (t2[i] == TT_INT32 && t1[i] == TT_DOUBLE) {
                             stackDemotes[stackCount++] = i;
@@ -3803,7 +3929,7 @@ TraceRecorder::joinEdgesToEntry(Fragmento* fragmento, VMFragment* peer_root)
                         }
                     }
                     t1 = treeInfo->globalTypeMap();
-                    t2 = getGlobalTypeMap(uexit->exit);
+                    t2 = GetGlobalTypeMap(uexit->exit);
                     for (unsigned i = 0; i < uexit->exit->numGlobalSlots; i++) {
                         if (t2[i] == TT_INT32 && t1[i] == TT_DOUBLE) {
                             globalDemotes[globalCount++] = i;
@@ -3838,8 +3964,8 @@ TraceRecorder::joinEdgesToEntry(Fragmento* fragmento, VMFragment* peer_root)
         }
     }
 
-    debug_only_stmt(js_DumpPeerStability(traceMonitor, peer_root->ip, peer_root->globalObj,
-                             peer_root->globalShape, peer_root->argc);)
+    debug_only_stmt(DumpPeerStability(traceMonitor, peer_root->ip, peer_root->globalObj,
+                                      peer_root->globalShape, peer_root->argc);)
 }
 
 /* Emit an always-exit guard and compile the tree (used for break statements. */
@@ -3848,7 +3974,7 @@ TraceRecorder::endLoop(JSTraceMonitor* tm)
 {
     if (callDepth != 0) {
         debug_only_print0(LC_TMTracer, "Blacklisted: stack depth mismatch, possible recursion.\n");
-        js_Blacklist((jsbytecode*) fragment->root->ip);
+        Blacklist((jsbytecode*) fragment->root->ip);
         trashSelf = true;
         return;
     }
@@ -3863,19 +3989,21 @@ TraceRecorder::endLoop(JSTraceMonitor* tm)
     VMFragment* root = (VMFragment*)fragment->root;
     joinEdgesToEntry(tm->fragmento, getLoop(tm, root->ip, root->globalObj, root->globalShape, root->argc));
 
-    /* Note: this must always be done, in case we added new globals on trace and haven't yet
-       propagated those to linked and dependent trees. */
+    /*
+     * Note: this must always be done, in case we added new globals on trace
+     * and haven't yet propagated those to linked and dependent trees.
+     */
     debug_only_print0(LC_TMTracer,
                       "updating specializations on dependent and linked trees\n");
     if (fragment->root->vmprivate)
-        specializeTreesToMissingGlobals(cx, globalObj, (TreeInfo*)fragment->root->vmprivate);
+        SpecializeTreesToMissingGlobals(cx, globalObj, (TreeInfo*)fragment->root->vmprivate);
 
     /*
-     * If this is a newly formed tree, and the outer tree has not been compiled yet, we
-     * should try to compile the outer tree again.
+     * If this is a newly formed tree, and the outer tree has not been compiled
+     * yet, we should try to compile the outer tree again.
      */
     if (outer)
-        js_AttemptCompilation(cx, tm, globalObj, outer, outerArgc);
+        AttemptCompilation(cx, tm, globalObj, outer, outerArgc);
 #ifdef JS_JIT_SPEW
     debug_only_printf(LC_TMMinimal,
                       "Recording completed at  %s:%u@%u via endLoop\n",
@@ -3892,18 +4020,29 @@ TraceRecorder::prepareTreeCall(Fragment* inner)
 {
     TreeInfo* ti = (TreeInfo*)inner->vmprivate;
     inner_sp_ins = lirbuf->sp;
-    /* The inner tree expects to be called from the current frame. If the outer tree (this
-       trace) is currently inside a function inlining code (calldepth > 0), we have to advance
-       the native stack pointer such that we match what the inner trace expects to see. We
-       move it back when we come out of the inner tree call. */
+
+    /*
+     * The inner tree expects to be called from the current frame. If the outer
+     * tree (this trace) is currently inside a function inlining code
+     * (calldepth > 0), we have to advance the native stack pointer such that
+     * we match what the inner trace expects to see. We move it back when we
+     * come out of the inner tree call.
+     */
     if (callDepth > 0) {
-        /* Calculate the amount we have to lift the native stack pointer by to compensate for
-           any outer frames that the inner tree doesn't expect but the outer tree has. */
+        /*
+         * Calculate the amount we have to lift the native stack pointer by to
+         * compensate for any outer frames that the inner tree doesn't expect
+         * but the outer tree has.
+         */
         ptrdiff_t sp_adj = nativeStackOffset(&cx->fp->argv[-2]);
-        /* Calculate the amount we have to lift the call stack by */
+
+        /* Calculate the amount we have to lift the call stack by. */
         ptrdiff_t rp_adj = callDepth * sizeof(FrameInfo*);
-        /* Guard that we have enough stack space for the tree we are trying to call on top
-           of the new value for sp. */
+
+        /*
+         * Guard that we have enough stack space for the tree we are trying to
+         * call on top of the new value for sp.
+         */
         debug_only_printf(LC_TMTracer,
                           "sp_adj=%d outer=%d inner=%d\n",
                           sp_adj, treeInfo->nativeStackBase, ti->nativeStackBase);
@@ -3912,10 +4051,12 @@ TraceRecorder::prepareTreeCall(Fragment* inner)
                 + sp_adj /* adjust for stack in outer frame inner tree can't see */
                 + ti->maxNativeStackSlots * sizeof(double)); /* plus the inner tree's stack */
         guard(true, lir->ins2(LIR_lt, sp_top, eos_ins), OOM_EXIT);
+
         /* Guard that we have enough call stack space. */
         LIns* rp_top = lir->ins2i(LIR_piadd, lirbuf->rp, rp_adj +
                 ti->maxCallDepth * sizeof(FrameInfo*));
         guard(true, lir->ins2(LIR_lt, rp_top, eor_ins), OOM_EXIT);
+
         /* We have enough space, so adjust sp and rp to their new level. */
         lir->insStorei(inner_sp_ins = lir->ins2i(LIR_piadd, lirbuf->sp,
                 - treeInfo->nativeStackBase /* rebase sp to beginning of outer tree's stack */
@@ -3941,19 +4082,20 @@ TraceRecorder::emitTreeCall(Fragment* inner, VMSideExit* exit)
 #ifdef DEBUG
     JSTraceType* map;
     size_t i;
-    map = getGlobalTypeMap(exit);
+    map = GetGlobalTypeMap(exit);
     for (i = 0; i < exit->numGlobalSlots; i++)
         JS_ASSERT(map[i] != TT_JSVAL);
-    map = getStackTypeMap(exit);
+    map = GetStackTypeMap(exit);
     for (i = 0; i < exit->numStackSlots; i++)
         JS_ASSERT(map[i] != TT_JSVAL);
 #endif
-    /* bug 502604 - It is illegal to extend from the outer typemap without first extending from the
-     * inner. Make a new typemap here.
+    /*
+     * Bug 502604 - It is illegal to extend from the outer typemap without
+     * first extending from the inner. Make a new typemap here.
      */
     TypeMap fullMap;
-    fullMap.add(getStackTypeMap(exit), exit->numStackSlots);
-    fullMap.add(getGlobalTypeMap(exit), exit->numGlobalSlots);
+    fullMap.add(GetStackTypeMap(exit), exit->numStackSlots);
+    fullMap.add(GetGlobalTypeMap(exit), exit->numGlobalSlots);
     TreeInfo* innerTree = (TreeInfo*)exit->from->root->vmprivate;
     if (exit->numGlobalSlots < innerTree->nGlobalTypes()) {
         fullMap.add(innerTree->globalTypeMap() + exit->numGlobalSlots,
@@ -3973,6 +4115,7 @@ TraceRecorder::emitTreeCall(Fragment* inner, VMSideExit* exit)
      * we called the inner tree at recording time.
      */
     guard(true, lir->ins2(LIR_eq, ret, INS_CONSTPTR(exit)), NESTED_EXIT);
+
     /* Register us as a dependent tree of the inner tree. */
     ((TreeInfo*)inner->vmprivate)->dependentTrees.addUnique(fragment->root);
     treeInfo->linkedTrees.addUnique(inner);
@@ -3995,18 +4138,21 @@ TraceRecorder::trackCfgMerges(jsbytecode* pc)
     }
 }
 
-/* Invert the direction of the guard if this is a loop edge that is not
-   taken (thin loop). */
+/*
+ * Invert the direction of the guard if this is a loop edge that is not
+ * taken (thin loop).
+ */
 JS_REQUIRES_STACK void
 TraceRecorder::emitIf(jsbytecode* pc, bool cond, LIns* x)
 {
     ExitType exitType;
-    if (js_IsLoopEdge(pc, (jsbytecode*)fragment->root->ip)) {
+    if (IsLoopEdge(pc, (jsbytecode*)fragment->root->ip)) {
         exitType = LOOP_EXIT;
 
         /*
-         * If we are about to walk out of the loop, generate code for the inverse loop
-         * condition, pretending we recorded the case that stays on trace.
+         * If we are about to walk out of the loop, generate code for the
+         * inverse loop condition, pretending we recorded the case that stays
+         * on trace.
          */
         if ((*pc == JSOP_IFEQ || *pc == JSOP_IFEQX) == cond) {
             JS_ASSERT(*pc == JSOP_IFNE || *pc == JSOP_IFNEX || *pc == JSOP_IFEQ || *pc == JSOP_IFEQX);
@@ -4016,9 +4162,9 @@ TraceRecorder::emitIf(jsbytecode* pc, bool cond, LIns* x)
         }
 
         /*
-         * Conditional guards do not have to be emitted if the condition is constant. We
-         * make a note whether the loop condition is true or false here, so we later know
-         * whether to emit a loop edge or a loop end.
+         * Conditional guards do not have to be emitted if the condition is
+         * constant. We make a note whether the loop condition is true or false
+         * here, so we later know whether to emit a loop edge or a loop end.
          */
         if (x->isconst()) {
             loop = (x->imm32() == cond);
@@ -4046,12 +4192,12 @@ TraceRecorder::fuseIf(jsbytecode* pc, bool cond, LIns* x)
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::checkTraceEnd(jsbytecode *pc)
 {
-    if (js_IsLoopEdge(pc, (jsbytecode*)fragment->root->ip)) {
+    if (IsLoopEdge(pc, (jsbytecode*)fragment->root->ip)) {
         /*
-         * If we compile a loop, the trace should have a zero stack balance at the loop
-         * edge. Currently we are parked on a comparison op or IFNE/IFEQ, so advance
-         * pc to the loop header and adjust the stack pointer and pretend we have
-         * reached the loop header.
+         * If we compile a loop, the trace should have a zero stack balance at
+         * the loop edge. Currently we are parked on a comparison op or
+         * IFNE/IFEQ, so advance pc to the loop header and adjust the stack
+         * pointer and pretend we have reached the loop header.
          */
         if (loop) {
             JS_ASSERT(!cx->fp->imacpc && (pc == cx->fp->regs->pc || pc == cx->fp->regs->pc + 1));
@@ -4067,14 +4213,14 @@ TraceRecorder::checkTraceEnd(jsbytecode *pc)
             *cx->fp->regs = orig;
 
             /*
-             * If compiling this loop generated new oracle information which will likely
-             * lead to a different compilation result, immediately trigger another
-             * compiler run. This is guaranteed to converge since the oracle only
-             * accumulates adverse information but never drops it (except when we
-             * flush it during garbage collection.)
+             * If compiling this loop generated new oracle information which
+             * will likely lead to a different compilation result, immediately
+             * trigger another compiler run. This is guaranteed to converge
+             * since the oracle only accumulates adverse information but never
+             * drops it (except when we flush it during garbage collection.)
              */
             if (demote)
-                js_AttemptCompilation(cx, traceMonitor, globalObj, outer, outerArgc);
+                AttemptCompilation(cx, traceMonitor, globalObj, outer, outerArgc);
         } else {
             endLoop(traceMonitor);
         }
@@ -4126,7 +4272,7 @@ TraceRecorder::hasIteratorMethod(JSObject* obj)
 }
 
 int
-nanojit::StackFilter::getTop(LInsp guard)
+nanojit::StackFilter::getTop(LIns* guard)
 {
     VMSideExit* e = (VMSideExit*)guard->record()->exit;
     if (sp == lirbuf->sp)
@@ -4161,7 +4307,7 @@ nanojit::Fragment::onDestroy()
 }
 
 static JS_REQUIRES_STACK bool
-js_DeleteRecorder(JSContext* cx)
+DeleteRecorder(JSContext* cx)
 {
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
 
@@ -4169,9 +4315,7 @@ js_DeleteRecorder(JSContext* cx)
     delete tm->recorder;
     tm->recorder = NULL;
 
-    /*
-     * If we ran out of memory, flush the code cache.
-     */
+    /* If we ran out of memory, flush the code cache. */
     if (JS_TRACE_MONITOR(cx).fragmento->assm()->error() == OutOMem ||
         js_OverfullFragmento(tm, tm->fragmento)) {
         FlushJITCache(cx);
@@ -4181,12 +4325,10 @@ js_DeleteRecorder(JSContext* cx)
     return true;
 }
 
-/**
- * Checks whether the shape of the global object has changed.
- */
+/* Check whether the shape of the global object has changed. */
 static JS_REQUIRES_STACK bool
 CheckGlobalObjectShape(JSContext* cx, JSTraceMonitor* tm, JSObject* globalObj,
-                       uint32 *shape=NULL, SlotList** slots=NULL)
+                       uint32 *shape = NULL, SlotList** slots = NULL)
 {
     if (tm->needFlush) {
         FlushJITCache(cx);
@@ -4201,6 +4343,7 @@ CheckGlobalObjectShape(JSContext* cx, JSTraceMonitor* tm, JSObject* globalObj,
     if (tm->recorder) {
         VMFragment* root = (VMFragment*)tm->recorder->getFragment()->root;
         TreeInfo* ti = tm->recorder->getTreeInfo();
+
         /* Check the global shape matches the recorder's treeinfo's shape. */
         if (globalObj != root->globalObj || globalShape != root->globalShape) {
             AUDIT(globalShapeMismatchAtEntry);
@@ -4208,7 +4351,7 @@ CheckGlobalObjectShape(JSContext* cx, JSTraceMonitor* tm, JSObject* globalObj,
                               "Global object/shape mismatch (%p/%u vs. %p/%u), flushing cache.\n",
                               (void*)globalObj, globalShape, (void*)root->globalObj,
                               root->globalShape);
-            js_Backoff(cx, (jsbytecode*) root->ip);
+            Backoff(cx, (jsbytecode*) root->ip);
             FlushJITCache(cx);
             return false;
         }
@@ -4249,9 +4392,9 @@ CheckGlobalObjectShape(JSContext* cx, JSTraceMonitor* tm, JSObject* globalObj,
 }
 
 static JS_REQUIRES_STACK bool
-js_StartRecorder(JSContext* cx, VMSideExit* anchor, Fragment* f, TreeInfo* ti,
-                 unsigned stackSlots, unsigned ngslots, JSTraceType* typeMap,
-                 VMSideExit* expectedInnerExit, jsbytecode* outer, uint32 outerArgc)
+StartRecorder(JSContext* cx, VMSideExit* anchor, Fragment* f, TreeInfo* ti,
+              unsigned stackSlots, unsigned ngslots, JSTraceType* typeMap,
+              VMSideExit* expectedInnerExit, jsbytecode* outer, uint32 outerArgc)
 {
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     if (JS_TRACE_MONITOR(cx).needFlush) {
@@ -4261,7 +4404,7 @@ js_StartRecorder(JSContext* cx, VMSideExit* anchor, Fragment* f, TreeInfo* ti,
 
     JS_ASSERT(f->root != f || !cx->fp->imacpc);
 
-    /* start recording if no exception during construction */
+    /* Start recording if no exception during construction. */
     tm->recorder = new (&gc) TraceRecorder(cx, anchor, f, ti,
                                            stackSlots, ngslots, typeMap,
                                            expectedInnerExit, outer, outerArgc);
@@ -4270,13 +4413,14 @@ js_StartRecorder(JSContext* cx, VMSideExit* anchor, Fragment* f, TreeInfo* ti,
         js_AbortRecording(cx, "setting up recorder failed");
         return false;
     }
-    /* clear any leftover error state */
+
+    /* Clear any leftover error state. */
     tm->fragmento->assm()->setError(None);
     return true;
 }
 
 static void
-js_TrashTree(JSContext* cx, Fragment* f)
+TrashTree(JSContext* cx, Fragment* f)
 {
     JS_ASSERT((!f->code()) == (!f->vmprivate));
     JS_ASSERT(f == f->root);
@@ -4291,17 +4435,17 @@ js_TrashTree(JSContext* cx, Fragment* f)
     Fragment** data = ti->dependentTrees.data();
     unsigned length = ti->dependentTrees.length();
     for (unsigned n = 0; n < length; ++n)
-        js_TrashTree(cx, data[n]);
+        TrashTree(cx, data[n]);
     data = ti->linkedTrees.data();
     length = ti->linkedTrees.length();
     for (unsigned n = 0; n < length; ++n)
-        js_TrashTree(cx, data[n]);
+        TrashTree(cx, data[n]);
     delete ti;
     JS_ASSERT(!f->code() && !f->vmprivate);
 }
 
 static int
-js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
+SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
 {
     VOUCH_DOES_NOT_REQUIRE_STACK();
 
@@ -4313,8 +4457,8 @@ js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
     /* Assert that we have a correct sp distance from cx->fp->slots in fi. */
     JSStackFrame* fp = cx->fp;
     JS_ASSERT_IF(!fi.imacpc,
-                 js_ReconstructStackDepth(cx, fp->script, fi.pc)
-                 == uintN(fi.spdist - fp->script->nfixed));
+                 js_ReconstructStackDepth(cx, fp->script, fi.pc) ==
+                 uintN(fi.spdist - fp->script->nfixed));
 
     uintN nframeslots = JS_HOWMANY(sizeof(JSInlineFrame), sizeof(jsval));
     JSScript* script = fun->u.i.script;
@@ -4353,7 +4497,10 @@ js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
         a->avail += nbytes;
         JS_ASSERT(missing == 0);
     } else {
-        /* This allocation is infallible: js_ExecuteTree reserved enough stack. */
+        /*
+         * This allocation is infallible: ExecuteTree reserved enough stack.
+         * (But see bug 491023.)
+         */
         JS_ARENA_ALLOCATE_CAST(newsp, jsval *, &cx->stackPool, nbytes);
         JS_ASSERT(newsp);
 
@@ -4450,10 +4597,14 @@ js_SynthesizeFrame(JSContext* cx, const FrameInfo& fi)
         newifp->hookData = NULL;
     }
 
-    /* Duplicate native stack layout computation: see VisitFrameSlots header comment. */
-    // FIXME? we must count stack slots from caller's operand stack up to (but not including)
-    // callee's, including missing arguments. Could we shift everything down to the caller's
-    // fp->slots (where vars start) and avoid some of the complexity?
+    /*
+     * Duplicate native stack layout computation: see VisitFrameSlots header comment.
+     *
+     * FIXME - We must count stack slots from caller's operand stack up to (but
+     * not including) callee's, including missing arguments. Could we shift
+     * everything down to the caller's fp->slots (where vars start) and avoid
+     * some of the complexity?
+     */
     return (fi.spdist - fp->down->script->nfixed) +
            ((fun->nargs > fp->argc) ? fun->nargs - fp->argc : 0) +
            script->nfixed + 1/*argsobj*/;
@@ -4467,7 +4618,7 @@ SynthesizeSlowNativeFrame(JSContext *cx, VMSideExit *exit)
     void *mark;
     JSInlineFrame *ifp;
 
-    /* This allocation is infallible: js_ExecuteTree reserved enough stack. */
+    /* This allocation is infallible: ExecuteTree reserved enough stack. */
     mark = JS_ARENA_MARK(&cx->stackPool);
     JS_ARENA_ALLOCATE_CAST(ifp, JSInlineFrame *, &cx->stackPool, sizeof(JSInlineFrame));
     JS_ASSERT(ifp);
@@ -4503,16 +4654,16 @@ SynthesizeSlowNativeFrame(JSContext *cx, VMSideExit *exit)
     cx->fp = fp;
 }
 
-JS_REQUIRES_STACK bool
-js_RecordTree(JSContext* cx, JSTraceMonitor* tm, Fragment* f, jsbytecode* outer,
-              uint32 outerArgc, JSObject* globalObj, uint32 globalShape,
-              SlotList* globalSlots, uint32 argc)
+static JS_REQUIRES_STACK bool
+RecordTree(JSContext* cx, JSTraceMonitor* tm, Fragment* f, jsbytecode* outer,
+           uint32 outerArgc, JSObject* globalObj, uint32 globalShape,
+           SlotList* globalSlots, uint32 argc)
 {
     JS_ASSERT(f->root == f);
 
     /* Make sure the global type map didn't change on us. */
     if (!CheckGlobalObjectShape(cx, tm, globalObj)) {
-        js_Backoff(cx, (jsbytecode*) f->root->ip);
+        Backoff(cx, (jsbytecode*) f->root->ip);
         return false;
     }
 
@@ -4533,7 +4684,7 @@ js_RecordTree(JSContext* cx, JSTraceMonitor* tm, Fragment* f, jsbytecode* outer,
     f->lirbuf = tm->lirbuf;
 
     if (f->lirbuf->outOMem() || js_OverfullFragmento(tm, tm->fragmento)) {
-        js_Backoff(cx, (jsbytecode*) f->root->ip);
+        Backoff(cx, (jsbytecode*) f->root->ip);
         FlushJITCache(cx);
         debug_only_print0(LC_TMTracer,
                           "Out of memory recording new tree, flushing cache.\n");
@@ -4542,42 +4693,42 @@ js_RecordTree(JSContext* cx, JSTraceMonitor* tm, Fragment* f, jsbytecode* outer,
 
     JS_ASSERT(!f->code() && !f->vmprivate);
 
-    /* setup the VM-private treeInfo structure for this fragment */
+    /* Set up the VM-private treeInfo structure for this fragment. */
     TreeInfo* ti = new (&gc) TreeInfo(f, globalSlots);
 
-    /* capture the coerced type of each active slot in the type map */
-    ti->typeMap.captureTypes(cx, globalObj, *globalSlots, 0/*callDepth*/);
+    /* Capture the coerced type of each active slot in the type map. */
+    ti->typeMap.captureTypes(cx, globalObj, *globalSlots, 0 /* callDepth */);
     ti->nStackTypes = ti->typeMap.length() - globalSlots->length();
 
 #ifdef DEBUG
-    ensureTreeIsUnique(tm, (VMFragment*)f, ti);
+    AssertTreeIsUnique(tm, (VMFragment*)f, ti);
     ti->treeFileName = cx->fp->script->filename;
     ti->treeLineNumber = js_FramePCToLineNumber(cx, cx->fp);
     ti->treePCOffset = FramePCOffset(cx->fp);
 #endif
 
-    /* determine the native frame layout at the entry point */
+    /* Determine the native frame layout at the entry point. */
     unsigned entryNativeStackSlots = ti->nStackTypes;
-    JS_ASSERT(entryNativeStackSlots == js_NativeStackSlots(cx, 0/*callDepth*/));
+    JS_ASSERT(entryNativeStackSlots == NativeStackSlots(cx, 0 /* callDepth */));
     ti->nativeStackBase = (entryNativeStackSlots -
             (cx->fp->regs->sp - StackBase(cx->fp))) * sizeof(double);
     ti->maxNativeStackSlots = entryNativeStackSlots;
     ti->maxCallDepth = 0;
     ti->script = cx->fp->script;
 
-    /* recording primary trace */
-    if (!js_StartRecorder(cx, NULL, f, ti,
-                          ti->nStackTypes,
-                          ti->globalSlots->length(),
-                          ti->typeMap.data(), NULL, outer, outerArgc)) {
+    /* Recording primary trace. */
+    if (!StartRecorder(cx, NULL, f, ti,
+                       ti->nStackTypes,
+                       ti->globalSlots->length(),
+                       ti->typeMap.data(), NULL, outer, outerArgc)) {
         return false;
     }
 
     return true;
 }
 
-JS_REQUIRES_STACK static inline void
-markSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
+static JS_REQUIRES_STACK inline void
+MarkSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
 {
     if (slot < ti->nStackTypes) {
         oracle.markStackSlotUndemotable(cx, slot);
@@ -4588,8 +4739,8 @@ markSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
     oracle.markGlobalSlotUndemotable(cx, gslots[slot - ti->nStackTypes]);
 }
 
-JS_REQUIRES_STACK static inline bool
-isSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
+static JS_REQUIRES_STACK inline bool
+IsSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
 {
     if (slot < ti->nStackTypes)
         return oracle.isStackSlotUndemotable(cx, slot);
@@ -4598,9 +4749,9 @@ isSlotUndemotable(JSContext* cx, TreeInfo* ti, unsigned slot)
     return oracle.isGlobalSlotUndemotable(cx, gslots[slot - ti->nStackTypes]);
 }
 
-JS_REQUIRES_STACK static bool
-js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
-                          jsbytecode* outer, uint32 outerArgc)
+static JS_REQUIRES_STACK bool
+AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit, jsbytecode* outer,
+                       uint32 outerArgc)
 {
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     if (tm->needFlush) {
@@ -4614,16 +4765,16 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
     JS_ASSERT(exit->from->root->code());
 
     /*
-     * The loop edge exit might not know about all types since the tree could have
-     * been further specialized since it was recorded. Fill in the missing types
-     * from the entry type map.
+     * The loop edge exit might not know about all types since the tree could
+     * have been further specialized since it was recorded. Fill in the missing
+     * types from the entry type map.
      */
-    JSTraceType* m = getFullTypeMap(exit);
+    JSTraceType* m = GetFullTypeMap(exit);
     unsigned ngslots = exit->numGlobalSlots;
     if (ngslots < from_ti->nGlobalTypes()) {
         uint32 partial = exit->numStackSlots + exit->numGlobalSlots;
         m = (JSTraceType*)alloca(from_ti->typeMap.length() * sizeof(JSTraceType));
-        memcpy(m, getFullTypeMap(exit), partial);
+        memcpy(m, GetFullTypeMap(exit), partial);
         memcpy(m + partial, from_ti->globalTypeMap() + exit->numGlobalSlots,
                from_ti->nGlobalTypes() - exit->numGlobalSlots);
         ngslots = from_ti->nGlobalTypes();
@@ -4636,7 +4787,7 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
      */
     for (unsigned i = 0; i < from_ti->typeMap.length(); i++) {
         if (m[i] == TT_DOUBLE)
-            markSlotUndemotable(cx, from_ti, i);
+            MarkSlotUndemotable(cx, from_ti, i);
     }
 
     bool bound = false;
@@ -4645,9 +4796,11 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
             continue;
         TreeInfo* ti = (TreeInfo*)f->vmprivate;
         JS_ASSERT(exit->numStackSlots == ti->nStackTypes);
+
         /* Check the minimum number of slots that need to be compared. */
         unsigned checkSlots = JS_MIN(from_ti->typeMap.length(), ti->typeMap.length());
         JSTraceType* m2 = ti->typeMap.data();
+
         /* Analyze the exit typemap against the peer typemap.
          * Two conditions are important:
          * 1) Typemaps are identical: these peers can be attached.
@@ -4662,10 +4815,12 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
             if (m[i] == m2[i])
                 continue;
             matched = false;
-            /* If there's an I->D that cannot be resolved, flag it.
+
+            /*
+             * If there's an I->D that cannot be resolved, flag it.
              * Otherwise, break and go to the next peer.
              */
-            if (m[i] == TT_INT32 && m2[i] == TT_DOUBLE && isSlotUndemotable(cx, ti, i)) {
+            if (m[i] == TT_INT32 && m2[i] == TT_DOUBLE && IsSlotUndemotable(cx, ti, i)) {
                 undemote = true;
             } else {
                 undemote = false;
@@ -4675,15 +4830,17 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
         if (matched) {
             JS_ASSERT(from_ti->globalSlots == ti->globalSlots);
             JS_ASSERT(from_ti->nStackTypes == ti->nStackTypes);
+
             /* Capture missing globals on both trees and link the fragments together. */
             if (from != f) {
                 ti->dependentTrees.addUnique(from);
                 from_ti->linkedTrees.addUnique(f);
             }
             if (ti->nGlobalTypes() < ti->globalSlots->length())
-                specializeTreesToMissingGlobals(cx, globalObj, ti);
+                SpecializeTreesToMissingGlobals(cx, globalObj, ti);
             exit->target = f;
             tm->fragmento->assm()->patch(exit);
+
             /* Now erase this exit from the unstable exit list. */
             UnstableExit** tail = &from_ti->unstableExits;
             for (UnstableExit* uexit = from_ti->unstableExits; uexit != NULL; uexit = uexit->next) {
@@ -4696,11 +4853,12 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
                 tail = &uexit->next;
             }
             JS_ASSERT(bound);
-            debug_only_stmt( js_DumpPeerStability(tm, f->ip, from->globalObj, from->globalShape, from->argc); )
+            debug_only_stmt( DumpPeerStability(tm, f->ip, from->globalObj, from->globalShape, from->argc); )
             break;
         } else if (undemote) {
             /* The original tree is unconnectable, so trash it. */
-            js_TrashTree(cx, f);
+            TrashTree(cx, f);
+
             /* We shouldn't attempt to record now, since we'll hit a duplicate. */
             return false;
         }
@@ -4709,12 +4867,12 @@ js_AttemptToStabilizeTree(JSContext* cx, JSObject* globalObj, VMSideExit* exit,
         return false;
 
     VMFragment* root = (VMFragment*)from->root;
-    return js_RecordTree(cx, tm, from->first, outer, outerArgc, root->globalObj,
-                         root->globalShape, from_ti->globalSlots, cx->fp->argc);
+    return RecordTree(cx, tm, from->first, outer, outerArgc, root->globalObj,
+                      root->globalShape, from_ti->globalSlots, cx->fp->argc);
 }
 
 static JS_REQUIRES_STACK bool
-js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom, jsbytecode* outer
+AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom, jsbytecode* outer
 #ifdef MOZ_TRACEVIS
     , TraceVisStateObj* tvso = NULL
 #endif
@@ -4733,7 +4891,10 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
     JS_ASSERT(f->vmprivate);
     TreeInfo* ti = (TreeInfo*)f->vmprivate;
 
-    /* Don't grow trees above a certain size to avoid code explosion due to tail duplication. */
+    /*
+     * Don't grow trees above a certain size to avoid code explosion due to
+     * tail duplication.
+     */
     if (ti->branchCount >= MAX_BRANCHES) {
 #ifdef MOZ_TRACEVIS
         if (tvso) tvso->r = R_FAIL_EXTEND_MAX_BRANCHES;
@@ -4751,9 +4912,10 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
     }
 
     /*
-     * If we are recycling a fragment, it might have a different ip so reset it here. This
-     * can happen when attaching a branch to a NESTED_EXIT, which might extend along separate paths
-     * (i.e. after the loop edge, and after a return statement).
+     * If we are recycling a fragment, it might have a different ip so reset it
+     * here. This can happen when attaching a branch to a NESTED_EXIT, which
+     * might extend along separate paths (i.e. after the loop edge, and after a
+     * return statement).
      */
     c->ip = cx->fp->regs->pc;
 
@@ -4769,22 +4931,27 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
         JSTraceType* typeMap;
         TypeMap fullMap;
         if (exitedFrom == NULL) {
-            /* If we are coming straight from a simple side exit, just use that exit's type map
-               as starting point. */
+            /*
+             * If we are coming straight from a simple side exit, just use that
+             * exit's type map as starting point.
+             */
             ngslots = anchor->numGlobalSlots;
             stackSlots = anchor->numStackSlots;
-            typeMap = getFullTypeMap(anchor);
+            typeMap = GetFullTypeMap(anchor);
         } else {
-            /* If we side-exited on a loop exit and continue on a nesting guard, the nesting
-               guard (anchor) has the type information for everything below the current scope,
-               and the actual guard we exited from has the types for everything in the current
-               scope (and whatever it inlined). We have to merge those maps here. */
+            /*
+             * If we side-exited on a loop exit and continue on a nesting
+             * guard, the nesting guard (anchor) has the type information for
+             * everything below the current scope, and the actual guard we
+             * exited from has the types for everything in the current scope
+             * (and whatever it inlined). We have to merge those maps here.
+             */
             VMSideExit* e1 = anchor;
             VMSideExit* e2 = exitedFrom;
-            fullMap.add(getStackTypeMap(e1), e1->numStackSlotsBelowCurrentFrame);
-            fullMap.add(getStackTypeMap(e2), e2->numStackSlots);
+            fullMap.add(GetStackTypeMap(e1), e1->numStackSlotsBelowCurrentFrame);
+            fullMap.add(GetStackTypeMap(e2), e2->numStackSlots);
             stackSlots = fullMap.length();
-            fullMap.add(getGlobalTypeMap(e2), e2->numGlobalSlots);
+            fullMap.add(GetGlobalTypeMap(e2), e2->numGlobalSlots);
             if (e2->numGlobalSlots < e1->numGlobalSlots) {
                 /*
                  * Watch out for an extremely rare case (bug 502714). The sequence of events is:
@@ -4809,15 +4976,15 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
                     slots += addSlots;
                 }
                 if (slots < e1->numGlobalSlots)
-                    fullMap.add(getGlobalTypeMap(e1) + slots, e1->numGlobalSlots - slots);
+                    fullMap.add(GetGlobalTypeMap(e1) + slots, e1->numGlobalSlots - slots);
                 JS_ASSERT(slots == e1->numGlobalSlots);
             }
             ngslots = e1->numGlobalSlots;
             typeMap = fullMap.data();
         }
         JS_ASSERT(ngslots >= anchor->numGlobalSlots);
-        bool rv = js_StartRecorder(cx, anchor, c, (TreeInfo*)f->vmprivate, stackSlots,
-                                   ngslots, typeMap, exitedFrom, outer, cx->fp->argc);
+        bool rv = StartRecorder(cx, anchor, c, (TreeInfo*)f->vmprivate, stackSlots,
+                                ngslots, typeMap, exitedFrom, outer, cx->fp->argc);
 #ifdef MOZ_TRACEVIS
         if (!rv && tvso)
             tvso->r = R_FAIL_EXTEND_START;
@@ -4831,11 +4998,11 @@ js_AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom
 }
 
 static JS_REQUIRES_STACK VMSideExit*
-js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
-               VMSideExit** innermostNestedGuardp);
+ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
+            VMSideExit** innermostNestedGuardp);
 
-JS_REQUIRES_STACK bool
-js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
+static JS_REQUIRES_STACK bool
+RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
 {
 #ifdef JS_THREADSAFE
     if (OBJ_SCOPE(JS_GetGlobalForObject(cx, cx->fp->scopeChain))->title.ownercx != cx) {
@@ -4876,13 +5043,15 @@ js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
 
     /* Make sure inner tree call will not run into an out-of-memory condition. */
     if (tm->reservedDoublePoolPtr < (tm->reservedDoublePool + MAX_NATIVE_STACK_SLOTS) &&
-        !js_ReplenishReservedPool(cx, tm)) {
+        !ReplenishReservedPool(cx, tm)) {
         js_AbortRecording(cx, "Couldn't call inner tree (out of memory)");
         return false;
     }
 
-    /* Make sure the shape of the global object still matches (this might flush
-       the JIT cache). */
+    /*
+     * Make sure the shape of the global object still matches (this might flush
+     * the JIT cache).
+     */
     JSObject* globalObj = JS_GetGlobalForObject(cx, cx->fp->scopeChain);
     uint32 globalShape = -1;
     SlotList* globalSlots = NULL;
@@ -4918,13 +5087,13 @@ js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
                 return false;
             }
         }
-        return js_RecordTree(cx, tm, f, outer, outerArgc, globalObj, globalShape, globalSlots, argc);
+        return RecordTree(cx, tm, f, outer, outerArgc, globalObj, globalShape, globalSlots, argc);
     }
 
     r->adjustCallerTypes(f);
     r->prepareTreeCall(f);
     VMSideExit* innermostNestedGuard = NULL;
-    VMSideExit* lr = js_ExecuteTree(cx, f, inlineCallCount, &innermostNestedGuard);
+    VMSideExit* lr = ExecuteTree(cx, f, inlineCallCount, &innermostNestedGuard);
     if (!lr || r->wasDeepAborted()) {
         if (!lr)
             js_AbortRecording(cx, "Couldn't call inner tree");
@@ -4939,23 +5108,27 @@ js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
         if (innermostNestedGuard) {
             js_AbortRecording(cx, "Inner tree took different side exit, abort current "
                               "recording and grow nesting tree");
-            return js_AttemptToExtendTree(cx, innermostNestedGuard, lr, outer);
+            return AttemptToExtendTree(cx, innermostNestedGuard, lr, outer);
         }
-        /* emit a call to the inner tree and continue recording the outer tree trace */
+
+        /* Emit a call to the inner tree and continue recording the outer tree trace. */
         r->emitTreeCall(f, lr);
         return true;
+
       case UNSTABLE_LOOP_EXIT:
-        /* abort recording so the inner loop can become type stable. */
+        /* Abort recording so the inner loop can become type stable. */
         js_AbortRecording(cx, "Inner tree is trying to stabilize, abort outer recording");
-        return js_AttemptToStabilizeTree(cx, globalObj, lr, outer, outerFragment->argc);
+        return AttemptToStabilizeTree(cx, globalObj, lr, outer, outerFragment->argc);
+
       case OVERFLOW_EXIT:
         oracle.markInstructionUndemotable(cx->fp->regs->pc);
-        /* fall through */
+        /* FALL THROUGH */
       case BRANCH_EXIT:
       case CASE_EXIT:
-        /* abort recording the outer tree, extend the inner tree */
+        /* Abort recording the outer tree, extend the inner tree. */
         js_AbortRecording(cx, "Inner tree is trying to grow, abort outer recording");
-        return js_AttemptToExtendTree(cx, lr, NULL, outer);
+        return AttemptToExtendTree(cx, lr, NULL, outer);
+
       default:
         debug_only_printf(LC_TMTracer, "exit_type=%s\n", getExitName(lr->exitType));
         js_AbortRecording(cx, "Inner tree not suitable for calling");
@@ -4964,7 +5137,7 @@ js_RecordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
 }
 
 static bool
-js_IsEntryTypeCompatible(jsval* vp, JSTraceType* m)
+IsEntryTypeCompatible(jsval* vp, JSTraceType* m)
 {
     unsigned tag = JSVAL_TAG(*vp);
 
@@ -5040,7 +5213,7 @@ public:
     JS_REQUIRES_STACK JS_ALWAYS_INLINE void
     visitGlobalSlot(jsval *vp, unsigned n, unsigned slot) {
         debug_only_printf(LC_TMTracer, "global%d=", n);
-        if (!js_IsEntryTypeCompatible(vp, mTypeMap)) {
+        if (!IsEntryTypeCompatible(vp, mTypeMap)) {
             mOk = false;
         } else if (!isPromoteInt(mRecorder.get(vp)) && *mTypeMap == TT_INT32) {
             oracle.markGlobalSlotUndemotable(mCx, slot);
@@ -5055,7 +5228,7 @@ public:
     visitStackSlots(jsval *vp, size_t count, JSStackFrame* fp) {
         for (size_t i = 0; i < count; ++i) {
             debug_only_printf(LC_TMTracer, "%s%u=", stackSlotKind(), unsigned(i));
-            if (!js_IsEntryTypeCompatible(vp, mTypeMap)) {
+            if (!IsEntryTypeCompatible(vp, mTypeMap)) {
                 mOk = false;
             } else if (!isPromoteInt(mRecorder.get(vp)) && *mTypeMap == TT_INT32) {
                 oracle.markStackSlotUndemotable(mCx, mStackSlotNum);
@@ -5093,15 +5266,16 @@ TraceRecorder::findNestedCompatiblePeer(Fragment* f)
         debug_only_printf(LC_TMTracer, "checking nested types %p: ", (void*)f);
 
         if (ngslots > ti->nGlobalTypes())
-            specializeTreesToMissingGlobals(cx, globalObj, ti);
+            SpecializeTreesToMissingGlobals(cx, globalObj, ti);
 
         /*
-         * Determine whether the typemap of the inner tree matches the outer tree's
-         * current state. If the inner tree expects an integer, but the outer tree
-         * doesn't guarantee an integer for that slot, we mark the slot undemotable
-         * and mismatch here. This will force a new tree to be compiled that accepts
-         * a double for the slot. If the inner tree expects a double, but the outer
-         * tree has an integer, we can proceed, but we mark the location undemotable.
+         * Determine whether the typemap of the inner tree matches the outer
+         * tree's current state. If the inner tree expects an integer, but the
+         * outer tree doesn't guarantee an integer for that slot, we mark the
+         * slot undemotable and mismatch here. This will force a new tree to be
+         * compiled that accepts a double for the slot. If the inner tree
+         * expects a double, but the outer tree has an integer, we can proceed,
+         * but we mark the location undemotable.
          */
         TypeCompatibilityVisitor visitor(*this, ti->typeMap.data());
         VisitSlots(visitor, cx, 0, *treeInfo->globalSlots);
@@ -5127,7 +5301,7 @@ public:
     JS_ALWAYS_INLINE void checkSlot(jsval *vp, char const *name, int i) {
         debug_only_printf(LC_TMTracer, "%s%d=", name, i);
         JS_ASSERT(*(uint8_t*)mTypeMap != 0xCD);
-        mOk = js_IsEntryTypeCompatible(vp, mTypeMap++);
+        mOk = IsEntryTypeCompatible(vp, mTypeMap++);
     }
 
     JS_REQUIRES_STACK JS_ALWAYS_INLINE void
@@ -5159,16 +5333,16 @@ public:
  * @return              True if compatible (with or without demotions), false otherwise.
  */
 static JS_REQUIRES_STACK bool
-js_CheckEntryTypes(JSContext* cx, JSObject* globalObj, TreeInfo* ti)
+CheckEntryTypes(JSContext* cx, JSObject* globalObj, TreeInfo* ti)
 {
     unsigned int ngslots = ti->globalSlots->length();
 
-    JS_ASSERT(ti->nStackTypes == js_NativeStackSlots(cx, 0));
+    JS_ASSERT(ti->nStackTypes == NativeStackSlots(cx, 0));
 
     if (ngslots > ti->nGlobalTypes())
-        specializeTreesToMissingGlobals(cx, globalObj, ti);
+        SpecializeTreesToMissingGlobals(cx, globalObj, ti);
 
-    JS_ASSERT(ti->typeMap.length() == js_NativeStackSlots(cx, 0) + ngslots);
+    JS_ASSERT(ti->typeMap.length() == NativeStackSlots(cx, 0) + ngslots);
     JS_ASSERT(ti->typeMap.length() == ti->nStackTypes + ngslots);
     JS_ASSERT(ti->nGlobalTypes() == ngslots);
 
@@ -5189,7 +5363,7 @@ js_CheckEntryTypes(JSContext* cx, JSObject* globalObj, TreeInfo* ti)
  * @out   count         Number of fragments consulted.
  */
 static JS_REQUIRES_STACK Fragment*
-js_FindVMCompatiblePeer(JSContext* cx, JSObject* globalObj, Fragment* f, uintN& count)
+FindVMCompatiblePeer(JSContext* cx, JSObject* globalObj, Fragment* f, uintN& count)
 {
     count = 0;
     for (; f != NULL; f = f->peer) {
@@ -5197,7 +5371,7 @@ js_FindVMCompatiblePeer(JSContext* cx, JSObject* globalObj, Fragment* f, uintN&
             continue;
         debug_only_printf(LC_TMTracer,
                           "checking vm types %p (ip: %p): ", (void*)f, f->ip);
-        if (js_CheckEntryTypes(cx, globalObj, (TreeInfo*)f->vmprivate))
+        if (CheckEntryTypes(cx, globalObj, (TreeInfo*)f->vmprivate))
             return f;
         ++count;
     }
@@ -5207,12 +5381,9 @@ js_FindVMCompatiblePeer(JSContext* cx, JSObject* globalObj, Fragment* f, uintN&
 static void
 LeaveTree(InterpState&, VMSideExit* lr);
 
-/**
- * Executes a tree.
- */
 static JS_REQUIRES_STACK VMSideExit*
-js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
-               VMSideExit** innermostNestedGuardp)
+ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
+            VMSideExit** innermostNestedGuardp)
 {
 #ifdef MOZ_TRACEVIS
     TraceVisStateObj tvso(S_EXECUTE);
@@ -5228,8 +5399,10 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
     unsigned globalFrameSize = STOBJ_NSLOTS(globalObj);
 
     /* Make sure the global object is sane. */
-    JS_ASSERT(!ngslots || (OBJ_SHAPE(JS_GetGlobalForObject(cx, cx->fp->scopeChain)) ==
-              ((VMFragment*)f)->globalShape));
+    JS_ASSERT_IF(ngslots != 0,
+                 OBJ_SHAPE(JS_GetGlobalForObject(cx, cx->fp->scopeChain)) ==
+                 ((VMFragment*)f)->globalShape);
+
     /* Make sure our caller replenished the double pool. */
     JS_ASSERT(tm->reservedDoublePoolPtr >= tm->reservedDoublePool + MAX_NATIVE_STACK_SLOTS);
 
@@ -5241,7 +5414,7 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
     uintN savedProhibitFlush = JS_TRACE_MONITOR(cx).prohibitFlush;
 #endif
 
-    /* Setup the interpreter state block, which is followed by the native global frame. */
+    /* Set up the interpreter state block, which is followed by the native global frame. */
     InterpState* state = (InterpState*)alloca(sizeof(InterpState) + (globalFrameSize+1)*sizeof(double));
     state->cx = cx;
     state->inlineCallCountp = &inlineCallCount;
@@ -5252,16 +5425,16 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
     state->rpAtLastTreeCall = NULL;
     state->builtinStatus = 0;
 
-    /* Setup the native global frame. */
+    /* Set up the native global frame. */
     double* global = (double*)(state+1);
 
-    /* Setup the native stack frame. */
+    /* Set up the native stack frame. */
     double stack_buffer[MAX_NATIVE_STACK_SLOTS];
     state->stackBase = stack_buffer;
     state->sp = stack_buffer + (ti->nativeStackBase/sizeof(double));
     state->eos = stack_buffer + MAX_NATIVE_STACK_SLOTS;
 
-    /* Setup the native call stack frame. */
+    /* Set up the native call stack frame. */
     FrameInfo* callstack_buffer[MAX_CALL_STACK_ENTRIES];
     state->callstackBase = callstack_buffer;
     state->rp = callstack_buffer;
@@ -5289,7 +5462,7 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
                       f->code());
 
     JS_ASSERT(ti->nGlobalTypes() == ngslots);
-    BuildNativeFrame(cx, globalObj, 0/*callDepth*/, ngslots, gslots,
+    BuildNativeFrame(cx, globalObj, 0 /* callDepth */, ngslots, gslots,
                      ti->typeMap.data(), global, stack_buffer);
 
     union { NIns *code; GuardRecord* (FASTCALL *func)(InterpState*, Fragment*); } u;
@@ -5306,6 +5479,7 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount,
 
     debug_only_stmt(fflush(NULL));
     GuardRecord* rec;
+
     // Note that the block scoping is crucial here for TraceVis;  the
     // TraceVisStateObj constructors and destructors must run at the right times.
     {
@@ -5340,34 +5514,46 @@ LeaveTree(InterpState& state, VMSideExit* lr)
     FrameInfo** callstack = state.callstackBase;
     double* stack = state.stackBase;
 
-    /* Except if we find that this is a nested bailout, the guard the call returned is the
-       one we have to use to adjust pc and sp. */
+    /*
+     * Except if we find that this is a nested bailout, the guard the call
+     * returned is the one we have to use to adjust pc and sp.
+     */
     VMSideExit* innermost = lr;
 
-    /* While executing a tree we do not update state.sp and state.rp even if they grow. Instead,
-       guards tell us by how much sp and rp should be incremented in case of a side exit. When
-       calling a nested tree, however, we actively adjust sp and rp. If we have such frames
-       from outer trees on the stack, then rp will have been adjusted. Before we can process
-       the stack of the frames of the tree we directly exited from, we have to first work our
-       way through the outer frames and generate interpreter frames for them. Once the call
-       stack (rp) is empty, we can process the final frames (which again are not directly
-       visible and only the guard we exited on will tells us about). */
+    /*
+     * While executing a tree we do not update state.sp and state.rp even if
+     * they grow. Instead, guards tell us by how much sp and rp should be
+     * incremented in case of a side exit. When calling a nested tree, however,
+     * we actively adjust sp and rp. If we have such frames from outer trees on
+     * the stack, then rp will have been adjusted. Before we can process the
+     * stack of the frames of the tree we directly exited from, we have to
+     * first work our way through the outer frames and generate interpreter
+     * frames for them. Once the call stack (rp) is empty, we can process the
+     * final frames (which again are not directly visible and only the guard we
+     * exited on will tells us about).
+     */
     FrameInfo** rp = (FrameInfo**)state.rp;
     if (lr->exitType == NESTED_EXIT) {
         VMSideExit* nested = state.lastTreeCallGuard;
         if (!nested) {
-            /* If lastTreeCallGuard is not set in state, we only have a single level of
-               nesting in this exit, so lr itself is the innermost and outermost nested
-               guard, and hence we set nested to lr. The calldepth of the innermost guard
-               is not added to state.rp, so we do it here manually. For a nesting depth
-               greater than 1 the CallTree builtin already added the innermost guard's
-               calldepth to state.rpAtLastTreeCall. */
+            /*
+             * If lastTreeCallGuard is not set in state, we only have a single
+             * level of nesting in this exit, so lr itself is the innermost and
+             * outermost nested guard, and hence we set nested to lr. The
+             * calldepth of the innermost guard is not added to state.rp, so we
+             * do it here manually. For a nesting depth greater than 1 the
+             * CallTree builtin already added the innermost guard's calldepth
+             * to state.rpAtLastTreeCall.
+             */
             nested = lr;
             rp += lr->calldepth;
         } else {
-            /* During unwinding state.rp gets overwritten at every step and we restore
-               it here to its state at the innermost nested guard. The builtin already
-               added the calldepth of that innermost guard to rpAtLastTreeCall. */
+            /*
+             * During unwinding state.rp gets overwritten at every step and we
+             * restore it here to its state at the innermost nested guard. The
+             * builtin already added the calldepth of that innermost guard to
+             * rpAtLastTreeCall.
+             */
             rp = (FrameInfo**)state.rpAtLastTreeCall;
         }
         innermost = state.lastTreeExitGuard;
@@ -5408,7 +5594,7 @@ LeaveTree(InterpState& state, VMSideExit* lr)
              * then immediately flunked the guard on state->builtinStatus.
              *
              * Now LeaveTree has been called again from the tail of
-             * js_ExecuteTree. We are about to return to the interpreter. Adjust
+             * ExecuteTree. We are about to return to the interpreter. Adjust
              * the top stack frame to resume on the next op.
              */
             jsbytecode *pc = cx->fp->regs->pc;
@@ -5426,7 +5612,7 @@ LeaveTree(InterpState& state, VMSideExit* lr)
              * The return value was not available when we reconstructed the stack,
              * but we have it now. Box it.
              */
-            JSTraceType* typeMap = getStackTypeMap(innermost);
+            JSTraceType* typeMap = GetStackTypeMap(innermost);
 
             /*
              * If there's a tree call around the point that we deep exited at,
@@ -5448,9 +5634,11 @@ LeaveTree(InterpState& state, VMSideExit* lr)
 
     JS_ARENA_RELEASE(&cx->stackPool, state.stackMark);
     while (callstack < rp) {
-        /* Synthesize a stack frame and write out the values in it using the type map pointer
-           on the native call stack. */
-        js_SynthesizeFrame(cx, **callstack);
+        /*
+         * Synthesize a stack frame and write out the values in it using the
+         * type map pointer on the native call stack.
+         */
+        SynthesizeFrame(cx, **callstack);
         int slots = FlushNativeStackFrame(cx, 1 /* callDepth */, (JSTraceType*)(*callstack + 1),
                                           stack, cx->fp);
 #ifdef DEBUG
@@ -5462,20 +5650,25 @@ LeaveTree(InterpState& state, VMSideExit* lr)
                           FramePCOffset(fp),
                           slots);
 #endif
-        /* Keep track of the additional frames we put on the interpreter stack and the native
-           stack slots we consumed. */
+        /*
+         * Keep track of the additional frames we put on the interpreter stack
+         * and the native stack slots we consumed.
+         */
         ++*state.inlineCallCountp;
         ++callstack;
         stack += slots;
     }
 
-    /* We already synthesized the frames around the innermost guard. Here we just deal
-       with additional frames inside the tree we are bailing out from. */
+    /*
+     * We already synthesized the frames around the innermost guard. Here we
+     * just deal with additional frames inside the tree we are bailing out
+     * from.
+     */
     JS_ASSERT(rp == callstack);
     unsigned calldepth = innermost->calldepth;
     unsigned calldepth_slots = 0;
     for (unsigned n = 0; n < calldepth; ++n) {
-        calldepth_slots += js_SynthesizeFrame(cx, *callstack[n]);
+        calldepth_slots += SynthesizeFrame(cx, *callstack[n]);
         ++*state.inlineCallCountp;
 #ifdef DEBUG
         JSStackFrame* fp = cx->fp;
@@ -5486,16 +5679,21 @@ LeaveTree(InterpState& state, VMSideExit* lr)
 #endif
     }
 
-    /* Adjust sp and pc relative to the tree we exited from (not the tree we entered into).
-       These are our final values for sp and pc since js_SynthesizeFrame has already taken
-       care of all frames in between. But first we recover fp->blockChain, which comes from
-       the side exit struct. */
+    /*
+     * Adjust sp and pc relative to the tree we exited from (not the tree we
+     * entered into).  These are our final values for sp and pc since
+     * SynthesizeFrame has already taken care of all frames in between. But
+     * first we recover fp->blockChain, which comes from the side exit
+     * struct.
+     */
     JSStackFrame* fp = cx->fp;
 
     fp->blockChain = innermost->block;
 
-    /* If we are not exiting from an inlined frame the state->sp is spbase, otherwise spbase
-       is whatever slots frames around us consume. */
+    /*
+     * If we are not exiting from an inlined frame, the state->sp is spbase.
+     * Otherwise spbase is whatever slots frames around us consume.
+     */
     fp->regs->pc = innermost->pc;
     fp->imacpc = innermost->imacpc;
     fp->regs->sp = StackBase(fp) + (innermost->sp_adj / sizeof(double)) - calldepth_slots;
@@ -5522,47 +5720,54 @@ LeaveTree(InterpState& state, VMSideExit* lr)
                       calldepth,
                       cycles);
 
-    /* If this trace is part of a tree, later branches might have added additional globals for
-       which we don't have any type information available in the side exit. We merge in this
-       information from the entry type-map. See also comment in the constructor of TraceRecorder
-       why this is always safe to do. */
+    /*
+     * If this trace is part of a tree, later branches might have added
+     * additional globals for which we don't have any type information
+     * available in the side exit. We merge in this information from the entry
+     * type-map. See also the comment in the constructor of TraceRecorder
+     * regarding why this is always safe to do.
+     */
     TreeInfo* outermostTree = state.outermostTree;
     uint16* gslots = outermostTree->globalSlots->data();
     unsigned ngslots = outermostTree->globalSlots->length();
     JS_ASSERT(ngslots == outermostTree->nGlobalTypes());
     JSTraceType* globalTypeMap;
 
-    /* Are there enough globals? This is the ideal fast path. */
+    /* Are there enough globals? */
     if (innermost->numGlobalSlots == ngslots) {
-        globalTypeMap = getGlobalTypeMap(innermost);
-    /* Otherwise, merge the typemap of the innermost entry and exit together.  This should always
-       work because it is invalid for nested trees or linked trees to have incompatible types.
-       Thus, whenever a new global type is lazily added into a tree, all dependent and linked
-       trees are immediately specialized (see bug 476653). */
+        /* Yes. This is the ideal fast path. */
+        globalTypeMap = GetGlobalTypeMap(innermost);
     } else {
+        /*
+         * No. Merge the typemap of the innermost entry and exit together. This
+         * should always work because it is invalid for nested trees or linked
+         * trees to have incompatible types. Thus, whenever a new global type
+         * is lazily added into a tree, all dependent and linked trees are
+         * immediately specialized (see bug 476653).
+         */
         TreeInfo* ti = (TreeInfo*)innermost->from->root->vmprivate;
         JS_ASSERT(ti->nGlobalTypes() == ngslots);
         JS_ASSERT(ti->nGlobalTypes() > innermost->numGlobalSlots);
         globalTypeMap = (JSTraceType*)alloca(ngslots * sizeof(JSTraceType));
-        memcpy(globalTypeMap, getGlobalTypeMap(innermost), innermost->numGlobalSlots);
+        memcpy(globalTypeMap, GetGlobalTypeMap(innermost), innermost->numGlobalSlots);
         memcpy(globalTypeMap + innermost->numGlobalSlots,
                ti->globalTypeMap() + innermost->numGlobalSlots,
                ti->nGlobalTypes() - innermost->numGlobalSlots);
     }
 
-    /* write back native stack frame */
+    /* Write back the topmost native stack frame. */
 #ifdef DEBUG
     int slots =
 #endif
         FlushNativeStackFrame(cx, innermost->calldepth,
-                              getStackTypeMap(innermost),
+                              GetStackTypeMap(innermost),
                               stack, NULL);
     JS_ASSERT(unsigned(slots) == innermost->numStackSlots);
 
     if (innermost->nativeCalleeWord)
         SynthesizeSlowNativeFrame(cx, innermost);
 
-    /* write back interned globals */
+    /* Write back interned globals. */
     double* global = (double*)(&state + 1);
     FlushNativeGlobalFrame(cx, global,
                            ngslots, gslots, globalTypeMap);
@@ -5572,7 +5777,7 @@ LeaveTree(InterpState& state, VMSideExit* lr)
     cx->nativeVp = NULL;
 
 #ifdef DEBUG
-    // Verify that our state restoration worked.
+    /* Verify that our state restoration worked. */
     for (JSStackFrame* fp = cx->fp; fp; fp = fp->down) {
         JS_ASSERT_IF(fp->callee, JSVAL_IS_OBJECT(fp->argv[-1]));
     }
@@ -5600,18 +5805,19 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
     if (tm->recorder) {
         jsbytecode* innerLoopHeaderPC = cx->fp->regs->pc;
 
-        if (js_RecordLoopEdge(cx, tm->recorder, inlineCallCount))
+        if (RecordLoopEdge(cx, tm->recorder, inlineCallCount))
             return true;
 
         /*
-         * js_RecordLoopEdge will invoke an inner tree if we have a matching one. If we
-         * arrive here, that tree didn't run to completion and instead we mis-matched
-         * or the inner tree took a side exit other than the loop exit. We are thus
-         * no longer guaranteed to be parked on the same loop header js_MonitorLoopEdge
-         * was called for. In fact, this might not even be a loop header at all. Hence
-         * if the program counter no longer hovers over the inner loop header, return to
-         * the interpreter and do not attempt to trigger or record a new tree at this
-         * location.
+         * RecordLoopEdge will invoke an inner tree if we have a matching
+         * one. If we arrive here, that tree didn't run to completion and
+         * instead we mis-matched or the inner tree took a side exit other than
+         * the loop exit. We are thus no longer guaranteed to be parked on the
+         * same loop header js_MonitorLoopEdge was called for. In fact, this
+         * might not even be a loop header at all. Hence if the program counter
+         * no longer hovers over the inner loop header, return to the
+         * interpreter and do not attempt to trigger or record a new tree at
+         * this location.
          */
          if (innerLoopHeaderPC != cx->fp->regs->pc) {
 #ifdef MOZ_TRACEVIS
@@ -5624,20 +5830,23 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
 
     /* Check the pool of reserved doubles (this might trigger a GC). */
     if (tm->reservedDoublePoolPtr < (tm->reservedDoublePool + MAX_NATIVE_STACK_SLOTS) &&
-        !js_ReplenishReservedPool(cx, tm)) {
+        !ReplenishReservedPool(cx, tm)) {
 #ifdef MOZ_TRACEVIS
         tvso.r = R_DOUBLES;
 #endif
         return false; /* Out of memory, don't try to record now. */
     }
 
-    /* Make sure the shape of the global object still matches (this might flush the JIT cache). */
+    /*
+     * Make sure the shape of the global object still matches (this might flush
+     * the JIT cache).
+     */
     JSObject* globalObj = JS_GetGlobalForObject(cx, cx->fp->scopeChain);
     uint32 globalShape = -1;
     SlotList* globalSlots = NULL;
 
     if (!CheckGlobalObjectShape(cx, tm, globalObj, &globalShape, &globalSlots)) {
-        js_Backoff(cx, cx->fp->regs->pc);
+        Backoff(cx, cx->fp->regs->pc);
         return false;
     }
 
@@ -5664,8 +5873,10 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
         return false;
     }
 
-    /* If we have no code in the anchor and no peers, we definitively won't be able to
-       activate any trees so, start compiling. */
+    /*
+     * If we have no code in the anchor and no peers, we definitively won't be
+     * able to activate any trees, so start compiling.
+     */
     if (!f->code() && !f->peer) {
     record:
         if (++f->hits() < HOTLOOP) {
@@ -5674,10 +5885,14 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
 #endif
             return false;
         }
-        /* We can give RecordTree the root peer. If that peer is already taken, it will
-           walk the peer list and find us a free slot or allocate a new tree if needed. */
-        bool rv = js_RecordTree(cx, tm, f->first, NULL, 0, globalObj, globalShape,
-                                globalSlots, argc);
+
+        /*
+         * We can give RecordTree the root peer. If that peer is already taken,
+         * it will walk the peer list and find us a free slot or allocate a new
+         * tree if needed.
+         */
+        bool rv = RecordTree(cx, tm, f->first, NULL, 0, globalObj, globalShape,
+                             globalSlots, argc);
 #ifdef MOZ_TRACEVIS
         if (!rv)
             tvso.r = R_FAIL_RECORD_TREE;
@@ -5691,14 +5906,17 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
                       FramePCOffset(cx->fp), (void*)f, f->ip);
 
     uintN count;
-    Fragment* match = js_FindVMCompatiblePeer(cx, globalObj, f, count);
+    Fragment* match = FindVMCompatiblePeer(cx, globalObj, f, count);
     if (!match) {
         if (count < MAXPEERS)
             goto record;
-        /* If we hit the max peers ceiling, don't try to lookup fragments all the time. Thats
-           expensive. This must be a rather type-unstable loop. */
+
+        /*
+         * If we hit the max peers ceiling, don't try to lookup fragments all
+         * the time. That's expensive. This must be a rather type-unstable loop.
+         */
         debug_only_print0(LC_TMTracer, "Blacklisted: too many peer trees.\n");
-        js_Blacklist((jsbytecode*) f->root->ip);
+        Blacklist((jsbytecode*) f->root->ip);
 #ifdef MOZ_TRACEVIS
         tvso.r = R_MAX_PEERS;
 #endif
@@ -5708,7 +5926,7 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
     VMSideExit* lr = NULL;
     VMSideExit* innermostNestedGuard = NULL;
 
-    lr = js_ExecuteTree(cx, match, inlineCallCount, &innermostNestedGuard);
+    lr = ExecuteTree(cx, match, inlineCallCount, &innermostNestedGuard);
     if (!lr) {
 #ifdef MOZ_TRACEVIS
         tvso.r = R_FAIL_EXECUTE_TREE;
@@ -5716,31 +5934,35 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
         return false;
     }
 
-    /* If we exit on a branch, or on a tree call guard, try to grow the inner tree (in case
-       of a branch exit), or the tree nested around the tree we exited from (in case of the
-       tree call guard). */
+    /*
+     * If we exit on a branch, or on a tree call guard, try to grow the inner
+     * tree (in case of a branch exit), or the tree nested around the tree we
+     * exited from (in case of the tree call guard).
+     */
     bool rv;
     switch (lr->exitType) {
       case UNSTABLE_LOOP_EXIT:
-          rv = js_AttemptToStabilizeTree(cx, globalObj, lr, NULL, NULL);
+          rv = AttemptToStabilizeTree(cx, globalObj, lr, NULL, NULL);
 #ifdef MOZ_TRACEVIS
           if (!rv)
               tvso.r = R_FAIL_STABILIZE;
 #endif
           return rv;
+
       case OVERFLOW_EXIT:
         oracle.markInstructionUndemotable(cx->fp->regs->pc);
-        /* fall through */
+        /* FALL THROUGH */
       case BRANCH_EXIT:
       case CASE_EXIT:
-          return js_AttemptToExtendTree(cx, lr, NULL, NULL
+          return AttemptToExtendTree(cx, lr, NULL, NULL
 #ifdef MOZ_TRACEVIS
                                           , &tvso
 #endif
                  );
+
       case LOOP_EXIT:
         if (innermostNestedGuard)
-            return js_AttemptToExtendTree(cx, innermostNestedGuard, lr, NULL
+            return AttemptToExtendTree(cx, innermostNestedGuard, lr, NULL
 #ifdef MOZ_TRACEVIS
                                             , &tvso
 #endif
@@ -5749,6 +5971,7 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
         tvso.r = R_NO_EXTEND_OUTER;
 #endif
         return false;
+
 #ifdef MOZ_TRACEVIS
       case MISMATCH_EXIT:  tvso.r = R_MISMATCH_EXIT;  return false;
       case OOM_EXIT:       tvso.r = R_OOM_EXIT;       return false;
@@ -5756,8 +5979,12 @@ js_MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount)
       case DEEP_BAIL_EXIT: tvso.r = R_DEEP_BAIL_EXIT; return false;
       case STATUS_EXIT:    tvso.r = R_STATUS_EXIT;    return false;
 #endif
+
       default:
-        /* No, this was an unusual exit (i.e. out of memory/GC), so just resume interpretation. */
+        /*
+         * No, this was an unusual exit (i.e. out of memory/GC), so just resume
+         * interpretation.
+         */
 #ifdef MOZ_TRACEVIS
         tvso.r = R_OTHER_EXIT;
 #endif
@@ -5795,9 +6022,12 @@ TraceRecorder::monitorRecording(JSContext* cx, TraceRecorder* tr, JSOp op)
         }
     )
 
-    /* If op is not a break or a return from a loop, continue recording and follow the
-       trace. We check for imacro-calling bytecodes inside each switch case to resolve
-       the if (JSOP_IS_IMACOP(x)) conditions at compile time. */
+    /*
+     * If op is not a break or a return from a loop, continue recording and
+     * follow the trace. We check for imacro-calling bytecodes inside each
+     * switch case to resolve the if (JSOP_IS_IMACOP(x)) conditions at compile
+     * time.
+     */
 
     JSRecordingStatus status;
 #ifdef DEBUG
@@ -5845,7 +6075,7 @@ TraceRecorder::monitorRecording(JSContext* cx, TraceRecorder* tr, JSOp op)
   stop_recording:
     /* If we recorded the end of the trace, destroy the recorder now. */
     if (tr->fragment->lastIns) {
-        js_DeleteRecorder(cx);
+        DeleteRecorder(cx);
         return status;
     }
 
@@ -5865,13 +6095,13 @@ js_AbortRecording(JSContext* cx, const char* reason)
     Fragment* f = tm->recorder->getFragment();
 
     /*
-     * If the recorder already had its fragment disposed, or we actually finished
-     * recording and this recorder merely is passing through the deep abort state
-     * to the next recorder on the stack, just destroy the recorder. There is
-     * nothing to abort.
+     * If the recorder already had its fragment disposed, or we actually
+     * finished recording and this recorder merely is passing through the deep
+     * abort state to the next recorder on the stack, just destroy the
+     * recorder. There is nothing to abort.
      */
     if (!f || f->lastIns) {
-        js_DeleteRecorder(cx);
+        DeleteRecorder(cx);
         return;
     }
 
@@ -5889,12 +6119,10 @@ js_AbortRecording(JSContext* cx, const char* reason)
                       reason);
 #endif
 
-    js_Backoff(cx, (jsbytecode*) f->root->ip, f->root);
+    Backoff(cx, (jsbytecode*) f->root->ip, f->root);
 
-    /*
-     * If js_DeleteRecorder flushed the code cache, we can't rely on f any more.
-     */
-    if (!js_DeleteRecorder(cx))
+    /* If DeleteRecorder flushed the code cache, we can't rely on f any more. */
+    if (!DeleteRecorder(cx))
         return;
 
     /*
@@ -5902,12 +6130,12 @@ js_AbortRecording(JSContext* cx, const char* reason)
      * TreeInfo object.
      */
     if (!f->code() && (f->root == f))
-        js_TrashTree(cx, f);
+        TrashTree(cx, f);
 }
 
 #if defined NANOJIT_IA32
 static bool
-js_CheckForSSE2()
+CheckForSSE2()
 {
     int features = 0;
 #if defined _MSC_VER
@@ -6147,9 +6375,9 @@ void
 js_InitJIT(JSTraceMonitor *tm)
 {
 #if defined JS_JIT_SPEW
-    /* Set up debug logging */
+    /* Set up debug logging. */
     if (!did_we_set_up_debug_logging) {
-        js_InitJITLogController();
+        InitJITLogController();
         did_we_set_up_debug_logging = true;
     }
 #else
@@ -6159,7 +6387,7 @@ js_InitJIT(JSTraceMonitor *tm)
     if (!did_we_check_processor_features) {
 #if defined NANOJIT_IA32
         avmplus::AvmCore::config.use_cmov =
-        avmplus::AvmCore::config.sse2 = js_CheckForSSE2();
+            avmplus::AvmCore::config.sse2 = CheckForSSE2();
 #endif
 #if defined NANOJIT_ARM
         bool            arm_vfp     = js_arm_check_vfp();
@@ -6186,9 +6414,7 @@ js_InitJIT(JSTraceMonitor *tm)
         did_we_check_processor_features = true;
     }
 
-    /*
-     * Set the default size for the code cache to 16MB.
-     */
+    /* Set the default size for the code cache to 16MB. */
     tm->maxCodeCacheBytes = 16 M;
 
     if (!tm->recordAttempts.ops) {
@@ -6262,7 +6488,7 @@ js_FinishJIT(JSTraceMonitor *tm)
 
         for (size_t i = 0; i < FRAGMENT_TABLE_SIZE; ++i) {
             VMFragment* f = tm->vmfragments[i];
-            while(f) {
+            while (f) {
                 VMFragment* next = f->next;
                 tm->fragmento->clearFragment(f);
                 f = next;
@@ -6314,9 +6540,7 @@ js_PurgeJITOracle()
 }
 
 static JSDHashOperator
-js_PurgeScriptRecordingAttempts(JSDHashTable *table,
-                                JSDHashEntryHdr *hdr,
-                                uint32 number, void *arg)
+PurgeScriptRecordingAttempts(JSDHashTable *table, JSDHashEntryHdr *hdr, uint32 number, void *arg)
 {
     PCHashEntry *e = (PCHashEntry *)hdr;
     JSScript *script = (JSScript *)arg;
@@ -6327,19 +6551,17 @@ js_PurgeScriptRecordingAttempts(JSDHashTable *table,
     return JS_DHASH_NEXT;
 }
 
-/*
- * Call 'action' for each root fragment created for 'script'.
- */
+/* Call 'action' for each root fragment created for 'script'. */
 template<typename FragmentAction>
 static void
-js_IterateScriptFragments(JSContext* cx, JSScript* script, FragmentAction action)
+IterateScriptFragments(JSContext* cx, JSScript* script, FragmentAction action)
 {
     JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
     for (size_t i = 0; i < FRAGMENT_TABLE_SIZE; ++i) {
         for (VMFragment **f = &(tm->vmfragments[i]); *f; ) {
             VMFragment* frag = *f;
-            /* Disable future use of any script-associated VMFragment.*/
             if (JS_UPTRDIFF(frag->ip, script->code) < script->length) {
+                /* This fragment is associated with the script. */
                 JS_ASSERT(frag->root == frag);
                 VMFragment* next = frag->next;
                 if (action(cx, tm, frag)) {
@@ -6360,15 +6582,15 @@ js_IterateScriptFragments(JSContext* cx, JSScript* script, FragmentAction action
 }
 
 static bool
-trashTreeAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
+TrashTreeAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
 {
     for (Fragment *p = frag; p; p = p->peer)
-        js_TrashTree(cx, p);
+        TrashTree(cx, p);
     return false;
 }
 
 static bool
-clearFragmentAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
+ClearFragmentAction(JSContext* cx, JSTraceMonitor* tm, Fragment* frag)
 {
     tm->fragmento->clearFragment(frag);
     return true;
@@ -6381,16 +6603,15 @@ js_PurgeScriptFragments(JSContext* cx, JSScript* script)
         return;
     debug_only_printf(LC_TMTracer,
                       "Purging fragments for JSScript %p.\n", (void*)script);
-    /*
-     * js_TrashTree trashes dependent trees recursively, so we must do all the trashing
-     * before clearing in order to avoid calling js_TrashTree with a deleted fragment.
-     */
-    js_IterateScriptFragments(cx, script, trashTreeAction);
-    js_IterateScriptFragments(cx, script, clearFragmentAction);
-    JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
-    JS_DHashTableEnumerate(&(tm->recordAttempts),
-                           js_PurgeScriptRecordingAttempts, script);
 
+    /*
+     * TrashTree trashes dependent trees recursively, so we must do all the trashing
+     * before clearing in order to avoid calling TrashTree with a deleted fragment.
+     */
+    IterateScriptFragments(cx, script, TrashTreeAction);
+    IterateScriptFragments(cx, script, ClearFragmentAction);
+    JSTraceMonitor* tm = &JS_TRACE_MONITOR(cx);
+    JS_DHashTableEnumerate(&(tm->recordAttempts), PurgeScriptRecordingAttempts, script);
 }
 
 bool
@@ -6502,9 +6723,9 @@ TraceRecorder::scopeChain() const
 }
 
 /*
- * Return the frame of a call object if that frame is part of the current trace. |depthp| is an
- * optional outparam: if it is non-null, it will be filled in with the depth of the call object's
- * frame relevant to cx->fp.
+ * Return the frame of a call object if that frame is part of the current
+ * trace. |depthp| is an optional outparam: if it is non-null, it will be
+ * filled in with the depth of the call object's frame relevant to cx->fp.
  */
 JS_REQUIRES_STACK JSStackFrame*
 TraceRecorder::frameIfInRange(JSObject* obj, unsigned* depthp) const
@@ -6523,22 +6744,22 @@ TraceRecorder::frameIfInRange(JSObject* obj, unsigned* depthp) const
     return NULL;
 }
 
-JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureVar, CONTEXT, OBJECT, UINT32,
+JS_DEFINE_CALLINFO_6(extern, UINT32, GetClosureVar, CONTEXT, OBJECT, UINT32,
                      UINT32, UINT32, DOUBLEPTR, 0, 0)
-JS_DEFINE_CALLINFO_6(extern, UINT32, js_GetClosureArg, CONTEXT, OBJECT, UINT32,
+JS_DEFINE_CALLINFO_6(extern, UINT32, GetClosureArg, CONTEXT, OBJECT, UINT32,
                      UINT32, UINT32, DOUBLEPTR, 0, 0)
 
 /*
- * Search the scope chain for a property lookup operation at the current PC and generate LIR
- * to access the given property. Return JSRS_CONTINUE on success, otherwise abort and return
- * JSRS_STOP. There are 3 outparams:
+ * Search the scope chain for a property lookup operation at the current PC and
+ * generate LIR to access the given property. Return JSRS_CONTINUE on success,
+ * otherwise abort and return JSRS_STOP. There are 3 outparams:
  *
  *     vp         the address of the current property value
  *     ins        LIR instruction representing the property value on trace
- *     tracked    true iff the property value is tracked on this trace. If true, then the
- *                tracked value can be modified using the tracker set functions. If false,
- *                then the value comes from a call to a builtin to access an upvar, and
- *                can not be modified directly.
+ *     tracked    true iff the property value is tracked on this trace. If true,
+ *                then the tracked value can be modified using the tracker set
+ *                functions. If false, then the value comes from a call to a
+ *                builtin to access an upvar, and can't be modified directly.
  */
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::scopeChainProp(JSObject* obj, jsval*& vp, LIns*& ins, bool& tracked)
@@ -6632,9 +6853,9 @@ TraceRecorder::scopeChainProp(JSObject* obj, jsval*& vp, LIns*& ins, bool& track
                 };
                 const CallInfo* ci;
                 if (sprop->getter == js_GetCallArg)
-                    ci = &js_GetClosureArg_ci;
+                    ci = &GetClosureArg_ci;
                 else
-                    ci = &js_GetClosureVar_ci;
+                    ci = &GetClosureVar_ci;
 
                 LIns* call_ins = lir->insCall(ci, args);
                 JSTraceType type = getCoercedType(*vp);
@@ -6689,8 +6910,6 @@ TraceRecorder::stack(int n, LIns* i)
     set(&stackval(n), i, n >= 0);
 }
 
-extern jsdouble FASTCALL js_dmod(jsdouble a, jsdouble b);
-
 JS_REQUIRES_STACK LIns*
 TraceRecorder::alu(LOpcode v, jsdouble v0, jsdouble v1, LIns* s0, LIns* s1)
 {
@@ -6763,36 +6982,30 @@ TraceRecorder::alu(LOpcode v, jsdouble v0, jsdouble v1, LIns* s0, LIns* s1)
 
         exit = snapshot(OVERFLOW_EXIT);
 
-        /*
-         * Make sure we don't trigger division by zero at runtime.
-         */
+        /* Make sure we don't trigger division by zero at runtime. */
         if (!d1->isconst())
             guard(false, lir->ins_eq0(d1), exit);
         result = lir->ins2(v = LIR_div, d0, d1);
 
-        /*
-         * As long the modulus is zero, the result is an integer.
-         */
+        /* As long the modulus is zero, the result is an integer. */
         guard(true, lir->ins_eq0(lir->ins1(LIR_mod, result)), exit);
-        /* Don't lose a -0 */
+
+        /* Don't lose a -0. */
         guard(false, lir->ins_eq0(result), exit);
         break;
+
       case LIR_fmod: {
         if (d0->isconst() && d1->isconst())
             return lir->ins1(LIR_i2f, lir->insImm(jsint(r)));
 
         exit = snapshot(OVERFLOW_EXIT);
 
-        /*
-         * Make sure we don't trigger division by zero at runtime.
-         */
+        /* Make sure we don't trigger division by zero at runtime. */
         if (!d1->isconst())
             guard(false, lir->ins_eq0(d1), exit);
         result = lir->ins1(v = LIR_mod, lir->ins2(LIR_div, d0, d1));
 
-        /*
-         * If the result is not 0, it is always within the integer domain.
-         */
+        /* If the result is not 0, it is always within the integer domain. */
         LIns* branch = lir->insBranch(LIR_jf, lir->ins_eq0(result), NULL);
 
         /*
@@ -6804,6 +7017,7 @@ TraceRecorder::alu(LOpcode v, jsdouble v0, jsdouble v1, LIns* s0, LIns* s1)
         break;
       }
 #endif
+
       default:
         v = (LOpcode)((int)v & ~LIR64);
         result = lir->ins2(v, d0, d1);
@@ -6815,7 +7029,7 @@ TraceRecorder::alu(LOpcode v, jsdouble v0, jsdouble v1, LIns* s0, LIns* s1)
          * that will inform the oracle and cause a non-demoted trace to be
          * attached that uses floating-point math for this operation.
          */
-        if (!result->isconst() && (!overflowSafe(v, d0) || !overflowSafe(v, d1))) {
+        if (!result->isconst() && (!IsOverflowSafe(v, d0) || !IsOverflowSafe(v, d1))) {
             exit = snapshot(OVERFLOW_EXIT);
             guard(false, lir->ins1(LIR_ov, result), exit);
             if (v == LIR_mul) // make sure we don't lose a -0
@@ -6934,9 +7148,11 @@ TraceRecorder::ifop()
 }
 
 #ifdef NANOJIT_IA32
-/* Record LIR for a tableswitch or tableswitchx op. We record LIR only the
-   "first" time we hit the op. Later, when we start traces after exiting that
-   trace, we just patch. */
+/*
+ * Record LIR for a tableswitch or tableswitchx op. We record LIR only the
+ * "first" time we hit the op. Later, when we start traces after exiting that
+ * trace, we just patch.
+ */
 JS_REQUIRES_STACK LIns*
 TraceRecorder::tableswitch()
 {
@@ -6944,7 +7160,7 @@ TraceRecorder::tableswitch()
     if (!isNumber(v))
         return NULL;
 
-    /* no need to guard if condition is constant */
+    /* No need to guard if the condition is constant. */
     LIns* v_ins = f2i(get(&v));
     if (v_ins->isconst() || v_ins->isconstq())
         return NULL;
@@ -6971,11 +7187,15 @@ TraceRecorder::tableswitch()
         high = GET_JUMPX_OFFSET(pc);
     }
 
-    /* Really large tables won't fit in a page. This is a conservative check.
-       If it matters in practice we need to go off-page. */
+    /*
+     * Really large tables won't fit in a page. This is a conservative check.
+     * If it matters in practice we need to go off-page.
+     */
     if ((high + 1 - low) * sizeof(intptr_t*) + 128 > (unsigned) LARGEST_UNDERRUN_PROT) {
-        // This throws away the return value of switchop but it seems
-        // ok because switchop always returns true.
+        /*
+         * This throws away the return value of switchop but it seems ok
+         * because switchop always returns true.
+         */
         (void) switchop();
         return NULL;
     }
@@ -7001,7 +7221,8 @@ TraceRecorder::switchop()
 {
     jsval& v = stackval(-1);
     LIns* v_ins = get(&v);
-    /* no need to guard if condition is constant */
+
+    /* No need to guard if the condition is constant. */
     if (v_ins->isconst() || v_ins->isconstq())
         return JSRS_CONTINUE;
     if (isNumber(v)) {
@@ -7037,8 +7258,8 @@ TraceRecorder::inc(jsval& v, jsint incr, bool pre)
 }
 
 /*
- * On exit, v_ins is the incremented unboxed value, and the appropriate
- * value (pre- or post-increment as described by pre) is stacked.
+ * On exit, v_ins is the incremented unboxed value, and the appropriate value
+ * (pre- or post-increment as described by pre) is stacked.
  */
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::inc(jsval& v, LIns*& v_ins, jsint incr, bool pre)
@@ -7106,7 +7327,7 @@ TraceRecorder::incElem(jsint incr, bool pre)
 }
 
 static bool
-evalCmp(LOpcode op, double l, double r)
+EvalCmp(LOpcode op, double l, double r)
 {
     bool cond;
     switch (op) {
@@ -7133,11 +7354,11 @@ evalCmp(LOpcode op, double l, double r)
 }
 
 static bool
-evalCmp(LOpcode op, JSString* l, JSString* r)
+EvalCmp(LOpcode op, JSString* l, JSString* r)
 {
     if (op == LIR_feq)
         return js_EqualStrings(l, r);
-    return evalCmp(op, js_CompareStrings(l, r), 0);
+    return EvalCmp(op, js_CompareStrings(l, r), 0);
 }
 
 JS_REQUIRES_STACK void
@@ -7150,8 +7371,8 @@ TraceRecorder::strictEquality(bool equal, bool cmpCase)
     LIns* x;
     bool cond;
 
-    JSTraceType ltag = getPromotedType(l);
-    if (ltag != getPromotedType(r)) {
+    JSTraceType ltag = GetPromotedType(l);
+    if (ltag != GetPromotedType(r)) {
         cond = !equal;
         x = lir->insImm(cond);
     } else if (ltag == TT_STRING) {
@@ -7210,7 +7431,7 @@ TraceRecorder::equalityHelper(jsval l, jsval r, LIns* l_ins, LIns* r_ins,
      * a primitive value (which would terminate recursion).
      */
 
-    if (getPromotedType(l) == getPromotedType(r)) {
+    if (GetPromotedType(l) == GetPromotedType(r)) {
         if (JSVAL_TAG(l) == JSVAL_OBJECT || JSVAL_TAG(l) == JSVAL_BOOLEAN) {
             cond = (l == r);
         } else if (JSVAL_IS_STRING(l)) {
@@ -7355,7 +7576,7 @@ TraceRecorder::relational(LOpcode op, bool tryBranchAfterCond)
         LIns* args[] = { r_ins, l_ins };
         l_ins = lir->insCall(&js_CompareStrings_ci, args);
         r_ins = lir->insImm(0);
-        cond = evalCmp(op, JSVAL_TO_STRING(l), JSVAL_TO_STRING(r));
+        cond = EvalCmp(op, JSVAL_TO_STRING(l), JSVAL_TO_STRING(r));
         goto do_comparison;
     }
 
@@ -7415,12 +7636,15 @@ TraceRecorder::relational(LOpcode op, bool tryBranchAfterCond)
         tmp = r;
         rnum = js_ValueToNumber(cx, &tmp);
     }
-    cond = evalCmp(op, lnum, rnum);
+    cond = EvalCmp(op, lnum, rnum);
     fp = true;
 
     /* 11.8.5 steps 6-15. */
   do_comparison:
-    /* If the result is not a number or it's not a quad, we must use an integer compare. */
+    /*
+     * If the result is not a number or it's not a quad, we must use an integer
+     * compare.
+     */
     if (!fp) {
         JS_ASSERT(op >= LIR_feq && op <= LIR_fge);
         op = LOpcode(op + (LIR_eq - LIR_feq));
@@ -7502,7 +7726,7 @@ TraceRecorder::binary(LOpcode op)
     bool rightIsNumber = isNumber(r);
     jsdouble rnum = rightIsNumber ? asNumber(r) : 0;
 
-    if ((op >= LIR_sub && op <= LIR_ush) ||  // sub, mul, (callh), or, xor, (not,) lsh, rsh, ush
+    if ((op >= LIR_sub && op <= LIR_ush) ||   // sub, mul, (callh), or, xor, (not,) lsh, rsh, ush
         (op >= LIR_fsub && op <= LIR_fmod)) { // fsub, fmul, fdiv, fmod
         LIns* args[2];
         if (JSVAL_IS_STRING(l)) {
@@ -7948,15 +8172,14 @@ TraceRecorder::getThis(LIns*& this_ins)
     if (!thisObj)
         ABORT_TRACE_ERROR("js_ComputeThisForName failed");
 
-    /*
-     * In global code, bake in the global object as 'this' object.
-     */
+    /* In global code, bake in the global object as 'this' object. */
     if (!cx->fp->callee) {
         JS_ASSERT(callDepth == 0);
         this_ins = INS_CONSTPTR(thisObj);
 
         /*
-         * We don't have argv[-1] in global code, so we don't update the tracker here.
+         * We don't have argv[-1] in global code, so we don't update the
+         * tracker here.
          */
         return JSRS_CONTINUE;
     }
@@ -7965,11 +8188,12 @@ TraceRecorder::getThis(LIns*& this_ins)
     JS_ASSERT(JSVAL_IS_OBJECT(thisv));
 
     /*
-     * Traces type-specialize between null and objects, so if we currently see a null
-     * value in argv[-1], this trace will only match if we see null at runtime as well.
-     * Bake in the global object as 'this' object, updating the tracker as well. We
-     * can only detect this condition prior to calling js_ComputeThisForFrame, since it
-     * updates the interpreter's copy of argv[-1].
+     * Traces type-specialize between null and objects, so if we currently see
+     * a null value in argv[-1], this trace will only match if we see null at
+     * runtime as well.  Bake in the global object as 'this' object, updating
+     * the tracker as well. We can only detect this condition prior to calling
+     * js_ComputeThisForFrame, since it updates the interpreter's copy of
+     * argv[-1].
      */
     JSClass* clasp = NULL;;
     if (JSVAL_IS_NULL(original) ||
@@ -7987,8 +8211,8 @@ TraceRecorder::getThis(LIns*& this_ins)
     this_ins = get(&thisv);
 
     /*
-     * The only unwrapped object that needs to be wrapped that we can get here is the
-     * global object obtained throught the scope chain.
+     * The only unwrapped object that needs to be wrapped that we can get here
+     * is the global object obtained throught the scope chain.
      */
     JSObject* obj = js_GetWrappedObject(cx, JSVAL_TO_OBJECT(thisv));
     JSObject* inner = obj;
@@ -8000,8 +8224,10 @@ TraceRecorder::getThis(LIns*& this_ins)
               original == OBJECT_TO_JSVAL(inner) ||
               original == OBJECT_TO_JSVAL(obj));
 
-    // If the returned this object is the unwrapped inner or outer object,
-    // then we need to use the wrapped outer object.
+    /*
+     * If the returned this object is the unwrapped inner or outer object,
+     * then we need to use the wrapped outer object.
+     */
     LIns* is_inner = lir->ins2(LIR_eq, this_ins, INS_CONSTPTR(inner));
     LIns* is_outer = lir->ins2(LIR_eq, this_ins, INS_CONSTPTR(obj));
     LIns* wrapper = INS_CONSTPTR(JSVAL_TO_OBJECT(thisv));
@@ -8076,8 +8302,8 @@ JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::guardPrototypeHasNoIndexedProperties(JSObject* obj, LIns* obj_ins, ExitType exitType)
 {
     /*
-     * Guard that no object along the prototype chain has any indexed properties which
-     * might become visible through holes in the array.
+     * Guard that no object along the prototype chain has any indexed
+     * properties which might become visible through holes in the array.
      */
     VMSideExit* exit = snapshot(exitType);
 
@@ -8111,16 +8337,22 @@ TraceRecorder::guardNotGlobalObject(JSObject* obj, LIns* obj_ins)
 JS_REQUIRES_STACK void
 TraceRecorder::clearFrameSlotsFromCache()
 {
-    /* Clear out all slots of this frame in the nativeFrameTracker. Different locations on the
-       VM stack might map to different locations on the native stack depending on the
-       number of arguments (i.e.) of the next call, so we have to make sure we map
-       those in to the cache with the right offsets. */
+    /*
+     * Clear out all slots of this frame in the nativeFrameTracker. Different
+     * locations on the VM stack might map to different locations on the native
+     * stack depending on the number of arguments (i.e.) of the next call, so
+     * we have to make sure we map those in to the cache with the right
+     * offsets.
+     */
     JSStackFrame* fp = cx->fp;
     jsval* vp;
     jsval* vpstop;
-    // Duplicate native stack layout computation: see VisitFrameSlots header comment.
-    // This doesn't do layout arithmetic, but it must clear out all the slots defined as
-    // imported by VisitFrameSlots.
+
+    /*
+     * Duplicate native stack layout computation: see VisitFrameSlots header comment.
+     * This doesn't do layout arithmetic, but it must clear out all the slots defined as
+     * imported by VisitFrameSlots.
+     */
     if (fp->callee) {
         vp = &fp->argv[-2];
         vpstop = &fp->argv[argSlots(fp)];
@@ -8141,6 +8373,7 @@ TraceRecorder::record_EnterFrame()
 
     if (++callDepth >= MAX_CALLDEPTH)
         ABORT_TRACE("exceeded maximum call depth");
+
     // FIXME: Allow and attempt to inline a single level of recursion until we compile
     //        recursive calls as independent trees (459301).
     if (fp->script == fp->down->script && fp->down->down && fp->down->down->script == fp->script)
@@ -8240,8 +8473,11 @@ TraceRecorder::record_JSOP_RETURN()
         return JSRS_STOP;
     }
 
-    // If we have created an |arguments| object for the frame, we must copy the argument
-    // values into the object as properties in case it is used after this frame returns.
+    /*
+     * If we have created an |arguments| object for the frame, we must copy the
+     * argument values into the object as properties in case it is used after
+     * this frame returns.
+     */
     if (cx->fp->argsobj) {
         LIns* argsobj_ins = get(&cx->fp->argsobj);
         LIns* length_ins = INS_CONST(cx->fp->argc);
@@ -8534,9 +8770,10 @@ TraceRecorder::record_JSOP_NEG()
     if (isNumber(v)) {
         LIns* a = get(&v);
 
-        /* If we're a promoted integer, we have to watch out for 0s since -0 is a double.
-           Only follow this path if we're not an integer that's 0 and we're not a double
-           that's zero.
+        /*
+         * If we're a promoted integer, we have to watch out for 0s since -0 is
+         * a double. Only follow this path if we're not an integer that's 0 and
+         * we're not a double that's zero.
          */
         if (!oracle.isInstructionUndemotable(cx->fp->regs->pc) &&
             isPromoteInt(a) &&
@@ -8618,15 +8855,6 @@ TraceRecorder::record_JSOP_OBJTOP()
     return JSRS_CONTINUE;
 }
 
-JSBool
-js_Array(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval);
-
-JSBool
-js_Object(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool
-js_Date(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
 JSRecordingStatus
 TraceRecorder::getClassPrototype(JSObject* ctor, LIns*& proto_ins)
 {
@@ -8859,7 +9087,8 @@ TraceRecorder::emitNativeCall(JSTraceableNative* known, uintN argc, LIns* args[]
 }
 
 /*
- * Check whether we have a specialized implementation for this native invocation.
+ * Check whether we have a specialized implementation for this native
+ * invocation.
  */
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::callTraceableNative(JSFunction* fun, uintN argc, bool constructing)
@@ -8898,11 +9127,11 @@ TraceRecorder::callTraceableNative(JSFunction* fun, uintN argc, bool constructin
             argtype = known->prefix[i];
             if (argtype == 'C') {
                 *argp = cx_ins;
-            } else if (argtype == 'T') {   /* this, as an object */
+            } else if (argtype == 'T') { /* this, as an object */
                 if (JSVAL_IS_PRIMITIVE(tval))
                     goto next_specialization;
                 *argp = this_ins;
-            } else if (argtype == 'S') {   /* this, as a string */
+            } else if (argtype == 'S') { /* this, as a string */
                 if (!JSVAL_IS_STRING(tval))
                     goto next_specialization;
                 *argp = this_ins;
@@ -8919,7 +9148,7 @@ TraceRecorder::callTraceableNative(JSFunction* fun, uintN argc, bool constructin
                     *argp = INS_CONSTPTR(fp->imacpc);
                 else
                     *argp = INS_CONSTPTR(pc);
-            } else if (argtype == 'D') {  /* this, as a number */
+            } else if (argtype == 'D') { /* this, as a number */
                 if (!isNumber(tval))
                     goto next_specialization;
                 *argp = this_ins;
@@ -8993,7 +9222,7 @@ TraceRecorder::callNative(uintN argc, JSOp mode)
     // Allocate the vp vector and emit code to root it.
     uintN vplen = 2 + JS_MAX(argc, FUN_MINARGS(fun)) + fun->u.n.extra;
     if (!(fun->flags & JSFUN_FAST_NATIVE))
-        vplen++;  // slow native return value slot
+        vplen++; // slow native return value slot
     lir->insStorei(INS_CONST(vplen), cx_ins, offsetof(JSContext, nativeVpLen));
     LIns* invokevp_ins = lir->insAlloc(vplen * sizeof(jsval));
     lir->insStorei(invokevp_ins, cx_ins, offsetof(JSContext, nativeVp));
@@ -9024,11 +9253,12 @@ TraceRecorder::callNative(uintN argc, JSOp mode)
         args[2] = cx_ins;
         newobj_ins = lir->insCall(&js_NewInstance_ci, args);
         guard(false, lir->ins_eq0(newobj_ins), OOM_EXIT);
-        this_ins = newobj_ins;  // boxing an object is a no-op
+        this_ins = newobj_ins; /* boxing an object is a no-op */
     } else if (JSFUN_BOUND_METHOD_TEST(fun->flags)) {
         this_ins = INS_CONSTWORD(OBJECT_TO_JSVAL(OBJ_GET_PARENT(cx, funobj)));
     } else {
         this_ins = get(&vp[1]);
+
         /*
          * For fast natives, 'null' or primitives are fine as as 'this' value.
          * For slow natives we have to ensure the object is substituted for the
@@ -9436,7 +9666,7 @@ TraceRecorder::setProp(jsval &l, JSPropCacheEntry* entry, JSScopeProperty* sprop
         ABORT_TRACE("can't trace JavaScript function setter");
 
     // These two cases are actually errors and can't be cached.
-    JS_ASSERT(!(sprop->attrs & JSPROP_GETTER));  // getter without setter
+    JS_ASSERT(!(sprop->attrs & JSPROP_GETTER)); // getter without setter
     JS_ASSERT(!(sprop->attrs & JSPROP_READONLY));
 
     JS_ASSERT(!JSVAL_IS_PRIMITIVE(l));
@@ -9633,7 +9863,8 @@ TraceRecorder::record_JSOP_GETELEM()
     /* Property access using a string name or something we have to stringify. */
     if (!JSVAL_IS_INT(idx)) {
         if (!JSVAL_IS_PRIMITIVE(idx))
-            ABORT_TRACE("non-primitive index");
+            ABORT_TRACE("object used as index");
+
         // If index is not a string, turn it into a string.
         if (!js_InternNonIntElementId(cx, obj, idx, &id))
             ABORT_TRACE_ERROR("failed to intern non-int element id");
@@ -9677,13 +9908,13 @@ TraceRecorder::record_JSOP_GETELEM()
                         // In this case, we are in the same frame where the arguments object was created.
                         // The entry type map is not necessarily up-to-date, so we capture a new type map
                         // for this point in the code.
-                        unsigned stackSlots = js_NativeStackSlots(cx, 0/*callDepth*/);
+                        unsigned stackSlots = NativeStackSlots(cx, 0 /* callDepth */);
                         if (stackSlots * sizeof(JSTraceType) > NJ_MAX_SKIP_PAYLOAD_SZB)
                             ABORT_TRACE("|arguments| requires saving too much stack");
                         JSTraceType* typemap = (JSTraceType*) lir->insSkip(stackSlots * sizeof(JSTraceType))->payload();
                         DetermineTypesVisitor detVisitor(*this, typemap);
                         VisitStackSlots(detVisitor, cx, 0);
-                        typemap_ins = INS_CONSTPTR(typemap + 2 /*callee,this*/);
+                        typemap_ins = INS_CONSTPTR(typemap + 2 /* callee, this */);
                     } else {
                         // In this case, we are in a deeper frame from where the arguments object was
                         // created. The type map at the point of the call out from the creation frame
@@ -9815,7 +10046,6 @@ TraceRecorder::record_JSOP_SETELEM()
     jsval& idx = stackval(-2);
     jsval& lval = stackval(-3);
 
-    /* no guards for type checks, trace specialized this already */
     if (JSVAL_IS_PRIMITIVE(lval))
         ABORT_TRACE("left JSOP_SETELEM operand is not an object");
     ABORT_IF_XML(lval);
@@ -9829,6 +10059,7 @@ TraceRecorder::record_JSOP_SETELEM()
     if (!JSVAL_IS_INT(idx)) {
         if (!JSVAL_IS_PRIMITIVE(idx))
             ABORT_TRACE("non-primitive index");
+
         // If index is not a string, turn it into a string.
         if (!js_InternNonIntElementId(cx, obj, idx, &id))
             ABORT_TRACE_ERROR("failed to intern non-int element id");
@@ -9914,17 +10145,17 @@ TraceRecorder::record_JSOP_CALLNAME()
     return JSRS_CONTINUE;
 }
 
-JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarArgOnTrace, CONTEXT, UINT32, INT32, UINT32,
+JS_DEFINE_CALLINFO_5(extern, UINT32, GetUpvarArgOnTrace, CONTEXT, UINT32, INT32, UINT32,
                      DOUBLEPTR, 0, 0)
-JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarVarOnTrace, CONTEXT, UINT32, INT32, UINT32,
+JS_DEFINE_CALLINFO_5(extern, UINT32, GetUpvarVarOnTrace, CONTEXT, UINT32, INT32, UINT32,
                      DOUBLEPTR, 0, 0)
-JS_DEFINE_CALLINFO_5(extern, UINT32, js_GetUpvarStackOnTrace, CONTEXT, UINT32, INT32, UINT32,
+JS_DEFINE_CALLINFO_5(extern, UINT32, GetUpvarStackOnTrace, CONTEXT, UINT32, INT32, UINT32,
                      DOUBLEPTR, 0, 0)
 
 /*
- * Record LIR to get the given upvar. Return the LIR instruction for
- * the upvar value. NULL is returned only on a can't-happen condition
- * with an invalid typemap. The value of the upvar is returned as v.
+ * Record LIR to get the given upvar. Return the LIR instruction for the upvar
+ * value. NULL is returned only on a can't-happen condition with an invalid
+ * typemap. The value of the upvar is returned as v.
  */
 JS_REQUIRES_STACK LIns*
 TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
@@ -9945,8 +10176,8 @@ TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
     }
 
     /*
-     * The upvar is not in the current trace, so get the upvar value
-     * exactly as the interpreter does and unbox.
+     * The upvar is not in the current trace, so get the upvar value exactly as
+     * the interpreter does and unbox.
      */
     uint32 level = script->staticLevel - UPVAR_FRAME_SKIP(cookie);
     uint32 cookieSlot = UPVAR_FRAME_SLOT(cookie);
@@ -9954,16 +10185,16 @@ TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
     const CallInfo* ci;
     int32 slot;
     if (!fp->fun) {
-        ci = &js_GetUpvarStackOnTrace_ci;
+        ci = &GetUpvarStackOnTrace_ci;
         slot = cookieSlot;
     } else if (cookieSlot < fp->fun->nargs) {
-        ci = &js_GetUpvarArgOnTrace_ci;
+        ci = &GetUpvarArgOnTrace_ci;
         slot = cookieSlot;
     } else if (cookieSlot == CALLEE_UPVAR_SLOT) {
-        ci = &js_GetUpvarArgOnTrace_ci;
+        ci = &GetUpvarArgOnTrace_ci;
         slot = -2;
     } else {
-        ci = &js_GetUpvarVarOnTrace_ci;
+        ci = &GetUpvarVarOnTrace_ci;
         slot = cookieSlot - fp->fun->nargs;
     }
 
@@ -9985,8 +10216,8 @@ TraceRecorder::upvar(JSScript* script, JSUpvarArray* uva, uintN index, jsval& v)
 }
 
 /*
- * Generate LIR to load a value from the native stack. This method ensures that the
- * correct LIR load operator is used.
+ * Generate LIR to load a value from the native stack. This method ensures that
+ * the correct LIR load operator is used.
  */
 LIns* TraceRecorder::stackLoad(LIns* base, uint8 type)
 {
@@ -10101,7 +10332,7 @@ TraceRecorder::interpretedFunctionCall(jsval& fval, JSFunction* fun, uintN argc,
     }
 
     // Generate a type map for the outgoing frame and stash it in the LIR
-    unsigned stackSlots = js_NativeStackSlots(cx, 0/*callDepth*/);
+    unsigned stackSlots = NativeStackSlots(cx, 0 /* callDepth */);
     if (sizeof(FrameInfo) + stackSlots * sizeof(JSTraceType) > NJ_MAX_SKIP_PAYLOAD_SZB)
         ABORT_TRACE("interpreted function call requires saving too much stack");
     LIns* data = lir->insSkip(sizeof(FrameInfo) + stackSlots * sizeof(JSTraceType));
@@ -10220,8 +10451,8 @@ TraceRecorder::record_JSOP_APPLY()
         aobj_ins = get(&vp[3]);
 
         /*
-         * We trace dense arrays and arguments objects. The code we generate for apply
-         * uses imacros to handle a specific number of arguments.
+         * We trace dense arrays and arguments objects. The code we generate
+         * for apply uses imacros to handle a specific number of arguments.
          */
         if (OBJ_IS_DENSE_ARRAY(cx, aobj)) {
             guardDenseArray(aobj, aobj_ins);
@@ -10297,7 +10528,7 @@ TraceRecorder::record_NativeCallComplete()
      */
 
     if (JSTN_ERRTYPE(pendingTraceableNative) == FAIL_STATUS) {
-        // Keep cx->bailExit null when it's invalid.
+        /* Keep cx->bailExit null when it's invalid. */
         lir->insStorei(INS_CONSTPTR(NULL), cx_ins, (int) offsetof(JSContext, bailExit));
 
         LIns* status = lir->insLoad(LIR_ld, lirbuf->state, (int) offsetof(InterpState, builtinStatus));
@@ -10378,15 +10609,11 @@ TraceRecorder::name(jsval*& vp, LIns*& ins, bool& tracked)
      */
     CHECK_STATUS(test_property_cache(obj, obj_ins, obj2, pcval));
 
-    /*
-     * Abort if property doesn't exist (interpreter will report an error.)
-     */
+    /* Abort if property doesn't exist (interpreter will report an error.) */
     if (PCVAL_IS_NULL(pcval))
         ABORT_TRACE("named property not found");
 
-    /*
-     * Insist on obj being the directly addressed object.
-     */
+    /* Insist on obj being the directly addressed object. */
     if (obj2 != obj)
         ABORT_TRACE("name() hit prototype chain");
 
@@ -10488,6 +10715,7 @@ TraceRecorder::prop(JSObject* obj, LIns* obj_ins, uint32& slot, LIns*& v_ins)
                 LIns* args[] = { INS_CONSTPTR(sprop), obj_ins, cx_ins };
                 v_ins = lir->insCall(&js_CallGetter_ci, args);
                 guard(false, lir->ins2(LIR_eq, v_ins, INS_CONST(JSVAL_ERROR_COOKIE)), OOM_EXIT);
+
                 /*
                  * BIG FAT WARNING: This snapshot cannot be a BRANCH_EXIT, since
                  * the value to the top of the stack is not the value we unbox.
@@ -10634,8 +10862,8 @@ TraceRecorder::denseArrayElement(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_
 
     if (JSVAL_TAG(*vp) == JSVAL_BOOLEAN) {
         /*
-         * If we read a hole from the array, convert it to undefined and guard that there
-         * are no indexed properties along the prototype chain.
+         * If we read a hole from the array, convert it to undefined and guard
+         * that there are no indexed properties along the prototype chain.
          */
         LIns* br = lir->insBranch(LIR_jf,
                                   lir->ins2i(LIR_eq, v_ins, JSVAL_TO_PSEUDO_BOOLEAN(JSVAL_HOLE)),
@@ -10643,9 +10871,7 @@ TraceRecorder::denseArrayElement(jsval& oval, jsval& ival, jsval*& vp, LIns*& v_
         CHECK_STATUS(guardPrototypeHasNoIndexedProperties(obj, obj_ins, MISMATCH_EXIT));
         br->setTarget(lir->ins0(LIR_label));
 
-        /*
-         * Don't let the hole value escape. Turn it into an undefined.
-         */
+        /* Don't let the hole value escape. Turn it into an undefined. */
         v_ins = lir->ins2i(LIR_and, v_ins, ~(JSVAL_HOLE_FLAG >> JSVAL_TAGBITS));
     }
     return JSRS_CONTINUE;
@@ -11093,12 +11319,13 @@ TraceRecorder::record_JSOP_BINDNAME()
     if (obj != globalObj && OBJ_GET_CLASS(cx, obj) != &js_CallClass)
         ABORT_TRACE("Can only trace JSOP_BINDNAME with global or call object");
 
-    // The trace is specialized to this global object.  Furthermore,
-    // we know it is the sole 'global' object on the scope chain: we
-    // set globalObj to the scope chain element with no parent, and we
-    // reached it starting from the function closure or the current
-    // scopeChain, so there is nothing inner to it.  So this must be
-    // the right base object.
+    /*
+     * The trace is specialized to this global object. Furthermore, we know it
+     * is the sole 'global' object on the scope chain: we set globalObj to the
+     * scope chain element with no parent, and we reached it starting from the
+     * function closure or the current scopeChain, so there is nothing inner to
+     * it. Therefore this must be the right base object.
+     */
     stack(0, INS_CONSTPTR(obj));
     return JSRS_CONTINUE;
 }
@@ -11168,15 +11395,18 @@ TraceRecorder::record_JSOP_IN()
     if (wasDeepAborted())
         ABORT_TRACE("deep abort from property lookup");
 
-    /* The interpreter fuses comparisons and the following branch,
-       so we have to do that here as well. */
+    /*
+     * The interpreter fuses comparisons and the following branch, so we have
+     * to do that here as well.
+     */
     fuseIf(cx->fp->regs->pc + 1, cond, x);
 
-    /* We update the stack after the guard. This is safe since
-       the guard bails out at the comparison and the interpreter
-       will therefore re-execute the comparison. This way the
-       value of the condition doesn't have to be calculated and
-       saved on the stack in most cases. */
+    /*
+     * We update the stack after the guard. This is safe since the guard bails
+     * out at the comparison and the interpreter will therefore re-execute the
+     * comparison. This way the value of the condition doesn't have to be
+     * calculated and saved on the stack in most cases.
+     */
     set(&lval, x);
     return JSRS_CONTINUE;
 }
@@ -11937,9 +12167,11 @@ TraceRecorder::record_JSOP_STOP()
     JSStackFrame *fp = cx->fp;
 
     if (fp->imacpc) {
-        // End of imacro, so return true to the interpreter immediately. The
-        // interpreter's JSOP_STOP case will return from the imacro, back to
-        // the pc after the calling op, still in the same JSStackFrame.
+        /*
+         * End of imacro, so return true to the interpreter immediately. The
+         * interpreter's JSOP_STOP case will return from the imacro, back to
+         * the pc after the calling op, still in the same JSStackFrame.
+         */
         atoms = fp->script->atomMap.vector;
         return JSRS_CONTINUE;
     }
@@ -12008,7 +12240,7 @@ TraceRecorder::record_JSOP_ENTERBLOCK()
 JS_REQUIRES_STACK JSRecordingStatus
 TraceRecorder::record_JSOP_LEAVEBLOCK()
 {
-    /* We mustn't exit the lexical block we began recording in.  */
+    /* We mustn't exit the lexical block we began recording in. */
     if (cx->fp->blockChain != lexicalBlock)
         return JSRS_CONTINUE;
     else
@@ -12068,9 +12300,10 @@ TraceRecorder::record_JSOP_GETTHISPROP()
     LIns* this_ins;
 
     CHECK_STATUS(getThis(this_ins));
+
     /*
-     * It's safe to just use cx->fp->thisp here because getThis() returns JSRS_STOP if thisp
-     * is not available.
+     * It's safe to just use cx->fp->thisp here because getThis() returns
+     * JSRS_STOP if thisp is not available.
      */
     CHECK_STATUS(getProp(cx->fp->thisp, this_ins));
     return JSRS_CONTINUE;
@@ -12230,7 +12463,7 @@ js_GetBuiltinFunction(JSContext *cx, uintN index)
             STOBJ_CLEAR_PARENT(funobj);
 
             JS_LOCK_GC(rt);
-            if (!rt->builtinFunctions[index])  /* retest now that the lock is held */
+            if (!rt->builtinFunctions[index]) /* retest now that the lock is held */
                 rt->builtinFunctions[index] = funobj;
             else
                 funobj = rt->builtinFunctions[index];
@@ -12369,10 +12602,13 @@ DBG_STUB(JSOP_DEFLOCALFUN_DBGFC)
 DBG_STUB(JSOP_LAMBDA_DBGFC)
 
 #ifdef JS_JIT_SPEW
-/* Prints information about entry typemaps and unstable exits for all peers at a PC */
+/*
+ * Print information about entry typemaps and unstable exits for all peers
+ * at a PC.
+ */
 void
-js_DumpPeerStability(JSTraceMonitor* tm, const void* ip, JSObject* globalObj, uint32 globalShape,
-                     uint32 argc)
+DumpPeerStability(JSTraceMonitor* tm, const void* ip, JSObject* globalObj, uint32 globalShape,
+                  uint32 argc)
 {
     Fragment* f;
     TreeInfo* ti;
@@ -12394,7 +12630,7 @@ js_DumpPeerStability(JSTraceMonitor* tm, const void* ip, JSObject* globalObj, ui
         UnstableExit* uexit = ti->unstableExits;
         while (uexit != NULL) {
             debug_only_print0(LC_TMStats, "EXIT:  ");
-            JSTraceType* m = getFullTypeMap(uexit->exit);
+            JSTraceType* m = GetFullTypeMap(uexit->exit);
             for (unsigned i = 0; i < uexit->exit->numStackSlots; i++)
                 debug_only_printf(LC_TMStats, "S%d ", m[i]);
             for (unsigned i = 0; i < uexit->exit->numGlobalSlots; i++)
@@ -12460,7 +12696,7 @@ JS_StopTraceVis()
     if (!traceVisLogFile)
         return false;
 
-    fclose(traceVisLogFile);    // not worth checking the result
+    fclose(traceVisLogFile); // not worth checking the result
     traceVisLogFile = NULL;
 
     return true;
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 523ea7047457..671ed8401519 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -166,8 +166,10 @@ public:
 #if defined(JS_JIT_SPEW) || defined(MOZ_NO_VARADIC_MACROS)
 
 enum LC_TMBits {
-    /* Output control bits for all non-Nanojit code.  Only use bits 16
-       and above, since Nanojit uses 0 .. 15 itself. */
+    /*
+     * Output control bits for all non-Nanojit code.  Only use bits 16 and
+     * above, since Nanojit uses 0 .. 15 itself.
+     */
     LC_TMMinimal  = 1<<16,
     LC_TMTracer   = 1<<17,
     LC_TMRecorder = 1<<18,
@@ -192,14 +194,22 @@ extern nanojit::LogControl js_LogController;
 
 #define debug_only_stmt(stmt) \
     stmt
-#define debug_only_printf(mask, fmt, ...) \
-    do { if ((js_LogController.lcbits & (mask)) > 0) {             \
-        js_LogController.printf(fmt, __VA_ARGS__); fflush(stdout); \
-    }} while (0)
-#define debug_only_print0(mask, str) \
-    do { if ((js_LogController.lcbits & (mask)) > 0) { \
-        js_LogController.printf(str); fflush(stdout);  \
-    }} while (0)
+
+#define debug_only_printf(mask, fmt, ...)                                      \
+    JS_BEGIN_MACRO                                                             \
+        if ((js_LogController.lcbits & (mask)) > 0) {                          \
+            js_LogController.printf(fmt, __VA_ARGS__);                         \
+            fflush(stdout);                                                    \
+        }                                                                      \
+    JS_END_MACRO
+
+#define debug_only_print0(mask, str)                                           \
+    JS_BEGIN_MACRO                                                             \
+        if ((js_LogController.lcbits & (mask)) > 0) {                          \
+            js_LogController.printf("%s", str);                                \
+            fflush(stdout);                                                    \
+        }                                                                      \
+    JS_END_MACRO
 
 #else
 
@@ -333,7 +343,6 @@ public:
     _(DEEP_BAIL)                                                                \
     _(STATUS)
 
-
 enum ExitType {
     #define MAKE_EXIT_CODE(x) x##_EXIT,
     JS_TM_EXITCODES(MAKE_EXIT_CODE)
@@ -374,21 +383,6 @@ struct VMSideExit : public nanojit::SideExit
     }
 };
 
-static inline JSTraceType* getStackTypeMap(nanojit::SideExit* exit)
-{
-    return (JSTraceType*)(((VMSideExit*)exit) + 1);
-}
-
-static inline JSTraceType* getGlobalTypeMap(nanojit::SideExit* exit)
-{
-    return getStackTypeMap(exit) + ((VMSideExit*)exit)->numStackSlots;
-}
-
-static inline JSTraceType* getFullTypeMap(nanojit::SideExit* exit)
-{
-    return getStackTypeMap(exit);
-}
-
 struct FrameInfo {
     JSObject*       callee;     // callee function object
     JSObject*       block;      // caller block chain head

From 487118f352f279421d041177bee449c08f5d20d6 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 29 Jul 2009 22:23:27 +0200
Subject: [PATCH 40/61] Bug 483437 - PSM doesn't properly escape AVA Values in
 Cert Viewer Details tab, r=nelson+benjamin

---
 build/pgo/certs/cert8.db                      | Bin 65536 -> 65536 bytes
 build/pgo/certs/key3.db                       | Bin 57344 -> 57344 bytes
 build/pgo/server-locations.txt                |   4 +
 security/manager/ssl/src/nsNSSCertHelper.cpp  |  19 +++-
 .../ssl/tests/mochitest/bugs/Makefile.in      |  17 +++-
 .../tests/mochitest/bugs/test_bug480509.html  |  88 ++++++++++++++++++
 .../tests/mochitest/bugs/test_bug484111.html  |  72 ++++++++++++++
 7 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug484111.html

diff --git a/build/pgo/certs/cert8.db b/build/pgo/certs/cert8.db
index a6e25b9d59c8e758dbce88ed703609da8009d919..ed2a828a379d203dcf83e134b1a52f583c0e4fef 100644
GIT binary patch
delta 1190
zcmZo@U}<PznPAN*wbAB?J)_cOMh8<7X0t1%D^2B0*P65%Wf<KxoNRd4aI>SsWJ7rl
zW(EdE20jLc)Z*mCg4D#4lEma}BL;>71_nWiI^W5H`*UoW4WtYu48+)&Ls^)G`OC}8
z^^y`(bkj>K^^)^*IT#rjoLL-L9GG|+_zaquI1QQ@ixx05F)}f+D0FZ~O}<#&;Am-J
zY-nL*U~Ft^7$weYh|D$6FjO;80h`Su3o$z{+Yn?j1CmXXwkg)1c)dc^p^t&#c<lZS
zN>haHXta2qTGD%|G)rWiUUb2V!n=LfKgwEM+|i%Oy6&`G>DIYi1+O<tZan(r>rJ+M
zXZ2lg>A9pY44HI#;}rw;WmnuZ1LyiQ+}W+mZ(C#88D!Jruv|clcbyP}vXD-ov5EFH
z)kLi`UN(mqS&pw1yY*`?7i06}h1(?R{e+I3-qFJDtP|YI?C-Z@V_ryIt<0}IW!KBD
zFB047`0?IP--_Q!6$hmcPMP_ODSBe}*8Nd0*@Ex1@i$%g^62ZKv?_=5U+R+t|83qq
z&;PQ0!P}bo2j1A9PZo@PajkWAs0qtErMAnzB<?<3r^+BZV|pB4sc@d!ggZCS2(CW&
zX>*iFH*!Q7GBAR}Sa5%?9JYuw1V<!PNlra8ae)nvRwf1pE#j3kp}Go^s<;>!O7lvJ
zN{dTUQy3Ve88&N_-QZ*tn#|ZB%ad#BV|v?UvQehdWTTB2(~Xok7!fH+7o3tbfhlPc
zG$n!4A}}QxLz0e>iG>MLN`i24rBYDZdC#^vqWS1)zOw6mQI7hFGP^!ZE;#?)A#Re@
z^5y@3N}buScV~M@greOCxkF)@GrzrCVBx6lsS=x1^@nZCpD@<f@3$}<e7sqCeJ}6!
zm5=7SoaQUw*ciTK=YrF%?YqNQaL4+@xow$s+Q05oZ9~_^KY7yr-`826pTXTJ`nqkW
zXhwQ{E)z2&1LI;H17Mf})4Hr6i=u&i6Fj{ep{I8c-+-5mQ>)FR?K>|cBP%Ndb7Lbz
zo<e8p!N7a(Kb~5!ZeRK7=aypkxxUFoK3evd)8$>fs^<m{bB!eXZ|)n^&o2?0dXOt}
zlEA_reTiSAXFfdf@#3Q;AM*=Kwgm=Vy}NGrIr&{v4`v(pKHT2-KVE$17HiA!aE<Hp
z({{|%G23dCm6mHiJ?m&z{eixW=?8+cn?lzvv$L7Tj2z8I42;ksqCi^)SKxy@f|59l
KHdk+L^#TCw3Ak(k

delta 60
zcmZo@U}<PznPAN*veD*<J)_iQMh8=t8>T{Ln*$ws3^yk@_^@miDtpJt$Tyj>L6#-T
Qw8nJf#VFIwHCtP}07_>Ra{vGU

diff --git a/build/pgo/certs/key3.db b/build/pgo/certs/key3.db
index 6238f5da9e5c67c28c4fe8a31441645e57b02941..5309a0e32bf0eb696b431a0186a18fcbfd5186ff 100644
GIT binary patch
delta 2494
zcmV;v2|@ONzypB51CTobC9yoj4-y6dfDg(HN(__<6bW7iOa@*Cvl0+Y29sVU8-L9|
zCmor+<yipp#}8ND;#Q~>8p#3y0R(~qfMzba9-SFjOWnch7I4QneZ1{}FHVAXZzGbU
zdrStW>&<)z5x3HG@u)7V#JC@fPU9Qwn;*81RQcOC=C_;-EYg|_$um0^$9*`A5Y2+B
z9#b{_PFD9kkb^}k4(W;c^_`-*N`EYdrK_cwEE2%CXumL?n5tdn#~wzW5?#c)X3Df7
ztR$=9J~Wi#AM44?RK9|SO_WYCWHRwm5V%33+npB+*oVy%lfh@NWA@Eud`XZ$MO%#k
z%Gb{*A3x{Cpq%FH1E@@#JQdjpXBU}7TqqKxuh_M~1ESAnm^K}H?n5Ej1b@?<_K;yQ
z%0m;cdsV{xQk?|FQ7NKB^9Rxsm8~~mhSuEO(cv{7T8L341z}CLxizO%V%&DZz@b$X
zh1reEpdud5bv2A|m>Kq@4Q(Vk$;q!*gqMAj?>ftj(o^=HEEts0o8oU{jfW4XB3%3o
z(%S8a@W5KdpS7j;_{IGC`hQB6i6EJnKB~+#z=Qizr>LKn>-*9j29kQ7I^v1wcEFv6
zCh?z33HxwQ8V3%K%LkUc7R3oFOqV*)U|X@cn7%gaY=Ttq+yqhLFj5VN#uaJ{S{PF-
z1yV_AjKb2BxF--#J>Gt1CLPihYO`c9I<57wZ$U=O3_)391X;5Efq#s-VOPv9u11I>
zh|)id^Ov&WcvDWX45;?V9VXAT!|tHTom)#3IINbGoaAfR1zzJP_M^Y_=M{eWmT-BC
z3-mF~w22>&l2rR$z}!cF^89o#akTMV$Of39ibx^{WGAAHHL)$7Mi(_QUv9K``DCcY
zO)5W=1gJ07D-!SQA%BlMwpeBENj)@Xfkw!)w=W}vXLI>3;2h$2JK=EIU3l*Xvsi=0
z%MNzej#@!4VH~>flW@=XKwgqMr>Fn<8qB{g+_zL%AwKXP!d7XS_U@oKK_^KhU1ECt
z2DJQE1?%s$0Kwz4Bd?7Ox2fWtM9U6v2(eeBxuDC1hr3s(3n5)hUPiQ<%TIpteSnJ5
z{B9dh_pUq7m<x#&>xQ`%XlHGcUM3rVHt&kG_caIU?*n`U`1Nck?sEUq0s#R8f&zf1
z@c>H>UIu!BytsfnB-IDg%7~Ae3@cf~$v!33$H%*4wiQv=Kwb^sfTL_#Ty$U<n^yrs
z(?bwLPy=A|b7_79GKhTofB;l9d8Da&MQtS6RXS!m{ed{nY;ES2GJ~R1LED3WGd@O|
zd?m|5%?mH5Z4+}uTJ-i(nw07|Wqsff>C^NKHU%A~J{7#hg61n&zOQ+45|Gs19~dHj
zH?taFw_Rk<E)ingvLKLhC7Y$Q0v6`IH4!0#?vq&Qzv?#>zxQvxo3QY!@SFUdjn*Vw
zNHcjuhqV-u$`-R0vbs%8A;z_TKPFpdbW{w}9%87nI{z%Yy6y8N#trvstw!_5Z6(+q
zgN;8*j1fUBE{2K{#-u?ezD$hpBfxW@eiJ2I_2A$fWYZHZIT0n{)3Q5=weg<#%+Zz-
zf#eO_P*MDB?nWgJcjRKc+Ypo}9trq+z@U&lUb^>EkeC~=g!0h-2R1l=^~K)oGY6oQ
zh;sF<XF2uQ)EQG?PeZHuHu{&@KjD*}fyDih-m<324wxV<ymB#Sblqz&x3KGrmv3DC
zJIA|y0>jN^>e4_nKTgSPj?Tp=4Tym4<6_W+3GQ9xAdu@f@!gDqhERxvd$4h1kBcRE
zxxOiY)Dqyvk{9Dt&Xq=gG8Yg`zXA4--)W(7gB56%5S)i6`g#Q(Acdzy+CyaC{EYJn
zyHax0{J%bqGRRibHwaPB9}tu1dI&9`CkmL%vWj$S{lzN-)~%&YF~$uH3abyKIZsNX
zhvhTK_{-43j7$5>yJuqC4<BTm(5!p}Nky1MYBDt#xZK&LIX_i@2RSv5buNX(fDPU#
zj;GZxAM?DZ@mS>Pn!am<D3V7n&pAvl5`6{`0?C-IIU$zqJi=3atf!$UY!#8Xnq2J@
zZ#Bz;iE27jk^=pgN8Q0pm+fy7hZD{34fH=j4AMs}yMU-1Pvf};BQe!QT5}c_!-6_J
z4S_{xbIrtVyr+F3kTkaNuLrfC(?&`~V{tGD4#x$5>mGGNutgw$4x#nNGm~B>8?)sc
z8>0>c0Duq53`z`?35E%j39|t(h6$5iMjL<b%J}OYtAJ&{JIBftkXH_PVNIt30RaSp
z0)PWVKgR3s)N3kpwhhoP)bXuS;A*=i$V*uYZxc{)9xlHhQcF9wtQoiJ-U9*^Ay4~j
zrDKkl(Cf#5?1H8do%Zs%X9;MrQu@GRn>ja7k3EYSdi>5G#=pZF6~jdgSJg7?FfV_k
z>uJ9rxMJHM-CVM)E_O@aG?0MZ=n;Xf`K}|dlVNPXoA5fv{oPCjcbx6$QS6GngWsvX
zgS{e54qDQ1gU{v`q4ScZ4A9+FDQG2d#-*wrR(3IlIQn90K$&t#Ug^K6`~h|f3cORQ
zOsH%`Ggl|!w0z9YNrDl?9#4Os!V7=UoSh(L@{}~=O!uM90MTsfr47#geLhPC!~Q((
zu9jM8#+rNAhru8_fU;fYXh&)bHtal-stJ?~CmA-%pJKjP$>CWr0Zg4Q0>(30eyqVI
z-?iyCKQ-5w_yWoXMFWtRwazo0b(v3XjT=e&o{sLcp7uW$zOOB-<8!tFFSmcaA$sdB
z6*!SGWZ9$VR4X{BUnlW9K^x211xS<(9=15kka98{PPmG;I|#=`GYg+U87xbKZjY8*
zjEDpYhqm+Yxo=>EoG4ElyEvib2+tE@B)CG4#(ui`!igY7ik)`W<T??d{DKYe^`%e?
zh<X0W%FO={Wy`OOrJ^{VrAB{Uz9M8OvjnnZN*V)&?l|MIF};%a{iXq%(Dl+*(E12-
z+a_7{FeFVuw)p|yLIKQ2p@2Z6BtLUipc`^B26}9cu5ig4Mu322<U}lVzeE1;H0zl&
z#xGr3XZT<X?qmP36xLxI04~##slaDe6EI?We0ItSj@#XDcI1y+=bL}X<mFePhnvM!
zp2g$xp8H^0n69}BV+rhAY-d)ESqtmP>!>9_jsO71UB9p*loH%1gh|SzjnZ{$6s|5?
zaHw(Jj@R)WIMKL|X$7v!9(A>y3UKSQ8L`FW_1OmA%`ZjTE<|UcRFccF)G!C8)J7>$
zolJn-yDbkrd^w3yJd7bgrw|qmt`Yzv5-d?OG%J=RVJgf@Ji-A4$Eg<D`n?K+lU^np
Iv*pYi6ReN2SO5S3

delta 86
zcmZoTz}#?vd4e^g(ngyj{6b6&4g9Bg4)C1fS<OG4Uz|UXXS0xi58LLrFmdM1tg&~P
jCKs%!oE#@6z4@t(^kOcA^399}2Y4pOxdA24NDBi1%qAT%

diff --git a/build/pgo/server-locations.txt b/build/pgo/server-locations.txt
index 6eaca35943c1..1b698564c405 100644
--- a/build/pgo/server-locations.txt
+++ b/build/pgo/server-locations.txt
@@ -156,3 +156,7 @@ https://sub.sectest1.example.org:443
 # Used while testing the url-classifier
 #
 http://malware.example.com:80
+
+# Bug 483437, 484111
+https://www.bank1.com:443           privileged,cert=escapeattack1
+https://www.bank2.com:443           privileged,cert=escapeattack2
diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/src/nsNSSCertHelper.cpp
index b897fc966e9f..8d8d0c36f69e 100755
--- a/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -885,7 +885,24 @@ ProcessRDN(CERTRDN* rdn, nsAString &finalString, nsINSSComponent *nssComponent)
     if(!decodeItem) {
       return NS_ERROR_FAILURE;
     }
-    avavalue = NS_ConvertUTF8toUTF16((char*)decodeItem->data, decodeItem->len);
+
+    // We know we can fit buffer of this length. CERT_RFC1485_EscapeAndQuote
+    // will fail if we provide smaller buffer then the result can fit to.
+    PRIntn escapedValueCapacity = decodeItem->len * 3 + 3;
+    nsAutoArrayPtr<char> escapedValue;
+    escapedValue = new char[escapedValueCapacity];
+    if (!escapedValue)
+      return NS_ERROR_OUT_OF_MEMORY;
+
+    SECStatus status = CERT_RFC1485_EscapeAndQuote(
+          escapedValue.get(),
+          escapedValueCapacity, 
+          (char*)decodeItem->data, 
+          decodeItem->len);
+    if (SECSuccess != status)
+      return NS_ERROR_FAILURE;
+
+    avavalue = NS_ConvertUTF8toUTF16(escapedValue);
     
     SECITEM_FreeItem(decodeItem, PR_TRUE);
     params[0] = type.get();
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index e27909cd87fc..1d6b2305f76e 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -40,14 +40,21 @@ DEPTH		= ../../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir	= security/ssl
+relativesrcdir	= security/ssl/bugs
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
- _CHROME_FILES	= \
-	test_bug413909.html \
-	$(NULL)
+_TEST_FILES = \
+        test_bug480509.html \
+        test_bug484111.html \
+        $(NULL)
 
- libs:: $(_CHROME_FILES)
+_CHROME_FILES = \
+        test_bug413909.html \
+        $(NULL)
+
+libs:: $(_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html b/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
new file mode 100644
index 000000000000..4ed9c09b38d3
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug480509.html
@@ -0,0 +1,88 @@
+<html>
+<head>
+  <title>Test bug 483437 and bug 480509</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body onload="onWindowLoad()">
+
+<iframe src="https://www.bank1.com/" onload="onFrameLoad()"></iframe>
+
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+function badCertListener() 
+{
+}
+
+badCertListener.prototype = {
+  badCertCaught: false,
+
+  getInterface: function (aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  QueryInterface: function(aIID) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (aIID.equals(Components.interfaces.nsIBadCertListener2) ||
+        aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        aIID.equals(Components.interfaces.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },  
+
+  testCert: function(cert1, expected)
+  {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var certDumpTree1 = Components.classes["@mozilla.org/security/nsASN1Tree;1"]
+                       .createInstance(Components.interfaces.nsIASN1Tree);
+    certDumpTree1.loadASN1Structure(cert1.ASN1Structure);
+    var value1 = certDumpTree1.getDisplayData(9);
+    
+    is(value1, expected, "Incorrect subject recognized");
+  },
+  
+  notifyCertProblem: function(socketInfo, sslStatus, targetHost) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    var cert = sslStatus.QueryInterface(Components.interfaces.nsISSLStatus)
+      .serverCert;
+    this.testCert(cert, "CN = www.bank1.com\\00www.bad-guy.com\n");
+
+    this.badCertCaught = true;
+    return true;
+  }
+}
+
+function onFrameLoad()
+{
+  ok(false, "Attackers page failed to load");
+}
+
+function onWindowLoad()
+{
+  var req = new XMLHttpRequest();
+  var certListener = new badCertListener();
+  try
+  {
+    req.open("GET", "https://www.bank1.com/", false);
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    req.channel.notificationCallbacks = certListener;
+    req.send(null);
+  }
+  catch(ex)
+  {
+    // ignore
+  }
+  
+  ok(certListener.badCertCaught, "We Caught the invalid certificate");
+  
+  SimpleTest.finish();
+}
+
+</script>
+
+</body>
+</html>
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
new file mode 100644
index 000000000000..11fe4d90ab69
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug484111.html
@@ -0,0 +1,72 @@
+<html>
+<head>
+  <title>Test bug 484111</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body onload="onWindowLoad()">
+
+<iframe src="https://www.bank2.com/" onload="onFrameLoad()"></iframe>
+
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+function badCertListener() 
+{
+}
+
+badCertListener.prototype = {
+  badCertCaught: false,
+
+  getInterface: function (aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  QueryInterface: function(aIID) {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    if (aIID.equals(Components.interfaces.nsIBadCertListener2) ||
+        aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+        aIID.equals(Components.interfaces.nsISupports))
+      return this;
+
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },  
+
+  notifyCertProblem: function(socketInfo, sslStatus, targetHost) {
+    this.badCertCaught = true;
+    return true;
+  }
+}
+
+function onFrameLoad()
+{
+  ok(false, "Attackers page failed to load");
+}
+
+function onWindowLoad()
+{
+  var req = new XMLHttpRequest();
+  var certListener = new badCertListener();
+  try
+  {
+    req.open("GET", "https://www.bank2.com/", false);
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    req.channel.notificationCallbacks = certListener;
+    req.send(null);
+  }
+  catch(ex)
+  {
+    // ignore
+  }
+  
+  ok(certListener.badCertCaught, "We Caught the invalid certificate");
+  
+  SimpleTest.finish();
+}
+
+</script>
+
+</body>
+</html>

From 9a7c591b1f40c3bfaa3e1288b7582c6cfcf76a63 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Wed, 29 Jul 2009 22:23:27 +0200
Subject: [PATCH 41/61] Bug 483440 - PSM doesn't detect invalid OID encodings
 in Cert Viewer Details tab, r=nelson+johnath

---
 build/pgo/certs/bug483440-attack2b.ca         | 14 +++
 build/pgo/certs/bug483440-attack7.ca          | 16 ++++
 build/pgo/certs/bug483440-pk10oflo.ca         | 14 +++
 security/manager/ssl/src/nsNSSCertHelper.cpp  | 92 ++++++++++++++-----
 .../ssl/tests/mochitest/bugs/Makefile.in      |  1 +
 .../tests/mochitest/bugs/test_bug483440.html  | 65 +++++++++++++
 6 files changed, 179 insertions(+), 23 deletions(-)
 create mode 100644 build/pgo/certs/bug483440-attack2b.ca
 create mode 100644 build/pgo/certs/bug483440-attack7.ca
 create mode 100644 build/pgo/certs/bug483440-pk10oflo.ca
 create mode 100644 security/manager/ssl/tests/mochitest/bugs/test_bug483440.html

diff --git a/build/pgo/certs/bug483440-attack2b.ca b/build/pgo/certs/bug483440-attack2b.ca
new file mode 100644
index 000000000000..8adcf2ac1075
--- /dev/null
+++ b/build/pgo/certs/bug483440-attack2b.ca
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICKDCCAZGgAwIBAgIFAIyjFPowDQYJKoZIhvcNAQEFBQAwKDEXMBUGA1UEAwwO
+KgB3d3cubXlDQS5vcmcxDTALBgNVBAMTBG15Q0EwHhcNMDkwMzE0MTg0NzU2WhcN
+MTkwMzE0MTg0NzU2WjBhMRMwEQYDVQQKEwpCYWRndXkgSW5jMRcwFQYDVQQDEw53
+d3cuYmFkZ3V5LmNvbTEZMBcGA1UECxMQSGFja2luZyBEaXZpc2lvbjEWMBQGBFUE
+gAMTDHd3dy5iYW5rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2YvL
+GgmF0OTLBKz0nYTvR+DlnZai7b2MqAIM9IUEpMfqzJPNYCsXziYXgHtr/do9ppJP
+BhDjeyIGEOSpgBqdkWItxlLopUHnf8VKwnDPPj4KkNyXuTLm60X/ph+/zrjTw+kU
+m+/kVYstgGMuTIoTuu7loxCqqeVlAgc5lzTpUhkCAwEAAaMlMCMwDAYDVR0TAQH/
+BAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUFAAOBgQAKHl1G
+vaXftj5QPK3eIT6Q3fWuGKR39grlg5GL/WocPanYycOlm9zvT1Hx95cY6msIXSKp
+xycndJ02ODX35DDgolV6VHUsM9yoagk+eqs5kCqW2qiv3moIshL0yWVhuCobMA+E
+D3wHFCPqVU+igRdCrEQDxZHoFOR4J/DKHfGANg==
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/bug483440-attack7.ca b/build/pgo/certs/bug483440-attack7.ca
new file mode 100644
index 000000000000..778e7acedd69
--- /dev/null
+++ b/build/pgo/certs/bug483440-attack7.ca
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICljCCAf+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBkDERMA8GBPMlBAMTB2F0
+dGFjazcxEDAOBgOABAMTB2F0dGFjazYxEzARBgZVBP///38TB2F0dGFjazUxEjAQ
+BgVVBAOBgRMHYXR0YWNrNDEUMBIGB1UEgICAgIATB2F0dGFjazMxFDASBgdVBJCA
+gIABEwdhdHRhY2syMRQwEgYHVQSIgICAARMHYXR0YWNrMTAeFw0wOTA0MTMxNDAw
+MzdaFw0yOTA0MTMxNDAwMzdaMIGQMREwDwYE8yUEAxMHYXR0YWNrNzEQMA4GA4AE
+AxMHYXR0YWNrNjETMBEGBlUE////fxMHYXR0YWNrNTESMBAGBVUEA4GBEwdhdHRh
+Y2s0MRQwEgYHVQSAgICAgBMHYXR0YWNrMzEUMBIGB1UEkICAgAETB2F0dGFjazIx
+FDASBgdVBIiAgIABEwdhdHRhY2sxMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQC77fQ1wrywBnVmr8XO0/78/qFOz+sjnMlpBvLx5UImittgMNSgEqNulRDbO0qG
+K4tlFF2sNsS7aOun6Cq7yl2+a8mIljmjzs+iwCLOEAkQTOM4RsdCosJVy/fjwmH1
+xI0uXt5cPkA0FM7B/IZSzWSC+2gY1+u1AhRJ35bXDhu92wIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAFZitQjsQJ1+XsxKchBefilaHsi4oncc05P29IXcRbHI8wK2vNk8
+kkG2c6M4a4Rx1R4C3n99NwXH4vyNUbA9FuMSAdjaS3TW3zm8lKNCuIWGuI2Vvefy
++wNcCfb8B4AuP8pZOqqKsspgiBAE1EPPErnb7nMVLCnf+ts9ARXLBZTi
+-----END CERTIFICATE-----
diff --git a/build/pgo/certs/bug483440-pk10oflo.ca b/build/pgo/certs/bug483440-pk10oflo.ca
new file mode 100644
index 000000000000..7daef524b23b
--- /dev/null
+++ b/build/pgo/certs/bug483440-pk10oflo.ca
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICMTCCAZqgAwIBAgIFAIyjFTAwDQYJKoZIhvcNAQEFBQAwKDEXMBUGA1UEAwwO
+KgB3d3cubXlDQS5vcmcxDTALBgNVBAMTBG15Q0EwHhcNMDkwMzE0MTg0ODI0WhcN
+MTkwMzE0MTg0ODI0WjBqMRMwEQYDVQQKEwpCYWRndXkgSW5jMRcwFQYDVQQDEw53
+d3cuYmFkZ3V5LmNvbTEZMBcGA1UECxMQSGFja2luZyBEaXZpc2lvbjEfMB0GDVUE
+goCAgICAgICAgAMTDHd3dy5iYW5rLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA2YvLGgmF0OTLBKz0nYTvR+DlnZai7b2MqAIM9IUEpMfqzJPNYCsXziYX
+gHtr/do9ppJPBhDjeyIGEOSpgBqdkWItxlLopUHnf8VKwnDPPj4KkNyXuTLm60X/
+ph+/zrjTw+kUm+/kVYstgGMuTIoTuu7loxCqqeVlAgc5lzTpUhkCAwEAAaMlMCMw
+DAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQUF
+AAOBgQBr+ekYoADBm6kbHBR1oc/6O9ZciRsTbxIAl3xjA3kNEeiUXXSoe+1dlt3Z
+7D6EaQztqR8usCW728J3vi8p/XxociK3r4aq0Sxu29gp21N1V/Um8y3ssI+Yt9Im
+oHlo5ikUXra5PtGAwi4FymrU5dWlHxYk1PlNP5nsvxdElPZnZA==
+-----END CERTIFICATE-----
diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/src/nsNSSCertHelper.cpp
index 8d8d0c36f69e..d67c477577cf 100755
--- a/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -204,23 +204,21 @@ ProcessSerialNumberDER(SECItem         *serialItem,
 
 static nsresult
 GetDefaultOIDFormat(SECItem *oid,
+                    nsINSSComponent *nssComponent,
                     nsAString &outString,
-		    char separator)
+                    char separator)
 {
   char buf[300];
-  unsigned int len;
-  int written;
+  unsigned int len = 0;
+  int written, invalidCount = 0;
     
-  unsigned long val  = oid->data[0];
-  unsigned int  i    = val % 40;
-  val /= 40;
-  written = PR_snprintf(buf, 300, "%lu%c%u", val, separator, i);
-  if (written < 0)
-    return NS_ERROR_FAILURE;	
-  len = written;
+  unsigned int i;
+  unsigned long val  = 0;
+  PRBool invalid = PR_FALSE;
+  PRBool first = PR_TRUE;
 
   val = 0;
-  for (i = 1; i < oid->len; ++i) {
+  for (i = 0; i < oid->len; ++i) {
     // In this loop, we have to parse a DER formatted 
     // If the first bit is a 1, then the integer is 
     // represented by more than one byte.  If the 
@@ -231,16 +229,64 @@ GetDefaultOIDFormat(SECItem *oid,
 
     j = oid->data[i];
     val = (val << 7) | (j & 0x7f);
-    if (j & 0x80)
-      continue;
-    written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%lu", 
-			  separator, val);
+    if (j & 0x80) {
+      // - If val is 0 in this block, the OID number particle starts with 0x80
+      // what is specified as an invalid formating.
+      // - If val is larger then 2^32-7, on next left shift by 7 we will loose
+      // the most significant bits, this OID number particle cannot be read
+      // by our implementation.
+      // - If the first bit is set while this is the last component of the OID
+      // we are also in an invalid state.
+      if (val == 0 || (val >= (1 << (32-7))) || (i == oid->len-1)) {
+        invalid = PR_TRUE;
+      }
+
+      if (i < oid->len-1)
+        continue;
+    }
+
+    if (!invalid) {
+      if (first) {
+        unsigned long one = PR_MIN(val/40, 2); // never > 2
+        unsigned long two = val - (one * 40);
+
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%lu%c%lu", 
+			      one, separator, two);
+      }
+      else {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%lu", 
+			      separator, val);
+      }
+    }
+    else {
+      nsAutoString unknownText;
+      nssComponent->GetPIPNSSBundleString("CertUnknown", 
+                                          unknownText);
+      if (first) {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%s",
+                              NS_ConvertUTF16toUTF8(unknownText).get());
+      }
+      else {
+        written = PR_snprintf(&buf[len], sizeof(buf)-len, "%c%s",
+                              separator, 
+                              NS_ConvertUTF16toUTF8(unknownText).get());
+      }
+
+      if (++invalidCount > 3) {
+        // Allow only 3 occurences of Unknown in OID display string to
+        // prevent bloat.
+        break;
+      }
+    }
+
     if (written < 0)
       return NS_ERROR_FAILURE;
 
     len += written;
     NS_ASSERTION(len < sizeof(buf), "OID data to big to display in 300 chars.");
     val = 0;      
+    invalid = PR_FALSE;
+    first = PR_FALSE;
   }
 
   CopyASCIItoUTF16(buf, outString);
@@ -600,7 +646,7 @@ GetOIDText(SECItem *oid, nsINSSComponent *nssComponent, nsAString &text)
     rv = nssComponent->GetPIPNSSBundleString(bundlekey, text);
   } else {
     nsAutoString text2;
-    rv = GetDefaultOIDFormat(oid, text2, ' ');
+    rv = GetDefaultOIDFormat(oid, nssComponent, text2, ' ');
     if (NS_FAILED(rv))
       return rv;
 
@@ -834,14 +880,14 @@ ProcessExtKeyUsage(SECItem  *extData,
     // of the form CertDumpEKU_<underlined-OID>
     nsAutoString oidname;
     oid = *oids;
-    rv = GetDefaultOIDFormat(oid, oidname, '_');
+    rv = GetDefaultOIDFormat(oid, nssComponent, oidname, '_');
     if (NS_FAILED(rv))
       return rv;
     nsAutoString bundlekey = NS_LITERAL_STRING("CertDumpEKU_")+ oidname;
     NS_ConvertUTF16toUTF8 bk_ascii(bundlekey);
     
     rv = nssComponent->GetPIPNSSBundleString(bk_ascii.get(), local);
-    nsresult rv2 = GetDefaultOIDFormat(oid, oidname, '.');
+    nsresult rv2 = GetDefaultOIDFormat(oid, nssComponent, oidname, '.');
     if (NS_FAILED(rv2))
       return rv2;
     if (NS_SUCCEEDED(rv)) {
@@ -1066,7 +1112,7 @@ ProcessGeneralName(PRArenaPool *arena,
 	  ProcessRawBytes(nssComponent, &current->name.OthName.name, value);
 	}
     } else {
-      rv = GetDefaultOIDFormat(&current->name.OthName.oid, key, ' ');
+      rv = GetDefaultOIDFormat(&current->name.OthName.oid, nssComponent, key, ' ');
       if (NS_FAILED(rv))
 	goto finish;
       ProcessRawBytes(nssComponent, &current->name.OthName.name, value);
@@ -1126,7 +1172,7 @@ ProcessGeneralName(PRArenaPool *arena,
     }
   case certRegisterID:
     nssComponent->GetPIPNSSBundleString("CertDumpRegisterID", key);
-    rv = GetDefaultOIDFormat(&current->name.other, value, '.');
+    rv = GetDefaultOIDFormat(&current->name.other, nssComponent, value, '.');
     if (NS_FAILED(rv))
       goto finish;
     break;
@@ -1356,7 +1402,7 @@ ProcessCertificatePolicies(SECItem  *extData,
       text.Append(local);
       break;
     default:
-      GetDefaultOIDFormat(&policyInfo->policyID, local, '.');
+      GetDefaultOIDFormat(&policyInfo->policyID, nssComponent, local, '.');
       text.Append(local);
     }
 
@@ -1407,7 +1453,7 @@ ProcessCertificatePolicies(SECItem  *extData,
 				 text, nssComponent);
 	  break;
 	default:
-	  GetDefaultOIDFormat(&policyQualifier->qualifierID, local, '.');
+	  GetDefaultOIDFormat(&policyQualifier->qualifierID, nssComponent, local, '.');
 	  text.Append(local);
 	  text.Append(NS_LITERAL_STRING(": "));
 	  ProcessRawBytes(nssComponent, &policyQualifier->qualifierValue, text);
@@ -1545,7 +1591,7 @@ ProcessAuthInfoAccess(SECItem  *extData,
       nssComponent->GetPIPNSSBundleString("CertDumpCAIssuers", local);
       break;
     default:
-      rv = GetDefaultOIDFormat(&desc->method, local, '.');
+      rv = GetDefaultOIDFormat(&desc->method, nssComponent, local, '.');
       if (NS_FAILED(rv))
 	goto finish;
     }
diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
index 1d6b2305f76e..3188726b06aa 100644
--- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in
@@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
         test_bug480509.html \
+        test_bug483440.html \
         test_bug484111.html \
         $(NULL)
 
diff --git a/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html b/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html
new file mode 100644
index 000000000000..96035ce58a69
--- /dev/null
+++ b/security/manager/ssl/tests/mochitest/bugs/test_bug483440.html
@@ -0,0 +1,65 @@
+<html>
+<head>
+  <title>Test bug 483437 and bug 480509</title>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<script class="testbody" type="text/javascript">
+
+netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+var certdb = Components.classes["@mozilla.org/security/x509certdb;1"]
+  .getService(Components.interfaces.nsIX509CertDB);
+
+function test(certNick, expected)
+{
+  var cert1 = certdb.findCertByNickname(null, certNick);
+  var certDumpTree1 = Components.classes["@mozilla.org/security/nsASN1Tree;1"]
+                     .createInstance(Components.interfaces.nsIASN1Tree);
+  certDumpTree1.loadASN1Structure(cert1.ASN1Structure);
+  var value1 = certDumpTree1.getDisplayData(9);
+  
+  is(value1, expected, "Incorrect OID recognized");
+}
+
+test("bug483440-attack2b", 
+     "Object Identifier (2 5 4 Unknown) = www.bank.com\n"+
+     "OU = Hacking Division\n"+
+     "CN = www.badguy.com\nO = Badguy Inc\n");
+
+test("bug483440-pk10oflo",
+     "Object Identifier (2 5 4 Unknown) = www.bank.com\n"+
+     "OU = Hacking Division\n"+
+     "CN = www.badguy.com\nO = Badguy Inc\n");
+
+test("bug483440-attack7",
+
+     // Check 88 80 80 80 01, not leading, have to pass
+     "Object Identifier (2 5 4 2147483649) = attack1\n"+
+     
+     // Check 90 80 80 80 01, not leading, have to fail
+     "Object Identifier (2 5 4 Unknown) = attack2\n"+
+     
+     // Check 80 80 80 80 80, not leading, have to fail
+     "Object Identifier (2 5 4 Unknown) = attack3\n"+
+     
+     // Check 81 81, trailing, have to fail
+     "Object Identifier (2 5 4 3 Unknown) = attack4\n"+
+     
+     // Check FF FF FF 7F, not leading, have to pass
+     "Object Identifier (2 5 4 268435455) = attack5\n"+
+     
+     // Check 80 leading, have to fail
+     "Object Identifier (Unknown 3) = attack6\n"+
+     
+     // Check 14757 = 2*40 + 14677 leading single byle encoded as F325, 
+     // have to pass
+     "Object Identifier (2 14677 4 3) = attack7\n");
+
+</script>
+
+</body>
+</html>

From a2578faeceb7221fe460f3e4ba88e2b14dee2832 Mon Sep 17 00:00:00 2001
From: Nelson Bolyard <nelson@bolyard.me>
Date: Wed, 29 Jul 2009 14:07:45 -0700
Subject: [PATCH 42/61] Bug 332173 - Problems with regexp parsing of '~' in
 nsIZipReader.findEntries (and other nsWildCard uses).  r=jwalden, a=ss

---
 xpcom/io/nsWildCard.cpp | 449 ++++++++++++++++++++++++----------------
 1 file changed, 275 insertions(+), 174 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index ff0ac240b5f5..1aa82e0f70d1 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,73 +57,75 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop)
+_valid_subexp(const T *expr, T stop1, T stop2)
 {
-    register int x,y,t;
-    int nsc,np,tld;
-
-    x=0;nsc=0;tld=0;
-
-    while(expr[x] && (expr[x] != stop)) {
+    register int x;
+    int nsc = 0;     /* Number of special characters */
+    int np;          /* Number of pipe characters in union */
+    int tld = 0;     /* Number of tilde characters */
+ 
+    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
         switch(expr[x]) {
-          case '~':
-            if(tld) return INVALID_SXP;
-            else ++tld;
-          case '*':
-          case '?':
-          case '^':
-          case '$':
+        case '~':
+            if(tld)                 /* at most one exclusion */
+                return INVALID_SXP;
+            if (stop1)              /* no exclusions within unions */
+                return INVALID_SXP;
+            if (!expr[x+1])          /* exclusion cannot be last character */
+                return INVALID_SXP;
+            if (!x)                 /* exclusion cannot be first character */
+                return INVALID_SXP;
+            ++tld;
+            /* fall through */
+        case '*':
+        case '?':
+        case '$':
             ++nsc;
             break;
-          case '[':
+        case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(;expr[x] && (expr[x] != ']');++x)
-                if(expr[x] == '\\')
-                    if(!expr[++x])
-                        return INVALID_SXP;
+            for(; expr[x] && (expr[x] != ']'); ++x) {
+                if(expr[x] == '\\' && !expr[++x])
+                    return INVALID_SXP;
+            }
             if(!expr[x])
                 return INVALID_SXP;
             break;
-          case '(':
-            ++nsc;np = 0;
-            while(1) {
-                if(expr[++x] == ')')
-                    return INVALID_SXP;
-                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
-                    if(expr[y] == '\\')
-                        if(!expr[++y])
-                            return INVALID_SXP;
-                if(!expr[y])
-                    return INVALID_SXP;
-                if(expr[y] == '|')
-                    ++np;
-                t = ::_valid_subexp(&expr[x],expr[y]);
-                if(t == INVALID_SXP)
+        case '(':
+            ++nsc;
+            if (stop1)                  /* no nested unions */
+                return INVALID_SXP;
+            np = -1;
+            do {
+                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
+                if(t == 0 || t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(expr[x] == ')') {
-                    if(!np)
-                        return INVALID_SXP;
-                    break;
-                }
-            }
+                if(!expr[x])
+                    return INVALID_SXP;
+                ++np;
+            } while (expr[x] == '|' );
+            if(np < 1)  /* must be at least one pipe */
+                return INVALID_SXP;
             break;
-          case ')':
-          case ']':
+        case ')':
+        case ']':
+        case '|':
             return INVALID_SXP;
-          case '\\':
+        case '\\':
+            ++nsc;
             if(!expr[++x])
                 return INVALID_SXP;
-          default:
+            break;
+        default:
             break;
         }
-        ++x;
     }
-    if((!stop) && (!nsc))
-        return NON_SXP;
-    return ((expr[x] == stop) ? x : INVALID_SXP);
+    if((!stop1) && (!nsc)) /* must be at least one special character */
+         return NON_SXP;
+    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
 }
 
 
@@ -131,7 +133,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -155,166 +157,265 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
+static int
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
 
+/**
+ * Count characters until we reach a NUL character or either of the
+ * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
+ * expression, look only for NUL or ']' inside it.  Do not look for stop1
+ * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
+ * Handle all escaping.
+ * Return index in input string of first stop found, or ABORTED if not found.
+ * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
+ */
 template<class T>
 static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive)
+_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
 {
-    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
-    register int t,p2,p1 = 1;
-    int cp;
+    register int sx;     /* source index */
+    register char cc;
 
-    while(1) {
-        for(cp=1;expr[cp] != ')';cp++)
-            if(expr[cp] == '\\')
-                ++cp;
-        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
-            if(expr[p1] == '\\')
-                e2[p2++] = expr[p1++];
-            e2[p2] = expr[p1];
+    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
+        if (cc == '\\') {
+            if (!expr[++sx])
+                return ABORTED; /* should be impossible */
         }
-        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
-        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
-            NS_Free(e2);
-            return MATCH;
+        else if (cc == '[') {
+            while ((cc = expr[++sx]) && cc != ']') {
+                if(cc == '\\' && !expr[++sx])
+                    return ABORTED;
+            }
+            if (!cc)
+                return ABORTED; /* should be impossible */
         }
-        if(p1 == cp) {
-            NS_Free(e2);
-            return NOMATCH;
-        }
-        else ++p1;
     }
+    if (dest && sx) {
+        /* Copy all but the closing delimiter. */
+        memcpy(dest, expr, sx * sizeof(T));
+        dest[sx] = 0;
+    }
+    return cc ? sx : ABORTED; /* index of closing delimiter */
 }
 
+/* On input, expr[0] is the opening parenthesis of a union.
+ * See if any of the alternatives in the union matches as a pattern.
+ * The strategy is to take each of the alternatives, in turn, and append
+ * the rest of the expression (after the closing ')' that marks the end of
+ * this union) to that alternative, and then see if the resultant expression
+ * matches the input string.  Repeat this until some alternative matches,
+ * or we have an abort.
+ */
+template<class T>
+static int
+_handle_union(const T *str, const T *expr, PRBool case_insensitive,
+              unsigned int level)
+{
+    register int sx;     /* source index */
+    int cp;              /* source index of closing parenthesis */
+    int count;
+    int ret   = NOMATCH;
+    T *e2;
+
+    /* Find the closing parenthesis that ends this union in the expression */
+    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
+    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
+        return ABORTED;
+    ++cp;                /* now index of char after closing parenthesis */
+    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    if (!e2)
+        return ABORTED;
+    for (sx = 1; ret == NOMATCH && expr[sx] && expr[sx] != ')'; ++sx) {
+        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
+        /* Copy everything up to the next delimiter to e2 */
+        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
+        if (count == ABORTED || !count) {
+            ret = ABORTED;
+            break;
+        }
+        sx += count;
+        /* Append everything after closing parenthesis to e2. This is safe. */
+        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
+        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
+    }
+    NS_Free(e2);
+    if (sx < 2)
+        ret = ABORTED;
+    return ret;
+}
+
+/* returns 1 if val is in range from start..end, case insensitive. */
+static int
+_is_char_in_range(int start, int end, int val)
+{
+    char map[256];
+    memset(map, 0, sizeof map);
+    while (start <= end)
+        map[tolower(start++)] = 1;
+    return map[tolower(val)];
+}
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
+             unsigned int level)
 {
-    register int x,y;
+    register int x;   /* input string index */
+    register int y;   /* expression index */
     int ret,neg;
 
-    ret = 0;
-    for(x=0,y=0;expr[y];++y,++x) {
-        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
-            ret = ABORTED;
-        else {
-            switch(expr[y]) {
-              case '$':
-                if( (str[x]) )
-                    ret = NOMATCH;
-                else
-                    --x;             /* we don't want loop to increment x */
-                break;
-              case '*':
-                while(expr[++y] == '*'){}
-                if(!expr[y])
+    if (level > 20)      /* Don't let the stack get too deep. */
+        return ABORTED;
+    for(x = 0, y = 0; expr[y]; ++y, ++x) {
+        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+            return NOMATCH;
+        }
+        switch(expr[y]) {
+        case '$':
+            if(str[x])
+                return NOMATCH;
+            --x;                 /* we don't want loop to increment x */
+            break;
+        case '*':
+            while(expr[++y] == '*'){}
+            if(!expr[y])
+                return MATCH;
+            while(str[x]) {
+                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
+                                     level + 1);
+                switch(ret) {
+                case NOMATCH:
+                    continue;
+                case ABORTED:
+                    return ABORTED;
+                default:
                     return MATCH;
-                while(str[x]) {
-                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
-                      case NOMATCH:
-                        continue;
-                      case ABORTED:
-                        ret = ABORTED;
-                        break;
-                      default:
-                        return MATCH;
-                    }
-                    break;
                 }
-                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                    return MATCH;
-                else
-                    ret = ABORTED;
-                break;
-              case '[':
-                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-                if (neg)
-                    ++y;
-
-                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
-                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
-                    {
-                        int start = expr[y], end = expr[y+2];
-
-                        /* Droolproofing for pinheads not included */
-                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
-                            ret = NOMATCH;
-                            break;
-                        }
-                        y+=3;
-                    }
-                else {
-                    int matched;
-
-                    for (matched=0;expr[y] != ']';y++) {
-                        /* match an escaped ']' character */
-                        if('\\' == expr[y] && ']' == expr[y+1]) {
-                            if(']' == str[x])
-                                matched |= 1;
-                            y++; /* move an extra char to compensate for '\\' */
-                            continue;
-                        }
-                        matched |= (str[x] == expr[y]);
-                    }
-                    if (neg ^ (!matched))
-                        ret = NOMATCH;
-                }
-                break;
-              case '(':
-                return ::_handle_union(&str[x],&expr[y], case_insensitive);
-                break;
-              case '?':
-                break;
-              case '\\':
+            }
+            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                return MATCH;
+            else
+                return NOMATCH;
+        case '[': {
+            T start, end = 0;
+            int i;
+            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+            if (neg)
                 ++y;
-              default:
-                if(case_insensitive)
-                  {
-                    if(toupper(str[x]) != toupper(expr[y]))
-                        ret = NOMATCH;
-                  }
-                else
-                  {
-                    if(str[x] != expr[y])
-                        ret = NOMATCH;
-                  }
-                break;
+            i = y;
+            start = expr[i++];
+            if (start == '\\')
+                start = expr[i++];
+            if (isalnum(int(start)) && expr[i++] == '-') {
+                end = expr[i++];
+                if (end == '\\')
+                    end = expr[i++];
+            }
+            if (isalnum(int(end)) && expr[i] == ']') {
+                /* This is a range form: a-b */
+                T val = str[x];
+                if (end < start) { /* swap them */
+                    T tmp = end;
+                    end = start;
+                    start = tmp;
+                }
+                if (case_insensitive && isalpha(int(val))) {
+                    val = ::_is_char_in_range(int(start), int(end), int(val));
+                    if (neg == val)
+                        return NOMATCH;
+                }
+                else if (neg != ((val < start) || (val > end))) {
+                    return NOMATCH;
+                }
+                y = i;
+            }
+            else {
+                /* Not range form */
+                int matched = 0;
+                for (; expr[y] != ']'; y++) {
+                    if (expr[y] == '\\')
+                        ++y;
+                    if(case_insensitive)
+                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
+                    else
+                        matched |= (str[x] == expr[y]);
+                }
+                if (neg == matched)
+                    return NOMATCH;
             }
         }
-        if(ret)
+        break;
+        case '(':
+            if (!expr[y+1])
+                return ABORTED;
+            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
+        case '?':
             break;
+        case ')':
+        case ']':
+        case '|':
+            return ABORTED;
+        case '\\':
+            ++y;
+            /* fall through */
+        default:
+            if(case_insensitive) {
+                if(toupper(int(str[x])) != toupper(int(expr[y])))
+                    return NOMATCH;
+            }
+            else {
+                if(str[x] != expr[y])
+                    return NOMATCH;
+            }
+            break;
+        }
     }
-    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
+    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
-int
-NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
+static int
+ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
 {
-    T *expr = NS_strdup(xp);
+    T *expr = NULL;
+    int x, ret = MATCH;
 
+    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
+        return _shexp_match(str, xp, case_insensitive, 0);
+
+    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
     if(!expr)
-        return 1;
+        return NOMATCH;
 
-    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
-        if((expr[x] == '~') && (expr[x-1] != '\\')) {
-            expr[x] = '\0';
-            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
-                goto punt;
-            break;
+    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
+    if (x != ABORTED && expr[x] == '~') {
+        expr[x++] = '\0';
+        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
+        switch (ret) {
+        case NOMATCH: ret = MATCH;   break;
+        case MATCH:   ret = NOMATCH; break;
+        default:                     break;
         }
     }
-    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
-        NS_Free(expr);
-        return 0;
-    }
+    if (ret == MATCH)
+        ret = ::_shexp_match(str, expr, case_insensitive, 0);
 
-  punt:
     NS_Free(expr);
-    return 1;
+    return ret;
+}
+
+template<class T>
+NS_COM int
+NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+{
+    int is_valid = NS_WildCardValid(expr);
+    switch(is_valid) {
+        case INVALID_SXP:
+            return -1;
+        default:
+            return ns_WildCardMatch(str, expr, case_insensitive);
+    }
 }
 
 NS_COM int

From 8fd52d3c1382b635a9a782199d3d2d4a6930af54 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:25 +0200
Subject: [PATCH 43/61] Bug 507219 - Crash in nsNavHistoryResult::OnVisit,
 r=dietrich

---
 toolkit/components/places/src/nsNavHistoryResult.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolkit/components/places/src/nsNavHistoryResult.cpp b/toolkit/components/places/src/nsNavHistoryResult.cpp
index 4b1538a7dbf2..c0462e30c3b3 100644
--- a/toolkit/components/places/src/nsNavHistoryResult.cpp
+++ b/toolkit/components/places/src/nsNavHistoryResult.cpp
@@ -3838,6 +3838,7 @@ RemoveBookmarkFolderObserversCallback(nsTrimInt64HashKey::KeyType aKey,
 }
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsNavHistoryResult)
+  tmp->StopObserving();
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRootNode)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mView)
   tmp->mBookmarkFolderObservers.Enumerate(&RemoveBookmarkFolderObserversCallback, nsnull);

From 4ae2ce6fd5b7c7c286bbfb53275af8783d1e094f Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:31 +0200
Subject: [PATCH 44/61] Bug 502860 - some of the seventh month's history
 entries missing in grouped by date history, r=sdwilsh Includes fix for Bug
 501439 - History shows month-name 'March' for February

---
 .../components/places/src/nsNavHistory.cpp    |  8 ++++--
 .../places/tests/unit/test_history_sidebar.js | 25 +++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index 3720f11aa2fc..7592006c6744 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -3563,9 +3563,9 @@ PlacesSQLQueryBuilder::SelectAsDay()
           // From start of epoch
           sqlFragmentContainerBeginTime = NS_LITERAL_CSTRING(
             "(datetime(0, 'unixepoch')*1000000)");
-          // To start of 6 months ago
+          // To start of 6 months ago ( 5 months + this month).
           sqlFragmentContainerEndTime = NS_LITERAL_CSTRING(
-            "(strftime('%s','now','localtime','start of day','-6 months','utc')*1000000)");
+            "(strftime('%s','now','localtime','start of month','-5 months','utc')*1000000)");
           // Search for the same timeframe.
           sqlFragmentSearchBeginTime = sqlFragmentContainerBeginTime;
           sqlFragmentSearchEndTime = sqlFragmentContainerEndTime;
@@ -3577,6 +3577,10 @@ PlacesSQLQueryBuilder::SelectAsDay()
         PRExplodedTime tm;
         PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &tm);
         PRUint16 currentYear = tm.tm_year;
+        // Set day before month, setting month without day could cause issues.
+        // For example setting month to February when today is 30, since
+        // February has not 30 days, will return March instead.
+        tm.tm_mday = 1;
         tm.tm_month -= MonthIndex;
         PR_NormalizeTime(&tm, PR_LocalTimeParameters);
         // tm_month starts from 0 while GetMonthName expects a 1-based index.
diff --git a/toolkit/components/places/tests/unit/test_history_sidebar.js b/toolkit/components/places/tests/unit/test_history_sidebar.js
index 11fce85176b7..37f213326ded 100644
--- a/toolkit/components/places/tests/unit/test_history_sidebar.js
+++ b/toolkit/components/places/tests/unit/test_history_sidebar.js
@@ -82,6 +82,19 @@ function add_normalized_visit(aURI, aTime, aDayOffset) {
   return visitId;
 }
 
+function days_for_x_months_ago(aNowObj, aMonths) {
+  var oldTime = new Date();
+  // Set day before month, otherwise we could try to calculate 30 February, or
+  // other not existant days.
+  oldTime.setDate(1);
+  oldTime.setMonth(aNowObj.getMonth() - aMonths);
+  oldTime.setHours(0);
+  oldTime.setMinutes(0);
+  oldTime.setSeconds(0);
+  // Stay larger for eventual timezone issues, add 2 days.
+  return parseInt((aNowObj - oldTime) / (1000*60*60*24)) + 2;
+}
+
 var nowObj = new Date();
 // This test relies on en-US locale
 // Offset is number of days
@@ -90,8 +103,12 @@ var containers = [
   { label: "Yesterday"           , offset: -1                    , visible: true },
   { label: "Last 7 days"         , offset: -3                    , visible: true },
   { label: "This month"          , offset: -8                    , visible: nowObj.getDate() > 8 },
-  { label: ""                    , offset: -nowObj.getDate()-1   , visible: true },
-  { label: "Older than 6 months" , offset: -nowObj.getDate()-186 , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 0)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 1)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 2)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 3)   , visible: true },
+  { label: ""                    , offset: -days_for_x_months_ago(nowObj, 4)   , visible: true },
+  { label: "Older than 6 months" , offset: -days_for_x_months_ago(nowObj, 5) , visible: true },
 ];
 
 var visibleContainers = containers.filter(
@@ -130,12 +147,16 @@ function fill_history() {
 
   var cc = root.childCount;
   print("Found containers:");
+  var previousLabels = [];
   for (var i = 0; i < cc; i++) {
     var container = visibleContainers[i];
     var node = root.getChild(i);
     print(node.title);
     if (container.label)
       do_check_eq(node.title, container.label);
+    // Check labels are not repeated.
+    do_check_eq(previousLabels.indexOf(node.title), -1);
+    previousLabels.push(node.title);
   }
   do_check_eq(cc, visibleContainers.length);
   root.containerOpen = false;

From e2442097d10c52dc0d89d3c76c3c2ab4756f7448 Mon Sep 17 00:00:00 2001
From: David Dahl <ddahl@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:37 +0200
Subject: [PATCH 45/61] Bug 479089 - Need to test that removing a page from
 autocomplete actually removes a page, r=sdwilsh

---
 ...st_autocomplete_on_value_removed_479089.js | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js

diff --git a/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
new file mode 100644
index 000000000000..ad1c93692b1f
--- /dev/null
+++ b/toolkit/components/places/tests/autocomplete/test_autocomplete_on_value_removed_479089.js
@@ -0,0 +1,83 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** 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 Places unit test code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   David Dahl <ddahl@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 ***** */
+
+/*
+ * Need to test that removing a page from autocomplete actually removes a page
+ * Description From  Shawn Wilsher :sdwilsh   2009-02-18 11:29:06 PST
+ * We don't test the code path of onValueRemoved
+ * for the autocomplete implementation
+ * Bug 479089
+ */
+
+var ios = Cc["@mozilla.org/network/io-service;1"].
+getService(Components.interfaces.nsIIOService);
+
+var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
+getService(Ci.nsINavHistoryService);
+
+function run_test()
+{
+  // QI to nsIAutoCompleteSimpleResultListener
+  var historyService = histsvc.QueryInterface(Components.interfaces.nsIAutoCompleteSimpleResultListener);
+
+  // add history visit
+  var now = Date.now() * 1000;
+  var uri = ios.newURI("http://foo.mozilla.com/", null, null);
+  var ref = ios.newURI("http://mozilla.com/", null, null);
+  var visit = histsvc.addVisit(uri, now, ref, 1, false, 0);
+  // create a query object
+  var query = historyService.getNewQuery();
+  // create the options object we will never use
+  var options = historyService.getNewQueryOptions();
+  // look for this uri only
+  query.uri = uri;
+  // execute
+  var queryRes = historyService.executeQuery(query, options);
+  // open the result container
+  queryRes.root.containerOpen = true;
+  // debug queries
+  // dump_table("moz_places_view");
+  do_check_eq(queryRes.root.childCount, 1);  
+  // call the untested code path
+  historyService.onValueRemoved(null, uri.spec, true);
+  // make sure it is GONE from the DB
+  do_check_eq(queryRes.root.childCount, 0);
+  // close the container
+  queryRes.root.containerOpen = false;
+}
+

From 6b8bdbf71a88ead078cc4fa17489b6f1b9acd840 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Wed, 29 Jul 2009 23:50:42 +0200
Subject: [PATCH 46/61] Bug 494749 - mochitest-browser-chrome:
 browser_490040.js times out intermittently, refactoring of the test,
 r=dietrich

---
 .../test/browser/browser_490040.js            | 111 ++++++++++--------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_490040.js b/browser/components/sessionstore/test/browser/browser_490040.js
index 5bb48bf0c1ef..1fb939442bf3 100644
--- a/browser/components/sessionstore/test/browser/browser_490040.js
+++ b/browser/components/sessionstore/test/browser/browser_490040.js
@@ -38,51 +38,69 @@
 function test() {
   /** Test for Bug 490040 **/
 
-  let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-  let os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+  let ss = Cc["@mozilla.org/browser/sessionstore;1"].
+           getService(Ci.nsISessionStore);
+  let os = Cc["@mozilla.org/observer-service;1"].
+           getService(Ci.nsIObserverService);
+  let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
+           getService(Ci.nsIWindowWatcher);
 
   waitForExplicitFinish();
 
-  function testWithState(aState, aCallback) {
-    // ensure we can store the window if need be
+  function testWithState(aState) {
+    // Ensure we can store the window if needed.
     let curClosedWindowCount = ss.getClosedWindowCount();
-    gPrefService.setIntPref("browser.sessionstore.max_windows_undo", curClosedWindowCount + 1);
+    gPrefService.setIntPref("browser.sessionstore.max_windows_undo",
+                            curClosedWindowCount + 1);
 
-    let theWin = openDialog(location, "_blank", "chrome,all,dialog=no");
-    theWin.addEventListener("load", function(aEvent) {
-      theWin.removeEventListener("load", arguments.callee, true);
+    let windowObserver = {
+      observe: function(aSubject, aTopic, aData) {
+        let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
 
-      ss.setWindowState(theWin, JSON.stringify(aState.windowState), true);
+        switch(aTopic) {
+          case "domwindowopened":
+            theWin.addEventListener("load", function () {
+              theWin.removeEventListener("load", arguments.callee, false);
+              executeSoon(function() {
+                // Close the window as soon as the first tab loads, or
+                // immediately if there are no tabs.
+                if (aState.windowState.windows[0].tabs[0].entries.length) {
+                  theWin.gBrowser.addEventListener("load", function() {
+                    theWin.gBrowser.removeEventListener("load",
+                                                        arguments.callee, true);
+                    theWin.close();
+                  }, true);
+                } else {
+                  executeSoon(function() {
+                    theWin.close();
+                  });
+                }
+                ss.setWindowState(theWin, JSON.stringify(aState.windowState),
+                                  true);
+              });
+            }, false);
+            break;
 
-      let observer = {
-        QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                               Ci.nsISupportsWeakReference]),
-        observe: function(aSubject, aTopic, aData) {
-          let _this = this;
-          // use executeSoon to ensure this happens after SS observer
-          executeSoon(function() {
-            is(ss.getClosedWindowCount(), curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
-               "That window should " + (aState.shouldBeAdded ? "" : "not ") + "be restorable");
-            os.removeObserver(_this, "domwindowclosed");
-            executeSoon(aCallback);
-          });
+          case "domwindowclosed":
+            ww.unregisterNotification(this);
+            // Use executeSoon to ensure this happens after SS observer.
+            executeSoon(function() {
+              is(ss.getClosedWindowCount(),
+                 curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
+                 "That window should " + (aState.shouldBeAdded ? "" : "not ") +
+                 "be restorable");
+              executeSoon(runNextTest);
+            });
+            break;
         }
-      };
-      os.addObserver(observer, "domwindowclosed", true);
-
-      // Close the window as soon as the first tab loads, or immediately if
-      // there are no tabs.
-      if (aState.windowState.windows[0].tabs[0].entries.length) {
-        theWin.gBrowser.addEventListener("load", function() {
-          theWin.gBrowser.removeEventListener("load", arguments.callee, true);
-          theWin.close();
-        }, true);
-      } else {
-        executeSoon(function() {
-          theWin.close();
-        });
       }
-    }, true);
+    }
+    ww.registerNotification(windowObserver);
+    ww.openWindow(null,
+                  location,
+                  "_blank",
+                  "chrome,all,dialog=no",
+                  null);
   }
 
   // Only windows with open tabs are restorable. Windows where a lone tab is
@@ -128,15 +146,16 @@ function test() {
     }
   ];
 
-  testWithState(states[0], function() {
-    testWithState(states[1], function() {
-      testWithState(states[2], function() {
-        testWithState(states[3], function() {
-          gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
-          finish();
-        });
-      });
-    });
-  });
+  function runNextTest() {
+    if (states.length) {
+      let state = states.shift();
+      testWithState(state);
+    }
+    else {
+      gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");
+      finish();
+    }
+  }
+  runNextTest();
 }
 

From 21d72e721fd79240c06c2ed12500d308655e76bf Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 47/61] Bug 269908. <legend> default style changes restrict
 styling options. r+sr=bzbarsky

---
 layout/base/nsCSSFrameConstructor.cpp  |  8 ++++++--
 layout/generic/nsHTMLReflowState.cpp   |  5 ++++-
 layout/reftests/bugs/269908-1-ref.html | 11 +++++++++++
 layout/reftests/bugs/269908-1.html     | 11 +++++++++++
 layout/reftests/bugs/269908-2-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-2.html     |  8 ++++++++
 layout/reftests/bugs/269908-3-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-3.html     |  8 ++++++++
 layout/reftests/bugs/269908-4-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-4.html     |  8 ++++++++
 layout/reftests/bugs/269908-5-ref.html |  8 ++++++++
 layout/reftests/bugs/269908-5.html     |  8 ++++++++
 layout/reftests/bugs/reftest.list      |  5 +++++
 layout/style/forms.css                 | 16 ++++++++--------
 14 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 layout/reftests/bugs/269908-1-ref.html
 create mode 100644 layout/reftests/bugs/269908-1.html
 create mode 100644 layout/reftests/bugs/269908-2-ref.html
 create mode 100644 layout/reftests/bugs/269908-2.html
 create mode 100644 layout/reftests/bugs/269908-3-ref.html
 create mode 100644 layout/reftests/bugs/269908-3.html
 create mode 100644 layout/reftests/bugs/269908-4-ref.html
 create mode 100644 layout/reftests/bugs/269908-4.html
 create mode 100644 layout/reftests/bugs/269908-5-ref.html
 create mode 100644 layout/reftests/bugs/269908-5.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 58682106cc05..50018c46959c 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3653,8 +3653,12 @@ nsCSSFrameConstructor::FindHTMLData(nsIContent* aContent,
       (!aParentFrame ||
        (aParentFrame->GetType() != nsGkAtoms::fieldSetFrame &&
         aParentFrame->GetStyleContext()->GetPseudoType() !=
-          nsCSSAnonBoxes::fieldsetContent))) {
-    // <legend> is only special inside fieldset frames
+          nsCSSAnonBoxes::fieldsetContent) ||
+       aStyleContext->GetStyleDisplay()->IsFloating() ||
+       aStyleContext->GetStyleDisplay()->IsAbsolutelyPositioned())) {
+    // <legend> is only special inside fieldset frames, but for floated or
+    // absolutely positioned legends we want to construct by display type and
+    // not do special legend stuff
     // XXXbz it would be nice if we could just decide this based on the parent
     // tag, and hence just use a SIMPLE_TAG_CHAIN for legend below, but the
     // fact that with XBL we could end up with this legend element in some
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index fade1dd67615..7bdde4a9c4c5 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1831,6 +1831,9 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
     } else {
       PRBool isBlock =
         NS_CSS_FRAME_TYPE_BLOCK == NS_FRAME_GET_TYPE(mFrameType);
+      // make sure legend frames with display:block and width:auto still
+      // shrink-wrap
+      PRBool shrinkWrap = !isBlock || frame->GetType() == nsGkAtoms::legendFrame;
       nsSize size =
         frame->ComputeSize(rendContext,
                            nsSize(aContainingBlockWidth,
@@ -1844,7 +1847,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
                                     mComputedPadding.TopBottom()),
                            nsSize(mComputedPadding.LeftRight(),
                                   mComputedPadding.TopBottom()),
-                           !isBlock);
+                           shrinkWrap);
 
       mComputedWidth = size.width;
       mComputedHeight = size.height;
diff --git a/layout/reftests/bugs/269908-1-ref.html b/layout/reftests/bugs/269908-1-ref.html
new file mode 100644
index 000000000000..38cccd6ec864
--- /dev/null
+++ b/layout/reftests/bugs/269908-1-ref.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="float: left; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+<fieldset>
+<div style="float: right; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-1.html b/layout/reftests/bugs/269908-1.html
new file mode 100644
index 000000000000..2578eac89ac0
--- /dev/null
+++ b/layout/reftests/bugs/269908-1.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="float: left; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+<fieldset>
+<legend style="float: right; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-2-ref.html b/layout/reftests/bugs/269908-2-ref.html
new file mode 100644
index 000000000000..3a986102eb0c
--- /dev/null
+++ b/layout/reftests/bugs/269908-2-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset style="position: relative">
+<div style="position: absolute; top 15px; left: 22px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-2.html b/layout/reftests/bugs/269908-2.html
new file mode 100644
index 000000000000..90ceea356ded
--- /dev/null
+++ b/layout/reftests/bugs/269908-2.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset style="position: relative">
+<legend style="position: absolute; top 15px; left: 22px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-3-ref.html b/layout/reftests/bugs/269908-3-ref.html
new file mode 100644
index 000000000000..114c58bff689
--- /dev/null
+++ b/layout/reftests/bugs/269908-3-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="position: absolute; top 17px; left: 19px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-3.html b/layout/reftests/bugs/269908-3.html
new file mode 100644
index 000000000000..6d36ac1693c0
--- /dev/null
+++ b/layout/reftests/bugs/269908-3.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="position: absolute; top 17px; left: 19px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-4-ref.html b/layout/reftests/bugs/269908-4-ref.html
new file mode 100644
index 000000000000..58f6ccffef2d
--- /dev/null
+++ b/layout/reftests/bugs/269908-4-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<div style="position: fixed; top 21px; left: 13px; display: block; padding-left: 0px; padding-right: 0px;">test</div>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-4.html b/layout/reftests/bugs/269908-4.html
new file mode 100644
index 000000000000..cfa207ac543c
--- /dev/null
+++ b/layout/reftests/bugs/269908-4.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="position: fixed; top 21px; left: 13px; padding-left: 0px; padding-right: 0px;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-5-ref.html b/layout/reftests/bugs/269908-5-ref.html
new file mode 100644
index 000000000000..03a7a816d766
--- /dev/null
+++ b/layout/reftests/bugs/269908-5-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend>test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/269908-5.html b/layout/reftests/bugs/269908-5.html
new file mode 100644
index 000000000000..a8bf121e5a36
--- /dev/null
+++ b/layout/reftests/bugs/269908-5.html
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+<fieldset>
+<legend style="width: auto;">test</legend>
+</fieldset>
+</body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index f425172aff18..8a02851e58e5 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -227,6 +227,11 @@ skip-if(MOZ_WIDGET_TOOLKIT=="cocoa") != 240536-resizer-ltr.xul 240536-resizer-rt
 == 262151-1.html 262151-1-ref.html
 == 262998-1.html 262998-1-ref.html
 == 267353-1.html 267353-1-ref.html
+== 269908-1.html 269908-1-ref.html
+== 269908-2.html 269908-2-ref.html
+== 269908-3.html 269908-3-ref.html
+== 269908-4.html 269908-4-ref.html
+== 269908-5.html 269908-5-ref.html
 == 271747-1a.html 271747-1-ref.html
 == 271747-1b.html 271747-1-ref.html
 == 272646-1.xul 272646-1-ref.xul
diff --git a/layout/style/forms.css b/layout/style/forms.css
index d7745abe2c3f..978d8ae7b2c5 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -53,14 +53,14 @@ fieldset > legend {
   padding-left: 2px;
   padding-right: 2px;
   border: none;
-  position: static ! important;
-  float: none ! important;
-  width: -moz-fit-content ! important;
-  min-width: 0 ! important;
-  max-width: none ! important;
-  height: auto ! important;
-  min-height: 0 ! important;
-  max-height: none ! important;
+  position: static;
+  float: none;
+  width: -moz-fit-content;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
   white-space: nowrap;
 }
 

From 5fff4ee2f445a9d43a9ac1d1656b70b6de74eaeb Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 48/61] Bug 503814. iframe contents shifted slightly due to
 rounding issue. r+sr=roc

---
 gfx/public/nsCoord.h                             |  5 +++++
 gfx/public/nsRect.h                              | 12 ++++++------
 layout/reftests/pixel-rounding/iframe-1-ref.html |  6 ++++++
 layout/reftests/pixel-rounding/iframe-1.html     |  6 ++++++
 layout/reftests/pixel-rounding/reftest.list      |  2 ++
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 layout/reftests/pixel-rounding/iframe-1-ref.html
 create mode 100644 layout/reftests/pixel-rounding/iframe-1.html

diff --git a/gfx/public/nsCoord.h b/gfx/public/nsCoord.h
index 624aae165b87..eb28a240eb65 100644
--- a/gfx/public/nsCoord.h
+++ b/gfx/public/nsCoord.h
@@ -365,6 +365,11 @@ inline PRInt32 NSToIntRound(float aValue)
   return NS_lroundf(aValue);
 }
 
+inline PRInt32 NSToIntRoundUp(float aValue)
+{
+  return PRInt32(NS_floorf(aValue + 0.5f));
+}
+
 /* 
  * App Unit/Pixel conversions
  */
diff --git a/gfx/public/nsRect.h b/gfx/public/nsRect.h
index 9d523288b844..f6c7bb058972 100644
--- a/gfx/public/nsRect.h
+++ b/gfx/public/nsRect.h
@@ -324,12 +324,12 @@ inline nsIntRect
 nsRect::ToNearestPixels(nscoord aAppUnitsPerPixel) const
 {
   nsIntRect rect;
-  rect.x = NSToIntRound(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)));
-  rect.y = NSToIntRound(NSAppUnitsToFloatPixels(y, float(aAppUnitsPerPixel)));
-  rect.width  = NSToIntRound(NSAppUnitsToFloatPixels(XMost(),
-                             float(aAppUnitsPerPixel))) - rect.x;
-  rect.height = NSToIntRound(NSAppUnitsToFloatPixels(YMost(),
-                             float(aAppUnitsPerPixel))) - rect.y;
+  rect.x = NSToIntRoundUp(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)));
+  rect.y = NSToIntRoundUp(NSAppUnitsToFloatPixels(y, float(aAppUnitsPerPixel)));
+  rect.width  = NSToIntRoundUp(NSAppUnitsToFloatPixels(XMost(),
+                               float(aAppUnitsPerPixel))) - rect.x;
+  rect.height = NSToIntRoundUp(NSAppUnitsToFloatPixels(YMost(),
+                               float(aAppUnitsPerPixel))) - rect.y;
   return rect;
 }
 
diff --git a/layout/reftests/pixel-rounding/iframe-1-ref.html b/layout/reftests/pixel-rounding/iframe-1-ref.html
new file mode 100644
index 000000000000..bc38a6fffdfb
--- /dev/null
+++ b/layout/reftests/pixel-rounding/iframe-1-ref.html
@@ -0,0 +1,6 @@
+<html>
+<body style="background-color: rgb(255,0,0)">
+<iframe style="position: fixed; top: 11" src="data:text/html,<body style='background-color: rgba(0,0,255,0.5)'>">
+</iframe>
+</body>
+</html>
diff --git a/layout/reftests/pixel-rounding/iframe-1.html b/layout/reftests/pixel-rounding/iframe-1.html
new file mode 100644
index 000000000000..c98f73cb3789
--- /dev/null
+++ b/layout/reftests/pixel-rounding/iframe-1.html
@@ -0,0 +1,6 @@
+<html>
+<body style="background-color: rgb(255,0,0)">
+<iframe style="position: fixed; top: 10.5" src="data:text/html,<body style='background-color: rgba(0,0,255,0.5)'>">
+</iframe>
+</body>
+</html>
diff --git a/layout/reftests/pixel-rounding/reftest.list b/layout/reftests/pixel-rounding/reftest.list
index d32576127e07..eb76cfc88868 100644
--- a/layout/reftests/pixel-rounding/reftest.list
+++ b/layout/reftests/pixel-rounding/reftest.list
@@ -175,3 +175,5 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") == background-image-tiling.html background
 != border-image-width-0.html border-image-width-10.html
 == border-image-width-4.html border-image-width-0.html
 == border-image-width-9.html border-image-width-0.html
+
+== iframe-1.html iframe-1-ref.html

From fd0c92782081ec75a8c53468906b7ab3b0e8e251 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Wed, 29 Jul 2009 18:10:50 -0400
Subject: [PATCH 49/61] Bug 504269. background color of iframe not drawn on
 print. r+sr=roc

---
 layout/base/nsLayoutUtils.cpp | 24 ++++++++++++++++++------
 layout/style/ua.css           |  5 -----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 985847a35faa..d04241d3b4c1 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1083,12 +1083,24 @@ nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFra
     }
   }
 
-  // For printing, this function is first called on an nsPageFrame, which
-  // creates a display list with a PageContent item. The PageContent item's
-  // paint function calls this function on the nsPageFrame's child which is
-  // an nsPageContentFrame. We only want to add the canvas background color
-  // item once, for the nsPageContentFrame.
-  if (NS_SUCCEEDED(rv) && aFrame->GetType() != nsGkAtoms::pageFrame) {
+  nsIAtom* frameType = aFrame->GetType();
+  // For the viewport frame in print preview/page layout we want to paint
+  // the grey background behind the page, not the canvas color.
+  if (frameType == nsGkAtoms::viewportFrame &&
+      aFrame->PresContext()->IsRootPaginatedDocument() &&
+      (aFrame->PresContext()->Type() == nsPresContext::eContext_PrintPreview ||
+       aFrame->PresContext()->Type() == nsPresContext::eContext_PageLayout)) {
+    nsRect bounds = nsRect(builder.ToReferenceFrame(aFrame),
+                           aFrame->GetSize());
+    rv = list.AppendNewToBottom(new (&builder) nsDisplaySolidColor(
+           aFrame, bounds, NS_RGB(115, 115, 115)));
+  } else if (frameType != nsGkAtoms::pageFrame) {
+    // For printing, this function is first called on an nsPageFrame, which
+    // creates a display list with a PageContent item. The PageContent item's
+    // paint function calls this function on the nsPageFrame's child which is
+    // an nsPageContentFrame. We only want to add the canvas background color
+    // item once, for the nsPageContentFrame.
+
     // Add the canvas background color.
     rv = aFrame->PresContext()->PresShell()->AddCanvasBackgroundColorItem(
            builder, list, aFrame, nsnull, aBackstop);
diff --git a/layout/style/ua.css b/layout/style/ua.css
index f7a1e07463d9..e6cf8a45d215 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -213,11 +213,6 @@
     cursor: default !important;
   }
 
-  *|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas,
-  *|*::-moz-scrolled-canvas {
-    background-color: #737373 !important;
-  }
-
 }
 
 /* XML parse error reporting */

From da2230279aecd9df2f0489487996169f62c33aac Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 29 Jul 2009 18:11:26 -0500
Subject: [PATCH 50/61] Bug 499816 - Minimizing Firefox opens and gives focus
 to minimized Steam windows. (r=jmathies, sr=roc)

---
 widget/src/windows/nsWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 1bad616d74a7..d6976c8f08de 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1415,9 +1415,9 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
       case nsSizeMode_Minimized :
         mode = sTrimOnMinimize ? SW_MINIMIZE : SW_SHOWMINIMIZED;
         if (!sTrimOnMinimize) {
-          // Find the next window that is visible and not minimized.
+          // Find the next window that is enabled, visible, and not minimized.
           HWND hwndBelow = ::GetNextWindow(mWnd, GW_HWNDNEXT);
-          while (hwndBelow && (!::IsWindowVisible(hwndBelow) ||
+          while (hwndBelow && (!::IsWindowEnabled(hwndBelow) || !::IsWindowVisible(hwndBelow) ||
                                ::IsIconic(hwndBelow))) {
             hwndBelow = ::GetNextWindow(hwndBelow, GW_HWNDNEXT);
           }

From e6dd441f4f4e297677af386541b25df6605abc09 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 29 Jul 2009 16:24:14 -0700
Subject: [PATCH 51/61] Backed out changeset ab1686101bfb, pending orange
 investigation

--HG--
extra : rebase_source : ad872bd18b36237fcc450f5fdc61d6579b532518
---
 xpcom/io/nsWildCard.cpp | 471 ++++++++++++++++------------------------
 1 file changed, 185 insertions(+), 286 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index 1aa82e0f70d1..ff0ac240b5f5 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,75 +57,73 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop1, T stop2)
+_valid_subexp(const T *expr, T stop)
 {
-    register int x;
-    int nsc = 0;     /* Number of special characters */
-    int np;          /* Number of pipe characters in union */
-    int tld = 0;     /* Number of tilde characters */
- 
-    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
+    register int x,y,t;
+    int nsc,np,tld;
+
+    x=0;nsc=0;tld=0;
+
+    while(expr[x] && (expr[x] != stop)) {
         switch(expr[x]) {
-        case '~':
-            if(tld)                 /* at most one exclusion */
-                return INVALID_SXP;
-            if (stop1)              /* no exclusions within unions */
-                return INVALID_SXP;
-            if (!expr[x+1])          /* exclusion cannot be last character */
-                return INVALID_SXP;
-            if (!x)                 /* exclusion cannot be first character */
-                return INVALID_SXP;
-            ++tld;
-            /* fall through */
-        case '*':
-        case '?':
-        case '$':
+          case '~':
+            if(tld) return INVALID_SXP;
+            else ++tld;
+          case '*':
+          case '?':
+          case '^':
+          case '$':
             ++nsc;
             break;
-        case '[':
+          case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(; expr[x] && (expr[x] != ']'); ++x) {
-                if(expr[x] == '\\' && !expr[++x])
-                    return INVALID_SXP;
-            }
+            for(;expr[x] && (expr[x] != ']');++x)
+                if(expr[x] == '\\')
+                    if(!expr[++x])
+                        return INVALID_SXP;
             if(!expr[x])
                 return INVALID_SXP;
             break;
-        case '(':
-            ++nsc;
-            if (stop1)                  /* no nested unions */
-                return INVALID_SXP;
-            np = -1;
-            do {
-                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
-                if(t == 0 || t == INVALID_SXP)
+          case '(':
+            ++nsc;np = 0;
+            while(1) {
+                if(expr[++x] == ')')
+                    return INVALID_SXP;
+                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
+                    if(expr[y] == '\\')
+                        if(!expr[++y])
+                            return INVALID_SXP;
+                if(!expr[y])
+                    return INVALID_SXP;
+                if(expr[y] == '|')
+                    ++np;
+                t = ::_valid_subexp(&expr[x],expr[y]);
+                if(t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(!expr[x])
-                    return INVALID_SXP;
-                ++np;
-            } while (expr[x] == '|' );
-            if(np < 1)  /* must be at least one pipe */
-                return INVALID_SXP;
+                if(expr[x] == ')') {
+                    if(!np)
+                        return INVALID_SXP;
+                    break;
+                }
+            }
             break;
-        case ')':
-        case ']':
-        case '|':
+          case ')':
+          case ']':
             return INVALID_SXP;
-        case '\\':
-            ++nsc;
+          case '\\':
             if(!expr[++x])
                 return INVALID_SXP;
-            break;
-        default:
+          default:
             break;
         }
+        ++x;
     }
-    if((!stop1) && (!nsc)) /* must be at least one special character */
-         return NON_SXP;
-    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
+    if((!stop) && (!nsc))
+        return NON_SXP;
+    return ((expr[x] == stop) ? x : INVALID_SXP);
 }
 
 
@@ -133,7 +131,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -157,265 +155,166 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
-
-/**
- * Count characters until we reach a NUL character or either of the
- * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
- * expression, look only for NUL or ']' inside it.  Do not look for stop1
- * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
- * Handle all escaping.
- * Return index in input string of first stop found, or ABORTED if not found.
- * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
- */
-template<class T>
-static int
-_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
-{
-    register int sx;     /* source index */
-    register char cc;
-
-    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
-        if (cc == '\\') {
-            if (!expr[++sx])
-                return ABORTED; /* should be impossible */
-        }
-        else if (cc == '[') {
-            while ((cc = expr[++sx]) && cc != ']') {
-                if(cc == '\\' && !expr[++sx])
-                    return ABORTED;
-            }
-            if (!cc)
-                return ABORTED; /* should be impossible */
-        }
-    }
-    if (dest && sx) {
-        /* Copy all but the closing delimiter. */
-        memcpy(dest, expr, sx * sizeof(T));
-        dest[sx] = 0;
-    }
-    return cc ? sx : ABORTED; /* index of closing delimiter */
-}
-
-/* On input, expr[0] is the opening parenthesis of a union.
- * See if any of the alternatives in the union matches as a pattern.
- * The strategy is to take each of the alternatives, in turn, and append
- * the rest of the expression (after the closing ')' that marks the end of
- * this union) to that alternative, and then see if the resultant expression
- * matches the input string.  Repeat this until some alternative matches,
- * or we have an abort.
- */
-template<class T>
-static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive,
-              unsigned int level)
-{
-    register int sx;     /* source index */
-    int cp;              /* source index of closing parenthesis */
-    int count;
-    int ret   = NOMATCH;
-    T *e2;
-
-    /* Find the closing parenthesis that ends this union in the expression */
-    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
-    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
-        return ABORTED;
-    ++cp;                /* now index of char after closing parenthesis */
-    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
-    if (!e2)
-        return ABORTED;
-    for (sx = 1; ret == NOMATCH && expr[sx] && expr[sx] != ')'; ++sx) {
-        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
-        /* Copy everything up to the next delimiter to e2 */
-        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
-        if (count == ABORTED || !count) {
-            ret = ABORTED;
-            break;
-        }
-        sx += count;
-        /* Append everything after closing parenthesis to e2. This is safe. */
-        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
-        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
-    }
-    NS_Free(e2);
-    if (sx < 2)
-        ret = ABORTED;
-    return ret;
-}
-
-/* returns 1 if val is in range from start..end, case insensitive. */
-static int
-_is_char_in_range(int start, int end, int val)
-{
-    char map[256];
-    memset(map, 0, sizeof map);
-    while (start <= end)
-        map[tolower(start++)] = 1;
-    return map[tolower(val)];
-}
+static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
-             unsigned int level)
+_handle_union(const T *str, const T *expr, PRBool case_insensitive)
 {
-    register int x;   /* input string index */
-    register int y;   /* expression index */
-    int ret,neg;
+    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
+    register int t,p2,p1 = 1;
+    int cp;
 
-    if (level > 20)      /* Don't let the stack get too deep. */
-        return ABORTED;
-    for(x = 0, y = 0; expr[y]; ++y, ++x) {
-        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+    while(1) {
+        for(cp=1;expr[cp] != ')';cp++)
+            if(expr[cp] == '\\')
+                ++cp;
+        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
+            if(expr[p1] == '\\')
+                e2[p2++] = expr[p1++];
+            e2[p2] = expr[p1];
+        }
+        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
+        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
+            NS_Free(e2);
+            return MATCH;
+        }
+        if(p1 == cp) {
+            NS_Free(e2);
             return NOMATCH;
         }
-        switch(expr[y]) {
-        case '$':
-            if(str[x])
-                return NOMATCH;
-            --x;                 /* we don't want loop to increment x */
-            break;
-        case '*':
-            while(expr[++y] == '*'){}
-            if(!expr[y])
-                return MATCH;
-            while(str[x]) {
-                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
-                                     level + 1);
-                switch(ret) {
-                case NOMATCH:
-                    continue;
-                case ABORTED:
-                    return ABORTED;
-                default:
-                    return MATCH;
-                }
-            }
-            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                return MATCH;
-            else
-                return NOMATCH;
-        case '[': {
-            T start, end = 0;
-            int i;
-            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-            if (neg)
-                ++y;
-            i = y;
-            start = expr[i++];
-            if (start == '\\')
-                start = expr[i++];
-            if (isalnum(int(start)) && expr[i++] == '-') {
-                end = expr[i++];
-                if (end == '\\')
-                    end = expr[i++];
-            }
-            if (isalnum(int(end)) && expr[i] == ']') {
-                /* This is a range form: a-b */
-                T val = str[x];
-                if (end < start) { /* swap them */
-                    T tmp = end;
-                    end = start;
-                    start = tmp;
-                }
-                if (case_insensitive && isalpha(int(val))) {
-                    val = ::_is_char_in_range(int(start), int(end), int(val));
-                    if (neg == val)
-                        return NOMATCH;
-                }
-                else if (neg != ((val < start) || (val > end))) {
-                    return NOMATCH;
-                }
-                y = i;
-            }
-            else {
-                /* Not range form */
-                int matched = 0;
-                for (; expr[y] != ']'; y++) {
-                    if (expr[y] == '\\')
-                        ++y;
-                    if(case_insensitive)
-                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
-                    else
-                        matched |= (str[x] == expr[y]);
-                }
-                if (neg == matched)
-                    return NOMATCH;
-            }
-        }
-        break;
-        case '(':
-            if (!expr[y+1])
-                return ABORTED;
-            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
-        case '?':
-            break;
-        case ')':
-        case ']':
-        case '|':
-            return ABORTED;
-        case '\\':
-            ++y;
-            /* fall through */
-        default:
-            if(case_insensitive) {
-                if(toupper(int(str[x])) != toupper(int(expr[y])))
-                    return NOMATCH;
-            }
-            else {
-                if(str[x] != expr[y])
-                    return NOMATCH;
-            }
-            break;
-        }
+        else ++p1;
     }
-    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
 static int
-ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
 {
-    T *expr = NULL;
-    int x, ret = MATCH;
+    register int x,y;
+    int ret,neg;
 
-    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
-        return _shexp_match(str, xp, case_insensitive, 0);
+    ret = 0;
+    for(x=0,y=0;expr[y];++y,++x) {
+        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
+            ret = ABORTED;
+        else {
+            switch(expr[y]) {
+              case '$':
+                if( (str[x]) )
+                    ret = NOMATCH;
+                else
+                    --x;             /* we don't want loop to increment x */
+                break;
+              case '*':
+                while(expr[++y] == '*'){}
+                if(!expr[y])
+                    return MATCH;
+                while(str[x]) {
+                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
+                      case NOMATCH:
+                        continue;
+                      case ABORTED:
+                        ret = ABORTED;
+                        break;
+                      default:
+                        return MATCH;
+                    }
+                    break;
+                }
+                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                    return MATCH;
+                else
+                    ret = ABORTED;
+                break;
+              case '[':
+                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+                if (neg)
+                    ++y;
 
-    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
-    if(!expr)
-        return NOMATCH;
+                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
+                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
+                    {
+                        int start = expr[y], end = expr[y+2];
 
-    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
-    if (x != ABORTED && expr[x] == '~') {
-        expr[x++] = '\0';
-        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
-        switch (ret) {
-        case NOMATCH: ret = MATCH;   break;
-        case MATCH:   ret = NOMATCH; break;
-        default:                     break;
+                        /* Droolproofing for pinheads not included */
+                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
+                            ret = NOMATCH;
+                            break;
+                        }
+                        y+=3;
+                    }
+                else {
+                    int matched;
+
+                    for (matched=0;expr[y] != ']';y++) {
+                        /* match an escaped ']' character */
+                        if('\\' == expr[y] && ']' == expr[y+1]) {
+                            if(']' == str[x])
+                                matched |= 1;
+                            y++; /* move an extra char to compensate for '\\' */
+                            continue;
+                        }
+                        matched |= (str[x] == expr[y]);
+                    }
+                    if (neg ^ (!matched))
+                        ret = NOMATCH;
+                }
+                break;
+              case '(':
+                return ::_handle_union(&str[x],&expr[y], case_insensitive);
+                break;
+              case '?':
+                break;
+              case '\\':
+                ++y;
+              default:
+                if(case_insensitive)
+                  {
+                    if(toupper(str[x]) != toupper(expr[y]))
+                        ret = NOMATCH;
+                  }
+                else
+                  {
+                    if(str[x] != expr[y])
+                        ret = NOMATCH;
+                  }
+                break;
+            }
         }
+        if(ret)
+            break;
     }
-    if (ret == MATCH)
-        ret = ::_shexp_match(str, expr, case_insensitive, 0);
-
-    NS_Free(expr);
-    return ret;
+    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
 }
 
+
 template<class T>
-NS_COM int
-NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+int
+NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
 {
-    int is_valid = NS_WildCardValid(expr);
-    switch(is_valid) {
-        case INVALID_SXP:
-            return -1;
-        default:
-            return ns_WildCardMatch(str, expr, case_insensitive);
+    T *expr = NS_strdup(xp);
+
+    if(!expr)
+        return 1;
+
+    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
+        if((expr[x] == '~') && (expr[x-1] != '\\')) {
+            expr[x] = '\0';
+            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
+                goto punt;
+            break;
+        }
     }
+    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
+        NS_Free(expr);
+        return 0;
+    }
+
+  punt:
+    NS_Free(expr);
+    return 1;
 }
 
 NS_COM int

From a25445565b8004c7c6e8c18c8e00489d91fb871e Mon Sep 17 00:00:00 2001
From: Nelson Bolyard <nelson@bolyard.me>
Date: Wed, 29 Jul 2009 14:07:45 -0700
Subject: [PATCH 52/61] Bug 332173 - Problems with regexp parsing of '~' in
 nsIZipReader.findEntries (and other nsWildCard uses).  r=jwalden, a=ss

---
 xpcom/io/nsWildCard.cpp | 451 ++++++++++++++++++++++++----------------
 1 file changed, 277 insertions(+), 174 deletions(-)

diff --git a/xpcom/io/nsWildCard.cpp b/xpcom/io/nsWildCard.cpp
index ff0ac240b5f5..90f3d7181781 100644
--- a/xpcom/io/nsWildCard.cpp
+++ b/xpcom/io/nsWildCard.cpp
@@ -57,73 +57,75 @@
 
 template<class T>
 static int
-_valid_subexp(const T *expr, T stop)
+_valid_subexp(const T *expr, T stop1, T stop2)
 {
-    register int x,y,t;
-    int nsc,np,tld;
-
-    x=0;nsc=0;tld=0;
-
-    while(expr[x] && (expr[x] != stop)) {
+    register int x;
+    int nsc = 0;     /* Number of special characters */
+    int np;          /* Number of pipe characters in union */
+    int tld = 0;     /* Number of tilde characters */
+ 
+    for (x = 0; expr[x] && (expr[x] != stop1) && (expr[x] != stop2); ++x) {
         switch(expr[x]) {
-          case '~':
-            if(tld) return INVALID_SXP;
-            else ++tld;
-          case '*':
-          case '?':
-          case '^':
-          case '$':
+        case '~':
+            if(tld)                 /* at most one exclusion */
+                return INVALID_SXP;
+            if (stop1)              /* no exclusions within unions */
+                return INVALID_SXP;
+            if (!expr[x+1])          /* exclusion cannot be last character */
+                return INVALID_SXP;
+            if (!x)                 /* exclusion cannot be first character */
+                return INVALID_SXP;
+            ++tld;
+            /* fall through */
+        case '*':
+        case '?':
+        case '$':
             ++nsc;
             break;
-          case '[':
+        case '[':
             ++nsc;
             if((!expr[++x]) || (expr[x] == ']'))
                 return INVALID_SXP;
-            for(;expr[x] && (expr[x] != ']');++x)
-                if(expr[x] == '\\')
-                    if(!expr[++x])
-                        return INVALID_SXP;
+            for(; expr[x] && (expr[x] != ']'); ++x) {
+                if(expr[x] == '\\' && !expr[++x])
+                    return INVALID_SXP;
+            }
             if(!expr[x])
                 return INVALID_SXP;
             break;
-          case '(':
-            ++nsc;np = 0;
-            while(1) {
-                if(expr[++x] == ')')
-                    return INVALID_SXP;
-                for(y=x;(expr[y]) && (expr[y] != '|') && (expr[y] != ')');++y)
-                    if(expr[y] == '\\')
-                        if(!expr[++y])
-                            return INVALID_SXP;
-                if(!expr[y])
-                    return INVALID_SXP;
-                if(expr[y] == '|')
-                    ++np;
-                t = ::_valid_subexp(&expr[x],expr[y]);
-                if(t == INVALID_SXP)
+        case '(':
+            ++nsc;
+            if (stop1)                  /* no nested unions */
+                return INVALID_SXP;
+            np = -1;
+            do {
+                int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
+                if(t == 0 || t == INVALID_SXP)
                     return INVALID_SXP;
                 x+=t;
-                if(expr[x] == ')') {
-                    if(!np)
-                        return INVALID_SXP;
-                    break;
-                }
-            }
+                if(!expr[x])
+                    return INVALID_SXP;
+                ++np;
+            } while (expr[x] == '|' );
+            if(np < 1)  /* must be at least one pipe */
+                return INVALID_SXP;
             break;
-          case ')':
-          case ']':
+        case ')':
+        case ']':
+        case '|':
             return INVALID_SXP;
-          case '\\':
+        case '\\':
+            ++nsc;
             if(!expr[++x])
                 return INVALID_SXP;
-          default:
+            break;
+        default:
             break;
         }
-        ++x;
     }
-    if((!stop) && (!nsc))
-        return NON_SXP;
-    return ((expr[x] == stop) ? x : INVALID_SXP);
+    if((!stop1) && (!nsc)) /* must be at least one special character */
+         return NON_SXP;
+    return ((expr[x] == stop1 || expr[x] == stop2) ? x : INVALID_SXP);
 }
 
 
@@ -131,7 +133,7 @@ template<class T>
 int
 NS_WildCardValid_(const T *expr)
 {
-    int x = ::_valid_subexp(expr, T('\0'));
+    int x = ::_valid_subexp(expr, T('\0'), T('\0'));
     return (x < 0 ? x : VALID_SXP);
 }
 
@@ -155,166 +157,267 @@ NS_WildCardValid(const PRUnichar *expr)
 #define ABORTED -1
 
 template<class T>
-static int _shexp_match(const T *str, const T *expr, PRBool case_insensitive);
+static int
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
 
+/**
+ * Count characters until we reach a NUL character or either of the
+ * two delimiter characters, stop1 or stop2.  If we encounter a bracketed
+ * expression, look only for NUL or ']' inside it.  Do not look for stop1
+ * or stop2 inside it. Return ABORTED if bracketed expression is unterminated.
+ * Handle all escaping.
+ * Return index in input string of first stop found, or ABORTED if not found.
+ * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
+ */
 template<class T>
 static int
-_handle_union(const T *str, const T *expr, PRBool case_insensitive)
+_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
 {
-    T *e2 = (T *) NS_Alloc(sizeof(T)*nsCharTraits<T>::length(expr));
-    register int t,p2,p1 = 1;
-    int cp;
+    register int sx;     /* source index */
+    register char cc;
 
-    while(1) {
-        for(cp=1;expr[cp] != ')';cp++)
-            if(expr[cp] == '\\')
-                ++cp;
-        for(p2 = 0;(expr[p1] != '|') && (p1 != cp);p1++,p2++) {
-            if(expr[p1] == '\\')
-                e2[p2++] = expr[p1++];
-            e2[p2] = expr[p1];
+    for (sx = 0; (cc = expr[sx]) && cc != stop1 && cc != stop2; sx++) {
+        if (cc == '\\') {
+            if (!expr[++sx])
+                return ABORTED; /* should be impossible */
         }
-        for (t=cp+1; ((e2[p2] = expr[t]) != 0); ++t,++p2) {}
-        if(::_shexp_match(str,e2, case_insensitive) == MATCH) {
-            NS_Free(e2);
-            return MATCH;
+        else if (cc == '[') {
+            while ((cc = expr[++sx]) && cc != ']') {
+                if(cc == '\\' && !expr[++sx])
+                    return ABORTED;
+            }
+            if (!cc)
+                return ABORTED; /* should be impossible */
         }
-        if(p1 == cp) {
-            NS_Free(e2);
-            return NOMATCH;
-        }
-        else ++p1;
     }
+    if (dest && sx) {
+        /* Copy all but the closing delimiter. */
+        memcpy(dest, expr, sx * sizeof(T));
+        dest[sx] = 0;
+    }
+    return cc ? sx : ABORTED; /* index of closing delimiter */
 }
 
+/* On input, expr[0] is the opening parenthesis of a union.
+ * See if any of the alternatives in the union matches as a pattern.
+ * The strategy is to take each of the alternatives, in turn, and append
+ * the rest of the expression (after the closing ')' that marks the end of
+ * this union) to that alternative, and then see if the resultant expression
+ * matches the input string.  Repeat this until some alternative matches,
+ * or we have an abort.
+ */
+template<class T>
+static int
+_handle_union(const T *str, const T *expr, PRBool case_insensitive,
+              unsigned int level)
+{
+    register int sx;     /* source index */
+    int cp;              /* source index of closing parenthesis */
+    int count;
+    int ret   = NOMATCH;
+    T *e2;
+
+    /* Find the closing parenthesis that ends this union in the expression */
+    cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
+    if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
+        return ABORTED;
+    ++cp;                /* now index of char after closing parenthesis */
+    e2 = (T *) NS_Alloc(1 + nsCharTraits<T>::length(expr));
+    if (!e2)
+        return ABORTED;
+    for (sx = 1; ; ++sx) {
+        /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
+        /* Copy everything up to the next delimiter to e2 */
+        count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
+        if (count == ABORTED || !count) {
+            ret = ABORTED;
+            break;
+        }
+        sx += count;
+        /* Append everything after closing parenthesis to e2. This is safe. */
+        nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
+        ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
+        if (ret != NOMATCH || !expr[sx] || expr[sx] == ')')
+            break;
+    }
+    NS_Free(e2);
+    if (sx < 2)
+        ret = ABORTED;
+    return ret;
+}
+
+/* returns 1 if val is in range from start..end, case insensitive. */
+static int
+_is_char_in_range(int start, int end, int val)
+{
+    char map[256];
+    memset(map, 0, sizeof map);
+    while (start <= end)
+        map[tolower(start++)] = 1;
+    return map[tolower(val)];
+}
 
 template<class T>
 static int
-_shexp_match(const T *str, const T *expr, PRBool case_insensitive)
+_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
+             unsigned int level)
 {
-    register int x,y;
+    register int x;   /* input string index */
+    register int y;   /* expression index */
     int ret,neg;
 
-    ret = 0;
-    for(x=0,y=0;expr[y];++y,++x) {
-        if((!str[x]) && (expr[y] != '(') && (expr[y] != '$') && (expr[y] != '*'))
-            ret = ABORTED;
-        else {
-            switch(expr[y]) {
-              case '$':
-                if( (str[x]) )
-                    ret = NOMATCH;
-                else
-                    --x;             /* we don't want loop to increment x */
-                break;
-              case '*':
-                while(expr[++y] == '*'){}
-                if(!expr[y])
+    if (level > 20)      /* Don't let the stack get too deep. */
+        return ABORTED;
+    for(x = 0, y = 0; expr[y]; ++y, ++x) {
+        if((!str[x]) && (expr[y] != '$') && (expr[y] != '*')) {
+            return NOMATCH;
+        }
+        switch(expr[y]) {
+        case '$':
+            if(str[x])
+                return NOMATCH;
+            --x;                 /* we don't want loop to increment x */
+            break;
+        case '*':
+            while(expr[++y] == '*'){}
+            if(!expr[y])
+                return MATCH;
+            while(str[x]) {
+                ret = ::_shexp_match(&str[x++], &expr[y], case_insensitive,
+                                     level + 1);
+                switch(ret) {
+                case NOMATCH:
+                    continue;
+                case ABORTED:
+                    return ABORTED;
+                default:
                     return MATCH;
-                while(str[x]) {
-                    switch(::_shexp_match(&str[x++],&expr[y], case_insensitive)) {
-                      case NOMATCH:
-                        continue;
-                      case ABORTED:
-                        ret = ABORTED;
-                        break;
-                      default:
-                        return MATCH;
-                    }
-                    break;
                 }
-                if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
-                    return MATCH;
-                else
-                    ret = ABORTED;
-                break;
-              case '[':
-                neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
-                if (neg)
-                    ++y;
-
-                if ((isalnum(expr[y])) && (expr[y+1] == '-') &&
-                   (isalnum(expr[y+2])) && (expr[y+3] == ']'))
-                    {
-                        int start = expr[y], end = expr[y+2];
-
-                        /* Droolproofing for pinheads not included */
-                        if(neg ^ ((str[x] < start) || (str[x] > end))) {
-                            ret = NOMATCH;
-                            break;
-                        }
-                        y+=3;
-                    }
-                else {
-                    int matched;
-
-                    for (matched=0;expr[y] != ']';y++) {
-                        /* match an escaped ']' character */
-                        if('\\' == expr[y] && ']' == expr[y+1]) {
-                            if(']' == str[x])
-                                matched |= 1;
-                            y++; /* move an extra char to compensate for '\\' */
-                            continue;
-                        }
-                        matched |= (str[x] == expr[y]);
-                    }
-                    if (neg ^ (!matched))
-                        ret = NOMATCH;
-                }
-                break;
-              case '(':
-                return ::_handle_union(&str[x],&expr[y], case_insensitive);
-                break;
-              case '?':
-                break;
-              case '\\':
+            }
+            if((expr[y] == '$') && (expr[y+1] == '\0') && (!str[x]))
+                return MATCH;
+            else
+                return NOMATCH;
+        case '[': {
+            T start, end = 0;
+            int i;
+            neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+            if (neg)
                 ++y;
-              default:
-                if(case_insensitive)
-                  {
-                    if(toupper(str[x]) != toupper(expr[y]))
-                        ret = NOMATCH;
-                  }
-                else
-                  {
-                    if(str[x] != expr[y])
-                        ret = NOMATCH;
-                  }
-                break;
+            i = y;
+            start = expr[i++];
+            if (start == '\\')
+                start = expr[i++];
+            if (isalnum(int(start)) && expr[i++] == '-') {
+                end = expr[i++];
+                if (end == '\\')
+                    end = expr[i++];
+            }
+            if (isalnum(int(end)) && expr[i] == ']') {
+                /* This is a range form: a-b */
+                T val = str[x];
+                if (end < start) { /* swap them */
+                    T tmp = end;
+                    end = start;
+                    start = tmp;
+                }
+                if (case_insensitive && isalpha(int(val))) {
+                    val = ::_is_char_in_range(int(start), int(end), int(val));
+                    if (neg == val)
+                        return NOMATCH;
+                }
+                else if (neg != ((val < start) || (val > end))) {
+                    return NOMATCH;
+                }
+                y = i;
+            }
+            else {
+                /* Not range form */
+                int matched = 0;
+                for (; expr[y] != ']'; y++) {
+                    if (expr[y] == '\\')
+                        ++y;
+                    if(case_insensitive)
+                        matched |= (toupper(int(str[x])) == toupper(int(expr[y])));
+                    else
+                        matched |= (str[x] == expr[y]);
+                }
+                if (neg == matched)
+                    return NOMATCH;
             }
         }
-        if(ret)
+        break;
+        case '(':
+            if (!expr[y+1])
+                return ABORTED;
+            return ::_handle_union(&str[x], &expr[y], case_insensitive, level + 1);
+        case '?':
             break;
+        case ')':
+        case ']':
+        case '|':
+            return ABORTED;
+        case '\\':
+            ++y;
+            /* fall through */
+        default:
+            if(case_insensitive) {
+                if(toupper(int(str[x])) != toupper(int(expr[y])))
+                    return NOMATCH;
+            }
+            else {
+                if(str[x] != expr[y])
+                    return NOMATCH;
+            }
+            break;
+        }
     }
-    return (ret ? ret : (str[x] ? NOMATCH : MATCH));
+    return (str[x] ? NOMATCH : MATCH);
 }
 
 
 template<class T>
-int
-NS_WildCardMatch_(const T *str, const T *xp, PRBool case_insensitive)
+static int
+ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
 {
-    T *expr = NS_strdup(xp);
+    T *expr = NULL;
+    int x, ret = MATCH;
 
+    if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
+        return _shexp_match(str, xp, case_insensitive, 0);
+
+    expr = (T *) NS_Alloc(nsCharTraits<T>::length(xp) + 1);
     if(!expr)
-        return 1;
+        return NOMATCH;
 
-    for(int x=nsCharTraits<T>::length(expr)-1;x;--x) {
-        if((expr[x] == '~') && (expr[x-1] != '\\')) {
-            expr[x] = '\0';
-            if(::_shexp_match(str,&expr[++x], case_insensitive) == MATCH)
-                goto punt;
-            break;
+    x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
+    if (x != ABORTED && expr[x] == '~') {
+        expr[x++] = '\0';
+        ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
+        switch (ret) {
+        case NOMATCH: ret = MATCH;   break;
+        case MATCH:   ret = NOMATCH; break;
+        default:                     break;
         }
     }
-    if(::_shexp_match(str,expr, case_insensitive) == MATCH) {
-        NS_Free(expr);
-        return 0;
-    }
+    if (ret == MATCH)
+        ret = ::_shexp_match(str, expr, case_insensitive, 0);
 
-  punt:
     NS_Free(expr);
-    return 1;
+    return ret;
+}
+
+template<class T>
+NS_COM int
+NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
+{
+    int is_valid = NS_WildCardValid(expr);
+    switch(is_valid) {
+        case INVALID_SXP:
+            return -1;
+        default:
+            return ns_WildCardMatch(str, expr, case_insensitive);
+    }
 }
 
 NS_COM int

From 6c0e1d9acec836e4d3dbfa3c6aadec90da83e395 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 29 Jul 2009 22:28:29 -0400
Subject: [PATCH 53/61] This test is testing stuff that is just not true
 anymore now

---
 layout/reftests/bugs/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 8a02851e58e5..dbd870863d84 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -811,7 +811,7 @@ random == 403134-1.html 403134-1-ref.html # bug 405377
 != 404030-1-notref2.html 404030-1.html
 == 404123-1.html 404123-1-ref.html
 == 404123-2.html 404123-2-ref.html
-== 404123-3.html 404123-3-ref.html
+!= 404123-3.html 404123-3-ref.html
 HTTP(..) == 404149-1.xul 404149-1-ref.xul # HTTP for fonts directory access
 == 404180-1.html 404180-1-ref.html
 == 404301-1.html 404301-1-ref.html

From 77be8894d4bb8c3664e99307114e2b77f6333308 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 30 Jul 2009 15:15:50 +1200
Subject: [PATCH 54/61] b=493541 hook jemalloc into glibc's malloc r=bsmedberg

---
 memory/jemalloc/jemalloc.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index 516d64259f4c..a3952dee01c4 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -7069,6 +7069,10 @@ _malloc_postfork(void)
  */
 /******************************************************************************/
 
+#ifdef HAVE_LIBDL
+#  include <dlfcn.h>
+#endif
+
 #ifdef MOZ_MEMORY_DARWIN
 static malloc_zone_t zone;
 static struct malloc_introspection_t zone_introspect;
@@ -7229,4 +7233,27 @@ jemalloc_darwin_init(void)
 		sizeof(malloc_zone_t *) * (malloc_num_zones - 1));
 	malloc_zones[0] = &zone;
 }
+
+#elif defined(__GLIBC__) && !defined(__UCLIBC__)
+/*
+ * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible
+ * to inconsistently reference libc's malloc(3)-compatible functions
+ * (bug 493541).
+ *
+ * These definitions interpose hooks in glibc.  The functions are actually
+ * passed an extra argument for the caller return address, which will be
+ * ignored.
+ */
+void (*__free_hook)(void *ptr) = free;
+void *(*__malloc_hook)(size_t size) = malloc;
+void *(*__realloc_hook)(void *ptr, size_t size) = realloc;
+void *(*__memalign_hook)(size_t alignment, size_t size) = memalign;
+
+#elif defined(RTLD_DEEPBIND)
+/*
+ * XXX On systems that support RTLD_GROUP or DF_1_GROUP, do their
+ * implementations permit similar inconsistencies?  Should STV_SINGLETON
+ * visibility be used for interposition where available?
+ */
+#  error "Interposing malloc is unsafe on this system without libc malloc hooks."
 #endif

From 2ed66c1983a7e4ac846f0ef23465bb40e7bda108 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Thu, 30 Jul 2009 15:23:56 +1200
Subject: [PATCH 55/61] whitespace change to force rebuild with dae91a0884c9

---
 toolkit/xre/nsAppRunner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 06a0c46c2951..1c5870399ae8 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -604,7 +604,7 @@ class nsXULAppInfo : public nsIXULAppInfo,
                      public nsICrashReporter,
 #endif
                      public nsIXULRuntime
-                     
+
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED

From 4bc4c4700511ddc5b0532a3da1c66c61a627937c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:48:13 +1200
Subject: [PATCH 56/61] Bug 467914. GetOverflowRectRelativeToSelf shouldn't
 always expect a preEffectsBBox. r=dbaron

--HG--
extra : rebase_source : cc6cd0bf3f4b11785b85baeaf74bd9ef7725c42f
---
 layout/generic/crashtests/467914-1.html   | 3 +++
 layout/generic/crashtests/crashtests.list | 1 +
 layout/generic/nsFrame.cpp                | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 layout/generic/crashtests/467914-1.html

diff --git a/layout/generic/crashtests/467914-1.html b/layout/generic/crashtests/467914-1.html
new file mode 100644
index 000000000000..1066a6c8a73b
--- /dev/null
+++ b/layout/generic/crashtests/467914-1.html
@@ -0,0 +1,3 @@
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:mathml="http://www.w3.org/1998/Math/MathML">
+<mathml:munder style="-moz-transform: translate(50px);clip-path: url(#h);"/>
+</window>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index a1d68cafc43b..047c4b65db91 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -222,6 +222,7 @@ load 457380-1.html
 load 463741-1.html
 load 465651-1.html
 load 467487-1.html
+load 467914-1.html
 load 468207-1.html
 load 469859-1.xhtml
 load 472587-1.xhtml
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index bd49f69a0880..0d69168a530a 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4023,8 +4023,11 @@ nsIFrame::GetOverflowRectRelativeToSelf() const
   if (!(mState & NS_FRAME_MAY_BE_TRANSFORMED_OR_HAVE_RENDERING_OBSERVERS) ||
       !GetStyleDisplay()->HasTransform())
     return GetOverflowRect();
-  return *static_cast<nsRect*>
+  nsRect* preEffectsBBox = static_cast<nsRect*>
     (GetProperty(nsGkAtoms::preEffectsBBoxProperty));
+  if (!preEffectsBBox)
+    return GetOverflowRect();
+  return *preEffectsBBox;
 }
 
 void

From 1e3c4c96f35b9d9b5e25aa5188413de5a59c5937 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 14:54:42 +1200
Subject: [PATCH 57/61] Bug 506615. XUL decks should not have wididgets.
 r=dbaron

--HG--
extra : rebase_source : 5d6728b11a121565f828f27e8abed5e0172aa069
---
 layout/generic/nsContainerFrame.cpp    |  9 +++----
 layout/generic/nsFrame.cpp             |  9 -------
 layout/generic/nsIFrame.h              |  8 ++----
 layout/xul/base/src/nsBoxFrame.cpp     | 12 ---------
 layout/xul/base/src/nsDeckFrame.h      |  4 ---
 layout/xul/base/src/nsLeafBoxFrame.cpp | 12 ---------
 view/public/nsIViewManager.h           |  7 ++++-
 view/src/nsView.cpp                    | 37 +++++++++++++++++++-------
 view/src/nsView.h                      |  4 +++
 view/src/nsViewManager.cpp             | 25 +++--------------
 10 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index f6f1423077b5..58f7a791ad97 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -617,11 +617,10 @@ nsContainerFrame::SyncFrameViewProperties(nsPresContext*  aPresContext,
 
     if (!aStyleContext->GetStyleVisibility()->IsVisible() &&
         !aFrame->SupportsVisibilityHidden()) {
-      // If it's a scrollable frame that can't hide its scrollbars,
-      // hide the view. This means that child elements can't override
-      // their parent's visibility, but it's not practical to leave it
-      // visible in all cases because the scrollbars will be showing
-      // XXXldb Does the view system really enforce this correctly?
+      // If it's a subdocument frame or a plugin, hide the view and
+      // any associated widget.
+      // These are leaf elements so this is OK, no descendant can be
+      // visibility:visible.
       viewIsVisible = PR_FALSE;
     } else if (IsMenuPopup(aFrame)) {
       // if the view is for a popup, don't show the view if the popup is closed
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 0d69168a530a..6168c7ed0ad4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6717,15 +6717,6 @@ nsFrame::SetParent(const nsIFrame* aParent)
   else if (wasBoxWrapped && !IsBoxWrapped())
     DeleteProperty(nsGkAtoms::boxMetricsProperty);
 
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-          CreateWidgetForView(view);
-    }
-  }
-
   return NS_OK;
 }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index def82baab314..6bea51a15afc 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -107,10 +107,9 @@ struct nsMargin;
 typedef class nsIFrame nsIBox;
 
 // IID for the nsIFrame interface
-// 7b437d20-a34e-11dd-ad8b-0800200c9a66
 #define NS_IFRAME_IID \
-  { 0x7b437d20, 0xa34e, 0x11dd, \
-    { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
+  { 0x7e9018b5, 0x5405, 0x4e2b, \
+    { 0x87, 0x67, 0xe2, 0xb4, 0xb1, 0x3e, 0xc1, 0x69 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -2286,9 +2285,6 @@ NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
   NS_IMETHOD DumpBox(FILE* out)=0;
 #endif
 
-  // Only nsDeckFrame requires that all its children have widgets
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_FALSE; }
-
   /**
    * @return PR_TRUE if this text frame ends with a newline character.  It
    * should return PR_FALSE if this is not a text frame.
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 5b2e4cefb11d..fe6bd386ca0d 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -205,18 +205,6 @@ nsBoxFrame::Init(nsIContent*      aContent,
 
   MarkIntrinsicWidthsDirty();
 
-  // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-
   CacheAttributes();
 
 #ifdef DEBUG_LAYOUT
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index 741ba5315c1a..6fe832a83a05 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -75,10 +75,6 @@ public:
 
   virtual nsIAtom* GetType() const;
 
-#ifndef MOZ_GFX_OPTIMIZE_MOBILE
-  virtual PRBool ChildrenMustHaveWidgets() const { return PR_TRUE; }
-#endif
-
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const
   {
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index dec1019d00cb..07448fe5743b 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -98,18 +98,6 @@ nsLeafBoxFrame::Init(
   nsresult  rv = nsLeafFrame::Init(aContent, aParent, aPrevInFlow);
   NS_ENSURE_SUCCESS(rv, rv);
 
-   // see if we need a widget
-  if (aParent && aParent->IsBoxFrame()) {
-    if (aParent->ChildrenMustHaveWidgets()) {
-        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE); 
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        nsIView* view = GetView();
-        if (!view->HasWidget())
-           view->CreateWidget(kWidgetCID);   
-    }
-  }
-  
   mMouseThrough = unset;
 
   UpdateMouseThrough();
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 840421b5e4f8..ec4825e4c1b5 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -256,7 +256,12 @@ public:
                          PRBool aRepaintExposedAreaOnly = PR_FALSE) = 0;
 
   /**
-   * Set the visibility of a view.
+   * Set the visibility of a view. Hidden views have the effect of hiding
+   * their descendants as well. This does not affect painting, so layout
+   * is responsible for ensuring that content in hidden views is not
+   * painted nor handling events. It does affect the visibility of widgets;
+   * if a view is hidden, descendant views with widgets have their widgets
+   * hidden.
    * The view manager generates the appropriate dirty regions.
    * @param aView view to change visibility state of
    * @param visible new visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 228e74597f2a..1fff95629f50 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -52,7 +52,6 @@ static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
 
 
 //#define SHOW_VIEW_BORDERS
-//#define HIDE_ALL_WIDGETS
 
 // {34297A07-A8FD-d811-87C6-000244212BCB}
 #define VIEW_WRAPPER_IID \
@@ -338,6 +337,15 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
   }
 }
 
+PRBool nsView::IsEffectivelyVisible()
+{
+  for (nsView* v = this; v; v = v->mParent) {
+    if (v->GetVisibility() == nsViewVisibility_kHide)
+      return PR_FALSE;
+  }
+  return PR_TRUE;
+}
+
 nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
 {
   nsCOMPtr<nsIDeviceContext> dx;
@@ -354,7 +362,7 @@ nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
     viewBounds += offset;
 
     if (parentWidget && aType == eWindowType_popup &&
-        mVis == nsViewVisibility_kShow) {
+        IsEffectivelyVisible()) {
       nsIntPoint screenPoint = parentWidget->WidgetToScreenOffset();
       viewBounds += nsPoint(NSIntPixelsToAppUnits(screenPoint.x, p2a),
                             NSIntPixelsToAppUnits(screenPoint.y, p2a));
@@ -433,29 +441,38 @@ void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWid
   }
 }
 
-NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+void nsView::NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible)
 {
-
-  mVis = aVisibility;
-
-  if (aVisibility == nsViewVisibility_kHide)
+  if (!aEffectivelyVisible)
   {
     DropMouseGrabbing();
   }
 
   if (nsnull != mWindow)
   {
-#ifndef HIDE_ALL_WIDGETS
-    if (mVis == nsViewVisibility_kShow)
+    if (aEffectivelyVisible)
     {
       DoResetWidgetBounds(PR_FALSE, PR_TRUE);
       mWindow->Show(PR_TRUE);
     }
     else
-#endif
       mWindow->Show(PR_FALSE);
   }
 
+  for (nsView* child = mFirstChild; child; child = child->mNextSibling) {
+    if (child->mVis == nsViewVisibility_kHide) {
+      // It was effectively hidden and still is
+      continue;
+    }
+    // Our child is visible if we are
+    child->NotifyEffectiveVisibilityChanged(aEffectivelyVisible);
+  }
+}
+
+NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
+{
+  mVis = aVisibility;
+  NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
   return NS_OK;
 }
 
diff --git a/view/src/nsView.h b/view/src/nsView.h
index 8baf66500c5f..ad12aa1daded 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -166,6 +166,8 @@ public:
   void SetPositionIgnoringChildWidgets(nscoord aX, nscoord aY);
   nsresult LoadWidget(const nsCID &aClassIID);
 
+  void NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible);
+
   // Update the cached RootViewManager for all view manager descendents,
   // If the hierarchy is being removed, aViewManagerParent points to the view
   // manager for the hierarchy's old parent, and will have its mouse grab
@@ -193,6 +195,8 @@ public:
 
   nsIntRect CalcWidgetBounds(nsWindowType aType);
 
+  PRBool IsEffectivelyVisible();
+
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 440ddfd1b3f4..eebb505cf6b5 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -110,14 +110,8 @@ public:
 
 static PRBool IsViewVisible(nsView *aView)
 {
-  for (nsIView *view = aView; view; view = view->GetParent()) {
-    // We don't check widget visibility here because in the future (with
-    // the better approach to this that's in attachment 160801 on bug
-    // 227361), callers of the equivalent to this function should be able
-    // to rely on being notified when the result of this function changes.
-    if (view->GetVisibility() == nsViewVisibility_kHide)
-      return PR_FALSE;
-  }
+  if (!aView->IsEffectivelyVisible())
+    return PR_FALSE;
 
   // Find out if the root view is visible by asking the view observer
   // (this won't be needed anymore if we link view trees across chrome /
@@ -1231,8 +1225,7 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && static_cast<nsView*>(aView)->GetVisibility()
-               == nsViewVisibility_kHide) {
+  if (aView && static_cast<nsView*>(aView)->IsEffectivelyVisible()) {
     aView = nsnull;
   }
 
@@ -1587,16 +1580,6 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
         }
       }
     }
-
-    // Any child views not associated with frames might not get their visibility
-    // updated, so propagate our visibility to them. This is important because
-    // hidden views should have all hidden children.
-    for (nsView* childView = view->GetFirstChild(); childView;
-         childView = childView->GetNextSibling()) {
-      if (!childView->GetClientData()) {
-        childView->SetVisibility(aVisible);
-      }
-    }
   }
   return NS_OK;
 }
@@ -1967,7 +1950,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
   }
 
   // is this view even visible?
-  if (view->GetVisibility() == nsViewVisibility_kHide) {
+  if (!view->IsEffectivelyVisible()) {
     return NS_OK; 
   }
 

From 3d6ee44234aaefa3b2c12751a2c5441383d4130f Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Thu, 30 Jul 2009 15:55:51 +0800
Subject: [PATCH 58/61] Bug 452564 - can't create accessibles for table
 children when visibility style of table is changed, r=ginn.chen, sr=roc

---
 layout/base/nsFrameManager.cpp | 65 ++++++++++++++++++++--------------
 layout/base/nsFrameManager.h   |  3 +-
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index ac4a6ebb7979..8572d1057eb4 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -1082,7 +1082,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                       nsIFrame          *aFrame,
                                       nsIContent        *aParentContent,
                                       nsStyleChangeList *aChangeList, 
-                                      nsChangeHint       aMinChange)
+                                      nsChangeHint       aMinChange,
+                                      PRBool             aFireAccessibilityEvents)
 {
   // It would be nice if we could make stronger assertions here; they
   // would let us simplify the ?: expressions below setting |content|
@@ -1146,9 +1147,12 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
       // can't be trusted because it assumes any changes to the parent
       // style context provider will be automatically propagated to
       // the frame(s) with child style contexts.
+
+      // Accessibility: we don't need to fire a11y events for child provider
+      // frame because it is visible or hidden withitn this frame.
       assumeDifferenceHint = ReResolveStyleContext(aPresContext, providerFrame,
                                                    aParentContent, aChangeList,
-                                                   aMinChange);
+                                                   aMinChange, PR_FALSE);
 
       // The provider's new context becomes the parent context of
       // aFrame's context.
@@ -1368,7 +1372,32 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
         }      
       }
     }
-    
+
+    PRBool fireAccessibilityEvents = aFireAccessibilityEvents;
+#ifdef ACCESSIBILITY
+    if (fireAccessibilityEvents && mPresShell->IsAccessibilityActive() &&
+        aFrame->GetStyleVisibility()->IsVisible() != isVisible &&
+        !aFrame->GetPrevContinuation()) {
+      // A significant enough change occured that this part
+      // of the accessible tree is no longer valid. Fire event for primary
+      // frames only and if it wasn't fired for parent frame already.
+
+      // XXX: bug 355521. Visibility does not affect descendents with
+      // visibility set. Work on a separate, accurate mechanism for dealing with
+      // visibility changes.
+      nsCOMPtr<nsIAccessibilityService> accService = 
+        do_GetService("@mozilla.org/accessibilityService;1");
+      if (accService) {
+        PRUint32 event = isVisible ?
+          nsIAccessibleEvent::EVENT_ASYNCH_HIDE :
+          nsIAccessibleEvent::EVENT_ASYNCH_SHOW;
+        accService->InvalidateSubtreeFor(mPresShell, aFrame->GetContent(),
+                                         event);
+        fireAccessibilityEvents = PR_FALSE;
+      }
+    }
+#endif
+
     if (!(aMinChange & nsChangeHint_ReconstructFrame)) {
       
       // There is no need to waste time crawling into a frame's children on a frame change.
@@ -1410,17 +1439,20 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
               ReResolveStyleContext(aPresContext, outOfFlowFrame,
                                     content, aChangeList,
                                     NS_SubtractHint(aMinChange,
-                                                    nsChangeHint_ReflowFrame));
+                                                    nsChangeHint_ReflowFrame),
+                                    fireAccessibilityEvents);
 
               // reresolve placeholder's context under the same parent
               // as the out-of-flow frame
               ReResolveStyleContext(aPresContext, child, content,
-                                    aChangeList, aMinChange);
+                                    aChangeList, aMinChange,
+                                    fireAccessibilityEvents);
             }
             else {  // regular child frame
               if (child != resolvedChild) {
                 ReResolveStyleContext(aPresContext, child, content,
-                                      aChangeList, aMinChange);
+                                      aChangeList, aMinChange,
+                                      fireAccessibilityEvents);
               } else {
                 NOISY_TRACE_FRAME("child frame already resolved as descendant, skipping",aFrame);
               }
@@ -1437,25 +1469,6 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
     newContext->Release();
   }
 
-#ifdef ACCESSIBILITY
-  if (mPresShell->IsAccessibilityActive() &&
-      aFrame->GetStyleVisibility()->IsVisible() != isVisible &&
-      !aFrame->GetPrevContinuation()) { // Primary frames only
-    // XXX Visibility does not affect descendents with visibility set
-    // Work on a separate, accurate mechanism for dealing with visibility changes.
-    // A significant enough change occured that this part
-    // of the accessible tree is no longer valid.
-    nsCOMPtr<nsIAccessibilityService> accService = 
-      do_GetService("@mozilla.org/accessibilityService;1");
-    if (accService) {
-      PRUint32 event = isVisible ?
-        PRUint32(nsIAccessibleEvent::EVENT_ASYNCH_HIDE) :
-        PRUint32(nsIAccessibleEvent::EVENT_ASYNCH_SHOW);
-      accService->InvalidateSubtreeFor(mPresShell, aFrame->GetContent(), event);
-    }
-  }
-#endif
-
   return aMinChange;
 }
 
@@ -1487,7 +1500,7 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame          *aFrame,
       // Inner loop over next-in-flows of the current frame
       nsChangeHint frameChange =
         ReResolveStyleContext(GetPresContext(), frame, nsnull,
-                              aChangeList, topLevelChange);
+                              aChangeList, topLevelChange, PR_TRUE);
       NS_UpdateHint(topLevelChange, frameChange);
 
       if (topLevelChange & nsChangeHint_ReconstructFrame) {
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index 1fa82778b5ea..f706bdd378df 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -240,7 +240,8 @@ private:
                           nsIFrame          *aFrame,
                           nsIContent        *aParentContent,
                           nsStyleChangeList *aChangeList, 
-                          nsChangeHint       aMinChange);
+                          nsChangeHint       aMinChange,
+                          PRBool             aFireAccessibilityEvents);
 };
 
 #endif

From 59352b6bb9caf70badf77dbcc8afc8f03409d280 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Thu, 30 Jul 2009 02:27:24 -0700
Subject: [PATCH 59/61] Bug 507023: When inserting fragments into the DOM, use
 ContentAppended notification when possible. r/sr=jst

---
 content/base/src/nsGenericElement.cpp | 106 +++++++++++++++++---------
 1 file changed, 70 insertions(+), 36 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 148e049a66ba..11ad999a9b2d 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -3209,15 +3209,10 @@ nsGenericElement::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
     return rv;
   }
 
-  // The kid may have removed its parent from the document, so recheck that
-  // that's still in the document before proceeding.  Also, the kid may have
-  // just removed itself, in which case we don't really want to fire
-  // ContentAppended or a mutation event.
-  // XXXbz What if the kid just moved us in the document?  Scripts suck.  We
-  // really need to stop running them while we're in the middle of modifying
-  // the DOM....
+  NS_ASSERTION(aKid->GetNodeParent() == container,
+               "Did we run script inappropriately?");
 
-  if (aNotify && aKid->GetNodeParent() == container) {
+  if (aNotify) {
     // Note that we always want to call ContentInserted when things are added
     // as kids to documents
     if (aParent && isAppend) {
@@ -3730,7 +3725,7 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
 
   // We want an update batch when we expect several mutations to be performed,
   // which is when we're replacing a node, or when we're inserting a fragment.
-  mozAutoDocConditionalContentUpdateBatch(aDocument,
+  mozAutoDocConditionalContentUpdateBatch batch(aDocument,
     aReplace || nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE);
 
   // If we're replacing
@@ -3768,6 +3763,12 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
   if (nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE) {
     PRUint32 count = newContent->GetChildCount();
 
+    if (!count) {
+      returnVal.swap(*aReturn);
+
+      return NS_OK;
+    }
+
     // Copy the children into a separate array to avoid having to deal with
     // mutations to the fragment while we're inserting.
     nsCOMArray<nsIContent> fragChildren;
@@ -3793,25 +3794,12 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
       mutated = mutated || guard.Mutated(1);
     }
 
-    // Iterate through the fragment's children, and insert them in the new
-    // parent
-    for (i = 0; i < count; ++i) {
-      // Get the n:th child from the array.
-      nsIContent* childContent = fragChildren[i];
-
-      // If we've had any unexpeted mutations so far we need to recheck that
-      // the child can still be inserted.
-      if (mutated) {
-        // We really only need to update insPos if we *just* got an unexpected
-        // mutation as opposed to 3 insertions ago. But this is an edgecase so
-        // no need to over optimize.
-        insPos = refContent ? container->IndexOf(refContent) :
-                              container->GetChildCount();
-        if (insPos < 0) {
-          // Someone seriously messed up the childlist. We have no idea
-          // where to insert the remaining children, so just bail.
-          return NS_ERROR_DOM_NOT_FOUND_ERR;
-        }
+    // If we've had any unexpeted mutations so far we need to recheck that
+    // the child can still be inserted.
+    if (mutated) {
+      for (i = 0; i < count; ++i) {
+        // Get the n:th child from the array.
+        nsIContent* childContent = fragChildren[i];
 
         nsCOMPtr<nsIDOMNode> tmpNode = do_QueryInterface(childContent);
         PRUint16 tmpType = 0;
@@ -3824,18 +3812,64 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
         }
       }
 
-      nsMutationGuard guard;
+      insPos = refContent ? container->IndexOf(refContent) :
+                            container->GetChildCount();
+      if (insPos < 0) {
+        // Someone seriously messed up the childlist. We have no idea
+        // where to insert the remaining children, so just bail.
+        return NS_ERROR_DOM_NOT_FOUND_ERR;
+      }
+    }
+
+    PRBool appending = aParent && (insPos == container->GetChildCount());
+    PRBool firstInsPos = insPos;
+
+    // Iterate through the fragment's children, and insert them in the new
+    // parent
+    for (i = 0; i < count; ++i, ++insPos) {
+      nsIContent* childContent = fragChildren[i];
 
       // XXXbz how come no reparenting here?  That seems odd...
       // Insert the child.
-      res = container->InsertChildAt(childContent, insPos, PR_TRUE);
-      NS_ENSURE_SUCCESS(res, res);
+      res = container->InsertChildAt(childContent, insPos, PR_FALSE);
+      if (NS_FAILED(res)) {
+        // Make sure to notify on any children that we did succeed to insert
+        if (appending && i != 0) {
+          nsNodeUtils::ContentAppended(aParent, firstInsPos);
+        }
+        return res;
+      }
 
-      // Check to see if any evil mutation events mucked around with the
-      // child list.
-      mutated = mutated || guard.Mutated(1);
-      
-      ++insPos;
+      if (!appending) {
+        nsNodeUtils::ContentInserted(container, childContent, insPos);
+      }
+    }
+
+    // Notify
+    if (appending) {
+      nsNodeUtils::ContentAppended(aParent, firstInsPos);
+    }
+
+    // Fire mutation events. Optimize for the case when there are no listeners
+    nsIDocument* doc = container->GetOwnerDoc();
+    nsPIDOMWindow* window = nsnull;
+    if (doc && (window = doc->GetInnerWindow()) &&
+        window->HasMutationListeners(NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
+
+      for (i = 0; i < count; ++i, ++insPos) {
+        nsIContent* childContent = fragChildren[i];
+
+        if (nsContentUtils::HasMutationListeners(childContent,
+              NS_EVENT_BITS_MUTATION_NODEINSERTED, container)) {
+          mozAutoRemovableBlockerRemover blockerRemover;
+
+          nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEINSERTED);
+          mutation.mRelatedNode = do_QueryInterface(container);
+
+          mozAutoSubtreeModified subtree(container->GetOwnerDoc(), container);
+          nsEventDispatcher::Dispatch(childContent, nsnull, &mutation);
+        }
+      }
     }
   }
   else {

From 3977a2761a8515aa933eea78186145aa9bda5841 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Thu, 30 Jul 2009 22:06:02 +1200
Subject: [PATCH 60/61] Backed out changeset c353fe809be0

---
 layout/generic/nsContainerFrame.cpp    |  9 ++++---
 layout/generic/nsFrame.cpp             |  9 +++++++
 layout/generic/nsIFrame.h              |  8 ++++--
 layout/xul/base/src/nsBoxFrame.cpp     | 12 +++++++++
 layout/xul/base/src/nsDeckFrame.h      |  4 +++
 layout/xul/base/src/nsLeafBoxFrame.cpp | 12 +++++++++
 view/public/nsIViewManager.h           |  7 +----
 view/src/nsView.cpp                    | 37 +++++++-------------------
 view/src/nsView.h                      |  4 ---
 view/src/nsViewManager.cpp             | 25 ++++++++++++++---
 10 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 58f7a791ad97..f6f1423077b5 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -617,10 +617,11 @@ nsContainerFrame::SyncFrameViewProperties(nsPresContext*  aPresContext,
 
     if (!aStyleContext->GetStyleVisibility()->IsVisible() &&
         !aFrame->SupportsVisibilityHidden()) {
-      // If it's a subdocument frame or a plugin, hide the view and
-      // any associated widget.
-      // These are leaf elements so this is OK, no descendant can be
-      // visibility:visible.
+      // If it's a scrollable frame that can't hide its scrollbars,
+      // hide the view. This means that child elements can't override
+      // their parent's visibility, but it's not practical to leave it
+      // visible in all cases because the scrollbars will be showing
+      // XXXldb Does the view system really enforce this correctly?
       viewIsVisible = PR_FALSE;
     } else if (IsMenuPopup(aFrame)) {
       // if the view is for a popup, don't show the view if the popup is closed
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 6168c7ed0ad4..0d69168a530a 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6717,6 +6717,15 @@ nsFrame::SetParent(const nsIFrame* aParent)
   else if (wasBoxWrapped && !IsBoxWrapped())
     DeleteProperty(nsGkAtoms::boxMetricsProperty);
 
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+          CreateWidgetForView(view);
+    }
+  }
+
   return NS_OK;
 }
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 6bea51a15afc..def82baab314 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -107,9 +107,10 @@ struct nsMargin;
 typedef class nsIFrame nsIBox;
 
 // IID for the nsIFrame interface
+// 7b437d20-a34e-11dd-ad8b-0800200c9a66
 #define NS_IFRAME_IID \
-  { 0x7e9018b5, 0x5405, 0x4e2b, \
-    { 0x87, 0x67, 0xe2, 0xb4, 0xb1, 0x3e, 0xc1, 0x69 } }
+  { 0x7b437d20, 0xa34e, 0x11dd, \
+    { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } }
 
 /**
  * Indication of how the frame can be split. This is used when doing runaround
@@ -2285,6 +2286,9 @@ NS_PTR_TO_INT32(frame->GetProperty(nsGkAtoms::embeddingLevel))
   NS_IMETHOD DumpBox(FILE* out)=0;
 #endif
 
+  // Only nsDeckFrame requires that all its children have widgets
+  virtual PRBool ChildrenMustHaveWidgets() const { return PR_FALSE; }
+
   /**
    * @return PR_TRUE if this text frame ends with a newline character.  It
    * should return PR_FALSE if this is not a text frame.
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index fe6bd386ca0d..5b2e4cefb11d 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -205,6 +205,18 @@ nsBoxFrame::Init(nsIContent*      aContent,
 
   MarkIntrinsicWidthsDirty();
 
+  // see if we need a widget
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE);
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+           view->CreateWidget(kWidgetCID);   
+    }
+  }
+
   CacheAttributes();
 
 #ifdef DEBUG_LAYOUT
diff --git a/layout/xul/base/src/nsDeckFrame.h b/layout/xul/base/src/nsDeckFrame.h
index 6fe832a83a05..741ba5315c1a 100644
--- a/layout/xul/base/src/nsDeckFrame.h
+++ b/layout/xul/base/src/nsDeckFrame.h
@@ -75,6 +75,10 @@ public:
 
   virtual nsIAtom* GetType() const;
 
+#ifndef MOZ_GFX_OPTIMIZE_MOBILE
+  virtual PRBool ChildrenMustHaveWidgets() const { return PR_TRUE; }
+#endif
+
 #ifdef NS_DEBUG
   NS_IMETHOD GetFrameName(nsAString& aResult) const
   {
diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp
index 07448fe5743b..dec1019d00cb 100644
--- a/layout/xul/base/src/nsLeafBoxFrame.cpp
+++ b/layout/xul/base/src/nsLeafBoxFrame.cpp
@@ -98,6 +98,18 @@ nsLeafBoxFrame::Init(
   nsresult  rv = nsLeafFrame::Init(aContent, aParent, aPrevInFlow);
   NS_ENSURE_SUCCESS(rv, rv);
 
+   // see if we need a widget
+  if (aParent && aParent->IsBoxFrame()) {
+    if (aParent->ChildrenMustHaveWidgets()) {
+        rv = nsHTMLContainerFrame::CreateViewForFrame(this, PR_TRUE); 
+        NS_ENSURE_SUCCESS(rv, rv);
+
+        nsIView* view = GetView();
+        if (!view->HasWidget())
+           view->CreateWidget(kWidgetCID);   
+    }
+  }
+  
   mMouseThrough = unset;
 
   UpdateMouseThrough();
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index ec4825e4c1b5..840421b5e4f8 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -256,12 +256,7 @@ public:
                          PRBool aRepaintExposedAreaOnly = PR_FALSE) = 0;
 
   /**
-   * Set the visibility of a view. Hidden views have the effect of hiding
-   * their descendants as well. This does not affect painting, so layout
-   * is responsible for ensuring that content in hidden views is not
-   * painted nor handling events. It does affect the visibility of widgets;
-   * if a view is hidden, descendant views with widgets have their widgets
-   * hidden.
+   * Set the visibility of a view.
    * The view manager generates the appropriate dirty regions.
    * @param aView view to change visibility state of
    * @param visible new visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 1fff95629f50..228e74597f2a 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -52,6 +52,7 @@ static nsEventStatus HandleEvent(nsGUIEvent *aEvent);
 
 
 //#define SHOW_VIEW_BORDERS
+//#define HIDE_ALL_WIDGETS
 
 // {34297A07-A8FD-d811-87C6-000244212BCB}
 #define VIEW_WRAPPER_IID \
@@ -337,15 +338,6 @@ void nsView::ResetWidgetBounds(PRBool aRecurse, PRBool aMoveOnly,
   }
 }
 
-PRBool nsView::IsEffectivelyVisible()
-{
-  for (nsView* v = this; v; v = v->mParent) {
-    if (v->GetVisibility() == nsViewVisibility_kHide)
-      return PR_FALSE;
-  }
-  return PR_TRUE;
-}
-
 nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
 {
   nsCOMPtr<nsIDeviceContext> dx;
@@ -362,7 +354,7 @@ nsIntRect nsView::CalcWidgetBounds(nsWindowType aType)
     viewBounds += offset;
 
     if (parentWidget && aType == eWindowType_popup &&
-        IsEffectivelyVisible()) {
+        mVis == nsViewVisibility_kShow) {
       nsIntPoint screenPoint = parentWidget->WidgetToScreenOffset();
       viewBounds += nsPoint(NSIntPixelsToAppUnits(screenPoint.x, p2a),
                             NSIntPixelsToAppUnits(screenPoint.y, p2a));
@@ -441,38 +433,29 @@ void nsView::SetDimensions(const nsRect& aRect, PRBool aPaint, PRBool aResizeWid
   }
 }
 
-void nsView::NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible)
+NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
 {
-  if (!aEffectivelyVisible)
+
+  mVis = aVisibility;
+
+  if (aVisibility == nsViewVisibility_kHide)
   {
     DropMouseGrabbing();
   }
 
   if (nsnull != mWindow)
   {
-    if (aEffectivelyVisible)
+#ifndef HIDE_ALL_WIDGETS
+    if (mVis == nsViewVisibility_kShow)
     {
       DoResetWidgetBounds(PR_FALSE, PR_TRUE);
       mWindow->Show(PR_TRUE);
     }
     else
+#endif
       mWindow->Show(PR_FALSE);
   }
 
-  for (nsView* child = mFirstChild; child; child = child->mNextSibling) {
-    if (child->mVis == nsViewVisibility_kHide) {
-      // It was effectively hidden and still is
-      continue;
-    }
-    // Our child is visible if we are
-    child->NotifyEffectiveVisibilityChanged(aEffectivelyVisible);
-  }
-}
-
-NS_IMETHODIMP nsView::SetVisibility(nsViewVisibility aVisibility)
-{
-  mVis = aVisibility;
-  NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
   return NS_OK;
 }
 
diff --git a/view/src/nsView.h b/view/src/nsView.h
index ad12aa1daded..8baf66500c5f 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -166,8 +166,6 @@ public:
   void SetPositionIgnoringChildWidgets(nscoord aX, nscoord aY);
   nsresult LoadWidget(const nsCID &aClassIID);
 
-  void NotifyEffectiveVisibilityChanged(PRBool aEffectivelyVisible);
-
   // Update the cached RootViewManager for all view manager descendents,
   // If the hierarchy is being removed, aViewManagerParent points to the view
   // manager for the hierarchy's old parent, and will have its mouse grab
@@ -195,8 +193,6 @@ public:
 
   nsIntRect CalcWidgetBounds(nsWindowType aType);
 
-  PRBool IsEffectivelyVisible();
-
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index eebb505cf6b5..440ddfd1b3f4 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -110,8 +110,14 @@ public:
 
 static PRBool IsViewVisible(nsView *aView)
 {
-  if (!aView->IsEffectivelyVisible())
-    return PR_FALSE;
+  for (nsIView *view = aView; view; view = view->GetParent()) {
+    // We don't check widget visibility here because in the future (with
+    // the better approach to this that's in attachment 160801 on bug
+    // 227361), callers of the equivalent to this function should be able
+    // to rely on being notified when the result of this function changes.
+    if (view->GetVisibility() == nsViewVisibility_kHide)
+      return PR_FALSE;
+  }
 
   // Find out if the root view is visible by asking the view observer
   // (this won't be needed anymore if we link view trees across chrome /
@@ -1225,7 +1231,8 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && static_cast<nsView*>(aView)->IsEffectivelyVisible()) {
+  if (aView && static_cast<nsView*>(aView)->GetVisibility()
+               == nsViewVisibility_kHide) {
     aView = nsnull;
   }
 
@@ -1580,6 +1587,16 @@ NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility
         }
       }
     }
+
+    // Any child views not associated with frames might not get their visibility
+    // updated, so propagate our visibility to them. This is important because
+    // hidden views should have all hidden children.
+    for (nsView* childView = view->GetFirstChild(); childView;
+         childView = childView->GetNextSibling()) {
+      if (!childView->GetClientData()) {
+        childView->SetVisibility(aVisible);
+      }
+    }
   }
   return NS_OK;
 }
@@ -1950,7 +1967,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
   }
 
   // is this view even visible?
-  if (!view->IsEffectivelyVisible()) {
+  if (view->GetVisibility() == nsViewVisibility_kHide) {
     return NS_OK; 
   }
 

From 4631579de74234e1abb78cfb089496c570176e06 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 30 Jul 2009 11:01:01 -0400
Subject: [PATCH 61/61] Backed out changeset 03c40c5a2d4b (bug 505988) to fix
 password manager test orange.

--HG--
extra : rebase_source : c88519859e51b9d49d0f2269085dbb17edabd1c1
---
 js/src/xpconnect/src/xpcprivate.h             |  9 ++-
 js/src/xpconnect/src/xpcvariant.cpp           | 69 ++++++++++---------
 js/src/xpconnect/tests/mochitest/Makefile.in  |  1 -
 .../tests/mochitest/test_bug384632.html       | 32 ---------
 4 files changed, 41 insertions(+), 70 deletions(-)
 delete mode 100644 js/src/xpconnect/tests/mochitest/test_bug384632.html

diff --git a/js/src/xpconnect/src/xpcprivate.h b/js/src/xpconnect/src/xpcprivate.h
index 59db7a8afccf..2ce45487d1b5 100644
--- a/js/src/xpconnect/src/xpcprivate.h
+++ b/js/src/xpconnect/src/xpcprivate.h
@@ -4007,7 +4007,7 @@ public:
 
     jsval GetJSVal() const {return mJSVal;}
 
-    XPCVariant(XPCCallContext& ccx, jsval aJSVal);
+    XPCVariant(jsval aJSVal);
 
     /**
      * Convert a variant into a jsval.
@@ -4032,7 +4032,6 @@ protected:
 protected:
     nsDiscriminatedUnion mData;
     jsval                mJSVal;
-    JSBool               mReturnRawObject;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(XPCVariant, XPCVARIANT_IID)
@@ -4041,10 +4040,10 @@ class XPCTraceableVariant: public XPCVariant,
                            public XPCRootSetElem
 {
 public:
-    XPCTraceableVariant(XPCCallContext& ccx, jsval aJSVal)
-        : XPCVariant(ccx, aJSVal)
+    XPCTraceableVariant(XPCJSRuntime *runtime, jsval aJSVal)
+        : XPCVariant(aJSVal)
     {
-        ccx.GetRuntime()->AddVariantRoot(this);
+        runtime->AddVariantRoot(this);
     }
 
     virtual ~XPCTraceableVariant();
diff --git a/js/src/xpconnect/src/xpcvariant.cpp b/js/src/xpconnect/src/xpcvariant.cpp
index 6a5f0f6955c4..9ce012e82e19 100644
--- a/js/src/xpconnect/src/xpcvariant.cpp
+++ b/js/src/xpconnect/src/xpcvariant.cpp
@@ -55,26 +55,10 @@ NS_IMPL_CI_INTERFACE_GETTER2(XPCVariant, XPCVariant, nsIVariant)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(XPCVariant)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(XPCVariant)
 
-XPCVariant::XPCVariant(XPCCallContext& ccx, jsval aJSVal)
+XPCVariant::XPCVariant(jsval aJSVal)
     : mJSVal(aJSVal)
 {
     nsVariant::Initialize(&mData);
-    if(!JSVAL_IS_PRIMITIVE(mJSVal))
-    {
-        // If the incoming object is an XPCWrappedNative, then it could be a
-        // double-wrapped object, and we should return the double-wrapped
-        // object back out to script.
-
-        JSObject* proto;
-        XPCWrappedNative* wn =
-            XPCWrappedNative::GetWrappedNativeOfJSObject(ccx,
-                                                         JSVAL_TO_OBJECT(mJSVal),
-                                                         nsnull,
-                                                         &proto);
-        mReturnRawObject = !wn && !proto;
-    }
-    else
-        mReturnRawObject = JS_FALSE;
 }
 
 XPCTraceableVariant::~XPCTraceableVariant()
@@ -135,9 +119,9 @@ XPCVariant* XPCVariant::newVariant(XPCCallContext& ccx, jsval aJSVal)
     XPCVariant* variant;
 
     if(!JSVAL_IS_TRACEABLE(aJSVal))
-        variant = new XPCVariant(ccx, aJSVal);
+        variant = new XPCVariant(aJSVal);
     else
-        variant = new XPCTraceableVariant(ccx, aJSVal);
+        variant = new XPCTraceableVariant(ccx.GetRuntime(), aJSVal);
 
     if(!variant)
         return nsnull;
@@ -417,15 +401,6 @@ XPCVariant::VariantDataToJS(XPCCallContext& ccx,
             return JS_TRUE;
         }
 
-        if(xpcvariant->mReturnRawObject)
-        {
-            NS_ASSERTION(type == nsIDataType::VTYPE_INTERFACE ||
-                         type == nsIDataType::VTYPE_INTERFACE_IS,
-                         "Weird variant");
-            *pJSVal = realVal;
-            return JS_TRUE;
-        }
-
         // else, it's an object and we really need to double wrap it if we've 
         // already decided that its 'natural' type is as some sort of interface.
         
@@ -666,10 +641,40 @@ VARIANT_DONE:
     }
     else
     {
-        success = XPCConvert::NativeData2JS(ccx, pJSVal,
-                                            (const void*)&xpctvar.val,
-                                            xpctvar.type,
-                                            &iid, scope, pErr);
+        // Last ditch check to prevent us from double-wrapping a regular JS
+        // object. This allows us to unwrap regular JS objects (since we
+        // normally can't double wrap them). See bug 384632.
+        *pJSVal = JSVAL_VOID;
+        if(type == nsIDataType::VTYPE_INTERFACE ||
+           type == nsIDataType::VTYPE_INTERFACE_IS)
+        {
+            nsISupports *src = reinterpret_cast<nsISupports *>(xpctvar.val.p);
+            if(nsXPCWrappedJSClass::IsWrappedJS(src))
+            {
+                // First QI the wrapper to the right interface.
+                nsCOMPtr<nsISupports> wrapper;
+                nsresult rv = src->QueryInterface(iid, getter_AddRefs(wrapper));
+                NS_ENSURE_SUCCESS(rv, JS_FALSE);
+
+                // Now, get the actual JS object out of the wrapper.
+                nsCOMPtr<nsIXPConnectJSObjectHolder> holder =
+                    do_QueryInterface(wrapper);
+                NS_ENSURE_TRUE(holder, JS_FALSE);
+
+                JSObject *obj;
+                holder->GetJSObject(&obj);
+                NS_ASSERTION(obj, "No JS object but the QIs above succeeded?");
+                *pJSVal = OBJECT_TO_JSVAL(obj);
+                success = JS_TRUE;
+            }
+        }
+        if(!JSVAL_IS_OBJECT(*pJSVal))
+        {
+            success = XPCConvert::NativeData2JS(ccx, pJSVal,
+                                                (const void*)&xpctvar.val,
+                                                xpctvar.type,
+                                                &iid, scope, pErr);
+        }
     }
 
     if(xpctvar.IsValAllocated())
diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in
index 90ed8ade38b8..3ff1465c03e3 100644
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/src/xpconnect/tests/mochitest/Makefile.in
@@ -47,7 +47,6 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES =	bug500931_helper.html \
 		inner.html \
 		test_bug361111.xul \
-		test_bug384632.html \
 		test_bug390488.html \
 		test_bug393269.html \
 		test_bug396851.html \
diff --git a/js/src/xpconnect/tests/mochitest/test_bug384632.html b/js/src/xpconnect/tests/mochitest/test_bug384632.html
deleted file mode 100644
index 7cdc397adb4e..000000000000
--- a/js/src/xpconnect/tests/mochitest/test_bug384632.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=384632
--->
-<head>
-  <title>Test for Bug 384632</title>
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/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=384632">Mozilla Bug 384632</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 384632 **/
-var div = $('content');
-var obj = {};
-div.setUserData("foopy", obj, function() {});
-ok(div.getUserData("foopy") === obj, "getUserData works with regular objects");
-div.setUserData("foopy1", sidebar, function() {});
-ok(div.getUserData("foopy1") === sidebar, "getUserData works with bizarre objects");
-
-</script>
-</pre>
-</body>
-</html>