diff --git a/.hgtags b/.hgtags
index 614c3e6a4db..3ee11aa0273 100644
--- a/.hgtags
+++ b/.hgtags
@@ -63,3 +63,6 @@ a71bd564ebf5bf4f93d13e84114f759c263130b0 MOBILE_MERGE_DONE
 a71bd564ebf5bf4f93d13e84114f759c263130b0 MOBILE_MERGE_DONE_20110406
 a95d426422816513477e5863add1b00ac7041dcb AURORA_BASE_20110412
 138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R14
+9eae975b3d6fb7748fe5a3c0113d449b1c7cc0b2 AURORA_BASE_20110524
+138f593553b66c9f815e8f57870c19d6347f7702 UPDATE_PACKAGING_R14
+462c726144bc1fb45b61e774f64ac5d61b4e047c UPDATE_PACKAGING_R14
diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp
index aadbe4399da..8fb9eb37ffb 100644
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -55,9 +55,6 @@
 #include "nsIDOMCSSPrimitiveValue.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
-#include "nsIDOMHTMLDocument.h"
-#include "nsIDOMHTMLElement.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
@@ -135,6 +132,12 @@ void nsAccessNode::LastRelease()
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessNode public
 
+bool
+nsAccessNode::IsDefunct() const
+{
+  return !mContent;
+}
+
 PRBool
 nsAccessNode::Init()
 {
diff --git a/accessible/src/base/nsAccessNode.h b/accessible/src/base/nsAccessNode.h
index 0f902f3db47..0b851b78ee4 100644
--- a/accessible/src/base/nsAccessNode.h
+++ b/accessible/src/base/nsAccessNode.h
@@ -120,11 +120,6 @@ public:
    */
   already_AddRefed<nsINode> GetCurrentFocus();
 
-  /**
-   * Returns true when the accessible is defunct.
-   */
-  virtual PRBool IsDefunct() { return !mContent; }
-
   /**
    * Initialize the access node object, add it to the cache.
    */
@@ -135,6 +130,11 @@ public:
    */
   virtual void Shutdown();
 
+  /**
+   * Returns true when the accessible is defunct.
+   */
+  virtual bool IsDefunct() const;
+
   /**
    * Return frame for the given access node object.
    */
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 92d9083a638..6827529f6f6 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -107,7 +107,6 @@
 
 #include "mozilla/FunctionTimer.h"
 #include "mozilla/dom/Element.h"
-#include "nsImageMapUtils.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessibilityService
@@ -275,8 +274,10 @@ nsAccessibilityService::CreateHTMLImageAccessible(nsIContent* aContent,
   aContent->GetAttr(kNameSpaceID_None,
                     nsAccessibilityAtoms::usemap,
                     mapElmName);
-  nsCOMPtr<nsIDOMHTMLMapElement> mapElm =
-    nsImageMapUtils::FindImageMap(aContent->GetCurrentDoc(), mapElmName);
+  nsCOMPtr<nsIDOMHTMLMapElement> mapElm;
+  if (nsIDocument* document = aContent->GetCurrentDoc()) {
+    mapElm = do_QueryInterface(document->FindImageMap(mapElmName));
+  }
 
   nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
   nsAccessible* accessible = mapElm ?
diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp
index 4ada51e9feb..927ef2363e1 100644
--- a/accessible/src/base/nsApplicationAccessible.cpp
+++ b/accessible/src/base/nsApplicationAccessible.cpp
@@ -332,8 +332,8 @@ nsApplicationAccessible::GetPlatformVersion(nsAString& aVersion)
 ////////////////////////////////////////////////////////////////////////////////
 // nsAccessNode public methods
 
-PRBool
-nsApplicationAccessible::IsDefunct()
+bool
+nsApplicationAccessible::IsDefunct() const
 {
   return nsAccessibilityService::IsShutdown();
 }
diff --git a/accessible/src/base/nsApplicationAccessible.h b/accessible/src/base/nsApplicationAccessible.h
index e9d094d6793..9adf0263c74 100644
--- a/accessible/src/base/nsApplicationAccessible.h
+++ b/accessible/src/base/nsApplicationAccessible.h
@@ -115,7 +115,7 @@ public:
   NS_DECL_NSIACCESSIBLEAPPLICATION
 
   // nsAccessNode
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual PRBool Init();
   virtual void Shutdown();
   virtual bool IsPrimaryForNode() const;
diff --git a/accessible/src/base/nsBaseWidgetAccessible.cpp b/accessible/src/base/nsBaseWidgetAccessible.cpp
index b4b9ba8867d..49cea016674 100644
--- a/accessible/src/base/nsBaseWidgetAccessible.cpp
+++ b/accessible/src/base/nsBaseWidgetAccessible.cpp
@@ -141,7 +141,7 @@ nsLinkableAccessible::GetNumActions(PRUint8 *aNumActions)
 {
   NS_ENSURE_ARG_POINTER(aNumActions);
 
-  *aNumActions = mActionAcc ? 1 : 0;
+  *aNumActions = (mIsOnclick || mIsLink) ? 1 : 0;
   return NS_OK;
 }
 
@@ -228,7 +228,6 @@ nsLinkableAccessible::BindToParent(nsAccessible* aParent,
   mIsOnclick = PR_FALSE;
 
   if (nsCoreUtils::HasClickListener(mContent)) {
-    mActionAcc = this;
     mIsOnclick = PR_TRUE;
     return;
   }
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 262d63b1d7a..febee5a1caa 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -54,8 +54,6 @@
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentType.h"
-#include "nsIDOMNSDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMXULDocument.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsPIDOMWindow.h"
@@ -411,22 +409,24 @@ NS_IMETHODIMP nsDocAccessible::GetURL(nsAString& aURL)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsDocAccessible::GetTitle(nsAString& aTitle)
+NS_IMETHODIMP
+nsDocAccessible::GetTitle(nsAString& aTitle)
 {
-  nsCOMPtr<nsIDOMNSDocument> domnsDocument(do_QueryInterface(mDocument));
-  if (domnsDocument) {
-    return domnsDocument->GetTitle(aTitle);
+  nsCOMPtr<nsIDOMDocument> domDocument = do_QueryInterface(mDocument);
+  if (!domDocument) {
+    return NS_ERROR_FAILURE;
   }
-  return NS_ERROR_FAILURE;
+  return domDocument->GetTitle(aTitle);
 }
 
-NS_IMETHODIMP nsDocAccessible::GetMimeType(nsAString& aMimeType)
+NS_IMETHODIMP
+nsDocAccessible::GetMimeType(nsAString& aMimeType)
 {
-  nsCOMPtr<nsIDOMNSDocument> domnsDocument(do_QueryInterface(mDocument));
-  if (domnsDocument) {
-    return domnsDocument->GetContentType(aMimeType);
+  nsCOMPtr<nsIDOMDocument> domDocument = do_QueryInterface(mDocument);
+  if (!domDocument) {
+    return NS_ERROR_FAILURE;
   }
-  return NS_ERROR_FAILURE;
+  return domDocument->GetContentType(aMimeType);
 }
 
 NS_IMETHODIMP nsDocAccessible::GetDocType(nsAString& aDocType)
@@ -607,6 +607,12 @@ nsDocAccessible::Init()
   if (!mNotificationController)
     return PR_FALSE;
 
+  // Mark the document accessible as loaded if its DOM document was loaded at
+  // this point (this can happen because a11y is started late or DOM document
+  // having no container was loaded.
+  if (mDocument->GetReadyStateEnum() == nsIDocument::READYSTATE_COMPLETE)
+    mIsLoaded = PR_TRUE;
+
   AddEventListeners();
   return PR_TRUE;
 }
@@ -670,8 +676,8 @@ nsDocAccessible::GetFrame() const
   return root;
 }
 
-PRBool
-nsDocAccessible::IsDefunct()
+bool
+nsDocAccessible::IsDefunct() const
 {
   return nsHyperTextAccessibleWrap::IsDefunct() || !mDocument;
 }
diff --git a/accessible/src/base/nsDocAccessible.h b/accessible/src/base/nsDocAccessible.h
index 55d8f753cef..2b966245230 100644
--- a/accessible/src/base/nsDocAccessible.h
+++ b/accessible/src/base/nsDocAccessible.h
@@ -108,7 +108,7 @@ public:
   virtual PRBool Init();
   virtual void Shutdown();
   virtual nsIFrame* GetFrame() const;
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual nsINode* GetNode() const { return mDocument; }
   virtual nsIDocument* GetDocumentNode() const { return mDocument; }
 
diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp
index 902b9c0ff6b..6fa4fca298d 100644
--- a/accessible/src/base/nsRootAccessible.cpp
+++ b/accessible/src/base/nsRootAccessible.cpp
@@ -59,7 +59,6 @@
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsIDOMDataContainerEvent.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMXULMenuListElement.h"
 #include "nsIDOMXULMultSelectCntrlEl.h"
@@ -139,7 +138,7 @@ nsRootAccessible::GetName(nsAString& aName)
     }
   }
 
-  nsCOMPtr<nsIDOMNSDocument> document(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMDocument> document = do_QueryInterface(mDocument);
   return document->GetTitle(aName);
 }
 
diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp
index 6a392d999d8..524d1e43ea0 100644
--- a/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -156,8 +156,8 @@ nsXULTreeAccessible::GetValue(nsAString& aValue)
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULTreeAccessible: nsAccessNode implementation
 
-PRBool
-nsXULTreeAccessible::IsDefunct()
+bool
+nsXULTreeAccessible::IsDefunct() const
 {
   return nsAccessibleWrap::IsDefunct() || !mTree || !mTreeView;
 }
@@ -834,8 +834,8 @@ nsXULTreeItemAccessibleBase::DoAction(PRUint8 aIndex)
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULTreeItemAccessibleBase: nsAccessNode implementation
 
-PRBool
-nsXULTreeItemAccessibleBase::IsDefunct()
+bool
+nsXULTreeItemAccessibleBase::IsDefunct() const
 {
   if (nsAccessibleWrap::IsDefunct() || !mTree || !mTreeView || mRow < 0)
     return PR_TRUE;
@@ -1091,8 +1091,8 @@ nsXULTreeItemAccessible::GetName(nsAString& aName)
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULTreeItemAccessible: nsAccessNode implementation
 
-PRBool
-nsXULTreeItemAccessible::IsDefunct()
+bool
+nsXULTreeItemAccessible::IsDefunct() const
 {
   return nsXULTreeItemAccessibleBase::IsDefunct() || !mColumn;
 }
diff --git a/accessible/src/xul/nsXULTreeAccessible.h b/accessible/src/xul/nsXULTreeAccessible.h
index de3f42b3166..7596124f498 100644
--- a/accessible/src/xul/nsXULTreeAccessible.h
+++ b/accessible/src/xul/nsXULTreeAccessible.h
@@ -80,7 +80,7 @@ public:
   NS_IMETHOD GetFocusedChild(nsIAccessible **aFocusedChild);
 
   // nsAccessNode
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual void Shutdown();
 
   // nsAccessible
@@ -201,7 +201,7 @@ public:
   NS_IMETHOD DoAction(PRUint8 aIndex);
 
   // nsAccessNode
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual void Shutdown();
   virtual bool IsPrimaryForNode() const;
 
@@ -266,7 +266,7 @@ public:
   NS_IMETHOD GetName(nsAString& aName);
 
   // nsAccessNode
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual PRBool Init();
   virtual void Shutdown();
 
diff --git a/accessible/src/xul/nsXULTreeGridAccessible.cpp b/accessible/src/xul/nsXULTreeGridAccessible.cpp
index 5c7f1316735..cf71759d90a 100644
--- a/accessible/src/xul/nsXULTreeGridAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeGridAccessible.cpp
@@ -1087,8 +1087,8 @@ nsXULTreeGridCellAccessible::IsSelected(PRBool *aIsSelected)
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULTreeGridCellAccessible: nsAccessNode implementation
 
-PRBool
-nsXULTreeGridCellAccessible::IsDefunct()
+bool
+nsXULTreeGridCellAccessible::IsDefunct() const
 {
   return nsLeafAccessible::IsDefunct() || !mParent || !mTree || !mTreeView ||
     !mColumn;
diff --git a/accessible/src/xul/nsXULTreeGridAccessible.h b/accessible/src/xul/nsXULTreeGridAccessible.h
index 678d43cdd52..897b1c8d762 100644
--- a/accessible/src/xul/nsXULTreeGridAccessible.h
+++ b/accessible/src/xul/nsXULTreeGridAccessible.h
@@ -155,7 +155,7 @@ public:
   NS_DECL_NSIACCESSIBLETABLECELL
 
   // nsAccessNode
-  virtual PRBool IsDefunct();
+  virtual bool IsDefunct() const;
   virtual PRBool Init();
   virtual bool IsPrimaryForNode() const;
 
diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in
index 9dfa858c1f8..16d56c4a61a 100644
--- a/accessible/tests/mochitest/Makefile.in
+++ b/accessible/tests/mochitest/Makefile.in
@@ -90,16 +90,14 @@ _TEST_FILES =\
 		test_aria_roles.xul \
 		test_aria_token_attrs.html \
 		test_bug420863.html \
-	$(warning   test_childAtPoint.html temporarily disabled) \
-	$(warning	test_childAtPoint.xul temporarily disabled) \
+		test_childAtPoint.html \
+		test_childAtPoint.xul \
 		test_descr.html \
 		test_elm_landmarks.html \
 		test_elm_listbox.xul \
-	$(warning   test_elm_media.html temporarily disabled) \
 		test_elm_nsApplicationAcc.html \
 		test_elm_plugin.html \
 		test_keys.html \
-	$(warning test_nsIAccessible_comboboxes.xul temporarily disabled) \
  		test_nsIAccessible_selects.html \
 		test_nsIAccessibleDocument.html \
 		test_nsIAccessibleImage.html \
diff --git a/accessible/tests/mochitest/actions/Makefile.in b/accessible/tests/mochitest/actions/Makefile.in
index e8ab174e43f..3b6885977c1 100644
--- a/accessible/tests/mochitest/actions/Makefile.in
+++ b/accessible/tests/mochitest/actions/Makefile.in
@@ -52,6 +52,7 @@ _TEST_FILES =\
 		test_general.xul \
 		test_inputs.html \
 		test_link.html \
+		test_media.html \
 		test_tree.xul \
 		test_treegrid.xul \
 		$(NULL)
diff --git a/accessible/tests/mochitest/actions/test_general.html b/accessible/tests/mochitest/actions/test_general.html
index a51118d648b..0133c9c607c 100644
--- a/accessible/tests/mochitest/actions/test_general.html
+++ b/accessible/tests/mochitest/actions/test_general.html
@@ -36,9 +36,19 @@
           ID: "li_clickable3",
           actionName: "click",
           events: CLICK_EVENTS
+        },
+        {
+          ID: "onclick_img",
+          actionName: "click",
+          events: CLICK_EVENTS
         }
       ];
+
       testActions(actionsArray);
+
+      getAccessible("onclick_img").takeFocus();
+is(getAccessible("link1").numActions, 1, "links should have one action");
+is(getAccessible("link2").numActions, 1, "link with onclick handler should have 1 action");
     }
 
     SimpleTest.waitForExplicitFinish();
@@ -58,6 +68,11 @@
      title="Expose click action if mouseup and mousedown are registered">
     Mozilla Bug 423409
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=659620"
+     title="hang when trying to edit a page on wikimo with NVDA running">
+    Mozilla Bug 659620
+  </a>
   <p id="display"></p>
   <div id="content" style="display: none"></div>
   <pre id="test">
@@ -68,5 +83,11 @@
     <li id="li_clickable2" onmousedown="">Clickable list item</li>
     <li id="li_clickable3" onmouseup="">Clickable list item</li>
   </ul>
+
+  <!-- linkable accessibles -->
+  <img id="onclick_img" onclick="" src="../moz.png">
+
+  <a id="link1" href="www">linkable textleaf accessible</a>
+  <div id="link2" onclick="">linkable textleaf accessible</div>
 </body>
 </html>
diff --git a/accessible/tests/mochitest/test_elm_media.html b/accessible/tests/mochitest/actions/test_media.html
similarity index 64%
rename from accessible/tests/mochitest/test_elm_media.html
rename to accessible/tests/mochitest/actions/test_media.html
index 0b17ab3f42a..a5ceba62e19 100644
--- a/accessible/tests/mochitest/test_elm_media.html
+++ b/accessible/tests/mochitest/actions/test_media.html
@@ -13,15 +13,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
   <script type="application/javascript"
-          src="common.js"></script>
+          src="../common.js"></script>
   <script type="application/javascript"
-          src="events.js"></script>
+          src="../events.js"></script>
   <script type="application/javascript"
-          src="actions.js"></script>
+          src="../actions.js"></script>
   <script type="application/javascript"
-          src="role.js"></script>
+          src="../role.js"></script>
   <script type="application/javascript"
-          src="states.js"></script>
+          src="../states.js"></script>
 
   <script type="application/javascript">
 
@@ -58,49 +58,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
 
     function doTest()
     {
-      //////////////////////////////////////////////////////////////////////////
-      // test the accessible tree
-
-      var accTree = {
-        role: ROLE_GROUPING,
-        children: [
-          { // start/stop button
-            role: ROLE_PUSHBUTTON,
-            name: "Play",
-            states: {
-              states: STATE_FOCUSABLE
-            }
-          },
-          { // buffer bar
-            role: ROLE_PROGRESSBAR
-          },
-          { // progress bar
-            role: ROLE_PROGRESSBAR
-          },
-          { // slider of progress bar
-            role: ROLE_SLIDER,
-            name: "0:00 of 0:01 elapsed",
-            states: {
-              states: STATE_FOCUSABLE
-            }
-          },
-          { // duration label, role="presentation"
-            role: ROLE_NOTHING
-          },
-          { // mute button
-            role: ROLE_PUSHBUTTON,
-            name: "Mute",
-            states: {
-              states: STATE_FOCUSABLE
-            }
-          }
-        ]
-      };
-      testAccessibleTree("audio", accTree);
-
       //////////////////////////////////////////////////////////////////////////
       // test actions of audio controls
 
+      todo(false, "Focus test are disabled until bug 494175 is fixed.");
+
       var audioElm = getAccessible("audio");
       var playBtn = audioElm.firstChild;
       var scrubber = playBtn.nextSibling.nextSibling.nextSibling;
@@ -112,24 +74,24 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
           actionName: "press",
           events: CLICK_EVENTS,
           eventSeq: [
-            new focusChecker(muteBtn),
+     //       new focusChecker(muteBtn),
             new nameChecker(muteBtn, "Unmute"),
           ]
         },
-        {
-          ID: scrubber,
-          actionName: "activate",
-          events: null,
-          eventSeq: [
-            new focusChecker(scrubber)
-          ]
-        },
+     //   {
+     //     ID: scrubber,
+     //     actionName: "activate",
+     //     events: null,
+     //     eventSeq: [
+     //       new focusChecker(scrubber)
+     //     ]
+     //   },
         {
           ID: playBtn,
           actionName: "press",
           events: CLICK_EVENTS,
           eventSeq: [
-            new focusChecker(playBtn),
+     //       new focusChecker(playBtn),
             new nameChecker(playBtn, "Pause"),
           ]
         }
@@ -152,7 +114,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
   <pre id="test">
   </pre>
 
-  <audio id="audio" src="bug461281.ogg"
+  <audio id="audio" src="../bug461281.ogg"
          controls="true"></audio>
 
   <div id="eventDump"></div>
diff --git a/accessible/tests/mochitest/attributes/test_obj_group.xul b/accessible/tests/mochitest/attributes/test_obj_group.xul
index 927ad72d2e9..a8fb69561d3 100644
--- a/accessible/tests/mochitest/attributes/test_obj_group.xul
+++ b/accessible/tests/mochitest/attributes/test_obj_group.xul
@@ -30,11 +30,11 @@
       var menu1 = document.getElementById("menu_item1");
       menu1.open = true;
 
-      window.setTimeout(function() {
+      menu1.addEventListener("popupshown", function() {
         var menu2 = document.getElementById("menu_item2");
         menu2.open = true;
 
-        window.setTimeout(function() {
+        menu2.addEventListener("popupshown", function() {
           testGroupAttrs("menu_item1.1", 1, 1);
           testGroupAttrs("menu_item1.2", 1, 3);
           testGroupAttrs("menu_item1.4", 2, 3);
@@ -42,9 +42,12 @@
           testGroupAttrs("menu_item2.1", 1, 2, 1);
           testGroupAttrs("menu_item2.2", 2, 2, 1);
 
+          menu1.open = false;
+          menu2.open = false;
+
           SimpleTest.finish();
-        }, 200);
-      }, 200);
+        }, false);
+      }, false);
 
       //////////////////////////////////////////////////////////////////////////
       // xul:tab
diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js
index 05584a0690d..8e913867a4a 100644
--- a/accessible/tests/mochitest/common.js
+++ b/accessible/tests/mochitest/common.js
@@ -93,7 +93,7 @@ function addA11yLoadEvent(aFunc)
         if (state.value & STATE_BUSY)
           return waitForDocLoad();
 
-        window.setTimeout(aFunc, 150);
+        window.setTimeout(aFunc, 0);
       },
       0
     );
diff --git a/accessible/tests/mochitest/events/test_docload.html b/accessible/tests/mochitest/events/test_docload.html
index f0c3416e450..851b80030d9 100644
--- a/accessible/tests/mochitest/events/test_docload.html
+++ b/accessible/tests/mochitest/events/test_docload.html
@@ -118,6 +118,25 @@
       }
     }
 
+    function makeIFrameVisible(aID)
+    {
+      this.DOMNode = getNode(aID);
+
+      this.eventSeq = [
+        new invokerChecker(EVENT_REORDER, this.DOMNode.parentNode)
+      ];
+
+      this.invoke = function makeIFrameVisible_invoke()
+      {
+        this.DOMNode.style.visibility = "visible";
+      }
+
+      this.getID = function makeIFrameVisible_getID()
+      {
+        return "The accessible for DOM document loaded before it's shown shouldn't have busy state.";
+      }
+    }
+
     function openDialogWnd(aURL)
     {
       // Get application root accessible.
@@ -224,7 +243,7 @@
 
     // Debug stuff.
     // gA11yEventDumpID = "eventdump";
-    // gA11yEventDumpToConsole = true;
+    //gA11yEventDumpToConsole = true;
 
     function doTests()
     {
@@ -235,12 +254,30 @@
       gQueue.push(new morphIFrame("iframe", kHide));
       gQueue.push(new morphIFrame("iframe", kShow));
       gQueue.push(new morphIFrame("iframe", kRemove));
+      gQueue.push(new makeIFrameVisible("iframe2"));
       gQueue.push(new openDialogWnd("about:"));
       gQueue.push(new openWndShutdownDoc());
 
+      gQueue.onFinish = doLastCallTests;
+
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
+    function doLastCallTests()
+    {
+      //////////////////////////////////////////////////////////////////////////
+      // makeIFrameVisible() test, part2
+
+      // The document shouldn't have busy state (the DOM document was loaded
+      // before its accessible was created). Do this test lately to make sure
+      // the content of document accessible was created initially, prior to this
+      // the document accessible keeps busy state. The initial creation happens
+      // asynchronously after document creation, there are no events we could
+      // use to catch it.
+      var iframeDoc = getAccessible("iframe2").firstChild;
+      testStates(iframeDoc, 0, 0, STATE_BUSY);
+    }
+
     SimpleTest.waitForExplicitFinish();
     addA11yLoadEvent(doTests);
   </script>
@@ -268,6 +305,11 @@
      title="Shutdown document accessible when presshell goes away">
     Mozilla Bug 571459
   </a>
+  <a target="_blank"
+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=658185"
+     title="The DOM document loaded before it's shown shouldn't have busy state">
+    Mozilla Bug 658185
+  </a>
 
   <p id="display"></p>
   <div id="content" style="display: none"></div>
@@ -275,6 +317,7 @@
   </pre>
 
   <div id="testContainer"><iframe id="iframe"></iframe></div>
+  <div id="testContainer2"><iframe id="iframe2" src="about:" style="visibility: hidden;"></iframe></div>
   <div id="eventdump"></div>
 </body>
 </html>
diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in
index 3905fb981e2..8314fd9460b 100644
--- a/accessible/tests/mochitest/states/Makefile.in
+++ b/accessible/tests/mochitest/states/Makefile.in
@@ -49,6 +49,7 @@ _TEST_FILES =\
 		test_aria.html \
 		test_aria_imgmap.html \
 		test_aria_tabs.html \
+		test_comboboxes.xul \
 		test_doc.html \
 		test_docarticle.html \
 		test_editablebody.html \
diff --git a/accessible/tests/mochitest/test_nsIAccessible_comboboxes.xul b/accessible/tests/mochitest/states/test_comboboxes.xul
similarity index 96%
rename from accessible/tests/mochitest/test_nsIAccessible_comboboxes.xul
rename to accessible/tests/mochitest/states/test_comboboxes.xul
index 6dfe7aca245..7edbcb52d1f 100644
--- a/accessible/tests/mochitest/test_nsIAccessible_comboboxes.xul
+++ b/accessible/tests/mochitest/states/test_comboboxes.xul
@@ -16,9 +16,9 @@
           src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js" />
 
   <script type="application/javascript"
-          src="common.js" />
+          src="../common.js" />
   <script type="application/javascript"
-          src="events.js" />        
+          src="../events.js" />
 
   <script type="application/javascript">
   <![CDATA[
@@ -64,6 +64,7 @@
       //var searchbar = document.getElementById("searchbar");
       //gQueue.push(new openHideCombobox(searchbar, true));
       //gQueue.push(new openHideCombobox(searchbar, false));
+      todo(false, "Enable states test for XUL searchbar widget!");
 
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
diff --git a/accessible/tests/mochitest/test_childAtPoint.html b/accessible/tests/mochitest/test_childAtPoint.html
index 6233a76fb4f..4787b11cb2f 100644
--- a/accessible/tests/mochitest/test_childAtPoint.html
+++ b/accessible/tests/mochitest/test_childAtPoint.html
@@ -25,19 +25,19 @@
       testChildAtPoint(list, 1, 1, true, image.firstChild);
 
       // ::MustPrune case (in this case childAtPoint doesn't look inside a
-      // button), point is inside of button.
-      var btn = getAccessible("btn");
-      testChildAtPoint(btn, 1, 1, false, btn);
-      testChildAtPoint(btn, 1, 1, true, btn);
+      // textbox), point is inside of textbox.
+      var txt = getAccessible("txt");
+      testChildAtPoint(txt, 1, 1, false, txt);
+      testChildAtPoint(txt, 1, 1, true, txt);
 
-      // ::MustPrune case, point is outside of button accessible but is in
+      // ::MustPrune case, point is outside of textbox accessible but is in
       // document.
-      testChildAtPoint(btn, -1, 1, false, null);
-      testChildAtPoint(btn, -1, 1, true, null);
+      testChildAtPoint(txt, -1, 1, false, null);
+      testChildAtPoint(txt, -1, 1, true, null);
 
       // ::MustPrune case, point is outside of root accessible.
-      testChildAtPoint(btn, -10000, 10000, false, null);
-      testChildAtPoint(btn, -10000, 10000, true, null);
+      testChildAtPoint(txt, -10000, 10000, false, null);
+      testChildAtPoint(txt, -10000, 10000, true, null);
 
       // Not specific case, point is inside of label accessible.
       var label = getAccessible("label");
@@ -82,7 +82,7 @@
 
   <span role="label">label1</span><span role="label" id="label">label2</span>
 
-  <span role="button">btn1</span><span role="button" id="btn">btn2</span>
+  <span role="textbox">textbox1</span><span role="textbox" id="txt">textbox2</span>
 
   <div id="outofflow" style="width: 10px; height: 10px; position: absolute; left: 0px; top: 0px; background-color: yellow;">
   </div>
diff --git a/accessible/tests/mochitest/test_childAtPoint.xul b/accessible/tests/mochitest/test_childAtPoint.xul
index 54d1152ce7d..b8f78eeba27 100644
--- a/accessible/tests/mochitest/test_childAtPoint.xul
+++ b/accessible/tests/mochitest/test_childAtPoint.xul
@@ -24,8 +24,7 @@
     function doTest()
     {
       // Initialize the tree
-      var view = new inTreeView();
-      view.mRowCount = 5;
+      var view = new nsTableTreeView(5);
 
       var tree = getNode("tree");
       var treeBox = tree.treeBoxObject;
diff --git a/accessible/tests/mochitest/tree/test_media.html b/accessible/tests/mochitest/tree/test_media.html
index 411c9d9fc80..b16b81ec768 100644
--- a/accessible/tests/mochitest/tree/test_media.html
+++ b/accessible/tests/mochitest/tree/test_media.html
@@ -30,24 +30,33 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=483573
         role: ROLE_GROUPING,
         children: [
           { // start/stop button
-            role: ROLE_PUSHBUTTON
+            role: ROLE_PUSHBUTTON,
+            name: "Play",
+            children: []
           },
           { // buffer bar
-            role: ROLE_PROGRESSBAR
+            role: ROLE_PROGRESSBAR,
+            children: []
           },
           { // progress bar
-            role: ROLE_PROGRESSBAR
+            role: ROLE_PROGRESSBAR,
+            children: []
           },
           { // slider of progress bar
-            role: ROLE_SLIDER
+            role: ROLE_SLIDER,
+            //name: "0:00 of 0:02 elapsed",
+            children: []
           },
           { // mute button
-            role: ROLE_PUSHBUTTON
+            role: ROLE_PUSHBUTTON,
+            name: "Mute",
+            children: []
           }
         ]
       };
       testAccessibleTree("audio", accTree);
 
+      todo(false, "Enable name test for slider. Fail on Linux.");
       SimpleTest.finish();
     }
 
diff --git a/accessible/tests/mochitest/tree/test_txtctrl.xul b/accessible/tests/mochitest/tree/test_txtctrl.xul
index ba3847f9ed2..545851218da 100644
--- a/accessible/tests/mochitest/tree/test_txtctrl.xul
+++ b/accessible/tests/mochitest/tree/test_txtctrl.xul
@@ -15,6 +15,8 @@
           src="../common.js" />
   <script type="application/javascript"
           src="../role.js" />
+  <script type="application/javascript"
+          src="../events.js" />
 
   <script type="application/javascript">
   <![CDATA[
@@ -108,6 +110,11 @@
         ]
       };
 
+      function test_txc7() {
+        testAccessibleTree("txc7", accTree);
+        SimpleTest.finish();
+      }
+
       // XPFE and Toolkit autocomplete widgets differ.
       var txc7 = document.getElementById("txc7");
       if ("clearResults" in txc7) {
@@ -139,11 +146,14 @@
               }
             ]
           }
-          );
+        );
+        test_txc7();
+
       } else {
         SimpleTest.ok(true, "Testing (New) Toolkit autocomplete widget.");
 
-        // Dumb access to trigger popup lazy creation. (See code below.)
+        // Dumb access to trigger popup lazy creation.
+        waitForEvent(EVENT_REORDER, txc7, test_txc7);
         txc7.popup;
 
         accTree.children.push(
@@ -161,17 +171,8 @@
               }
             ]
           }
-          );
+        );
       }
-
-      // Delay txc7 test a bit, to let Toolkit popup lazy creation complete.
-      function test_txc7() {
-        testAccessibleTree("txc7", accTree);
-  
-        SimpleTest.finish();
-      }
-      // SimpleTest.executeSoon() doesn't help here: use setTimeout() with a little delay.
-      setTimeout(test_txc7, 25);
     }
 
     SimpleTest.waitForExplicitFinish();
diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 57c60dfacaf..a54d4af8027 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -97,6 +97,11 @@
            <versionRange minVersion="3.7a1" maxVersion="*"/>
         </targetApplication>
       </versionRange>
+      <versionRange minVersion="3.3.1" maxVersion="*">
+        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+           <versionRange minVersion="5.0a1" maxVersion="*"/>
+        </targetApplication>
+      </versionRange>
     </emItem>
     <emItem id="{E8E88AB0-7182-11DF-904E-6045E0D72085}"/>
   </emItems>
diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
index f71f16301f2..9c5e04e6da4 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -92,6 +92,55 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>oga</string>
+				<string>ogg</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/ogg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>HTML5 Audio (Ogg)</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>ogv</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>video/ogg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>HTML5 Video (Ogg)</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>webm</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>document.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>video/webm</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>HTML5 Video (WebM)</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>firefox-bin</string>
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
index 338065fbf37..48d6175e290 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
@@ -123,7 +123,7 @@ var stringBundle;
       // and targets
       let io = Components.classes["@mozilla.org/network/io-service;1"].
 	getService(Components.interfaces.nsIIOService);
-      let source = io.newURI(canvas.toDataURL("image/png", ""), "UTF8", null);
+      let source = io.newURI(canvas.toDataURL("image/png"), "UTF8", null);
       let target = io.newFileURI(file);
 
       // prepare to save the canvas data
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf b/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
index c3b9d9a71d9..356237316ae 100755
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>testpilot@labs.mozilla.com</em:id>
-    <em:version>1.1.1</em:version>
+    <em:version>1.1.2</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into, 
@@ -13,7 +13,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>3.5</em:minVersion>
-        <em:maxVersion>5.0</em:maxVersion>
+        <em:maxVersion>6.0</em:maxVersion>
       </Description>
     </em:targetApplication>
    
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
index 599e32094cb..f843de43bf4 100644
--- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
@@ -43,8 +43,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DFIREFOX_VERSION=$(FIREFOX_VERSION)
-
 FILES := \
 	install.rdf \
 	$(NULL)
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index d503274b88e..cd0cc46aef8 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -70,6 +70,7 @@ pref("extensions.blocklist.interval", 86400);
 pref("extensions.blocklist.level", 2);
 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
 pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
+pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
 
 pref("extensions.update.autoUpdateDefault", true);
 
@@ -264,7 +265,7 @@ pref("browser.urlbar.doubleClickSelectsAll", true);
 #else
 pref("browser.urlbar.doubleClickSelectsAll", false);
 #endif
-pref("browser.urlbar.autoFill", true);
+pref("browser.urlbar.autoFill", false);
 // 0: Match anywhere (e.g., middle of words)
 // 1: Match on word boundaries and then try matching anywhere
 // 2: Match only on word boundaries (e.g., after / or .)
diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 0a492d3cdae..cc0372f2297 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -48,6 +48,7 @@ let TabView = {
   PREF_STARTUP_PAGE: "browser.startup.page",
   PREF_RESTORE_ENABLED_ONCE: "browser.panorama.session_restore_enabled_once",
   VISIBILITY_IDENTIFIER: "tabview-visibility",
+  GROUPS_IDENTIFIER: "tabview-groups",
 
   // ----------
   get windowTitle() {
@@ -95,14 +96,21 @@ let TabView = {
       // ___ visibility
       let sessionstore =
         Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-      let data = sessionstore.getWindowValue(window, this.VISIBILITY_IDENTIFIER);
 
+      let data = sessionstore.getWindowValue(window, this.VISIBILITY_IDENTIFIER);
       if (data && data == "true") {
         this.show();
       } else {
-        let self = this;
+        try {
+          data = sessionstore.getWindowValue(window, this.GROUPS_IDENTIFIER);
+          if (data) {
+            let parsedData = JSON.parse(data);
+            this.updateGroupNumberBroadcaster(parsedData.totalNumber || 0);
+          }
+        } catch (e) { }
 
-        // if a tab is changed from hidden to unhidden and the iframe is not 
+        let self = this;
+        // if a tab is changed from hidden to unhidden and the iframe is not
         // initialized, load the iframe and setup the tab.
         this._tabShowEventListener = function (event) {
           if (!self._window)
@@ -380,6 +388,14 @@ let TabView = {
     document.persist(toolbar.id, "currentset");
   },
 
+  // ----------
+  // Function: updateGroupNumberBroadcaster
+  // Updates the group number broadcaster.
+  updateGroupNumberBroadcaster: function TabView_updateGroupNumberBroadcaster(number) {
+    let groupsNumber = document.getElementById("tabviewGroupsNumber");
+    groupsNumber.setAttribute("groups", number);
+  },
+
   // ----------
   // Function: enableSessionRestore
   // Enables automatic session restore when the browser is started. Does
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4a242623411..faf4ca8970b 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2964,11 +2964,6 @@ function FillInHTMLTooltip(tipElement)
   var titleText = null;
   var XLinkTitleText = null;
   var SVGTitleText = null;
-#ifdef MOZ_SVG
-  var lookingForSVGTitle = true;
-#else
-  var lookingForSVGTitle = false;
-#endif // MOZ_SVG
   var direction = tipElement.ownerDocument.dir;
 
   // If the element is invalid per HTML5 Forms specifications and has no title,
@@ -2989,20 +2984,14 @@ function FillInHTMLTooltip(tipElement)
       titleText = tipElement.getAttribute("title");
       if ((tipElement instanceof HTMLAnchorElement && tipElement.href) ||
           (tipElement instanceof HTMLAreaElement && tipElement.href) ||
-          (tipElement instanceof HTMLLinkElement && tipElement.href)
-#ifdef MOZ_SVG
-          || (tipElement instanceof SVGAElement && tipElement.hasAttributeNS(XLinkNS, "href"))
-#endif // MOZ_SVG
-          ) {
+          (tipElement instanceof HTMLLinkElement && tipElement.href) ||
+          (tipElement instanceof SVGAElement && tipElement.hasAttributeNS(XLinkNS, "href"))) {
         XLinkTitleText = tipElement.getAttributeNS(XLinkNS, "title");
       }
-      if (lookingForSVGTitle &&
-          !(tipElement instanceof SVGElement &&
-            tipElement.parentNode instanceof SVGElement &&
-            !(tipElement.parentNode instanceof SVGForeignObjectElement))) {
-        lookingForSVGTitle = false;
-      }
-      if (lookingForSVGTitle) {
+      if (tipElement instanceof SVGElement &&
+          tipElement.parentNode instanceof SVGElement &&
+          !(tipElement.parentNode instanceof SVGForeignObjectElement)) {
+        // Looking for SVG title
         let length = tipElement.childNodes.length;
         for (let i = 0; i < length; i++) {
           let childNode = tipElement.childNodes[i];
@@ -3346,7 +3335,7 @@ const BrowserSearch = {
       var win = getTopWin();
       if (win) {
         // If there's an open browser window, it should handle this command
-        win.focus()
+        win.focus();
         win.BrowserSearch.webSearch();
       } else {
         // If there are no open browser windows, open a new one
@@ -3356,7 +3345,7 @@ const BrowserSearch = {
             Services.obs.removeObserver(observer, "browser-delayed-startup-finished");
           }
         }
-        win = window.openDialog("chrome://browser/content/", "_blank",
+        win = window.openDialog(getBrowserURL(), "_blank",
                                 "chrome,all,dialog=no", "about:blank");
         Services.obs.addObserver(observer, "browser-delayed-startup-finished", false); 
       }
diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js
index c19102ee592..f4a5abaf060 100644
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -626,7 +626,6 @@ function grabAll(elem)
   if (elem instanceof HTMLImageElement)
     addImage(elem.src, gStrings.mediaImg,
              (elem.hasAttribute("alt")) ? elem.alt : gStrings.notSet, elem, false);
-#ifdef MOZ_SVG
   else if (elem instanceof SVGImageElement) {
     try {
       // Note: makeURLAbsolute will throw if either the baseURI is not a valid URI
@@ -635,7 +634,6 @@ function grabAll(elem)
       addImage(href, gStrings.mediaImg, "", elem, false);
     } catch (e) { }
   }
-#endif
 #ifdef MOZ_MEDIA
   else if (elem instanceof HTMLVideoElement) {
     addImage(elem.currentSrc, gStrings.mediaVideo, "", elem, false);
@@ -841,9 +839,7 @@ function makePreview(row)
 
   var imageText;
   if (!isBG &&
-#ifdef MOZ_SVG
       !(item instanceof SVGImageElement) &&
-#endif
       !(gDocument instanceof ImageDocument)) {
     imageText = item.title || item.alt;
 
@@ -941,9 +937,7 @@ function makePreview(row)
 
   if ((item instanceof HTMLLinkElement || item instanceof HTMLInputElement ||
        item instanceof HTMLImageElement ||
-#ifdef MOZ_SVG
        item instanceof SVGImageElement ||
-#endif
       (item instanceof HTMLObjectElement && /^image\//.test(mimeType)) || isBG) && isProtocolAllowed) {
     newImage.setAttribute("src", url);
     physWidth = newImage.width || 0;
@@ -963,12 +957,10 @@ function makePreview(row)
       newImage.height = newImage.naturalHeight;
     }
 
-#ifdef MOZ_SVG
     if (item instanceof SVGImageElement) {
       newImage.width = item.width.baseVal.value;
       newImage.height = item.height.baseVal.value;
     }
-#endif
 
     width = newImage.width;
     height = newImage.height;
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 47381b3c28b..36678d08861 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -95,7 +95,7 @@
       <property name="visibleTabs" readonly="true">
         <getter><![CDATA[
           return Array.filter(this.tabs, function(tab) {
-            return !tab.hidden && this._removingTabs.indexOf(tab) == -1;
+            return !tab.hidden && !tab.closing;
           }, this);
         ]]></getter>
       </property>
@@ -208,7 +208,7 @@
           //
           // Fixing bug 630826 could make that happen automatically.
           // Fixing bug 630830 could avoid the ugly hack below.
-          
+
           let closeMenuItem = document.getElementById("menu_close");
           let parentPopup = closeMenuItem.parentNode;
           let nextItem = closeMenuItem.nextSibling;
@@ -963,6 +963,10 @@
                 // if the tab is a blank one.
                 oldBrowser._urlbarFocused = (gURLBar && gURLBar.focused);
                 if (newBrowser._urlbarFocused && gURLBar) {
+
+                  // Explicitly close the popup if the URL bar retains focus
+                  gURLBar.closePopup();
+
                   if (!window.fullScreen) {
                     gURLBar.focus();
                     break;
@@ -999,7 +1003,7 @@
       <method name="_tabAttrModified">
         <parameter name="aTab"/>
         <body><![CDATA[
-          if (this._removingTabs.indexOf(aTab) > -1)
+          if (aTab.closing)
             return;
 
           // This event should be dispatched when any of these attributes change:
@@ -1455,7 +1459,7 @@
             // Handle requests for synchronously removing an already
             // asynchronously closing tab.
             if (!animate &&
-                this._removingTabs.indexOf(aTab) > -1) {
+                aTab.closing) {
               this._endRemoveTab(aTab);
               return;
             }
@@ -1509,7 +1513,7 @@
         <parameter name="aCloseWindowFastpath"/>
         <body>
           <![CDATA[
-            if (this._removingTabs.indexOf(aTab) > -1 || this._windowIsClosing)
+            if (aTab.closing || this._windowIsClosing)
               return false;
 
             var browser = this.getBrowserForTab(aTab);
@@ -1539,6 +1543,7 @@
               newTab = true;
             }
 
+            aTab.closing = true;
             this._removingTabs.push(aTab);
             if (newTab)
               this.addTab("about:blank", {skipAnimation: true});
@@ -1707,7 +1712,7 @@
 
             if (aTab.owner &&
                 !aTab.owner.hidden &&
-                this._removingTabs.indexOf(aTab.owner) == -1 &&
+                !aTab.owner.closing &&
                 Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")) {
               this.selectedTab = aTab.owner;
               return;
@@ -1718,7 +1723,7 @@
             let numTabs = remainingTabs.length;
             if (numTabs == 0 || numTabs == 1 && remainingTabs[0] == aTab) {
               remainingTabs = Array.filter(this.tabs, function(tab) {
-                return this._removingTabs.indexOf(tab) == -1;
+                return !tab.closing;
               }, this);
             }
 
@@ -1933,7 +1938,7 @@
         <body>
         <![CDATA[
           if (!aTab.hidden && !aTab.pinned && !aTab.selected &&
-              this._removingTabs.indexOf(aTab) == -1) {
+              !aTab.closing) {
             aTab.setAttribute("hidden", "true");
             this.tabContainer.adjustTabstrip();
             let event = document.createEvent("Events");
@@ -2948,8 +2953,7 @@
         <body><![CDATA[
           var numPinned = this.tabbrowser._numPinnedTabs;
           var doPosition = this.getAttribute("overflow") == "true" &&
-                           numPinned > 0 &&
-                           numPinned < this.tabbrowser.visibleTabs.length;
+                           numPinned > 0;
 
           if (doPosition) {
             this.setAttribute("positionpinnedtabs", "true");
@@ -3077,7 +3081,7 @@
           var tab = this._getDragTargetTab(event);
           if (window.getComputedStyle(this, null).direction == "ltr") {
             for (let i = tab ? tab._tPos : 0; i < tabs.length; i++)
-              if (event.screenX < tabs[i].boxObject.screenX + tabs[i].boxObject.width / 2) 
+              if (event.screenX < tabs[i].boxObject.screenX + tabs[i].boxObject.width / 2)
                 return i;
           } else {
             for (let i = tab ? tab._tPos : 0; i < tabs.length; i++)
@@ -3171,7 +3175,7 @@
         <parameter name="aTab"/>
         <body>
         <![CDATA[
-          return this.tabbrowser._removingTabs.indexOf(aTab) == -1;
+          return !aTab.closing;
         ]]>
         </body>
       </method>
@@ -3194,7 +3198,7 @@
 
         if (tab.getAttribute("fadein") == "true")
           this._handleNewTab(tab);
-        else if (this.tabbrowser._removingTabs.indexOf(tab) > -1)
+        else if (tab.closing)
           this.tabbrowser._endRemoveTab(tab);
       ]]></handler>
 
@@ -3337,7 +3341,7 @@
         var scrollRect = tabStrip.scrollClientRect;
         var rect = this.getBoundingClientRect();
         var minMargin = scrollRect.left - rect.left;
-        var maxMargin = Math.min(minMargin + scrollRect.width, 
+        var maxMargin = Math.min(minMargin + scrollRect.width,
                                  scrollRect.right);
         if (!ltr)
           [minMargin, maxMargin] = [this.clientWidth - maxMargin,
@@ -3635,6 +3639,7 @@
       <field name="mOverCloseButton">false</field>
       <field name="mCorrespondingMenuitem">null</field>
       <field name="_fullyOpen">false</field>
+      <field name="closing">false</field>
     </implementation>
 
     <handlers>
@@ -3746,7 +3751,7 @@
               continue;
             if (curTabBO.screenX >= tabstripBO.screenX &&
                 curTabBO.screenX + curTabBO.width <= tabstripBO.screenX + tabstripBO.width)
-              this.childNodes[i].setAttribute("tabIsVisible", "true"); 
+              this.childNodes[i].setAttribute("tabIsVisible", "true");
             else
               this.childNodes[i].removeAttribute("tabIsVisible");
           }
@@ -3757,7 +3762,7 @@
         <parameter name="aTab"/>
         <body><![CDATA[
           var menuItem = document.createElementNS(
-            "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", 
+            "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
             "menuitem");
 
           menuItem.setAttribute("class", "menuitem-iconic alltabs-item menuitem-with-favicon");
diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index ec2d808ba0d..0438ef95be7 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -2107,7 +2107,9 @@ let GroupItems = {
 
     let activeGroupId = this._activeGroupItem ? this._activeGroupItem.id : null;
     Storage.saveGroupItemsData(
-      gWindow, { nextID: this.nextID, activeGroupId: activeGroupId });
+      gWindow,
+      { nextID: this.nextID, activeGroupId: activeGroupId,
+        totalNumber: this.groupItems.length });
   },
 
   // ----------
diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 24b467d63cc..50d17934008 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -1558,6 +1558,6 @@ TabCanvas.prototype = {
   // ----------
   // Function: toImageData
   toImageData: function TabCanvas_toImageData() {
-    return this.canvas.toDataURL("image/png", "");
+    return this.canvas.toDataURL("image/png");
   }
 };
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index e9cba640ccf..107e2467a5d 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -956,12 +956,11 @@ let UI = {
   
   // ----------
   updateTabButton: function UI__updateTabButton() {
-    let groupsNumber = gWindow.document.getElementById("tabviewGroupsNumber");
     let exitButton = document.getElementById("exit-button");
     let numberOfGroups = GroupItems.groupItems.length;
 
-    groupsNumber.setAttribute("groups", numberOfGroups);
     exitButton.setAttribute("groups", numberOfGroups);
+    gTabView.updateGroupNumberBroadcaster(numberOfGroups);
   },
 
   // ----------
@@ -995,7 +994,8 @@ let UI = {
 #ifdef XP_MACOSX
       "preferencesCmdMac", "minimizeWindow",
 #endif
-      "newNavigator", "newNavigatorTab", "find"
+      "newNavigator", "newNavigatorTab", "undo", "cut", "copy", "paste", 
+      "selectAll", "find"
      ].forEach(function(key) {
       let element = gWindow.document.getElementById("key_" + key);
       keys[key] = element.getAttribute("key").toLocaleLowerCase().charCodeAt(0);
@@ -1004,7 +1004,7 @@ let UI = {
     // for key combinations with shift key, the charCode of upper case letters 
     // are different to the lower case ones so need to handle them differently.
     ["closeWindow", "tabview", "undoCloseTab", "undoCloseWindow",
-     "privatebrowsing"].forEach(function(key) {
+     "privatebrowsing", "redo"].forEach(function(key) {
       let element = gWindow.document.getElementById("key_" + key);
       keys[key] = element.getAttribute("key").toLocaleUpperCase().charCodeAt(0);
     });
@@ -1043,6 +1043,7 @@ let UI = {
               case self._browserKeys.undoCloseTab:
               case self._browserKeys.undoCloseWindow:
               case self._browserKeys.closeWindow:
+              case self._browserKeys.redo:
                 preventDefault = false;
                 break;
               case self._browserKeys.tabview:
@@ -1056,6 +1057,11 @@ let UI = {
                 break;
               case self._browserKeys.newNavigator:
               case self._browserKeys.newNavigatorTab:
+              case self._browserKeys.undo:
+              case self._browserKeys.cut:
+              case self._browserKeys.copy:
+              case self._browserKeys.paste:
+              case self._browserKeys.selectAll:
                 preventDefault = false;
                 break;
 #ifdef XP_UNIX
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index f8456f4be9a..51cc7c1cc94 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -171,6 +171,7 @@ _BROWSER_FILES = \
                  browser_bug623893.js \
                  browser_bug624734.js \
                  browser_bug647886.js \
+                 browser_bug655584.js \
                  browser_findbarClose.js \
                  browser_contextSearchTabPosition.js \
                  browser_ctrlTab.js \
diff --git a/browser/base/content/test/browser_bug655584.js b/browser/base/content/test/browser_bug655584.js
new file mode 100644
index 00000000000..2fb1b4b4362
--- /dev/null
+++ b/browser/base/content/test/browser_bug655584.js
@@ -0,0 +1,23 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// Bug 655584 - awesomebar suggestions don't update after tab is closed
+
+function test() {
+  var tab1 = gBrowser.addTab();
+  var tab2 = gBrowser.addTab();
+
+  // When urlbar in a new tab is focused, and a tab switch occurs,
+  // the urlbar popup should be closed
+  gBrowser.selectedTab = tab2;
+  gURLBar.focus(); // focus the urlbar in the tab we will switch to
+  gBrowser.selectedTab = tab1;
+  gURLBar.openPopup();
+  gBrowser.selectedTab = tab2;
+  ok(!gURLBar.popupOpen, "urlbar focused in tab to switch to, close popup");
+  
+  // cleanup
+  gBrowser.removeCurrentTab();
+  gBrowser.removeCurrentTab();
+}
diff --git a/browser/base/content/test/browser_urlHighlight.js b/browser/base/content/test/browser_urlHighlight.js
index 706cd35aebd..7ea57b8a2d2 100644
--- a/browser/base/content/test/browser_urlHighlight.js
+++ b/browser/base/content/test/browser_urlHighlight.js
@@ -54,6 +54,9 @@ function test() {
 
   testVal("<http://sub.>mozilla.org<:666/file.ext>");
 
+  testVal("<http://>[fe80::222:19ff:fe11:8c76]</file.ext>");
+  testVal("<http://user:pass@>[fe80::222:19ff:fe11:8c76]<:666/file.ext>");
+
   testVal("mailto:admin@mozilla.org");
   testVal("gopher://mozilla.org/");
   testVal("about:config");
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index e8cc37f58ec..ec1e5765728 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -115,6 +115,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug626791.js \
                  browser_tabview_bug627288.js \
                  browser_tabview_bug627736.js \
+                 browser_tabview_bug628061.js \
                  browser_tabview_bug628165.js \
                  browser_tabview_bug628270.js \
                  browser_tabview_bug629189.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624265.js b/browser/base/content/test/tabview/browser_tabview_bug624265.js
index e0d85e4384a..d3c3bee722e 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug624265.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug624265.js
@@ -19,15 +19,6 @@ function test() {
     is(gBrowser.visibleTabs.length, numTabs, 'There should be ' + numTabs + ' visible tabs');
   }
 
-  let restoreTab = function (callback) {
-    let tab = undoCloseTab(0);
-    
-    tab._tabViewTabItem.addSubscriber(tab, 'reconnected', function () {
-      tab._tabViewTabItem.removeSubscriber(tab, 'reconnected');
-      afterAllTabsLoaded(callback);
-    });
-  }
-
   let next = function () {
     while (gBrowser.tabs.length-1)
       gBrowser.removeTab(gBrowser.tabs[1]);
@@ -86,7 +77,7 @@ function test() {
     let tab = gBrowser.loadOneTab('http://mochi.test:8888/#1', {inBackground: true});
     gBrowser.selectedTab = tab;
 
-    let continueTest = function () {
+    afterAllTabsLoaded(function () {
       tab.linkedBrowser.loadURI('http://mochi.test:8888/#2');
 
       afterAllTabsLoaded(function () {
@@ -106,13 +97,7 @@ function test() {
           });
         });
       });
-    }
-
-    // The executeSoon() call is really needed here because there's probably
-    // some callback waiting to be fired after gBrowser.loadOneTab(). After
-    // that the browser is in a state where loadURI() will create a new entry
-    // in the session history (that is vital for back/forward functionality).
-    afterAllTabsLoaded(function () executeSoon(continueTest));
+    });
   }
 
   // ----------
@@ -156,45 +141,30 @@ function test() {
 
 // ----------
 function loadTabView(callback) {
-  window.addEventListener('tabviewshown', function () {
-    window.removeEventListener('tabviewshown', arguments.callee, false);
-
-    hideTabView(function () {
-      window.removeEventListener('tabviewhidden', arguments.callee, false);
-      callback();
-    });
-  }, false);
-
-  TabView.show();
-}
-
-// ----------
-function hideTabView(callback) {
-  if (!TabView.isVisible())
-    return callback();
-
-  window.addEventListener('tabviewhidden', function () {
-    window.removeEventListener('tabviewhidden', arguments.callee, false);
-    callback();
-  }, false);
-
-  TabView.hide();
+  showTabView(function () {
+    hideTabView(callback);
+  });
 }
 
 // ----------
 function enterAndLeavePrivateBrowsing(callback) {
+  togglePrivateBrowsing(function () {
+    togglePrivateBrowsing(callback);
+  });
+}
+
+// ----------
+function togglePrivateBrowsing(callback) {
+  let topic = "private-browsing-transition-complete";
+
   function pbObserver(aSubject, aTopic, aData) {
-    if (aTopic != "private-browsing-transition-complete")
+    if (aTopic != topic)
       return;
 
-    if (pb.privateBrowsingEnabled)
-      pb.privateBrowsingEnabled = false;
-    else {
-      Services.obs.removeObserver(pbObserver, "private-browsing-transition-complete");
-      afterAllTabsLoaded(function () executeSoon(callback));
-    }
+    Services.obs.removeObserver(pbObserver, topic, false);
+    afterAllTabsLoaded(callback);
   }
 
-  Services.obs.addObserver(pbObserver, "private-browsing-transition-complete", false);
-  pb.privateBrowsingEnabled = true;
+  Services.obs.addObserver(pbObserver, topic, false);
+  pb.privateBrowsingEnabled = !pb.privateBrowsingEnabled;
 }
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628061.js b/browser/base/content/test/tabview/browser_tabview_bug628061.js
new file mode 100644
index 00000000000..f01c10a836e
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug628061.js
@@ -0,0 +1,37 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+
+let state = {
+  windows: [{
+    tabs: [{
+      entries: [{ url: "about:blank" }],
+      hidden: true,
+      extData: {"tabview-tab": '{"url":"about:blank","groupID":1,"bounds":{"left":20,"top":20,"width":20,"height":20}}'}
+    },{
+      entries: [{ url: "about:blank" }],
+      hidden: false,
+      extData: {"tabview-tab": '{"url":"about:blank","groupID":2,"bounds":{"left":20,"top":20,"width":20,"height":20}}'},
+    }],
+    selected: 2,
+    extData: {
+      "tabview-groups": '{"nextID":3,"activeGroupId":2, "totalNumber":2}',
+      "tabview-group":
+        '{"1":{"bounds":{"left":15,"top":5,"width":280,"height":232},"id":1},' +
+        '"2":{"bounds":{"left":309,"top":5,"width":267,"height":226},"id":2}}'
+    }
+  }]
+};
+
+function test() {
+  waitForExplicitFinish();
+
+  newWindowWithState(state, function(win) {
+    registerCleanupFunction(function() win.close());
+
+    is(win.document.getElementById("tabviewGroupsNumber").getAttribute("groups"), 
+       "2", "There are two groups");
+    waitForFocus(finish);
+  });
+}
diff --git a/browser/base/content/test/tabview/head.js b/browser/base/content/test/tabview/head.js
index 10d21b06466..c2f5502c0b9 100644
--- a/browser/base/content/test/tabview/head.js
+++ b/browser/base/content/test/tabview/head.js
@@ -105,7 +105,7 @@ function afterAllTabsLoaded(callback, win) {
     this.removeEventListener("load", onLoad, true);
     stillToLoad--;
     if (!stillToLoad)
-      callback();
+      executeSoon(callback);
   }
 
   for (let a = 0; a < win.gBrowser.tabs.length; a++) {
@@ -301,3 +301,21 @@ function newWindowWithState(state, callback) {
     afterAllTabsLoaded(function () callback(win), win);
   });
 }
+
+// ----------
+function restoreTab(callback, index, win) {
+  win = win || window;
+
+  let tab = win.undoCloseTab(index || 0);
+  let tabItem = tab._tabViewTabItem;
+
+  if (tabItem._reconnected) {
+    afterAllTabsLoaded(callback, win);
+    return;
+  }
+
+  tab._tabViewTabItem.addSubscriber(tab, "reconnected", function onReconnected() {
+    tab._tabViewTabItem.removeSubscriber(tab, "reconnected");
+    afterAllTabsLoaded(callback, win);
+  });
+}
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 1b016394a16..be51995593a 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -192,7 +192,7 @@
 
           let textNode = this.editor.rootElement.firstChild;
           let value = textNode.textContent;
-          let matchedURL = value.match(/^((?:http|https|ftp):\/\/(?:[^\/]+@)?)([^\/:]+)/);
+          let matchedURL = value.match(/^((?:http|https|ftp):\/\/(?:[^\/]+@)?)(.+?)(?::\d+)?(?:\/|$)/);
           if (!matchedURL)
             return;
 
diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest
index afb4c5107da..c04163f9623 100644
--- a/browser/components/BrowserComponents.manifest
+++ b/browser/components/BrowserComponents.manifest
@@ -5,9 +5,7 @@ component {47cd0651-b1be-4a0f-b5c4-10e5a573ef71} nsBrowserContentHandler.js appl
 contract @mozilla.org/browser/final-clh;1 {47cd0651-b1be-4a0f-b5c4-10e5a573ef71} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 contract @mozilla.org/uriloader/content-handler;1?type=text/html {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.mozilla.xul+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-#ifdef MOZ_SVG
 contract @mozilla.org/uriloader/content-handler;1?type=image/svg+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
-#endif
 contract @mozilla.org/uriloader/content-handler;1?type=text/rdf {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 contract @mozilla.org/uriloader/content-handler;1?type=text/xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 contract @mozilla.org/uriloader/content-handler;1?type=application/xhtml+xml {5d0ce354-df01-421a-83fb-7ead0990c24e} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index 0c89b0f1d5e..e89121c2046 100644
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -221,6 +221,19 @@
                       accesskey="&cmd.new_separator.accesskey;"/>
 
 #ifndef XP_MACOSX
+            <menuseparator id="orgUndoSeparator"/>
+
+            <menuitem id="orgUndo"
+                      command="cmd_undo"
+                      label="&undoCmd.label;"
+                      key="key_undo"
+                      accesskey="&undoCmd.accesskey;"/>
+            <menuitem id="orgRedo"
+                      command="cmd_redo"
+                      label="&redoCmd.label;"
+                      key="key_redo"
+                      accesskey="&redoCmd.accesskey;"/>
+
             <menuseparator id="orgCutSeparator"/>
 
             <menuitem id="orgCut"
@@ -241,19 +254,14 @@
                       key="key_paste"
                       accesskey="&pasteCmd.accesskey;"
                       selection="mutable"/>
-            <menuitem id="orgUndo"
-                      command="cmd_undo"
-                      label="&undoCmd.label;"
-                      key="key_undo"
-                      accesskey="&undoCmd.accesskey;"/>
-            <menuitem id="orgRedo"
-                      command="cmd_redo"
-                      label="&redoCmd.label;"
-                      key="key_redo"
-                      accesskey="&redoCmd.accesskey;"/>
+            <menuitem id="orgDelete"
+                      command="cmd_delete"
+                      label="&deleteCmd.label;"
+                      key="key_delete"
+                      accesskey="&deleteCmd.accesskey;"/>
 
             <menuseparator id="selectAllSeparator"/>
-            
+
             <menuitem id="orgSelectAll"
                       command="cmd_selectAll"
                       label="&selectAllCmd.label;"
@@ -262,16 +270,18 @@
 
 #endif
             <menuseparator id="orgMoveSeparator"/>
+
             <menuitem id="orgMoveBookmarks"
                       command="placesCmd_moveBookmarks"
                       label="&cmd.moveBookmarks.label;"
                       accesskey="&cmd.moveBookmarks.accesskey;"/>
+#ifdef XP_MACOSX
             <menuitem id="orgDelete"
                       command="cmd_delete"
                       label="&deleteCmd.label;"
                       key="key_delete"
                       accesskey="&deleteCmd.accesskey;"/>
-#ifndef XP_MACOSX
+#else
             <menuseparator id="orgCloseSeparator"/>
 
             <menuitem id="orgClose"
@@ -369,12 +379,12 @@
 
   <hbox flex="1" id="placesView">
     <tree id="placesList"
-          class="placesTree"
+          class="plain placesTree"
           type="places"
           hidecolumnpicker="true" context="placesContext"
           onselect="PlacesOrganizer.onPlaceSelected(true);"
           onclick="PlacesOrganizer.onTreeClick(event);"
-          onfocus="PlacesOrganizer.onTreeFocus(event);"          
+          onfocus="PlacesOrganizer.onTreeFocus(event);"
           seltype="single"
           persist="width"
           width="200"
@@ -387,116 +397,112 @@
     </tree>
     <splitter collapse="none" persist="state"></splitter>
     <vbox id="contentView" flex="4">
-      <deck id="contentDeck" flex="1">
-        <vbox id="defaultView" flex="1">
-          <vbox id="searchModifiers" hidden="true">
-            <toolbar id="organizerScopeBar" class="chromeclass-toolbar" align="center">
-              <label id="scopeBarTitle" value="&search.in.label;"/>
-              <toolbarbutton id="scopeBarAll" type="radio" group="scopeBar"
-                             oncommand="PlacesQueryBuilder.onScopeSelected(this);"
-                             label="&search.scopeBookmarks.label;"
-                             accesskey="&search.scopeBookmarks.accesskey;"/>
-              <!--
-              <toolbarbutton id="scopeBarDownloads" type="radio" group="scopeBar"
-                             oncommand="PlacesQueryBuilder.onScopeSelected(this);"
-                             label="&search.scopeDownloads.label;"
-                             accesskey="&search.scopeDownloads.accesskey;"/>
-              -->
-              <toolbarbutton id="scopeBarHistory" type="radio" group="scopeBar"
-                             oncommand="PlacesQueryBuilder.onScopeSelected(this);"
-                             label="&search.scopeHistory.label;"
-                             accesskey="&search.scopeHistory.accesskey;"/>
-              <toolbarbutton id="scopeBarFolder" type="radio" group="scopeBar"
-                             oncommand="PlacesQueryBuilder.onScopeSelected(this);"
-                             accesskey="&search.scopeFolder.accesskey;"
-                             emptytitle="&search.scopeFolder.label;" flex="1"/>
-              <!-- The folder scope button should flex but not take up more room
-                   than its label needs.  The only simple way to do that is to
-                   set a really big flex on the spacer, e.g., 2^31 - 1. -->
-              <spacer flex="2147483647"/>
-              <button id="saveSearch" class="small" 
-                       label="&saveSearch.label;" accesskey="&saveSearch.accesskey;"
-                       command="OrganizerCommand_search:save"/>
-            </toolbar>
+      <toolbox id="searchModifiers" hidden="true">
+        <toolbar id="organizerScopeBar" class="chromeclass-toolbar" align="center">
+          <label id="scopeBarTitle" value="&search.in.label;"/>
+          <toolbarbutton id="scopeBarAll" class="small-margin"
+                         type="radio" group="scopeBar"
+                         oncommand="PlacesQueryBuilder.onScopeSelected(this);"
+                         label="&search.scopeBookmarks.label;"
+                         accesskey="&search.scopeBookmarks.accesskey;"/>
+          <!--
+          <toolbarbutton id="scopeBarDownloads" class="small-margin"
+                         type="radio" group="scopeBar"
+                         oncommand="PlacesQueryBuilder.onScopeSelected(this);"
+                         label="&search.scopeDownloads.label;"
+                         accesskey="&search.scopeDownloads.accesskey;"/>
+          -->
+          <toolbarbutton id="scopeBarHistory" class="small-margin"
+                         type="radio" group="scopeBar"
+                         oncommand="PlacesQueryBuilder.onScopeSelected(this);"
+                         label="&search.scopeHistory.label;"
+                         accesskey="&search.scopeHistory.accesskey;"/>
+          <toolbarbutton id="scopeBarFolder" class="small-margin"
+                         type="radio" group="scopeBar"
+                         oncommand="PlacesQueryBuilder.onScopeSelected(this);"
+                         accesskey="&search.scopeFolder.accesskey;"
+                         emptytitle="&search.scopeFolder.label;" flex="1"/>
+          <!-- The folder scope button should flex but not take up more room
+                than its label needs.  The only simple way to do that is to
+                set a really big flex on the spacer, e.g., 2^31 - 1. -->
+          <spacer flex="2147483647"/>
+          <button id="saveSearch" class="small-margin"
+                  label="&saveSearch.label;" accesskey="&saveSearch.accesskey;"
+                  command="OrganizerCommand_search:save"/>
+        </toolbar>
+      </toolbox>
+      <tree id="placeContent"
+            class="plain placesTree"
+            context="placesContext"
+            hidecolumnpicker="true"
+            flex="1"
+            type="places"
+            flatList="true"
+            enableColumnDrag="true"
+            onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) PlacesOrganizer.openSelectedNode(event);"
+            onopenflatcontainer="PlacesOrganizer.openFlatContainer(aContainer);"
+            onselect="PlacesOrganizer.onContentTreeSelect();"
+            onfocus="PlacesOrganizer.onTreeFocus(event);"
+            onclick="PlacesOrganizer.onTreeClick(event);">
+        <treecols id="placeContentColumns" context="placesColumnsContext">
+          <treecol label="&col.name.label;" id="placesContentTitle" anonid="title" flex="5" primary="true" ordinal="1" 
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.tags.label;" id="placesContentTags" anonid="tags" flex="2"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.url.label;" id="placesContentUrl" anonid="url" flex="5"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.lastvisit.label;" id="placesContentDate" anonid="date" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.visitcount.label;" id="placesContentVisitCount" anonid="visitCount" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.keyword.label;" id="placesContentKeyword" anonid="keyword" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.description.label;" id="placesContentDescription" anonid="description" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.dateadded.label;" id="placesContentDateAdded" anonid="dateAdded" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+          <splitter class="tree-splitter"/>
+          <treecol label="&col.lastmodified.label;" id="placesContentLastModified" anonid="lastModified" flex="1" hidden="true"
+                    persist="width hidden ordinal sortActive sortDirection"/>
+        </treecols>
+        <treechildren flex="1"/>
+      </tree>
+      <deck id="detailsDeck" style="height: 11em;">
+        <vbox id="itemsCountBox" align="center">
+          <spacer flex="3"/>
+          <label id="itemsCountText"/>
+          <spacer flex="1"/>
+          <description id="selectItemDescription">
+              &detailsPane.selectAnItemText.description;
+          </description>
+          <spacer flex="3"/>
+        </vbox>
+        <vbox id="infoBox" minimal="true">
+          <vbox id="editBookmarkPanelContent" flex="1"/>
+          <hbox id="infoBoxExpanderWrapper" align="center">
 
-          </vbox>
-          <vbox flex="1">
-            <tree id="placeContent" class="placesTree" context="placesContext"
-                  hidecolumnpicker="true"
-                  flex="1" type="places"
-                  flatList="true"
-                  enableColumnDrag="true"
-                  onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) PlacesOrganizer.openSelectedNode(event);"
-                  onopenflatcontainer="PlacesOrganizer.openFlatContainer(aContainer);"
-                  onselect="PlacesOrganizer.onContentTreeSelect();"
-                  onfocus="PlacesOrganizer.onTreeFocus(event);"
-                  onclick="PlacesOrganizer.onTreeClick(event);">
-              <treecols id="placeContentColumns" context="placesColumnsContext">
-                <treecol label="&col.name.label;" id="placesContentTitle" anonid="title" flex="5" primary="true" ordinal="1" 
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.tags.label;" id="placesContentTags" anonid="tags" flex="2"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.url.label;" id="placesContentUrl" anonid="url" flex="5"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.lastvisit.label;" id="placesContentDate" anonid="date" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.visitcount.label;" id="placesContentVisitCount" anonid="visitCount" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.keyword.label;" id="placesContentKeyword" anonid="keyword" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.description.label;" id="placesContentDescription" anonid="description" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.dateadded.label;" id="placesContentDateAdded" anonid="dateAdded" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-                <splitter class="tree-splitter"/>
-                <treecol label="&col.lastmodified.label;" id="placesContentLastModified" anonid="lastModified" flex="1" hidden="true"
-                         persist="width hidden ordinal sortActive sortDirection"/>
-              </treecols>
-              <treechildren flex="1"/>
-            </tree>
-            <hbox id="infoPaneBox" style="height: 11em;">
-              <deck flex="1" id="detailsDeck">
-                <vbox id="itemsCountBox" align="center">
-                  <spacer flex="3"/>
-                  <label id="itemsCountText"/>
-                  <spacer flex="1"/>
-                  <description id="selectItemDescription">
-                     &detailsPane.selectAnItemText.description;
-                  </description>
-                  <spacer flex="3"/>
-                </vbox>
-                <vbox id="infoBox" minimal="true">
-                  <vbox id="editBookmarkPanelContent"/>
-                  <spacer flex="1"/>
-                  <hbox id="infoBoxExpanderWrapper" align="center">
+            <button type="image" id="infoBoxExpander"
+                    class="expander-down"
+                    oncommand="PlacesOrganizer.toggleAdditionalInfoFields();"
+                    observes="paneElementsBroadcaster"/>
 
-                    <button type="image" id="infoBoxExpander"
-                            class="expander-down"
-                            oncommand="PlacesOrganizer.toggleAdditionalInfoFields();"
-                            observes="paneElementsBroadcaster"/>
+            <label id="infoBoxExpanderLabel"
+                    lesslabel="&detailsPane.less.label;"
+                    lessaccesskey="&detailsPane.less.accesskey;"
+                    morelabel="&detailsPane.more.label;"
+                    moreaccesskey="&detailsPane.more.accesskey;"
+                    value="&detailsPane.more.label;"
+                    accesskey="&detailsPane.more.accesskey;"
+                    control="infoBoxExpander"/>
 
-                    <label id="infoBoxExpanderLabel"
-                           lesslabel="&detailsPane.less.label;"
-                           lessaccesskey="&detailsPane.less.accesskey;"
-                           morelabel="&detailsPane.more.label;"
-                           moreaccesskey="&detailsPane.more.accesskey;"
-                           value="&detailsPane.more.label;"
-                           accesskey="&detailsPane.more.accesskey;"
-                           control="infoBoxExpander"/>
-
-                    <spacer flex="1"/>
-                  </hbox>
-                </vbox>
-              </deck>
-            </hbox>
-          </vbox>
+          </hbox>
         </vbox>
       </deck>
     </vbox>
diff --git a/browser/components/preferences/aboutPermissions.js b/browser/components/preferences/aboutPermissions.js
index 745be4c0968..45a3c7202ed 100644
--- a/browser/components/preferences/aboutPermissions.js
+++ b/browser/components/preferences/aboutPermissions.js
@@ -81,29 +81,29 @@ function Site(host) {
 
   this.httpURI = NetUtil.newURI("http://" + this.host);
   this.httpsURI = NetUtil.newURI("https://" + this.host);
-
-  this._favicon = "";
 }
 
 Site.prototype = {
   /**
-   * Gets the favicon to use for the site. This will return the default favicon
-   * if there is no favicon stored for the site.
+   * Gets the favicon to use for the site. The callback only gets called if
+   * a favicon is found for either the http URI or the https URI.
    *
-   * @return A favicon image URL.
+   * @param aCallback
+   *        A callback function that takes a favicon image URL as a parameter.
    */
-  get favicon() {
-    if (!this._favicon) {
-      // TODO: Bug 657961: Make this async when bug 655270 is fixed.
+  getFavicon: function Site_getFavicon(aCallback) {
+    function faviconDataCallback(aURI, aDataLen, aData, aMimeType) {
       try {
-        // First try to see if a favicon is stored for the http URI.
-        this._favicon = gFaviconService.getFaviconForPage(this.httpURI).spec;
+        aCallback(aURI.spec);
       } catch (e) {
-        // getFaviconImageForPage returns the default favicon if no stored favicon is found.
-        this._favicon = gFaviconService.getFaviconImageForPage(this.httpsURI).spec;
+        Cu.reportError("AboutPermissions: " + e);
       }
     }
-    return this._favicon;
+
+    // Try to find favicion for both URIs. Callback will only be called if a
+    // favicon URI is found, so this means we'll always prefer the https favicon.
+    gFaviconService.getFaviconURLForPage(this.httpURI, faviconDataCallback);
+    gFaviconService.getFaviconURLForPage(this.httpsURI, faviconDataCallback);
   },
 
   /**
@@ -265,7 +265,7 @@ let PermissionDefaults = {
     return this.DENY;
   },
   set password(aValue) {
-    let value = (aValue == this.ALLOW);
+    let value = (aValue != this.DENY);
     Services.prefs.setBoolPref("signon.rememberSignons", value);
   },
 
@@ -280,7 +280,7 @@ let PermissionDefaults = {
       return this.DENY;
     }
 
-    if (Services.prefs.getIntPref("network.cookie.lifetimePolicy") == this.COOKIE_DENY) {
+    if (Services.prefs.getIntPref("network.cookie.lifetimePolicy") == this.COOKIE_SESSION) {
       return this.SESSION;
     }
     return this.ALLOW;
@@ -303,7 +303,7 @@ let PermissionDefaults = {
     return this.UNKNOWN;
   },
   set geo(aValue) {
-    let value = (aValue == this.ALLOW);
+    let value = (aValue != this.DENY);
     Services.prefs.setBoolPref("geo.enabled", value);
   },
 
@@ -316,7 +316,7 @@ let PermissionDefaults = {
     return this.UNKNOWN;
   },
   set indexedDB(aValue) {
-    let value = (aValue == this.ALLOW);
+    let value = (aValue != this.DENY);
     Services.prefs.setBoolPref("dom.indexedDB.enabled", value);
   },
 
@@ -542,7 +542,10 @@ let AboutPermissions = {
     let item = document.createElement("richlistitem");
     item.setAttribute("class", "site");
     item.setAttribute("value", aSite.host);
-    item.setAttribute("favicon", aSite.favicon);
+
+    aSite.getFavicon(function(aURL) {
+      item.setAttribute("favicon", aURL);
+    });
     aSite.listitem = item;
 
     this.sitesList.appendChild(item);    
diff --git a/browser/components/sidebar/src/nsSidebar.js b/browser/components/sidebar/src/nsSidebar.js
index 1484c2654b1..b2654cb73a3 100644
--- a/browser/components/sidebar/src/nsSidebar.js
+++ b/browser/components/sidebar/src/nsSidebar.js
@@ -41,6 +41,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
+Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const DEBUG = false; /* set to false to suppress debug messages */
@@ -56,15 +57,6 @@ const SHERLOCK_FILE_EXT_REGEXP = /\.src$/i;
 
 function nsSidebar()
 {
-    const PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1";
-    const nsIPromptService = Components.interfaces.nsIPromptService;
-    this.promptService =
-        Components.classes[PROMPTSERVICE_CONTRACTID].getService(nsIPromptService);
-
-    const SEARCHSERVICE_CONTRACTID = "@mozilla.org/browser/search-service;1";
-    const nsIBrowserSearchService = Components.interfaces.nsIBrowserSearchService;
-    this.searchService =
-      Components.classes[SEARCHSERVICE_CONTRACTID].getService(nsIBrowserSearchService);
 }
 
 nsSidebar.prototype.classID = SIDEBAR_CID;
@@ -102,20 +94,15 @@ function(aTitle, aContentURL, aCustomizeURL)
 nsSidebar.prototype.addPanelInternal =
 function (aTitle, aContentURL, aCustomizeURL, aPersist)
 {
-    var WINMEDSVC = Components.classes['@mozilla.org/appshell/window-mediator;1']
-                              .getService(Components.interfaces.nsIWindowMediator);
-
     // XXX Bug 620418: We shouldn't do this anymore. Instead, we should find the
     // global object for our caller and use it.
-    var win = WINMEDSVC.getMostRecentWindow( "navigator:browser" );
+    var win = Services.wm.getMostRecentWindow("navigator:browser");
     if (!sidebarURLSecurityCheck(aContentURL))
       return;
 
     var uri = null;
-    var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                              .getService(Components.interfaces.nsIIOService);
     try {
-      uri = ioService.newURI(aContentURL, null, null);
+      uri = Services.io.newURI(aContentURL, null, null);
     }
     catch(ex) { return; }
 
@@ -141,7 +128,7 @@ function (engineURL, iconURL)
 
     if (!isWeb.test(engineURL))
       throw "Unsupported search engine URL";
-  
+
     if (iconURL && !isWeb.test(iconURL))
       throw "Unsupported search icon URL.";
   }
@@ -149,19 +136,17 @@ function (engineURL, iconURL)
   {
     debug(ex);
     Components.utils.reportError("Invalid argument passed to window.sidebar.addSearchEngine: " + ex);
-    
-    var searchBundle = srGetStrBundle("chrome://global/locale/search/search.properties");
-    var brandBundle = srGetStrBundle("chrome://branding/locale/brand.properties");
+
+    var searchBundle = Services.strings.createBundle("chrome://global/locale/search/search.properties");
+    var brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
     var brandName = brandBundle.GetStringFromName("brandShortName");
     var title = searchBundle.GetStringFromName("error_invalid_engine_title");
     var msg = searchBundle.formatStringFromName("error_invalid_engine_msg",
                                                 [brandName], 1);
-    var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
-             getService(Components.interfaces.nsIWindowWatcher);
-    ww.getNewPrompter(null).alert(title, msg);
+    Services.ww.getNewPrompter(null).alert(title, msg);
     return false;
   }
-  
+
   return true;
 }
 
@@ -185,7 +170,7 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
   else
     dataType = Components.interfaces.nsISearchEngine.DATA_XML;
 
-  this.searchService.addEngine(engineURL, dataType, iconURL, true);
+  Services.search.addEngine(engineURL, dataType, iconURL, true);
 }
 
 // This function exists largely to implement window.external.AddSearchProvider(),
@@ -198,23 +183,21 @@ function (aDescriptionURL)
   // page since we don't have easy access to the active document.  Most search
   // engines will override this with an icon specified in the OpenSearch
   // description anyway.
-  var WINMEDSVC = Components.classes['@mozilla.org/appshell/window-mediator;1']
-                            .getService(Components.interfaces.nsIWindowMediator);
-  var win = WINMEDSVC.getMostRecentWindow("navigator:browser");
-  var browser = win.document.getElementById("content");
+  var win = Services.wm.getMostRecentWindow("navigator:browser");
+  var browser = win.gBrowser;
   var iconURL = "";
   // Use documentURIObject in the check for shouldLoadFavIcon so that we
   // do the right thing with about:-style error pages.  Bug 453442
   if (browser.shouldLoadFavIcon(browser.selectedBrowser
                                        .contentDocument
                                        .documentURIObject))
-    iconURL = win.gBrowser.getIcon();
-  
+    iconURL = browser.getIcon();
+
   if (!this.validateSearchEngine(aDescriptionURL, iconURL))
     return;
 
   const typeXML = Components.interfaces.nsISearchEngine.DATA_XML;
-  this.searchService.addEngine(aDescriptionURL, typeXML, iconURL, true);
+  Services.search.addEngine(aDescriptionURL, typeXML, iconURL, true);
 }
 
 // This function exists to implement window.external.IsSearchProviderInstalled(),
@@ -265,16 +248,3 @@ if (DEBUG)
     debug = function (s) { dump("-*- sidebar component: " + s + "\n"); }
 else
     debug = function (s) {}
-
-// String bundle service
-var gStrBundleService = null;
-
-function srGetStrBundle(path)
-{
-  if (!gStrBundleService)
-    gStrBundleService =
-      Components.classes["@mozilla.org/intl/stringbundle;1"]
-                .getService(Components.interfaces.nsIStringBundleService);
-
-  return gStrBundleService.createBundle(path);
-}
diff --git a/browser/config/version.txt b/browser/config/version.txt
index 52eb6e01376..25a852bfe95 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-6.0a1
+7.0a1
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 1945570a801..7d70ded45ca 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -138,7 +138,6 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_xmldoc.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 5eec576b939..64fe0f0c6da 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -1697,6 +1697,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
+.alltabs-item[tabIsVisible] {
+  /* box-shadow instead of background-color to work around native styling */
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
+}
+
 /* Sidebar */
 #sidebar-header > .tabs-closebutton {
   margin-bottom: 0px !important;
diff --git a/browser/themes/gnomestripe/browser/places/organizer.css b/browser/themes/gnomestripe/browser/places/organizer.css
index 5c7d4ce68de..6ee79aee4e8 100644
--- a/browser/themes/gnomestripe/browser/places/organizer.css
+++ b/browser/themes/gnomestripe/browser/places/organizer.css
@@ -64,38 +64,11 @@
   background-color: Window;
 }
 
-/* Place List, Place Content */
-.placesTree {
-  margin: 0px;
-}
-
-#placesList {
-  margin: 0px;
-  border: none;
-  padding: 0;
-}
-
-#placeContent {
-  border: 0px;
-}
-
-#infoPaneBox {
+/* Info box */
+#detailsDeck {
   padding: 5px;
 }
 
-.small, .small[disabled="true"] {
-  min-width: 0px;
-  padding: 0px 4px 0px 4px;
-  margin: 0px;  
-  border: 0px;
-}
-
-.small .button-text,
-.small .button-box {
-  padding: 0px;
-  border: 0px;
-}
-
 #infoBoxExpanderLabel {
   -moz-padding-start: 2px;
 }
diff --git a/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css b/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
index 445f9f11fcb..db118061feb 100644
--- a/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/gnomestripe/browser/preferences/aboutPermissions.css
@@ -32,6 +32,11 @@
   height: 16px;
   width: 16px;
   -moz-margin-end: 4px;
+  list-style-image: url("moz-icon://stock/gtk-file?size=menu");
+}
+
+#all-sites-item > .site-container > .site-favicon {
+  list-style-image: none;
 }
 
 .site-domain {
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index a29dda41d24..9c71e660b7f 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -2006,6 +2006,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
+.alltabs-item[tabIsVisible] {
+  /* box-shadow instead of background-color to work around native styling */
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
+}
+
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-padding-end: 4px;
diff --git a/browser/themes/pinstripe/browser/places/organizer.css b/browser/themes/pinstripe/browser/places/organizer.css
index 101c511c3ce..b70f4f3d33d 100644
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -2,12 +2,6 @@
 
 /* Places Organizer Sidebars */
 
-#placesList {
-  -moz-appearance: none;
-  border: none;
-  margin: 0;
-}
-
 #placesList > treechildren::-moz-tree-row {
   background-color: transparent;
   border-color: transparent;
@@ -179,23 +173,17 @@
 }
 
 /* Place List, Place Content */
-.placesTree {
-  margin: 0px;
-}
-
 #placesList {
-  -moz-appearance: none;
   background-color: #d2d8e2;
   width: 160px;
-  margin: 0px;
-  border: 0px;
 }
 
 #placesList:-moz-window-inactive {
   background-color: #e8e8e8;
 }
 
-#infoPaneBox {
+/* Info box */
+#detailsDeck {
   border-top: 1px solid #919191;
   background-color: #f0f0f0;
   padding: 10px;
@@ -235,19 +223,6 @@
   border-color: transparent;
 }
 
-.small {
-  min-width: 0px;
-  padding: 0px 4px 0px 4px;
-  margin: 0px;  
-  border: 0px;
-}
-
-.small .button-text,
-.small .button-box {
-  padding: 0px;
-  border: 0px;
-}
-
 /* Scope Bar */
 
 #advancedSearch > hbox, 
diff --git a/browser/themes/pinstripe/browser/preferences/aboutPermissions.css b/browser/themes/pinstripe/browser/preferences/aboutPermissions.css
index 7a99df82924..ba1db4999ce 100644
--- a/browser/themes/pinstripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/pinstripe/browser/preferences/aboutPermissions.css
@@ -34,6 +34,11 @@
   height: 16px;
   width: 16px;
   -moz-margin-end: 4px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+#all-sites-item > .site-container > .site-favicon {
+  list-style-image: none;
 }
 
 .site-domain {
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 39f7d72a6e1..256832d7e1f 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1881,6 +1881,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
+.alltabs-item[tabIsVisible] {
+  /* box-shadow instead of background-color to work around native styling */
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
+}
+
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-appearance: none;
diff --git a/browser/themes/winstripe/browser/places/organizer-aero.css b/browser/themes/winstripe/browser/places/organizer-aero.css
index bae102df484..18ae94c3abf 100644
--- a/browser/themes/winstripe/browser/places/organizer-aero.css
+++ b/browser/themes/winstripe/browser/places/organizer-aero.css
@@ -65,7 +65,7 @@
     border: none;
   }
 
-  #infoPaneBox {
+  #detailsDeck {
     border-top-color: #A9B7C9;
   }
 
diff --git a/browser/themes/winstripe/browser/places/organizer.css b/browser/themes/winstripe/browser/places/organizer.css
index 2d2692c77f8..833eb6599eb 100644
--- a/browser/themes/winstripe/browser/places/organizer.css
+++ b/browser/themes/winstripe/browser/places/organizer.css
@@ -110,47 +110,17 @@
   border-top: 1px solid ThreeDDarkShadow;
 }
 
-/* Place List, Place Content */
-.placesTree {
-  margin: 0px;
-}
-
-#placesList {
-  -moz-appearance: none;
-  margin: 0px;
-  border: none;
-  padding: 0;
-}
-
-#placeContent {
-  -moz-appearance: none;
-  border: 0px;
-}
-
-#infoPaneBox {
+/* Info box */
+#detailsDeck {
   border-top: 1px solid ThreeDShadow;
   padding: 5px;
 }
 
-.small, .small[disabled="true"] {
-  min-width: 0px;
-  padding: 0px 4px 0px 4px;
-  margin: 0px;  
-  border: 0px;
-}
-
-.small .button-text,
-.small .button-box {
-  padding: 0px;
-  border: 0px;
-}
-
 #infoBoxExpanderLabel {
   -moz-padding-start: 2px;
 }
 
 #organizerScopeBar {
-  -moz-appearance: toolbox;
   padding: 2px 0;
   -moz-padding-end: 3px;
 }
diff --git a/browser/themes/winstripe/browser/preferences/aboutPermissions.css b/browser/themes/winstripe/browser/preferences/aboutPermissions.css
index 82aaf43cd2c..e3f8451e0f2 100644
--- a/browser/themes/winstripe/browser/preferences/aboutPermissions.css
+++ b/browser/themes/winstripe/browser/preferences/aboutPermissions.css
@@ -37,6 +37,11 @@
   height: 16px;
   width: 16px;
   -moz-margin-end: 4px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+#all-sites-item > .site-container > .site-favicon {
+  list-style-image: none;
 }
 
 .site-domain {
diff --git a/build/Makefile.in b/build/Makefile.in
index 8ace44be7b8..ac9c670ecd6 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -123,11 +123,11 @@ libs:: $(topsrcdir)/tools/rb/fix_macosx_stack.py
 
 # Basic unit tests for some stuff in the unify script
 check::
-# build ppc/i386 binaries, and unify them
-	rm -f unify-test-ppc unify-test-i386 unify-test-universal
-	$(HOST_CC) -arch ppc $(srcdir)/unify-test.c -o unify-test-ppc
+# build x64/i386 binaries, and unify them
+	rm -f unify-test-x64 unify-test-i386 unify-test-universal
+	$(HOST_CC) -arch x86_64 $(srcdir)/unify-test.c -o unify-test-x64
 	$(HOST_CC) -arch i386 $(srcdir)/unify-test.c -o unify-test-i386
-	@if ! $(srcdir)/macosx/universal/unify ./unify-test-ppc ./unify-test-i386 \
+	@if ! $(srcdir)/macosx/universal/unify ./unify-test-x64 ./unify-test-i386 \
           ./unify-test-universal; then \
           echo "TEST-UNEXPECTED-FAIL | build/ | unify failed to produce a universal binary!"; \
           false; \
diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
index 72438295912..3fad4d74824 100755
--- a/build/autoconf/config.sub
+++ b/build/autoconf/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-04'
+timestamp='2011-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1432,6 +1432,9 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -android*)
+	        os=android
+                ;;
 	-none)
 		;;
 	*)
@@ -1686,6 +1689,9 @@ case $basic_machine in
 			-vos*)
 				vendor=stratus
 				;;
+			*-android*|*-linuxandroid*)
+				vendor=linux-
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index ba7b3de491d..aeb424357f0 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -55,7 +55,6 @@ MOZ_APP_VENDOR = @MOZ_APP_VENDOR@
 MOZ_APP_PROFILE = @MOZ_APP_PROFILE@
 MOZ_APP_UA_NAME = @MOZ_APP_UA_NAME@
 MOZ_APP_VERSION = @MOZ_APP_VERSION@
-MOZ_UA_FIREFOX_VERSION = @FIREFOX_VERSION@
 MOZ_UA_BUILDID = @MOZ_UA_BUILDID@
 
 MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
@@ -258,7 +257,7 @@ MOZ_MATHML = @MOZ_MATHML@
 MOZ_CSS_ANIMATIONS = @MOZ_CSS_ANIMATIONS@
 MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
 MOZ_XTF = @MOZ_XTF@
-MOZ_SVG = @MOZ_SVG@
+MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@
 MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
 MOZ_SMIL = @MOZ_SMIL@
 MOZ_XSLT_STANDALONE = @MOZ_XSLT_STANDALONE@
@@ -549,6 +548,7 @@ MOZ_GTK2_LIBS		= @MOZ_GTK2_LIBS@
 MOZ_QT_CFLAGS		= @MOZ_QT_CFLAGS@
 MOZ_QT_LIBS		= @MOZ_QT_LIBS@
 MOZ_ENABLE_QTNETWORK    = @MOZ_ENABLE_QTNETWORK@
+MOZ_ENABLE_QMSYSTEM2    = @MOZ_ENABLE_QMSYSTEM2@
 MOZ_ENABLE_QTMOBILITY   = @MOZ_ENABLE_QTMOBILITY@
 MOZ_ENABLE_CONTENTACTION   = @MOZ_ENABLE_CONTENTACTION@
 MOZ_ENABLE_MEEGOTOUCHSHARE = @MOZ_ENABLE_MEEGOTOUCHSHARE@
diff --git a/config/milestone.txt b/config/milestone.txt
index 87783c6532f..81a286596b1 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-6.0a1
+7.0a1
diff --git a/configure.in b/configure.in
index 6156091b6cd..299f6058f86 100644
--- a/configure.in
+++ b/configure.in
@@ -264,7 +264,25 @@ MOZ_ARG_WITH_STRING(android-sdk,
                           location where the Android SDK can be found (base directory, e.g. .../android/platforms/android-6)],
     android_sdk=$withval)
 
-if test "$target" = "arm-android-eabi" ; then
+MOZ_ARG_WITH_STRING(android-platform,
+[  --with-android-platform=DIR
+                           location of platform dir, default NDK/build/platforms/android-5/arch-arm],
+    android_platform=$withval)
+
+case "$target" in
+arm-linux*-android*|*-linuxandroid*)
+    android_tool_prefix="arm-linux-androideabi"
+    ;;
+arm-android-eabi)
+    android_tool_prefix="arm-eabi"
+    ;;
+*)
+    android_tool_prefix="$target_os"
+    ;;
+esac
+
+case "$target" in
+*-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
         AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.])
     fi
@@ -287,24 +305,30 @@ if test "$target" = "arm-android-eabi" ; then
     fi
 
     dnl set up compilers
-    AS="$android_toolchain"/bin/arm-eabi-as
-    CC="$android_toolchain"/bin/arm-eabi-gcc
-    CXX="$android_toolchain"/bin/arm-eabi-g++
-    CPP="$android_toolchain"/bin/arm-eabi-cpp
-    LD="$android_toolchain"/bin/arm-eabi-ld
-    AR="$android_toolchain"/bin/arm-eabi-ar
-    RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
-    STRIP="$android_toolchain"/bin/arm-eabi-strip
+    AS="$android_toolchain"/bin/"$android_tool_prefix"-as
+    CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc
+    CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++
+    CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp
+    LD="$android_toolchain"/bin/"$android_tool_prefix"-ld
+    AR="$android_toolchain"/bin/"$android_tool_prefix"-ar
+    RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib
+    STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip
 
-    CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
+    if test -e "$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a" ; then
+       STLPORT_CPPFLAGS="-I$android_ndk/sources/cxx-stl/stlport/stlport"
+       STLPORT_LDFLAGS="-L$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/  -lstlport_static"
+    fi
+
+    CPPFLAGS="-I$android_platform/usr/include $STLPORT_CPPFLAGS $CPPFLAGS"
     CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CXXFLAGS"
+    LIBS="$LIBS $STLPORT_LDFLAGS"
 
     dnl Add -llog by default, since we use it all over the place.
     dnl Add --allow-shlib-undefined, because libGLESv2 links to an
     dnl undefined symbol (present on the hardware, just not in the
     dnl NDK.)
-    LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
+    LDFLAGS="-mandroid -L$android_platform/usr/lib -L$android_ndk/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
 
     dnl prevent cross compile section from using these flags as host flags
     if test -z "$HOST_CPPFLAGS" ; then
@@ -336,7 +360,8 @@ if test "$target" = "arm-android-eabi" ; then
     CROSS_COMPILE=1
     MOZ_CHROME_FILE_FORMAT=omni
     ZLIB_DIR=yes
-fi
+    ;;
+esac
 
 AC_SUBST(ANDROID_NDK)
 AC_SUBST(ANDROID_TOOLCHAIN)
@@ -1223,7 +1248,7 @@ if test -n "$CROSS_COMPILE"; then
         darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
     esac
     case "${target}" in
-        arm-android-eabi) OS_ARCH=Linux OS_TARGET=Android ;;
+        *-android*|*-linuxandroid*) OS_ARCH=Linux OS_TARGET=Android ;;
     esac
 else
     OS_TARGET=`uname -s`
@@ -2171,6 +2196,23 @@ ia64*-hpux*)
     fi
     ;;
 
+*-android*|*-linuxandroid*)
+    AC_DEFINE(NO_PW_GECOS)
+    no_x=yes
+    _PLATFORM_DEFAULT_TOOLKIT=cairo-android
+    TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+
+    MOZ_GFX_OPTIMIZE_MOBILE=1
+    # If we're building with --enable-profiling, we need a frame pointer.
+    if test -z "$MOZ_PROFILING"; then
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fomit-frame-pointer"
+    else
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fno-omit-frame-pointer"
+    fi
+    # The Maemo builders don't know about this flag
+    MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
+    ;;
+
 *-*linux*)
     # Note: both GNU_CC and INTEL_CC are set when using Intel's C compiler.
     # Similarly for GNU_CXX and INTEL_CXX.
@@ -2690,23 +2732,6 @@ alpha*-*-osf*)
     HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
     ;;
 
-*-android*)
-    AC_DEFINE(NO_PW_GECOS)
-    no_x=yes
-    _PLATFORM_DEFAULT_TOOLKIT=cairo-android
-    TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-    # If we're building with --enable-profiling, we need a frame pointer.
-    if test -z "$MOZ_PROFILING"; then
-        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fomit-frame-pointer"
-    else
-        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fno-omit-frame-pointer"
-    fi
-    # The Maemo builders don't know about this flag
-    MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
-    ;;
-
 esac
 
 dnl Only one oddball right now (QNX), but this gives us flexibility
@@ -3323,25 +3348,6 @@ case $target in
     AC_CHECK_LIB(socket, socket)
 esac
 
-dnl ========================================================
-dnl Check whether we can compile code for Core Text
-dnl (available on Mac OS X 10.5 or later)
-dnl ========================================================
-case "$target" in
-*-darwin*)
-  AC_MSG_CHECKING([for Core Text])
-  AC_TRY_COMPILE([#include <ApplicationServices/ApplicationServices.h>],
-                 [CTLineRef lineRef;],
-                  ac_cv_have_core_text="yes",
-                  ac_cv_have_core_text="no")
-  AC_MSG_RESULT([$ac_cv_have_core_text])
-
-  if test "$ac_cv_have_core_text" = "no"; then
-    AC_MSG_ERROR([Core Text is required (available on Mac OS X 10.5 or later).])
-  fi
-  ;;
-esac
-
 XLDFLAGS="$X_LIBS"
 XLIBS="$X_EXTRA_LIBS"
 
@@ -4299,7 +4305,7 @@ if test "$ac_cv_thread_keyword" = yes; then
     mips*-*)
       :
       ;;
-    *-android*)
+    *-android*|*-linuxandroid*)
       :
       ;;
     *)
@@ -4835,7 +4841,7 @@ MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_SPLASHSCREEN=
 MOZ_STORAGE=1
-MOZ_SVG=1
+MOZ_SVG_DLISTS=
 MOZ_THUMB2=
 MOZ_TIMELINE=
 MOZ_TOOLKIT_SEARCH=1
@@ -4883,7 +4889,7 @@ case "$target_os" in
 esac
 
 case "${target}" in
-    arm-android-eabi)
+    *-android*|*-linuxandroid*)
         NSS_DISABLE_DBM=1
         USE_ARM_KUSER=1
         MOZ_INSTALLER=
@@ -5251,6 +5257,18 @@ incorrect])
     fi
     MOC=$HOST_MOC
 
+    MOZ_ENABLE_QMSYSTEM2=
+    PKG_CHECK_MODULES(_QMSYSTEM2, qmsystem2,
+                      MOZ_ENABLE_QMSYSTEM2=1,
+                      MOZ_ENABLE_QMSYSTEM2=)
+
+    if test "$MOZ_ENABLE_QMSYSTEM2"; then
+      MOZ_ENABLE_QMSYSTEM2=1
+      MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $_QMSYSTEM2_CFLAGS"
+      MOZ_QT_LIBS="$MOZ_QT_LIBS $_QMSYSTEM2_LIBS"
+      AC_DEFINE(MOZ_ENABLE_QMSYSTEM2)
+    fi
+
     MOZ_ENABLE_QTNETWORK=
     PKG_CHECK_MODULES(_QTNETWORK, QtNetwork >= 4.7,
                       MOZ_ENABLE_QTNETWORK=1,
@@ -5290,6 +5308,7 @@ AC_SUBST(MOZ_ENABLE_GTK2)
 AC_SUBST(MOZ_ENABLE_PHOTON)
 AC_SUBST(MOZ_ENABLE_QT)
 AC_SUBST(MOZ_ENABLE_QTNETWORK)
+AC_SUBST(MOZ_ENABLE_QMSYSTEM2)
 AC_SUBST(MOZ_ENABLE_QTMOBILITY)
 AC_SUBST(MOZ_ENABLE_XREMOTE)
 AC_SUBST(MOZ_GTK2_CFLAGS)
@@ -6196,7 +6215,7 @@ i?86-*-linux*|x86_64-*-linux*|arm-*-linux*)
     MOZ_CRASHREPORTER=1
   fi
   ;;
-arm-android-eabi)
+*-android*|*-linuxandroid*)
   MOZ_CRASHREPORTER=1
   ;;
 *solaris*)
@@ -6403,9 +6422,11 @@ fi
 AC_DEFINE(MOZ_CSS_ANIMATIONS)
 
 dnl ========================================================
-dnl Keeping AC_DEFINE(MOZ_SVG) for the moment in case of something needs it.
+dnl SVG Display Lists
 dnl ========================================================
-AC_DEFINE(MOZ_SVG)
+if test -n "$MOZ_SVG_DLISTS"; then
+  AC_DEFINE(MOZ_SVG_DLISTS)
+fi
 
 dnl ========================================================
 dnl SMIL
@@ -7324,6 +7345,13 @@ else
   *-*freebsd*)
     AC_DEFINE(MOZ_MEMORY_BSD)
     ;;
+  *-android*|*-linuxandroid*)
+    AC_DEFINE(MOZ_MEMORY_LINUX)
+    AC_DEFINE(MOZ_MEMORY_ANDROID)
+    _WRAP_MALLOC=1
+    export WRAP_MALLOC_LIB="-L$_objdir/dist/lib -lmozalloc -lmozutils"
+    WRAP_MALLOC_CFLAGS="-Wl,--wrap=dlopen -Wl,--wrap=dlclose -Wl,--wrap=dlerror -Wl,--wrap=dlsym -Wl,--wrap=dladdr"
+    ;;
   *-*linux*)
     AC_DEFINE(MOZ_MEMORY_LINUX)
     ;;
@@ -7372,13 +7400,6 @@ else
     DLLFLAGS="$DLLFLAGS $MOZ_MEMORY_LDFLAGS"
     export DLLFLAGS
     ;;
-  *-android*)
-    AC_DEFINE(MOZ_MEMORY_LINUX)
-    AC_DEFINE(MOZ_MEMORY_ANDROID)
-    _WRAP_MALLOC=1
-    export WRAP_MALLOC_LIB="-L$_objdir/dist/lib -lmozalloc -lmozutils"
-    WRAP_MALLOC_CFLAGS="-Wl,--wrap=dlopen -Wl,--wrap=dlclose -Wl,--wrap=dlerror -Wl,--wrap=dlsym -Wl,--wrap=dladdr"
-    ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
@@ -8380,6 +8401,7 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_DEFINE(HAVE_UINT64_T)
 
     # Define macros for cairo-features.h
+    TEE_SURFACE_FEATURE="#define CAIRO_HAS_TEE_SURFACE 1"
     if test "$MOZ_X11"; then
         XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
         XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
@@ -8462,6 +8484,7 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_SUBST(QUARTZ_FONT_FEATURE)
     AC_SUBST(PNG_FUNCTIONS_FEATURE)
     AC_SUBST(QT_SURFACE_FEATURE)
+    AC_SUBST(TEE_SURFACE_FEATURE)
 
     MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/gfx/cairo/cairo/src)'" $CAIRO_FT_LIBS"
 
@@ -8731,7 +8754,6 @@ AC_SUBST(MOZ_CSS_ANIMATIONS)
 AC_SUBST(MOZ_PERMISSIONS)
 AC_SUBST(MOZ_XTF)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
-AC_SUBST(MOZ_SVG)
 AC_SUBST(MOZ_SMIL)
 AC_SUBST(MOZ_XSLT_STANDALONE)
 AC_SUBST(MOZ_JS_LIBS)
@@ -8841,7 +8863,7 @@ AC_SUBST(MOZ_APP_UA_NAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
 AC_SUBST(MOZ_APP_VERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_FIREFOX_VERSION, "$FIREFOX_VERSION")
-AC_SUBST(MOZ_UA_FIREFOX_VERSION)
+AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
 AC_DEFINE_UNQUOTED(MOZ_UA_BUILDID, "$MOZ_UA_BUILDID")
 AC_SUBST(MOZ_UA_BUILDID)
diff --git a/content/Makefile.in b/content/Makefile.in
index f0572029e05..aaa02552aa6 100644
--- a/content/Makefile.in
+++ b/content/Makefile.in
@@ -43,16 +43,12 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
-PARALLEL_DIRS		= base canvas events html smil xml xul xbl xslt
+PARALLEL_DIRS		= base canvas events html smil svg xml xul xbl xslt
 
 ifdef MOZ_MEDIA
 PARALLEL_DIRS	+= media
 endif
 
-ifdef MOZ_SVG
-PARALLEL_DIRS	+= svg
-endif
-
 ifdef MOZ_XTF
 PARALLEL_DIRS   += xtf
 endif
diff --git a/content/base/crashtests/552651.html b/content/base/crashtests/552651.html
index fc89e009804..8c2a9b09f01 100644
--- a/content/base/crashtests/552651.html
+++ b/content/base/crashtests/552651.html
@@ -9,14 +9,12 @@ function testCancel() {
   xhr.addEventListener("readystatechange", function(e) {
     if (xhr.readyState == 3) // NOTE : only leaks for state == 3
       xhr.abort();
+    else if (xhr.readyState == 4)
+      document.documentElement.className = "";
   }, false);
 
   xhr.open("GET", "552651.xml", true);
   xhr.send();
-
-  setTimeout(function f() {
-      document.documentElement.className = "";
-  }, 1000);
 }
 </script>
 </head>
diff --git a/content/base/public/nsContentCID.h b/content/base/public/nsContentCID.h
index 77074af5103..4b032d8cd19 100644
--- a/content/base/public/nsContentCID.h
+++ b/content/base/public/nsContentCID.h
@@ -214,15 +214,11 @@
 #define NS_RANGEUTILS_CID \
 { 0xa6cf9126, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
 
-#ifdef MOZ_SVG
-
 #define NS_SVGDOCUMENT_CID                        \
 { /* b7f44954-1dd1-11b2-8c2e-c2feab4186bc */      \
   0xb7f44954, 0x11d1, 0x11b2,                     \
   {0x8c, 0x2e, 0xc2, 0xfe, 0xab, 0x41, 0x86, 0xbc}}
 
-#endif // MOZ_SVG
-
 #ifdef MOZ_MEDIA
 
 // {d899a152-9412-46b2-b651-2e71c5c2f05f}
diff --git a/content/base/public/nsContentCreatorFunctions.h b/content/base/public/nsContentCreatorFunctions.h
index bd56f71372f..e55273e6fdd 100644
--- a/content/base/public/nsContentCreatorFunctions.h
+++ b/content/base/public/nsContentCreatorFunctions.h
@@ -125,11 +125,9 @@ void
 NS_TrustedNewXULElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo);
 #endif
 
-#ifdef MOZ_SVG
 nsresult
 NS_NewSVGElement(nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo,
                  mozilla::dom::FromParser aFromParser);
-#endif
 
 nsresult
 NS_NewGenConImageContent(nsIContent** aResult,
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index e9700fadc3d..4ec4428b4ff 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -51,6 +51,17 @@
 #include <ieeefp.h>
 #endif
 
+//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+#ifdef __FreeBSD__
+#include <ieeefp.h>
+#ifdef __alpha__
+static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+#else
+static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
+#endif
+static fp_except_t oldmask = fpsetmask(~allmask);
+#endif
+
 #include "nsAString.h"
 #include "nsIStatefulFrame.h"
 #include "nsINodeInfo.h"
@@ -66,7 +77,6 @@
 #include "nsTArray.h"
 #include "nsTextFragment.h"
 #include "nsReadableUtils.h"
-#include "nsIPrefBranch2.h"
 #include "mozilla/AutoRestore.h"
 #include "nsINode.h"
 #include "nsHashtable.h"
@@ -93,7 +103,6 @@ class imgIDecoderObserver;
 class imgIRequest;
 class imgILoader;
 class imgICache;
-class nsIPrefBranch2;
 class nsIImageLoadingContent;
 class nsIDOMHTMLFormElement;
 class nsIDOMDocument;
@@ -118,8 +127,6 @@ class nsPIDOMWindow;
 class nsPIDOMEventTarget;
 class nsIPresShell;
 class nsIXPConnectJSObjectHolder;
-class nsPrefOldCallback;
-class nsPrefObserverHashKey;
 #ifdef MOZ_XTF
 class nsIXTFService;
 #endif
@@ -135,11 +142,6 @@ struct nsIntMargin;
 class nsPIDOMWindow;
 class nsIDocumentLoaderFactory;
 
-#ifndef have_PrefChangedFunc_typedef
-typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
-#define have_PrefChangedFunc_typedef
-#endif
-
 namespace mozilla {
 
 namespace layers {
@@ -214,7 +216,8 @@ public:
    * When a document's scope changes (e.g., from document.open(), call this
    * function to move all content wrappers from the old scope to the new one.
    */
-  static nsresult ReparentContentWrappersInScope(nsIScriptGlobalObject *aOldScope,
+  static nsresult ReparentContentWrappersInScope(JSContext *cx,
+                                                 nsIScriptGlobalObject *aOldScope,
                                                  nsIScriptGlobalObject *aNewScope);
 
   static PRBool   IsCallerChrome();
@@ -550,27 +553,6 @@ public:
   static void SplitExpatName(const PRUnichar *aExpatName, nsIAtom **aPrefix,
                              nsIAtom **aTagName, PRInt32 *aNameSpaceID);
 
-  static nsAdoptingCString GetCharPref(const char *aPref);
-  static PRPackedBool GetBoolPref(const char *aPref,
-                                  PRBool aDefault = PR_FALSE);
-  static PRInt32 GetIntPref(const char *aPref, PRInt32 aDefault = 0);
-  static nsAdoptingString GetLocalizedStringPref(const char *aPref);
-  static nsAdoptingString GetStringPref(const char *aPref);
-  static void RegisterPrefCallback(const char *aPref,
-                                   PrefChangedFunc aCallback,
-                                   void * aClosure);
-  static void UnregisterPrefCallback(const char *aPref,
-                                     PrefChangedFunc aCallback,
-                                     void * aClosure);
-  static void AddBoolPrefVarCache(const char* aPref, PRBool* aVariable,
-                                  PRBool aDefault = PR_FALSE);
-  static void AddIntPrefVarCache(const char* aPref, PRInt32* aVariable,
-                                 PRInt32 aDefault = 0);
-  static nsIPrefBranch2 *GetPrefBranch()
-  {
-    return sPrefBranch;
-  }
-
   // Get a permission-manager setting for the given uri and type.
   // If the pref doesn't exist or if it isn't ALLOW_ACTION, PR_FALSE is
   // returned, otherwise PR_TRUE is returned.
@@ -770,9 +752,7 @@ public:
     eFORMS_PROPERTIES,
     ePRINTING_PROPERTIES,
     eDOM_PROPERTIES,
-#ifdef MOZ_SVG
     eSVG_PROPERTIES,
-#endif
     eBRAND_PROPERTIES,
     eCOMMON_DIALOG_PROPERTIES,
     PropertiesFile_COUNT
@@ -865,16 +845,6 @@ public:
    */
   static PRBool IsInChromeDocshell(nsIDocument *aDocument);
 
-  /**
-   * Release *aSupportsPtr when the shutdown notification is received
-   */
-  static nsresult ReleasePtrOnShutdown(nsISupports** aSupportsPtr) {
-    NS_ASSERTION(aSupportsPtr, "Expect to crash!");
-    NS_ASSERTION(*aSupportsPtr, "Expect to crash!");
-    return sPtrsToPtrsToRelease->AppendElement(aSupportsPtr) != nsnull ? NS_OK :
-      NS_ERROR_OUT_OF_MEMORY;
-  }
-
   /**
    * Return the content policy service
    */
@@ -1491,29 +1461,6 @@ public:
     return sScriptBlockerCount == 0;
   }
 
-  /**
-   * Get/Set the current number of removable updates. Currently only
-   * UPDATE_CONTENT_MODEL updates are removable, and only when firing mutation
-   * events. These functions should only be called by mozAutoDocUpdateRemover.
-   * The count is also adjusted by the normal calls to BeginUpdate/EndUpdate.
-   */
-  static void AddRemovableScriptBlocker()
-  {
-    AddScriptBlocker();
-    ++sRemovableScriptBlockerCount;
-  }
-  static void RemoveRemovableScriptBlocker()
-  {
-    NS_ASSERTION(sRemovableScriptBlockerCount != 0,
-                "Number of removable blockers should never go below zero");
-    --sRemovableScriptBlockerCount;
-    RemoveScriptBlocker();
-  }
-  static PRUint32 GetRemovableScriptBlockerLevel()
-  {
-    return sRemovableScriptBlockerCount;
-  }
-
   /* Process viewport META data. This gives us information for the scale
    * and zoom of a page on mobile devices. We stick the information in
    * the document header and use it later on after rendering.
@@ -1823,11 +1770,6 @@ private:
   static nsIXTFService *sXTFService;
 #endif
 
-  static nsIPrefBranch2 *sPrefBranch;
-  // For old compatibility of RegisterPrefCallback
-  static nsRefPtrHashtable<nsPrefObserverHashKey, nsPrefOldCallback>
-    *sPrefCallbackTable;
-
   static bool sImgLoaderInitialized;
   static void InitImgLoader();
 
@@ -1851,9 +1793,6 @@ private:
   static nsIWordBreaker* sWordBreaker;
   static nsIUGenCategory* sGenCat;
 
-  // Holds pointers to nsISupports* that should be released at shutdown
-  static nsTArray<nsISupports**>* sPtrsToPtrsToRelease;
-
   static nsIScriptRuntime* sScriptRuntimes[NS_STID_ARRAY_UBOUND];
   static PRInt32 sScriptRootCount[NS_STID_ARRAY_UBOUND];
   static PRUint32 sJSGCThingRootCount;
@@ -1864,7 +1803,6 @@ private:
 
   static PRBool sInitialized;
   static PRUint32 sScriptBlockerCount;
-  static PRUint32 sRemovableScriptBlockerCount;
 #ifdef DEBUG
   static PRUint32 sDOMNodeRemovedSuppressCount;
 #endif
@@ -1932,33 +1870,6 @@ private:
   MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
-class NS_STACK_CLASS nsAutoRemovableScriptBlocker {
-public:
-  nsAutoRemovableScriptBlocker(MOZILLA_GUARD_OBJECT_NOTIFIER_ONLY_PARAM) {
-    MOZILLA_GUARD_OBJECT_NOTIFIER_INIT;
-    nsContentUtils::AddRemovableScriptBlocker();
-  }
-  ~nsAutoRemovableScriptBlocker() {
-    nsContentUtils::RemoveRemovableScriptBlocker();
-  }
-private:
-  MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
-};
-
-class NS_STACK_CLASS mozAutoRemovableBlockerRemover
-{
-public:
-  mozAutoRemovableBlockerRemover(nsIDocument* aDocument
-                                 MOZILLA_GUARD_OBJECT_NOTIFIER_PARAM);
-  ~mozAutoRemovableBlockerRemover();
-
-private:
-  PRUint32 mNestingLevel;
-  nsCOMPtr<nsIDocument> mDocument;
-  nsCOMPtr<nsIDocumentObserver> mObserver;
-  MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
-};
-
 class NS_STACK_CLASS nsAutoScriptBlockerSuppressNodeRemoved :
                           public nsAutoScriptBlocker {
 public:
@@ -1983,6 +1894,88 @@ public:
     }                                                                         \
   } else
 
+/**
+ * Macros to workaround math-bugs bugs in various platforms
+ */
+
+/**
+ * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
+ *  ARM is a little endian architecture but 64 bit double words are stored
+ * differently: the 32 bit words are in little endian byte order, the two words
+ * are stored in big endian`s way.
+ */
+
+#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
+#if !defined(__VFP_FP__)
+#define FPU_IS_ARM_FPA
+#endif
+#endif
+
+typedef union dpun {
+    struct {
+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+        PRUint32 lo, hi;
+#else
+        PRUint32 hi, lo;
+#endif
+    } s;
+    PRFloat64 d;
+public:
+    operator double() const {
+        return d;
+    }
+} dpun;
+
+/**
+ * Utility class for doubles
+ */
+#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+/**
+ * This version of the macros is safe for the alias optimizations
+ * that gcc does, but uses gcc-specific extensions.
+ */
+#define DOUBLE_HI32(x) (__extension__ ({ dpun u; u.d = (x); u.s.hi; }))
+#define DOUBLE_LO32(x) (__extension__ ({ dpun u; u.d = (x); u.s.lo; }))
+
+#else // __GNUC__
+
+/* We don't know of any non-gcc compilers that perform alias optimization,
+ * so this code should work.
+ */
+
+#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
+#define DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
+#define DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
+#else
+#define DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
+#define DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
+#endif
+
+#endif // __GNUC__
+
+#define DOUBLE_HI32_SIGNBIT   0x80000000
+#define DOUBLE_HI32_EXPMASK   0x7ff00000
+#define DOUBLE_HI32_MANTMASK  0x000fffff
+
+#define DOUBLE_IS_NaN(x)                                                \
+((DOUBLE_HI32(x) & DOUBLE_HI32_EXPMASK) == DOUBLE_HI32_EXPMASK && \
+ (DOUBLE_LO32(x) || (DOUBLE_HI32(x) & DOUBLE_HI32_MANTMASK)))
+
+#ifdef IS_BIG_ENDIAN
+#define DOUBLE_NaN {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_MANTMASK,   \
+                        0xffffffff}}
+#else
+#define DOUBLE_NaN {{0xffffffff,                                         \
+                        DOUBLE_HI32_EXPMASK | DOUBLE_HI32_MANTMASK}}
+#endif
+
+#if defined(XP_WIN)
+#define DOUBLE_COMPARE(LVAL, OP, RVAL)                                  \
+    (!DOUBLE_IS_NaN(LVAL) && !DOUBLE_IS_NaN(RVAL) && (LVAL) OP (RVAL))
+#else
+#define DOUBLE_COMPARE(LVAL, OP, RVAL) ((LVAL) OP (RVAL))
+#endif
+
 /*
  * Check whether a floating point number is finite (not +/-infinity and not a
  * NaN value).
diff --git a/content/base/public/nsIDOMFile.idl b/content/base/public/nsIDOMFile.idl
index f317562ae75..f0048d10f9b 100644
--- a/content/base/public/nsIDOMFile.idl
+++ b/content/base/public/nsIDOMFile.idl
@@ -82,7 +82,7 @@ interface nsIDOMFile : nsIDOMBlob
 };
 
 [scriptable, uuid(c4a77171-039b-4f84-97f9-820fb51626af)]
-interface nsIDOMBlobBuilder : nsISupports
+interface nsIDOMMozBlobBuilder : nsISupports
 {
   nsIDOMBlob getBlob([optional] in DOMString contentType);
   [implicit_jscontext] void append(in jsval data);
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 2c705faf867..aff5432e9c9 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -124,8 +124,8 @@ class Element;
 
 
 #define NS_IDOCUMENT_IID      \
-{ 0x26ef6218, 0xcd5e, 0x4953,  \
- { 0xbb, 0x57, 0xb8, 0x50, 0x29, 0xa1, 0xae, 0x40 } }
+{ 0x2ec7872f, 0x97c3, 0x43de, \
+  { 0x81, 0x0a, 0x8f, 0x18, 0xa0, 0xa0, 0xdf, 0x30 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -361,7 +361,7 @@ public:
   /**
    * Get the Content-Type of this document.
    * (This will always return NS_OK, but has this signature to be compatible
-   *  with nsIDOMNSDocument::GetContentType())
+   *  with nsIDOMDocument::GetContentType())
    */
   NS_IMETHOD GetContentType(nsAString& aContentType) = 0;
 
@@ -479,8 +479,6 @@ public:
 
   void SetBFCacheEntry(nsISHEntry* aSHEntry) {
     mSHEntry = aSHEntry;
-    // Doing this just to keep binary compat for the gecko 2.0 release
-    mShellIsHidden = !!aSHEntry;
   }
 
   nsISHEntry* GetBFCacheEntry() const { return mSHEntry; }
@@ -1079,7 +1077,7 @@ public:
                                      nsIDOMNodeList** aResult) = 0;
 
   /**
-   * Helper for nsIDOMNSDocument::elementFromPoint implementation that allows
+   * Helper for nsIDOMDocument::elementFromPoint implementation that allows
    * ignoring the scroll frame and/or avoiding layout flushes.
    *
    * @see nsIDOMWindowUtils::elementFromPoint
@@ -1519,6 +1517,8 @@ public:
 
   virtual nsresult GetStateObject(nsIVariant** aResult) = 0;
 
+  virtual Element* FindImageMap(const nsAString& aNormalizedMapName) = 0;
+
 protected:
   ~nsIDocument()
   {
@@ -1621,10 +1621,6 @@ protected:
   // document in it.
   PRPackedBool mIsInitialDocumentInWindow;
 
-  // True if we're currently bfcached. This is only here for binary compat.
-  // Remove once the gecko 2.0 has branched and just use mSHEntry instead.
-  PRPackedBool mShellIsHidden;
-
   PRPackedBool mIsRegularHTML;
   PRPackedBool mIsXUL;
 
@@ -1796,10 +1792,8 @@ NS_NewHTMLDocument(nsIDocument** aInstancePtrResult);
 nsresult
 NS_NewXMLDocument(nsIDocument** aInstancePtrResult);
 
-#ifdef MOZ_SVG
 nsresult
 NS_NewSVGDocument(nsIDocument** aInstancePtrResult);
-#endif
 
 nsresult
 NS_NewImageDocument(nsIDocument** aInstancePtrResult);
diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 33197f89b30..cafde14d1d4 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -514,8 +514,7 @@ public:
    * Note: If there is no child at aIndex, this method will simply do nothing.
    */
   virtual nsresult RemoveChildAt(PRUint32 aIndex, 
-                                 PRBool aNotify, 
-                                 PRBool aMutationEvent = PR_TRUE) = 0;
+                                 PRBool aNotify) = 0;
 
   /**
    * Get a property associated with this node.
@@ -1295,8 +1294,7 @@ protected:
    * @param aMutationEvent whether to fire a mutation event for this removal.
    */
   nsresult doRemoveChildAt(PRUint32 aIndex, PRBool aNotify, nsIContent* aKid,
-                           nsAttrAndChildArray& aChildArray,
-                           PRBool aMutationEvent);
+                           nsAttrAndChildArray& aChildArray);
 
   /**
    * Most of the implementation of the nsINode InsertChildAt method.
diff --git a/content/base/src/mozAutoDocUpdate.h b/content/base/src/mozAutoDocUpdate.h
index 58a6a3ae55b..a4949af79c9 100644
--- a/content/base/src/mozAutoDocUpdate.h
+++ b/content/base/src/mozAutoDocUpdate.h
@@ -52,9 +52,6 @@ public:
     if (mDocument) {
       mDocument->BeginUpdate(mUpdateType);
     }
-    else if (aUpdateType == UPDATE_CONTENT_MODEL) {
-      nsContentUtils::AddRemovableScriptBlocker();
-    }
     else {
       nsContentUtils::AddScriptBlocker();
     }
@@ -65,9 +62,6 @@ public:
     if (mDocument) {
       mDocument->EndUpdate(mUpdateType);
     }
-    else if (mUpdateType == UPDATE_CONTENT_MODEL) {
-      nsContentUtils::RemoveRemovableScriptBlocker();
-    }
     else {
       nsContentUtils::RemoveScriptBlocker();
     }
diff --git a/content/base/src/nsAttrValue.cpp b/content/base/src/nsAttrValue.cpp
index f622bc7eee1..bfef46f3fa4 100644
--- a/content/base/src/nsAttrValue.cpp
+++ b/content/base/src/nsAttrValue.cpp
@@ -52,9 +52,7 @@
 #include "nsContentUtils.h"
 #include "nsReadableUtils.h"
 #include "prprf.h"
-#ifdef MOZ_SVG
 #include "nsISVGValue.h"
-#endif
 
 namespace css = mozilla::css;
 
@@ -86,13 +84,11 @@ nsAttrValue::nsAttrValue(css::StyleRule* aValue, const nsAString* aSerialized)
   SetTo(aValue, aSerialized);
 }
 
-#ifdef MOZ_SVG
 nsAttrValue::nsAttrValue(nsISVGValue* aValue)
     : mBits(0)
 {
   SetTo(aValue);
 }
-#endif
 
 nsAttrValue::nsAttrValue(const nsIntMargin& aValue)
     : mBits(0)
@@ -255,13 +251,11 @@ nsAttrValue::SetTo(const nsAttrValue& aOther)
       }
       break;
     }
-#ifdef MOZ_SVG
     case eSVGValue:
     {
       NS_ADDREF(cont->mSVGValue = otherCont->mSVGValue);
       break;
     }
-#endif
     case eDoubleValue:
     {
       cont->mDoubleValue = otherCont->mDoubleValue;
@@ -323,7 +317,6 @@ nsAttrValue::SetTo(css::StyleRule* aValue, const nsAString* aSerialized)
   }
 }
 
-#ifdef MOZ_SVG
 void
 nsAttrValue::SetTo(nsISVGValue* aValue)
 {
@@ -333,7 +326,6 @@ nsAttrValue::SetTo(nsISVGValue* aValue)
     cont->mType = eSVGValue;
   }
 }
-#endif
 
 void
 nsAttrValue::SetTo(const nsIntMargin& aValue)
@@ -436,13 +428,11 @@ nsAttrValue::ToString(nsAString& aResult) const
 
       break;
     }
-#ifdef MOZ_SVG
     case eSVGValue:
     {
       GetMiscContainer()->mSVGValue->GetValueString(aResult);
       break;
     }
-#endif
     case eDoubleValue:
     {
       aResult.Truncate();
@@ -601,12 +591,10 @@ nsAttrValue::HashValue() const
       }
       return retval;
     }
-#ifdef MOZ_SVG
     case eSVGValue:
     {
       return NS_PTR_TO_INT32(cont->mSVGValue);
     }
-#endif
     case eDoubleValue:
     {
       // XXX this is crappy, but oh well
@@ -700,12 +688,10 @@ nsAttrValue::Equals(const nsAttrValue& aOther) const
       needsStringComparison = PR_TRUE;
       break;
     }
-#ifdef MOZ_SVG
     case eSVGValue:
     {
       return thisCont->mSVGValue == otherCont->mSVGValue;
     }
-#endif
     case eDoubleValue:
     {
       return thisCont->mDoubleValue == otherCont->mDoubleValue;
@@ -1309,13 +1295,11 @@ nsAttrValue::EnsureEmptyMiscContainer()
         delete cont->mAtomArray;
         break;
       }
-#ifdef MOZ_SVG
       case eSVGValue:
       {
         NS_RELEASE(cont->mSVGValue);
         break;
       }
-#endif
       case eIntMarginValue:
       {
         delete cont->mIntMargin;
diff --git a/content/base/src/nsAttrValue.h b/content/base/src/nsAttrValue.h
index 8d2f0e93f3e..566802cf12a 100644
--- a/content/base/src/nsAttrValue.h
+++ b/content/base/src/nsAttrValue.h
@@ -105,9 +105,7 @@ public:
   nsAttrValue(const nsAttrValue& aOther);
   explicit nsAttrValue(const nsAString& aValue);
   nsAttrValue(mozilla::css::StyleRule* aValue, const nsAString* aSerialized);
-#ifdef MOZ_SVG
   explicit nsAttrValue(nsISVGValue* aValue);
-#endif
   explicit nsAttrValue(const nsIntMargin& aValue);
   ~nsAttrValue();
 
@@ -127,9 +125,7 @@ public:
     // struct.
     eCSSStyleRule = 0x10,
     eAtomArray =    0x11 
-#ifdef MOZ_SVG
     ,eSVGValue =    0x12
-#endif
     ,eDoubleValue  = 0x13
     ,eIntMarginValue = 0x14
   };
@@ -142,9 +138,7 @@ public:
   void SetTo(const nsAString& aValue);
   void SetTo(PRInt16 aInt);
   void SetTo(mozilla::css::StyleRule* aValue, const nsAString* aSerialized);
-#ifdef MOZ_SVG
   void SetTo(nsISVGValue* aValue);
-#endif
   void SetTo(const nsIntMargin& aValue);
 
   void SwapValueWith(nsAttrValue& aOther);
@@ -162,9 +156,7 @@ public:
   inline float GetPercentValue() const;
   inline AtomArray* GetAtomArrayValue() const;
   inline mozilla::css::StyleRule* GetCSSStyleRuleValue() const;
-#ifdef MOZ_SVG
   inline nsISVGValue* GetSVGValue() const;
-#endif
   inline double GetDoubleValue() const;
   PRBool GetIntMarginValue(nsIntMargin& aMargin) const;
 
@@ -343,9 +335,7 @@ private:
       PRInt32 mPercent;
       mozilla::css::StyleRule* mCSSStyleRule;
       AtomArray* mAtomArray;
-#ifdef MOZ_SVG
       nsISVGValue* mSVGValue;
-#endif
       double mDoubleValue;
       nsIntMargin* mIntMargin;
     };
@@ -449,14 +439,12 @@ nsAttrValue::GetCSSStyleRuleValue() const
   return GetMiscContainer()->mCSSStyleRule;
 }
 
-#ifdef MOZ_SVG
 inline nsISVGValue*
 nsAttrValue::GetSVGValue() const
 {
   NS_PRECONDITION(Type() == eSVGValue, "wrong type");
   return GetMiscContainer()->mSVGValue;
 }
-#endif
 
 inline double
 nsAttrValue::GetDoubleValue() const
diff --git a/content/base/src/nsCSPService.cpp b/content/base/src/nsCSPService.cpp
index ff825fe3ac2..c6f89beb2fc 100644
--- a/content/base/src/nsCSPService.cpp
+++ b/content/base/src/nsCSPService.cpp
@@ -44,7 +44,6 @@
 #include "nsIObserver.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
-#include "nsContentUtils.h"
 #include "nsCSPService.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIChannelPolicy.h"
@@ -55,6 +54,9 @@
 #include "nsChannelProperties.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "nsAsyncRedirectVerifyHelper.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 /* Keeps track of whether or not CSP is enabled */
 PRBool CSPService::sCSPEnabled = PR_TRUE;
@@ -65,7 +67,7 @@ static PRLogModuleInfo* gCspPRLog;
 
 CSPService::CSPService()
 {
-  nsContentUtils::AddBoolPrefVarCache("security.csp.enable", &sCSPEnabled);
+  Preferences::AddBoolVarCache(&sCSPEnabled, "security.csp.enable");
 
 #ifdef PR_LOGGING
   if (!gCspPRLog)
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index 32887e760f5..00c17bf3dff 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -89,7 +89,6 @@
 #include "nsIAppShell.h"
 #include "nsIWidget.h"
 #include "nsWidgetsCID.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIRequest.h"
 #include "nsNodeUtils.h"
 #include "nsIDOMNode.h"
@@ -103,6 +102,9 @@
 #include "nsGenericHTMLElement.h"
 #include "nsHTMLDNSPrefetch.h"
 #include "nsISupportsPrimitives.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 PRLogModuleInfo* gContentSinkLogModuleInfo;
 
@@ -233,11 +235,11 @@ PRBool  nsContentSink::sCanInterruptParser;
 void
 nsContentSink::InitializeStatics()
 {
-  nsContentUtils::AddBoolPrefVarCache("content.notify.ontimer",
-                                      &sNotifyOnTimer, PR_TRUE);
+  Preferences::AddBoolVarCache(&sNotifyOnTimer,
+                               "content.notify.ontimer", PR_TRUE);
   // -1 means never.
-  nsContentUtils::AddIntPrefVarCache("content.notify.backoffcount",
-                                     &sBackoffCount, -1);
+  Preferences::AddIntVarCache(&sBackoffCount,
+                              "content.notify.backoffcount", -1);
   // The gNotificationInterval has a dramatic effect on how long it
   // takes to initially display content for slow connections.
   // The current value provides good
@@ -245,29 +247,28 @@ nsContentSink::InitializeStatics()
   // in page load time. If this value is set below 1/10 of second
   // it starts to impact page load performance.
   // see bugzilla bug 72138 for more info.
-  nsContentUtils::AddIntPrefVarCache("content.notify.interval",
-                                     &sNotificationInterval,
-                                     120000);
-  nsContentUtils::AddIntPrefVarCache("content.sink.interactive_deflect_count",
-                                     &sInteractiveDeflectCount, 0);
-  nsContentUtils::AddIntPrefVarCache("content.sink.perf_deflect_count",
-                                     &sPerfDeflectCount, 200);
-  nsContentUtils::AddIntPrefVarCache("content.sink.pending_event_mode",
-                                     &sPendingEventMode, 1);
-  nsContentUtils::AddIntPrefVarCache("content.sink.event_probe_rate",
-                                     &sEventProbeRate, 1);
-  nsContentUtils::AddIntPrefVarCache("content.sink.interactive_parse_time",
-                                     &sInteractiveParseTime, 3000);
-  nsContentUtils::AddIntPrefVarCache("content.sink.perf_parse_time",
-                                     &sPerfParseTime, 360000);
-  nsContentUtils::AddIntPrefVarCache("content.sink.interactive_time",
-                                     &sInteractiveTime, 750000);
-  nsContentUtils::AddIntPrefVarCache("content.sink.initial_perf_time",
-                                     &sInitialPerfTime, 2000000);
-  nsContentUtils::AddIntPrefVarCache("content.sink.enable_perf_mode",
-                                     &sEnablePerfMode, 0);
-  nsContentUtils::AddBoolPrefVarCache("content.interrupt.parsing",
-                                      &sCanInterruptParser, PR_TRUE);
+  Preferences::AddIntVarCache(&sNotificationInterval,
+                              "content.notify.interval", 120000);
+  Preferences::AddIntVarCache(&sInteractiveDeflectCount,
+                              "content.sink.interactive_deflect_count", 0);
+  Preferences::AddIntVarCache(&sPerfDeflectCount,
+                              "content.sink.perf_deflect_count", 200);
+  Preferences::AddIntVarCache(&sPendingEventMode,
+                              "content.sink.pending_event_mode", 1);
+  Preferences::AddIntVarCache(&sEventProbeRate,
+                              "content.sink.event_probe_rate", 1);
+  Preferences::AddIntVarCache(&sInteractiveParseTime,
+                              "content.sink.interactive_parse_time", 3000);
+  Preferences::AddIntVarCache(&sPerfParseTime,
+                              "content.sink.perf_parse_time", 360000);
+  Preferences::AddIntVarCache(&sInteractiveTime,
+                              "content.sink.interactive_time", 750000);
+  Preferences::AddIntVarCache(&sInitialPerfTime,
+                              "content.sink.initial_perf_time", 2000000);
+  Preferences::AddIntVarCache(&sEnablePerfMode,
+                              "content.sink.enable_perf_mode", 0);
+  Preferences::AddBoolVarCache(&sCanInterruptParser,
+                               "content.interrupt.parsing", PR_TRUE);
 }
 
 nsresult
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 3c264ce3b4a..77d7b103395 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -49,9 +49,6 @@
 #include "nsAString.h"
 #include "nsPrintfCString.h"
 #include "nsUnicharUtils.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch2.h"
-#include "nsIPrefLocalizedString.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptContext.h"
@@ -211,8 +208,11 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #endif
 #include "nsDOMTouchEvent.h"
 
+#include "mozilla/Preferences.h"
+
 using namespace mozilla::dom;
 using namespace mozilla::layers;
+using namespace mozilla;
 
 const char kLoadAsData[] = "loadAsData";
 
@@ -230,7 +230,6 @@ nsIIOService *nsContentUtils::sIOService;
 #ifdef MOZ_XTF
 nsIXTFService *nsContentUtils::sXTFService = nsnull;
 #endif
-nsIPrefBranch2 *nsContentUtils::sPrefBranch = nsnull;
 imgILoader *nsContentUtils::sImgLoader;
 imgICache *nsContentUtils::sImgCache;
 nsIConsoleService *nsContentUtils::sConsoleService;
@@ -244,7 +243,6 @@ PRBool nsContentUtils::sTriedToGetContentPolicy = PR_FALSE;
 nsILineBreaker *nsContentUtils::sLineBreaker;
 nsIWordBreaker *nsContentUtils::sWordBreaker;
 nsIUGenCategory *nsContentUtils::sGenCat;
-nsTArray<nsISupports**> *nsContentUtils::sPtrsToPtrsToRelease;
 nsIScriptRuntime *nsContentUtils::sScriptRuntimes[NS_STID_ARRAY_UBOUND];
 PRInt32 nsContentUtils::sScriptRootCount[NS_STID_ARRAY_UBOUND];
 PRUint32 nsContentUtils::sJSGCThingRootCount;
@@ -252,7 +250,6 @@ PRUint32 nsContentUtils::sJSGCThingRootCount;
 nsIBidiKeyboard *nsContentUtils::sBidiKeyboard = nsnull;
 #endif
 PRUint32 nsContentUtils::sScriptBlockerCount = 0;
-PRUint32 nsContentUtils::sRemovableScriptBlockerCount = 0;
 #ifdef DEBUG
 PRUint32 nsContentUtils::sDOMNodeRemovedSuppressCount = 0;
 #endif
@@ -266,9 +263,6 @@ PRBool nsContentUtils::sAllowXULXBL_for_file = PR_FALSE;
 
 PRBool nsContentUtils::sInitialized = PR_FALSE;
 
-nsRefPtrHashtable<nsPrefObserverHashKey, nsPrefOldCallback>
-  *nsContentUtils::sPrefCallbackTable = nsnull;
-
 static PLDHashTable sEventListenerManagersHash;
 
 class EventListenerManagerMapEntry : public PLDHashEntryHdr
@@ -318,110 +312,6 @@ class nsSameOriginChecker : public nsIChannelEventSink,
   NS_DECL_NSIINTERFACEREQUESTOR
 };
 
-class nsPrefObserverHashKey : public PLDHashEntryHdr {
-public:
-  typedef nsPrefObserverHashKey* KeyType;
-  typedef const nsPrefObserverHashKey* KeyTypePointer;
-
-  static const nsPrefObserverHashKey* KeyToPointer(nsPrefObserverHashKey *aKey)
-  {
-    return aKey;
-  }
-
-  static PLDHashNumber HashKey(const nsPrefObserverHashKey *aKey)
-  {
-    PRUint32 strHash = nsCRT::HashCode(aKey->mPref.BeginReading(),
-                                       aKey->mPref.Length());
-    return PR_ROTATE_LEFT32(strHash, 4) ^
-           NS_PTR_TO_UINT32(aKey->mCallback);
-  }
-
-  nsPrefObserverHashKey(const char *aPref, PrefChangedFunc aCallback) :
-    mPref(aPref), mCallback(aCallback) { }
-
-  nsPrefObserverHashKey(const nsPrefObserverHashKey *aOther) :
-    mPref(aOther->mPref), mCallback(aOther->mCallback)
-  { }
-
-  PRBool KeyEquals(const nsPrefObserverHashKey *aOther) const
-  {
-    return mCallback == aOther->mCallback &&
-           mPref.Equals(aOther->mPref);
-  }
-
-  nsPrefObserverHashKey *GetKey() const
-  {
-    return const_cast<nsPrefObserverHashKey*>(this);
-  }
-
-  enum { ALLOW_MEMMOVE = PR_TRUE };
-
-public:
-  nsCString mPref;
-  PrefChangedFunc mCallback;
-};
-
-// For nsContentUtils::RegisterPrefCallback/UnregisterPrefCallback
-class nsPrefOldCallback : public nsIObserver,
-                          public nsPrefObserverHashKey
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIOBSERVER
-
-public:
-  nsPrefOldCallback(const char *aPref, PrefChangedFunc aCallback)
-    : nsPrefObserverHashKey(aPref, aCallback) { }
-
-  ~nsPrefOldCallback() {
-    nsIPrefBranch2 *prefBranch = nsContentUtils::GetPrefBranch();
-    if(prefBranch)
-      prefBranch->RemoveObserver(mPref.get(), this);
-  }
-
-  void AppendClosure(void *aClosure) {
-    mClosures.AppendElement(aClosure);
-  }
-
-  void RemoveClosure(void *aClosure) {
-    mClosures.RemoveElement(aClosure);
-  }
-
-  PRBool HasNoClosures() {
-    return mClosures.Length() == 0;
-  }
-
-public:
-  nsTArray<void *>  mClosures;
-};
-
-NS_IMPL_ISUPPORTS1(nsPrefOldCallback, nsIObserver)
-
-NS_IMETHODIMP
-nsPrefOldCallback::Observe(nsISupports     *aSubject,
-                           const char      *aTopic,
-                           const PRUnichar *aData)
-{
-  NS_ASSERTION(!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID),
-               "invalid topic");
-  NS_LossyConvertUTF16toASCII data(aData);
-  for (PRUint32 i = 0; i < mClosures.Length(); i++) {
-    mCallback(data.get(), mClosures.ElementAt(i));
-  }
-
-  return NS_OK;
-}
-
-struct PrefCacheData {
-  void* cacheLocation;
-  union {
-    PRBool defaultValueBool;
-    PRInt32 defaultValueInt;
-  };
-};
-
-nsTArray<nsAutoPtr<PrefCacheData> >* sPrefCacheData = nsnull;
-
 // static
 nsresult
 nsContentUtils::Init()
@@ -432,11 +322,6 @@ nsContentUtils::Init()
     return NS_OK;
   }
 
-  sPrefCacheData = new nsTArray<nsAutoPtr<PrefCacheData> >();
-
-  // It's ok to not have a pref service.
-  CallGetService(NS_PREFSERVICE_CONTRACTID, &sPrefBranch);
-
   nsresult rv = NS_GetNameSpaceManager(&sNameSpaceManager);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -467,11 +352,6 @@ nsContentUtils::Init()
   rv = CallGetService(NS_UNICHARCATEGORY_CONTRACTID, &sGenCat);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  sPtrsToPtrsToRelease = new nsTArray<nsISupports**>();
-  if (!sPtrsToPtrsToRelease) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
   if (!InitializeEventTable())
     return NS_ERROR_FAILURE;
 
@@ -499,8 +379,8 @@ nsContentUtils::Init()
   sBlockedScriptRunners = new nsCOMArray<nsIRunnable>;
   NS_ENSURE_TRUE(sBlockedScriptRunners, NS_ERROR_OUT_OF_MEMORY);
 
-  nsContentUtils::AddBoolPrefVarCache("dom.allow_XUL_XBL_for_file",
-                                      &sAllowXULXBL_for_file);
+  Preferences::AddBoolVarCache(&sAllowXULXBL_for_file,
+                               "dom.allow_XUL_XBL_for_file");
 
   sInitialized = PR_TRUE;
 
@@ -627,7 +507,6 @@ nsContentUtils::InitializeEventTable() {
 
     { nsGkAtoms::onoverflow,                    NS_SCROLLPORT_OVERFLOW, EventNameType_XUL, NS_EVENT_NULL},
     { nsGkAtoms::onunderflow,                   NS_SCROLLPORT_UNDERFLOW, EventNameType_XUL, NS_EVENT_NULL},
-#ifdef MOZ_SVG
     { nsGkAtoms::onSVGLoad,                     NS_SVG_LOAD, EventNameType_None, NS_SVG_EVENT },
     { nsGkAtoms::onSVGUnload,                   NS_SVG_UNLOAD, EventNameType_None, NS_SVG_EVENT },
     { nsGkAtoms::onSVGAbort,                    NS_SVG_ABORT, EventNameType_None, NS_SVG_EVENT },
@@ -639,7 +518,6 @@ nsContentUtils::InitializeEventTable() {
 
     // This is a bit hackish, but SVG's event names are weird.
     { nsGkAtoms::onzoom,                        NS_SVG_ZOOM, EventNameType_SVGSVG, NS_EVENT_NULL },
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
     { nsGkAtoms::onbegin,                       NS_SMIL_BEGIN, EventNameType_SMIL, NS_EVENT_NULL },
     { nsGkAtoms::onbeginEvent,                  NS_SMIL_BEGIN, EventNameType_None, NS_SMIL_TIME_EVENT },
@@ -1129,9 +1007,10 @@ nsContentUtils::OfflineAppAllowed(nsIURI *aURI)
   }
 
   PRBool allowed;
-  nsresult rv = updateService->OfflineAppAllowedForURI(aURI,
-                                                       sPrefBranch,
-                                                       &allowed);
+  nsresult rv =
+    updateService->OfflineAppAllowedForURI(aURI,
+                                           Preferences::GetRootBranch(),
+                                           &allowed);
   return NS_SUCCEEDED(rv) && allowed;
 }
 
@@ -1147,7 +1026,7 @@ nsContentUtils::OfflineAppAllowed(nsIPrincipal *aPrincipal)
 
   PRBool allowed;
   nsresult rv = updateService->OfflineAppAllowed(aPrincipal,
-                                                 sPrefBranch,
+                                                 Preferences::GetRootBranch(),
                                                  &allowed);
   return NS_SUCCEEDED(rv) && allowed;
 }
@@ -1167,15 +1046,6 @@ nsContentUtils::Shutdown()
   for (i = 0; i < PropertiesFile_COUNT; ++i)
     NS_IF_RELEASE(sStringBundles[i]);
 
-  // Clean up c-style's observer 
-  if (sPrefCallbackTable) {
-    delete sPrefCallbackTable;
-    sPrefCallbackTable = nsnull;
-  }
-
-  delete sPrefCacheData;
-  sPrefCacheData = nsnull;
-
   NS_IF_RELEASE(sStringBundleService);
   NS_IF_RELEASE(sConsoleService);
   NS_IF_RELEASE(sDOMScriptObjectFactory);
@@ -1193,7 +1063,6 @@ nsContentUtils::Shutdown()
 #endif
   NS_IF_RELEASE(sImgLoader);
   NS_IF_RELEASE(sImgCache);
-  NS_IF_RELEASE(sPrefBranch);
 #ifdef IBMBIDI
   NS_IF_RELEASE(sBidiKeyboard);
 #endif
@@ -1205,15 +1074,6 @@ nsContentUtils::Shutdown()
   delete sUserDefinedEvents;
   sUserDefinedEvents = nsnull;
 
-  if (sPtrsToPtrsToRelease) {
-    for (i = 0; i < sPtrsToPtrsToRelease->Length(); ++i) {
-      nsISupports** ptrToPtr = sPtrsToPtrsToRelease->ElementAt(i);
-      NS_RELEASE(*ptrToPtr);
-    }
-    delete sPtrsToPtrsToRelease;
-    sPtrsToPtrsToRelease = nsnull;
-  }
-
   if (sEventListenerManagersHash.ops) {
     NS_ASSERTION(sEventListenerManagersHash.entryCount == 0,
                  "Event listener manager hash not empty at shutdown!");
@@ -1476,42 +1336,10 @@ nsContentUtils::GetContextAndScope(nsIDocument *aOldDocument,
 }
 
 nsresult
-nsContentUtils::ReparentContentWrappersInScope(nsIScriptGlobalObject *aOldScope,
+nsContentUtils::ReparentContentWrappersInScope(JSContext *cx,
+                                               nsIScriptGlobalObject *aOldScope,
                                                nsIScriptGlobalObject *aNewScope)
 {
-  JSContext *cx = nsnull;
-
-  // Try really hard to find a context to work on.
-  nsIScriptContext *context = aOldScope->GetContext();
-  if (context) {
-    cx = static_cast<JSContext *>(context->GetNativeContext());
-  }
-
-  if (!cx) {
-    context = aNewScope->GetContext();
-    if (context) {
-      cx = static_cast<JSContext *>(context->GetNativeContext());
-    }
-
-    if (!cx) {
-      sThreadJSContextStack->Peek(&cx);
-
-      if (!cx) {
-        sThreadJSContextStack->GetSafeJSContext(&cx);
-
-        if (!cx) {
-          // Wow, this is really bad!
-          NS_WARNING("No context reachable in ReparentContentWrappers()!");
-
-          return NS_ERROR_NOT_AVAILABLE;
-        }
-      }
-    }
-  }
-
-  // Now that we have a context, let's get the global objects from the two
-  // scopes and ask XPConnect to do the rest of the work.
-
   JSObject *oldScopeObj = aOldScope->GetGlobalJSObject();
   JSObject *newScopeObj = aNewScope->GetGlobalJSObject();
 
@@ -2595,186 +2423,6 @@ nsContentUtils::IsDraggableLink(const nsIContent* aContent) {
   return aContent->IsLink(getter_AddRefs(absURI));
 }
 
-// static
-nsAdoptingCString
-nsContentUtils::GetCharPref(const char *aPref)
-{
-  nsAdoptingCString result;
-
-  if (sPrefBranch) {
-    sPrefBranch->GetCharPref(aPref, getter_Copies(result));
-  }
-
-  return result;
-}
-
-// static
-PRPackedBool
-nsContentUtils::GetBoolPref(const char *aPref, PRBool aDefault)
-{
-  PRBool result;
-
-  if (!sPrefBranch ||
-      NS_FAILED(sPrefBranch->GetBoolPref(aPref, &result))) {
-    result = aDefault;
-  }
-
-  return (PRPackedBool)result;
-}
-
-// static
-PRInt32
-nsContentUtils::GetIntPref(const char *aPref, PRInt32 aDefault)
-{
-  PRInt32 result;
-
-  if (!sPrefBranch ||
-      NS_FAILED(sPrefBranch->GetIntPref(aPref, &result))) {
-    result = aDefault;
-  }
-
-  return result;
-}
-
-// static
-nsAdoptingString
-nsContentUtils::GetLocalizedStringPref(const char *aPref)
-{
-  nsAdoptingString result;
-
-  if (sPrefBranch) {
-    nsCOMPtr<nsIPrefLocalizedString> prefLocalString;
-    sPrefBranch->GetComplexValue(aPref, NS_GET_IID(nsIPrefLocalizedString),
-                                 getter_AddRefs(prefLocalString));
-    if (prefLocalString) {
-      prefLocalString->GetData(getter_Copies(result));
-    }
-  }
-
-  return result;
-}
-
-// static
-nsAdoptingString
-nsContentUtils::GetStringPref(const char *aPref)
-{
-  nsAdoptingString result;
-
-  if (sPrefBranch) {
-    nsCOMPtr<nsISupportsString> theString;
-    sPrefBranch->GetComplexValue(aPref, NS_GET_IID(nsISupportsString),
-                                 getter_AddRefs(theString));
-    if (theString) {
-      theString->ToString(getter_Copies(result));
-    }
-  }
-
-  return result;
-}
-
-// RegisterPrefCallback/UnregisterPrefCallback are for backward compatiblity
-// with c-style observers.
-
-// static
-void
-nsContentUtils::RegisterPrefCallback(const char *aPref,
-                                     PrefChangedFunc aCallback,
-                                     void * aClosure)
-{
-  if (sPrefBranch) {
-    if (!sPrefCallbackTable) {
-      sPrefCallbackTable = 
-        new nsRefPtrHashtable<nsPrefObserverHashKey, nsPrefOldCallback>();
-      sPrefCallbackTable->Init();
-    }
-
-    nsPrefObserverHashKey hashKey(aPref, aCallback);
-    nsRefPtr<nsPrefOldCallback> callback;
-    sPrefCallbackTable->Get(&hashKey, getter_AddRefs(callback));
-    if (callback) {
-      callback->AppendClosure(aClosure);
-      return;
-    }
-
-    callback = new nsPrefOldCallback(aPref, aCallback);
-    callback->AppendClosure(aClosure);
-    if (NS_SUCCEEDED(sPrefBranch->AddObserver(aPref, callback, PR_FALSE))) {
-      sPrefCallbackTable->Put(callback, callback);
-    }
-  }
-}
-
-// static
-void
-nsContentUtils::UnregisterPrefCallback(const char *aPref,
-                                       PrefChangedFunc aCallback,
-                                       void * aClosure)
-{
-  if (sPrefBranch) {
-    if (!sPrefCallbackTable) {
-      return;
-    }
-
-    nsPrefObserverHashKey hashKey(aPref, aCallback);
-    nsRefPtr<nsPrefOldCallback> callback;
-    sPrefCallbackTable->Get(&hashKey, getter_AddRefs(callback));
-
-    if (callback) {
-      callback->RemoveClosure(aClosure);
-      if (callback->HasNoClosures()) {
-        // Delete the callback since its list of closures is empty.
-        sPrefCallbackTable->Remove(callback);
-      }
-    }
-  }
-}
-
-static int
-BoolVarChanged(const char *aPref, void *aClosure)
-{
-  PrefCacheData* cache = static_cast<PrefCacheData*>(aClosure);
-  *((PRBool*)cache->cacheLocation) =
-    nsContentUtils::GetBoolPref(aPref, cache->defaultValueBool);
-  
-  return 0;
-}
-
-void
-nsContentUtils::AddBoolPrefVarCache(const char *aPref,
-                                    PRBool* aCache,
-                                    PRBool aDefault)
-{
-  *aCache = GetBoolPref(aPref, aDefault);
-  PrefCacheData* data = new PrefCacheData;
-  data->cacheLocation = aCache;
-  data->defaultValueBool = aDefault;
-  sPrefCacheData->AppendElement(data);
-  RegisterPrefCallback(aPref, BoolVarChanged, data);
-}
-
-static int
-IntVarChanged(const char *aPref, void *aClosure)
-{
-  PrefCacheData* cache = static_cast<PrefCacheData*>(aClosure);
-  *((PRInt32*)cache->cacheLocation) =
-    nsContentUtils::GetIntPref(aPref, cache->defaultValueInt);
-  
-  return 0;
-}
-
-void
-nsContentUtils::AddIntPrefVarCache(const char *aPref,
-                                   PRInt32* aCache,
-                                   PRInt32 aDefault)
-{
-  *aCache = GetIntPref(aPref, aDefault);
-  PrefCacheData* data = new PrefCacheData;
-  data->cacheLocation = aCache;
-  data->defaultValueInt = aDefault;
-  sPrefCacheData->AppendElement(data);
-  RegisterPrefCallback(aPref, IntVarChanged, data);
-}
-
 PRBool
 nsContentUtils::IsSitePermAllow(nsIURI* aURI, const char* aType)
 {
@@ -3031,9 +2679,7 @@ static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = {
   "chrome://global/locale/layout/HtmlForm.properties",
   "chrome://global/locale/printing.properties",
   "chrome://global/locale/dom/dom.properties",
-#ifdef MOZ_SVG
   "chrome://global/locale/svg/svg.properties",
-#endif
   "chrome://branding/locale/brand.properties",
   "chrome://global/locale/commonDialogs.properties"
 };
@@ -4501,7 +4147,7 @@ nsContentUtils::GetLocalizedEllipsis()
 {
   static PRUnichar sBuf[4] = { 0, 0, 0, 0 };
   if (!sBuf[0]) {
-    nsAutoString tmp(GetLocalizedStringPref("intl.ellipsis"));
+    nsAdoptingString tmp = Preferences::GetLocalizedString("intl.ellipsis");
     PRUint32 len = NS_MIN(PRUint32(tmp.Length()),
                           PRUint32(NS_ARRAY_LENGTH(sBuf) - 1));
     CopyUnicodeTo(tmp, 0, sBuf, len);
@@ -6193,35 +5839,6 @@ nsContentUtils::CheckCCWrapperTraversal(nsISupports* aScriptObjectHolder,
 }
 #endif
 
-mozAutoRemovableBlockerRemover::mozAutoRemovableBlockerRemover(nsIDocument* aDocument MOZILLA_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
-{
-  MOZILLA_GUARD_OBJECT_NOTIFIER_INIT;
-  mNestingLevel = nsContentUtils::GetRemovableScriptBlockerLevel();
-  mDocument = aDocument;
-  nsISupports* sink = aDocument ? aDocument->GetCurrentContentSink() : nsnull;
-  mObserver = do_QueryInterface(sink);
-  for (PRUint32 i = 0; i < mNestingLevel; ++i) {
-    if (mObserver) {
-      mObserver->EndUpdate(mDocument, UPDATE_CONTENT_MODEL);
-    }
-    nsContentUtils::RemoveRemovableScriptBlocker();
-  }
-
-  NS_ASSERTION(nsContentUtils::IsSafeToRunScript(), "killing mutation events");
-}
-
-mozAutoRemovableBlockerRemover::~mozAutoRemovableBlockerRemover()
-{
-  NS_ASSERTION(nsContentUtils::GetRemovableScriptBlockerLevel() == 0,
-               "Should have had none");
-  for (PRUint32 i = 0; i < mNestingLevel; ++i) {
-    nsContentUtils::AddRemovableScriptBlocker();
-    if (mObserver) {
-      mObserver->BeginUpdate(mDocument, UPDATE_CONTENT_MODEL);
-    }
-  }
-}
-
 // static
 PRBool
 nsContentUtils::IsFocusedContent(const nsIContent* aContent)
@@ -6322,21 +5939,6 @@ nsContentUtils::PlatformToDOMLineBreaks(nsString &aString)
   }
 }
 
-static nsIView* GetDisplayRootFor(nsIView* aView)
-{
-  nsIView *displayRoot = aView;
-  for (;;) {
-    nsIView *displayParent = displayRoot->GetParent();
-    if (!displayParent)
-      return displayRoot;
-
-    if (displayRoot->GetFloating() && !displayParent->GetFloating())
-      return displayRoot;
-    displayRoot = displayParent;
-  }
-  return nsnull;
-}
-
 static already_AddRefed<LayerManager>
 LayerManagerForDocumentInternal(nsIDocument *aDoc, bool aRequirePersistent,
                                 bool* aAllowRetaining)
@@ -6372,7 +5974,7 @@ LayerManagerForDocumentInternal(nsIDocument *aDoc, bool aRequirePersistent,
     if (VM) {
       nsIView* rootView = VM->GetRootView();
       if (rootView) {
-        nsIView* displayRoot = GetDisplayRootFor(rootView);
+        nsIView* displayRoot = nsIViewManager::GetDisplayRootFor(rootView);
         if (displayRoot) {
           nsIWidget* widget = displayRoot->GetNearestWidget(nsnull);
           if (widget) {
diff --git a/content/base/src/nsCrossSiteListenerProxy.cpp b/content/base/src/nsCrossSiteListenerProxy.cpp
index d79cfb15872..2905fc40479 100644
--- a/content/base/src/nsCrossSiteListenerProxy.cpp
+++ b/content/base/src/nsCrossSiteListenerProxy.cpp
@@ -60,6 +60,9 @@
 #include "nsClassHashtable.h"
 #include "nsHashKeys.h"
 #include "nsStreamUtils.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define PREFLIGHT_CACHE_SIZE 100
 
@@ -369,8 +372,10 @@ NS_IMPL_ISUPPORTS5(nsCORSListenerProxy, nsIStreamListener,
 void
 nsCORSListenerProxy::Startup()
 {
-  nsContentUtils::AddBoolPrefVarCache("content.cors.disable", &gDisableCORS);
-  nsContentUtils::AddBoolPrefVarCache("content.cors.no_private_data", &gDisableCORSPrivateData);
+  Preferences::AddBoolVarCache(&gDisableCORS,
+                               "content.cors.disable");
+  Preferences::AddBoolVarCache(&gDisableCORSPrivateData,
+                               "content.cors.no_private_data");
 }
 
 /* static */
diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
index 874cfc28f6d..73e6249c300 100644
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -610,9 +610,8 @@ nsDOMAttribute::AppendChildTo(nsIContent* aKid, PRBool aNotify)
 }
 
 nsresult
-nsDOMAttribute::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsDOMAttribute::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on attribute child removal.");
   if (aIndex != 0 || !mChild) {
     return NS_OK;
   }
diff --git a/content/base/src/nsDOMAttribute.h b/content/base/src/nsDOMAttribute.h
index cd9192606ad..b2381fe012e 100644
--- a/content/base/src/nsDOMAttribute.h
+++ b/content/base/src/nsDOMAttribute.h
@@ -94,7 +94,7 @@ public:
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
   virtual nsresult AppendChildTo(nsIContent* aKid, PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
   virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent,
diff --git a/content/base/src/nsDOMBlobBuilder.cpp b/content/base/src/nsDOMBlobBuilder.cpp
index 3aad463f982..482f345ca93 100644
--- a/content/base/src/nsDOMBlobBuilder.cpp
+++ b/content/base/src/nsDOMBlobBuilder.cpp
@@ -221,7 +221,7 @@ nsDOMMultipartBlob::MozSlice(PRInt64 aStart, PRInt64 aEnd,
   return NS_OK;
 }
 
-class nsDOMBlobBuilder : public nsIDOMBlobBuilder
+class nsDOMBlobBuilder : public nsIDOMMozBlobBuilder
 {
 public:
   nsDOMBlobBuilder()
@@ -229,7 +229,7 @@ public:
   {}
 
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIDOMBLOBBUILDER
+  NS_DECL_NSIDOMMOZBLOBBUILDER
 protected:
   nsresult AppendVoidPtr(void* aData, PRUint32 aLength);
   nsresult AppendString(JSString* aString, JSContext* aCx);
@@ -287,7 +287,7 @@ DOMCI_DATA(MozBlobBuilder, nsDOMBlobBuilder)
 NS_IMPL_ADDREF(nsDOMBlobBuilder)
 NS_IMPL_RELEASE(nsDOMBlobBuilder)
 NS_INTERFACE_MAP_BEGIN(nsDOMBlobBuilder)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMBlobBuilder)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMMozBlobBuilder)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozBlobBuilder)
 NS_INTERFACE_MAP_END
diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp
index 24b306f0be7..9c4a0b8a2db 100644
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -64,6 +64,7 @@
 #include "nsStringStream.h"
 #include "CheckedInt.h"
 #include "nsJSUtils.h"
+#include "mozilla/Preferences.h"
 
 #include "plbase64.h"
 #include "prmem.h"
@@ -499,12 +500,12 @@ nsDOMFile::GuessCharset(nsIInputStream *aStream,
                         "universal_charset_detector");
   if (!detector) {
     // No universal charset detector, try the default charset detector
-    const nsAdoptingString& detectorName =
-      nsContentUtils::GetLocalizedStringPref("intl.charset.detector");
+    const nsAdoptingCString& detectorName =
+      Preferences::GetLocalizedCString("intl.charset.detector");
     if (!detectorName.IsEmpty()) {
       nsCAutoString detectorContractID;
       detectorContractID.AssignLiteral(NS_CHARSET_DETECTOR_CONTRACTID_BASE);
-      AppendUTF16toUTF8(detectorName, detectorContractID);
+      detectorContractID += detectorName;
       detector = do_CreateInstance(detectorContractID.get());
     }
   }
diff --git a/content/base/src/nsDOMFileReader.cpp b/content/base/src/nsDOMFileReader.cpp
index a00a5422047..ae3f34b3e6c 100644
--- a/content/base/src/nsDOMFileReader.cpp
+++ b/content/base/src/nsDOMFileReader.cpp
@@ -77,6 +77,9 @@
 #include "nsLayoutStatics.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsFileDataProtocolHandler.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define LOAD_STR "load"
 #define ERROR_STR "error"
@@ -684,12 +687,12 @@ nsDOMFileReader::GuessCharset(const char *aFileData,
                         "universal_charset_detector");
   if (!detector) {
     // No universal charset detector, try the default charset detector
-    const nsAdoptingString& detectorName =
-      nsContentUtils::GetLocalizedStringPref("intl.charset.detector");
+    const nsAdoptingCString& detectorName =
+      Preferences::GetLocalizedCString("intl.charset.detector");
     if (!detectorName.IsEmpty()) {
       nsCAutoString detectorContractID;
       detectorContractID.AssignLiteral(NS_CHARSET_DETECTOR_CONTRACTID_BASE);
-      AppendUTF16toUTF8(detectorName, detectorContractID);
+      detectorContractID += detectorName;
       detector = do_CreateInstance(detectorContractID.get());
     }
   }
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index d11abcf47cc..391767cf1f2 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -203,6 +203,9 @@ static NS_DEFINE_CID(kDOMEventGroupCID, NS_DOMEVENTGROUP_CID);
 #include "nsXULAppAPI.h"
 #include "nsDOMTouchEvent.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 using namespace mozilla::dom;
 
 typedef nsTArray<Link*> LinkArray;
@@ -1685,8 +1688,6 @@ NS_INTERFACE_TABLE_HEAD(nsDocument)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_DOCUMENT_INTERFACE_TABLE_BEGIN(nsDocument)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDocument)
-    NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMDocumentStyle)
-    NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMNSDocumentStyle)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOMDocumentXBL)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIScriptObjectPrincipal)
     NS_INTERFACE_TABLE_ENTRY(nsDocument, nsIDOM3EventTarget)
@@ -1870,6 +1871,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnloadBlocker)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDOMImplementation)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mImageMaps,
+                                                       nsIDOMNodeList)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOriginalDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCachedEncoder)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mStateObjectCached)
@@ -1922,6 +1925,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDisplayDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDOMImplementation)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mImageMaps)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOriginalDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCachedEncoder)
 
@@ -3446,9 +3450,8 @@ nsDocument::AppendChildTo(nsIContent* aKid, PRBool aNotify)
 }
 
 nsresult
-nsDocument::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsDocument::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on document child removal.");
   nsCOMPtr<nsIContent> oldKid = GetChildAt(aIndex);
   if (!oldKid) {
     return NS_OK;
@@ -3460,7 +3463,7 @@ nsDocument::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent
   }
 
   nsresult rv =
-    doRemoveChildAt(aIndex, aNotify, oldKid, mChildren, aMutationEvent);
+    doRemoveChildAt(aIndex, aNotify, oldKid, mChildren);
   mCachedRootElement = nsnull;
   return rv;
 }
@@ -3949,12 +3952,7 @@ nsDocument::BeginUpdate(nsUpdateType aUpdateType)
   }
   
   ++mUpdateNestLevel;
-  if (aUpdateType == UPDATE_CONTENT_MODEL) {
-    nsContentUtils::AddRemovableScriptBlocker();
-  }
-  else {
-    nsContentUtils::AddScriptBlocker();
-  }
+  nsContentUtils::AddScriptBlocker();
   NS_DOCUMENT_NOTIFY_OBSERVERS(BeginUpdate, (this, aUpdateType));
 }
 
@@ -3963,12 +3961,7 @@ nsDocument::EndUpdate(nsUpdateType aUpdateType)
 {
   NS_DOCUMENT_NOTIFY_OBSERVERS(EndUpdate, (this, aUpdateType));
 
-  if (aUpdateType == UPDATE_CONTENT_MODEL) {
-    nsContentUtils::RemoveRemovableScriptBlocker();
-  }
-  else {
-    nsContentUtils::RemoveScriptBlocker();
-  }
+  nsContentUtils::RemoveScriptBlocker();
 
   --mUpdateNestLevel;
 
@@ -4542,20 +4535,6 @@ nsDocument::CreateAttributeNS(const nsAString & aNamespaceURI,
   return CallQueryInterface(attribute, aResult);
 }
 
-NS_IMETHODIMP
-nsDocument::CreateEntityReference(const nsAString& aName,
-                                  nsIDOMEntityReference** aReturn)
-{
-  NS_ENSURE_ARG_POINTER(aReturn);
-  *aReturn = nsnull;
-
-  if (IsHTML()) {
-    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDocument::GetElementsByTagName(const nsAString& aTagname,
                                  nsIDOMNodeList** aReturn)
@@ -5162,13 +5141,11 @@ nsDocument::GetTitle(nsAString& aTitle)
       rootElement->GetAttr(kNameSpaceID_None, nsGkAtoms::title, tmp);
       break;
 #endif
-#ifdef MOZ_SVG
     case kNameSpaceID_SVG:
       if (rootElement->Tag() == nsGkAtoms::svg) {
         GetTitleFromElement(kNameSpaceID_SVG, tmp);
         break;
       } // else fall through
-#endif
     default:
       GetTitleFromElement(kNameSpaceID_XHTML, tmp);
       break;
@@ -5187,10 +5164,8 @@ nsDocument::SetTitle(const nsAString& aTitle)
     return NS_OK;
 
   switch (rootElement->GetNameSpaceID()) {
-#ifdef MOZ_SVG
     case kNameSpaceID_SVG:
       return NS_OK; // SVG doesn't support setting a title
-#endif
 #ifdef MOZ_XUL
     case kNameSpaceID_XUL:
       return rootElement->SetAttr(kNameSpaceID_None, nsGkAtoms::title,
@@ -6152,12 +6127,6 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
   return CallQueryInterface(adoptedNode, aResult);
 }
 
-NS_IMETHODIMP
-nsDocument::NormalizeDocument()
-{
-  return Normalize();
-}
-
 NS_IMETHODIMP
 nsDocument::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 {
@@ -8163,6 +8132,48 @@ nsDocument::GetStateObject(nsIVariant** aState)
   return NS_OK;
 }
 
+Element*
+nsDocument::FindImageMap(const nsAString& aUseMapValue)
+{
+  if (aUseMapValue.IsEmpty()) {
+    return nsnull;
+  }
+
+  nsAString::const_iterator start, end;
+  aUseMapValue.BeginReading(start);
+  aUseMapValue.EndReading(end);
+
+  PRInt32 hash = aUseMapValue.FindChar('#');
+  if (hash < 0) {
+    return nsnull;
+  }
+  // aUsemap contains a '#', set start to point right after the '#'
+  start.advance(hash + 1);
+
+  if (start == end) {
+    return nsnull; // aUsemap == "#"
+  }
+
+  const nsAString& mapName = Substring(start, end);
+
+  if (!mImageMaps) {
+    mImageMaps = new nsContentList(this, kNameSpaceID_XHTML, nsGkAtoms::map, nsGkAtoms::map);
+  }
+
+  PRUint32 i, n = mImageMaps->Length(PR_TRUE);
+  for (i = 0; i < n; ++i) {
+    nsIContent* map = mImageMaps->GetNodeAt(i);
+    if (map->AttrValueIs(kNameSpaceID_None, nsGkAtoms::id, mapName,
+                         eCaseMatters) ||
+        map->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, mapName,
+                         eIgnoreCase)) {
+      return map->AsElement();
+    }
+  }
+
+  return nsnull;
+}
+
 nsresult
 nsDocument::AddImage(imgIRequest* aImage)
 {
@@ -8261,7 +8272,7 @@ nsresult
 nsDocument::SetImageLockingState(PRBool aLocked)
 {
   if (XRE_GetProcessType() == GeckoProcessType_Content &&
-      !nsContentUtils::GetBoolPref("content.image.allow_locking", PR_TRUE)) {
+      !Preferences::GetBool("content.image.allow_locking", PR_TRUE)) {
     return NS_OK;
   }
 
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 38cc19c4f13..4571b2b8c2c 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -53,8 +53,6 @@
 #include "nsHashSets.h"
 #include "nsIDOMXMLDocument.h"
 #include "nsIDOMDocumentXBL.h"
-#include "nsIDOMNSDocument.h"
-#include "nsIDOMNSDocumentStyle.h"
 #include "nsStubDocumentObserver.h"
 #include "nsIDOM3EventTarget.h"
 #include "nsIDOMNSEventTarget.h"
@@ -490,8 +488,6 @@ protected:
 // the interface.
 class nsDocument : public nsIDocument,
                    public nsIDOMXMLDocument, // inherits nsIDOMDocument
-                   public nsIDOMNSDocument,
-                   public nsIDOMNSDocumentStyle,
                    public nsIDOMDocumentXBL,
                    public nsSupportsWeakReference,
                    public nsIDOMEventTarget,
@@ -540,7 +536,7 @@ public:
    * Get the Content-Type of this document.
    */
   // NS_IMETHOD GetContentType(nsAString& aContentType);
-  // Already declared in nsIDOMNSDocument
+  // Already declared in nsIDOMDocument
 
   /**
    * Set the Content-Type of this document.
@@ -730,7 +726,7 @@ public:
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
   virtual nsresult AppendChildTo(nsIContent* aKid, PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
   virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent,
@@ -791,15 +787,6 @@ public:
   // nsIDOMXMLDocument
   NS_DECL_NSIDOMXMLDOCUMENT
 
-  // nsIDOMNSDocument
-  NS_DECL_NSIDOMNSDOCUMENT
-
-  // nsIDOMDocumentStyle
-  NS_DECL_NSIDOMDOCUMENTSTYLE
-
-  // nsIDOMNSDocumentStyle
-  NS_DECL_NSIDOMNSDOCUMENTSTYLE
-
   // nsIDOMDocumentXBL
   NS_DECL_NSIDOMDOCUMENTXBL
 
@@ -961,6 +948,8 @@ public:
 
   virtual nsresult GetStateObject(nsIVariant** aResult);
 
+  virtual Element* FindImageMap(const nsAString& aNormalizedMapName);
+
 protected:
   friend class nsNodeUtils;
 
@@ -1225,6 +1214,8 @@ private:
 
   nsCOMPtr<nsIDOMDOMImplementation> mDOMImplementation;
 
+  nsRefPtr<nsContentList> mImageMaps;
+
   nsCString mScrollToRef;
   PRUint8 mScrolledToRefAlready : 1;
   PRUint8 mChangeScrollPosWhenScrollingToRef : 1;
@@ -1241,7 +1232,6 @@ protected:
 #define NS_DOCUMENT_INTERFACE_TABLE_BEGIN(_class)                             \
   NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(_class)                            \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMDocument, nsDocument)      \
-  NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMNSDocument, nsDocument)    \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMEventTarget, nsDocument)   \
   NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, nsIDOMNode, nsDocument)
 
diff --git a/content/base/src/nsEventSource.cpp b/content/base/src/nsEventSource.cpp
index d3112ff3350..ee29db88cd1 100755
--- a/content/base/src/nsEventSource.cpp
+++ b/content/base/src/nsEventSource.cpp
@@ -57,6 +57,9 @@
 #include "nsICharsetConverterManager.h"
 #include "nsIChannelPolicy.h"
 #include "nsIContentSecurityPolicy.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define REPLACEMENT_CHAR     (PRUnichar)0xFFFD
 #define BOM_CHAR             (PRUnichar)0xFEFF
@@ -296,8 +299,8 @@ nsEventSource::Init(nsIPrincipal* aPrincipal,
   mOrigin = origin;
 
   mReconnectionTime =
-    nsContentUtils::GetIntPref("dom.server-events.default-reconnection-time",
-                               DEFAULT_RECONNECTION_TIME_VALUE);
+    Preferences::GetInt("dom.server-events.default-reconnection-time",
+                        DEFAULT_RECONNECTION_TIME_VALUE);
 
   nsCOMPtr<nsICharsetConverterManager> convManager =
     do_GetService(NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv);
@@ -775,7 +778,7 @@ nsEventSource::GetInterface(const nsIID & aIID,
 PRBool
 nsEventSource::PrefEnabled()
 {
-  return nsContentUtils::GetBoolPref("dom.server-events.enabled", PR_FALSE);
+  return Preferences::GetBool("dom.server-events.enabled", PR_FALSE);
 }
 
 nsresult
diff --git a/content/base/src/nsFileDataProtocolHandler.cpp b/content/base/src/nsFileDataProtocolHandler.cpp
index e4934d35b8b..b0d06a51447 100644
--- a/content/base/src/nsFileDataProtocolHandler.cpp
+++ b/content/base/src/nsFileDataProtocolHandler.cpp
@@ -161,12 +161,23 @@ public:
   nsCOMPtr<nsIPrincipal> mPrincipal;
 };
 
+static NS_DEFINE_CID(kThisSimpleURIImplementationCID,
+                     NS_THIS_SIMPLEURI_IMPLEMENTATION_CID);
+
 NS_IMPL_ADDREF_INHERITED(nsFileDataURI, nsSimpleURI)
 NS_IMPL_RELEASE_INHERITED(nsFileDataURI, nsSimpleURI)
+
 NS_INTERFACE_MAP_BEGIN(nsFileDataURI)
   NS_INTERFACE_MAP_ENTRY(nsIURIWithPrincipal)
   if (aIID.Equals(kFILEDATAURICID))
-      foundInterface = static_cast<nsIURI*>(this);
+    foundInterface = static_cast<nsIURI*>(this);
+  else if (aIID.Equals(kThisSimpleURIImplementationCID)) {
+    // Need to return explicitly here, because if we just set foundInterface
+    // to null the NS_INTERFACE_MAP_END_INHERITING will end up calling into
+    // nsSimplURI::QueryInterface and finding something for this CID.
+    *aInstancePtr = nsnull;
+    return NS_NOINTERFACE;
+  }
   else
 NS_INTERFACE_MAP_END_INHERITING(nsSimpleURI)
 
@@ -257,15 +268,20 @@ nsFileDataURI::EqualsInternal(nsIURI* aOther,
     return NS_OK;
   }
 
-  nsresult rv = mPrincipal->Equals(otherFileDataUri->mPrincipal, aResult);
-  NS_ENSURE_SUCCESS(rv, rv);
-  
-  if (!*aResult) {
+  // Compare the member data that our base class knows about.
+  if (!nsSimpleURI::EqualsInternal(otherFileDataUri, aRefHandlingMode)) {
+    *aResult = PR_FALSE;
     return NS_OK;
-  }
+   }
 
-  return nsSimpleURI::EqualsInternal(otherFileDataUri, aRefHandlingMode,
-                                     aResult);
+  // Compare the piece of additional member data that we add to base class.
+  if (mPrincipal && otherFileDataUri->mPrincipal) {
+    // Both of us have mPrincipals. Compare them.
+    return mPrincipal->Equals(otherFileDataUri->mPrincipal, aResult);
+  }
+  // else, at least one of us lacks a principal; only equal if *both* lack it.
+  *aResult = (!mPrincipal && !otherFileDataUri->mPrincipal);
+  return NS_OK;
 }
 
 // nsIClassInfo methods:
diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 8515337552b..4168acb7672 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -83,7 +83,7 @@
 #include "nsISHistory.h"
 #include "nsISHistoryInternal.h"
 #include "nsIDocShellHistory.h"
-#include "nsIDOMNSHTMLDocument.h"
+#include "nsIDOMHTMLDocument.h"
 #include "nsIXULWindow.h"
 #include "nsIEditor.h"
 #include "nsIEditorDocShell.h"
@@ -114,6 +114,8 @@
 #include "TabParent.h"
 #include "mozilla/layout/RenderFrameParent.h"
 
+#include "mozilla/Preferences.h"
+
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;
@@ -818,7 +820,7 @@ nsFrameLoader::Show(PRInt32 marginWidth, PRInt32 marginHeight,
   nsCOMPtr<nsIPresShell> presShell;
   mDocShell->GetPresShell(getter_AddRefs(presShell));
   if (presShell) {
-    nsCOMPtr<nsIDOMNSHTMLDocument> doc =
+    nsCOMPtr<nsIDOMHTMLDocument> doc =
       do_QueryInterface(presShell->GetDocument());
 
     if (doc) {
@@ -836,7 +838,7 @@ nsFrameLoader::Show(PRInt32 marginWidth, PRInt32 marginHeight,
         doc->SetDesignMode(NS_LITERAL_STRING("off"));
         doc->SetDesignMode(NS_LITERAL_STRING("on"));
       } else {
-        // Re-initialie the presentation for contenteditable documents
+        // Re-initialize the presentation for contenteditable documents
         nsCOMPtr<nsIEditorDocShell> editorDocshell = do_QueryInterface(mDocShell);
         if (editorDocshell) {
           PRBool editable = PR_FALSE,
@@ -1346,8 +1348,8 @@ nsFrameLoader::ShouldUseRemoteProcess()
     return false;
   }
 
-  PRBool remoteDisabled = nsContentUtils::GetBoolPref("dom.ipc.tabs.disabled",
-                                                      PR_FALSE);
+  PRBool remoteDisabled =
+    Preferences::GetBool("dom.ipc.tabs.disabled", PR_FALSE);
   if (remoteDisabled) {
     return false;
   }
@@ -1366,8 +1368,7 @@ nsFrameLoader::ShouldUseRemoteProcess()
     return true;
   }
 
-  PRBool remoteEnabled = nsContentUtils::GetBoolPref("dom.ipc.tabs.enabled",
-                                                     PR_FALSE);
+  PRBool remoteEnabled = Preferences::GetBool("dom.ipc.tabs.enabled", PR_FALSE);
   return (bool) remoteEnabled;
 }
 
diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp
index f4fe5320c6e..482a6b80c1b 100644
--- a/content/base/src/nsGenericDOMDataNode.cpp
+++ b/content/base/src/nsGenericDOMDataNode.cpp
@@ -723,7 +723,7 @@ nsGenericDOMDataNode::InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
 }
 
 nsresult
-nsGenericDOMDataNode::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsGenericDOMDataNode::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
   return NS_OK;
 }
@@ -846,52 +846,6 @@ nsGenericDOMDataNode::SplitText(PRUint32 aOffset, nsIDOMText** aReturn)
   return rv;
 }
 
-//----------------------------------------------------------------------
-
-// Implementation of the nsGenericDOMDataNode nsIDOM3Text tearoff
-
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsText3Tearoff)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsText3Tearoff)
-  NS_INTERFACE_MAP_ENTRY(nsIDOM3Text)
-NS_INTERFACE_MAP_END_AGGREGATED(mNode)
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsText3Tearoff)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mNode)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsText3Tearoff)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mNode, nsIContent)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsText3Tearoff)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsText3Tearoff)
-
-NS_IMETHODIMP
-nsText3Tearoff::GetIsElementContentWhitespace(PRBool *aReturn)
-{
-  *aReturn = mNode->IsElementContentWhitespace();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsText3Tearoff::GetWholeText(nsAString& aWholeText)
-{
-  return mNode->GetWholeText(aWholeText);
-}
-
-NS_IMETHODIMP
-nsText3Tearoff::ReplaceWholeText(const nsAString& aContent,
-                                 nsIDOMText **aReturn)
-{
-  nsresult rv;
-  nsIContent* result = mNode->ReplaceWholeText(PromiseFlatString(aContent),
-                                               &rv);
-  return result ? CallQueryInterface(result, aReturn) : rv;
-}
-
-// Implementation of the nsIDOM3Text interface
-
 /* static */ PRInt32
 nsGenericDOMDataNode::FirstLogicallyAdjacentTextNode(nsIContent* aParent,
                                                      PRInt32 aIndex)
@@ -918,7 +872,7 @@ nsGenericDOMDataNode::LastLogicallyAdjacentTextNode(nsIContent* aParent,
 }
 
 nsresult
-nsGenericTextNode::GetWholeText(nsAString& aWholeText)
+nsGenericDOMDataNode::GetWholeText(nsAString& aWholeText)
 {
   nsIContent* parent = GetParent();
 
@@ -949,21 +903,21 @@ nsGenericTextNode::GetWholeText(nsAString& aWholeText)
   return NS_OK;
 }
 
-nsIContent*
-nsGenericTextNode::ReplaceWholeText(const nsAFlatString& aContent,
-                                    nsresult* aResult)
+nsresult
+nsGenericDOMDataNode::ReplaceWholeText(const nsAString& aContent,
+                                       nsIDOMText **aResult)
 {
-  *aResult = NS_OK;
+  *aResult = nsnull;
 
   // Handle parent-less nodes
   nsCOMPtr<nsIContent> parent = GetParent();
   if (!parent) {
     if (aContent.IsEmpty()) {
-      return nsnull;
+      return NS_OK;
     }
 
     SetNodeValue(aContent);
-    return this;
+    return CallQueryInterface(this, aResult);
   }
 
   // We're relying on mozAutoSubtreeModified to keep the doc alive here.
@@ -976,8 +930,7 @@ nsGenericTextNode::ReplaceWholeText(const nsAFlatString& aContent,
   if (index < 0) {
     NS_WARNING("Trying to use .replaceWholeText with an anonymous text node "
                "child of a binding parent?");
-    *aResult = NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-    return nsnull;
+    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
   }
 
   // We don't support entity references or read-only nodes, so remove the
@@ -1016,11 +969,11 @@ nsGenericTextNode::ReplaceWholeText(const nsAFlatString& aContent,
 
   // Empty string means we removed this node too.
   if (aContent.IsEmpty()) {
-    return nsnull;
+    return NS_OK;
   }
 
-  SetText(aContent.get(), aContent.Length(), PR_TRUE);
-  return this;
+  SetText(aContent.BeginReading(), aContent.Length(), PR_TRUE);
+  return CallQueryInterface(this, aResult);
 }
 
 //----------------------------------------------------------------------
diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h
index 3557ac0511e..68ef37e7535 100644
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -46,7 +46,6 @@
 #include "nsIContent.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMEventTarget.h"
-#include "nsIDOM3Text.h"
 #include "nsTextFragment.h"
 #include "nsDOMError.h"
 #include "nsIEventListenerManager.h"
@@ -155,7 +154,7 @@ public:
   virtual PRInt32 IndexOf(nsINode* aPossibleChild) const;
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
   virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent,
@@ -328,7 +327,15 @@ protected:
 
   nsresult SplitText(PRUint32 aOffset, nsIDOMText** aReturn);
 
-  friend class nsText3Tearoff;
+  nsresult GetWholeText(nsAString& aWholeText);
+
+  nsresult ReplaceWholeText(const nsAString& aContent, nsIDOMText **aReturn);
+
+  nsresult GetIsElementContentWhitespace(PRBool *aReturn)
+  {
+    *aReturn = TextIsOnlyWhitespace();
+    return NS_OK;
+  }
 
   static PRInt32 FirstLogicallyAdjacentTextNode(nsIContent* aParent,
                                                 PRInt32 aIndex);
@@ -360,45 +367,6 @@ private:
   already_AddRefed<nsIAtom> GetCurrentValueAtom();
 };
 
-class nsGenericTextNode : public nsGenericDOMDataNode
-{
-public:
-  nsGenericTextNode(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericDOMDataNode(aNodeInfo)
-  {
-  }
-
-  PRBool IsElementContentWhitespace()
-  {
-    return TextIsOnlyWhitespace();
-  }
-  nsresult GetWholeText(nsAString& aWholeText);
-
-  nsIContent* ReplaceWholeText(const nsAFlatString& aContent,
-                               nsresult *aResult);
-};
-
-/** Tearoff class for the nsIDOM3Text portion of nsGenericDOMDataNode. */
-class nsText3Tearoff : public nsIDOM3Text
-{
-public:
-  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-
-  NS_DECL_NSIDOM3TEXT
-
-  NS_DECL_CYCLE_COLLECTION_CLASS(nsText3Tearoff)
-
-  nsText3Tearoff(nsGenericTextNode *aNode) : mNode(aNode)
-  {
-  }
-
-protected:
-  virtual ~nsText3Tearoff() {}
-
-private:
-  nsRefPtr<nsGenericTextNode> mNode;
-};
-
 //----------------------------------------------------------------------
 
 /**
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 0a68cfa8d07..34bc4c06304 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -94,14 +94,10 @@
 #include "nsXBLBinding.h"
 #include "nsIXBLService.h"
 #include "nsPIDOMWindow.h"
-#include "nsIBoxObject.h"
 #include "nsPIBoxObject.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMNSElement.h"
 #include "nsClientRect.h"
-#ifdef MOZ_SVG
 #include "nsSVGUtils.h"
-#endif
 #include "nsLayoutUtils.h"
 #include "nsGkAtoms.h"
 #include "nsContentUtils.h"
@@ -149,9 +145,7 @@
 #include "nsTPtrArray.h"
 #include "prprf.h"
 
-#ifdef MOZ_SVG
 #include "nsSVGFeatures.h"
-#endif /* MOZ_SVG */
 
 using namespace mozilla::dom;
 namespace css = mozilla::css;
@@ -3663,14 +3657,13 @@ nsINode::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
 }
 
 nsresult
-nsGenericElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsGenericElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
   nsCOMPtr<nsIContent> oldKid = mAttrsAndChildren.GetSafeChildAt(aIndex);
   NS_ASSERTION(oldKid == GetChildAt(aIndex), "Unexpected child in RemoveChildAt");
 
   if (oldKid) {
-    return doRemoveChildAt(aIndex, aNotify, oldKid, mAttrsAndChildren,
-                           aMutationEvent);
+    return doRemoveChildAt(aIndex, aNotify, oldKid, mAttrsAndChildren);
   }
 
   return NS_OK;
@@ -3678,8 +3671,7 @@ nsGenericElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutatio
 
 nsresult
 nsINode::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify,
-                         nsIContent* aKid, nsAttrAndChildArray& aChildArray,
-                         PRBool aMutationEvent)
+                         nsIContent* aKid, nsAttrAndChildArray& aChildArray)
 {
   NS_PRECONDITION(aKid && aKid->GetNodeParent() == this &&
                   aKid == GetChildAt(aIndex) &&
@@ -3991,10 +3983,10 @@ PRBool IsAllowedAsChild(nsIContent* aNewChild, PRUint16 aNewNodeType,
 void
 nsGenericElement::FireNodeInserted(nsIDocument* aDoc,
                                    nsINode* aParent,
-                                   nsCOMArray<nsIContent>& aNodes)
+                                   nsTArray<nsCOMPtr<nsIContent> >& aNodes)
 {
-  PRInt32 count = aNodes.Count();
-  for (PRInt32 i = 0; i < count; ++i) {
+  PRUint32 count = aNodes.Length();
+  for (PRUint32 i = 0; i < count; ++i) {
     nsIContent* childContent = aNodes[i];
 
     if (nsContentUtils::HasMutationListeners(childContent,
@@ -4159,57 +4151,18 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
 
     // Copy the children into a separate array to avoid having to deal with
     // mutations to the fragment while we're inserting.
-    nsCOMArray<nsIContent> fragChildren;
-    if (!fragChildren.SetCapacity(count)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
-    PRUint32 i;
-    for (i = 0; i < count; i++) {
+    nsAutoTArray<nsCOMPtr<nsIContent>, 50> fragChildren;
+    fragChildren.SetCapacity(count);
+    for (PRUint32 i = 0; i < count; i++) {
       nsIContent* child = newContent->GetChildAt(i);
       NS_ASSERTION(child->GetCurrentDoc() == nsnull,
                    "How did we get a child with a current doc?");
-      fragChildren.AppendObject(child);
+      fragChildren.AppendElement(child);
     }
 
-    // Remove the children from the fragment and flag for possible mutations.
-    PRBool mutated = PR_FALSE;
-    for (i = count; i > 0;) {
-      // We don't need to update i if someone mutates the DOM. The only thing
-      // that'd happen is that the resulting child list might be unexpected,
-      // but we should never crash since RemoveChildAt is out-of-bounds safe.
-      nsMutationGuard guard;
+    // Remove the children from the fragment.
+    for (PRUint32 i = count; i > 0;) {
       newContent->RemoveChildAt(--i, PR_TRUE);
-      mutated = mutated || guard.Mutated(1);
-    }
-
-    // If we've had any unexpected 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];
-        if (!HasSameOwnerDoc(childContent) ||
-            doc != childContent->GetOwnerDoc()) {
-          return NS_ERROR_DOM_WRONG_DOCUMENT_ERR;
-        }
-
-        nsCOMPtr<nsIDOMNode> tmpNode = do_QueryInterface(childContent);
-        PRUint16 tmpType = 0;
-        tmpNode->GetNodeType(&tmpType);
-
-        if (childContent->GetNodeParent() ||
-            !IsAllowedAsChild(childContent, tmpType, this, PR_FALSE,
-                              refContent)) {
-          return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
-        }
-      }
-
-      insPos = refContent ? IndexOf(refContent) : 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 =
@@ -4219,12 +4172,10 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
 
     // Iterate through the fragment's children, and insert them in the new
     // parent
-    for (i = 0; i < count; ++i, ++insPos) {
-      nsIContent* childContent = fragChildren[i];
-
+    for (PRUint32 i = 0; i < count; ++i, ++insPos) {
       // XXXbz how come no reparenting here?  That seems odd...
       // Insert the child.
-      res = InsertChildAt(childContent, insPos, PR_FALSE);
+      res = InsertChildAt(fragChildren[i], insPos, !appending);
       if (NS_FAILED(res)) {
         // Make sure to notify on any children that we did succeed to insert
         if (appending && i != 0) {
@@ -4234,22 +4185,17 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
         }
         return res;
       }
-
-      if (!appending) {
-        nsNodeUtils::ContentInserted(this, childContent, insPos);
-      }
     }
 
-    // Notify
+    // Notify and fire mutation events when appending
     if (appending) {
       nsNodeUtils::ContentAppended(static_cast<nsIContent*>(this),
                                    firstInsertedContent, firstInsPos);
-    }
-
-    // Fire mutation events. Optimize for the case when there are no listeners
-    if (nsContentUtils::
-          HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
-      nsGenericElement::FireNodeInserted(doc, this, fragChildren);
+      // Optimize for the case when there are no listeners
+      if (nsContentUtils::
+            HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
+        nsGenericElement::FireNodeInserted(doc, this, fragChildren);
+      }
     }
   }
   else {
@@ -4629,7 +4575,7 @@ nsGenericElement::SetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
 
   // Hold a script blocker while calling ParseAttribute since that can call
   // out to id-observers
-  nsAutoRemovableScriptBlocker scriptBlocker;
+  nsAutoScriptBlocker scriptBlocker;
 
   nsAttrValue attrValue;
   if (!ParseAttribute(aNamespaceID, aName, aValue, attrValue)) {
diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h
index 35869244f97..59aa562962d 100644
--- a/content/base/src/nsGenericElement.h
+++ b/content/base/src/nsGenericElement.h
@@ -329,7 +329,7 @@ public:
   virtual PRInt32 IndexOf(nsINode* aPossibleChild) const;
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
   virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent,
@@ -596,7 +596,7 @@ public:
    */
   static void FireNodeInserted(nsIDocument* aDoc,
                                nsINode* aParent,
-                               nsCOMArray<nsIContent>& aNodes);
+                               nsTArray<nsCOMPtr<nsIContent> >& aNodes);
 
   /**
    * Helper methods for implementing querySelector/querySelectorAll
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index 72c5cbac91d..ed3769ea08f 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -1097,7 +1097,6 @@ GK_ATOM(z_index, "z-index")
 GK_ATOM(zeroDigit, "zero-digit")
 
 
-#ifdef MOZ_SVG
 GK_ATOM(percentage, "%")
 GK_ATOM(A, "A")
 GK_ATOM(alignment_baseline, "alignment-baseline")
@@ -1347,13 +1346,13 @@ GK_ATOM(x, "x")
 GK_ATOM(x1, "x1")
 GK_ATOM(x2, "x2")
 GK_ATOM(xChannelSelector, "xChannelSelector")
+GK_ATOM(xor_, "xor")
 GK_ATOM(y, "y")
 GK_ATOM(y1, "y1")
 GK_ATOM(y2, "y2")
 GK_ATOM(yChannelSelector, "yChannelSelector")
 GK_ATOM(z, "z")
 GK_ATOM(zoomAndPan, "zoomAndPan")
-#endif
 
 #ifdef MOZ_SMIL
 GK_ATOM(accumulate, "accumulate")
@@ -1670,10 +1669,6 @@ GK_ATOM(xref_, "xref")
 GK_ATOM(math, "math") // the only one without an underscore
 #endif
 
-#if defined(MOZ_SVG) || defined(MOZ_MATHML)
-GK_ATOM(xor_, "xor")
-#endif
-
 #ifndef DISABLE_XFORMS_HOOKS
 GK_ATOM(avg, "avg")
 GK_ATOM(booleanFromString, "boolean-from-string")
@@ -1774,7 +1769,6 @@ GK_ATOM(viewportFrame, "ViewportFrame")
 #ifdef MOZ_XUL
 GK_ATOM(XULLabelFrame, "XULLabelFrame")
 #endif
-#ifdef MOZ_SVG
 GK_ATOM(svgAFrame, "SVGAFrame")
 GK_ATOM(svgClipPathFrame, "SVGClipPathFrame")
 GK_ATOM(svgDefsFrame, "SVGDefsFrame")
@@ -1799,7 +1793,6 @@ GK_ATOM(svgTextFrame, "SVGTextFrame")
 GK_ATOM(svgTextPathFrame, "SVGTextPathFrame")
 GK_ATOM(svgTSpanFrame, "SVGTSpanFrame")
 GK_ATOM(svgUseFrame, "SVGUseFrame")
-#endif
 #ifdef MOZ_MEDIA
 GK_ATOM(HTMLVideoFrame, "VideoFrame")
 GK_ATOM(onloadstart, "onloadstart")
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index c499adbd4ee..8d7a5004cf7 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -76,9 +76,7 @@
 #include "nsContentPolicyUtils.h"
 #include "nsEventDispatcher.h"
 #include "nsDOMClassInfo.h"
-#ifdef MOZ_SVG
 #include "nsSVGEffects.h"
-#endif
 
 #include "mozAutoDocUpdate.h"
 
@@ -358,10 +356,8 @@ nsImageLoadingContent::OnStopDecode(imgIRequest* aRequest,
     FireEvent(NS_LITERAL_STRING("error"));
   }
 
-#ifdef MOZ_SVG
   nsCOMPtr<nsINode> thisNode = do_QueryInterface(this);
   nsSVGEffects::InvalidateDirectRenderingObservers(thisNode->AsElement());
-#endif
 
   return NS_OK;
 }
diff --git a/content/base/src/nsNameSpaceManager.cpp b/content/base/src/nsNameSpaceManager.cpp
index 34350285aa1..6cbeedc6741 100644
--- a/content/base/src/nsNameSpaceManager.cpp
+++ b/content/base/src/nsNameSpaceManager.cpp
@@ -268,9 +268,7 @@ NameSpaceManagerImpl::HasElementCreator(PRInt32 aNameSpaceID)
 #ifdef MOZ_MATHML
          aNameSpaceID == kNameSpaceID_MathML ||
 #endif
-#ifdef MOZ_SVG
          aNameSpaceID == kNameSpaceID_SVG ||
-#endif
          aNameSpaceID == kNameSpaceID_XMLEvents ||
          PR_FALSE;
 }
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 877e49be598..f60961b52fe 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -1497,11 +1497,8 @@ nsObjectLoadingContent::GetCapabilities() const
 {
   return eSupportImages |
          eSupportPlugins |
-         eSupportDocuments
-#ifdef MOZ_SVG
-         | eSupportSVG
-#endif
-         ;
+         eSupportDocuments |
+         eSupportSVG;
 }
 
 void
@@ -1706,12 +1703,8 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType)
     return eType_Image;
   }
 
-#ifdef MOZ_SVG
   PRBool isSVG = aMIMEType.LowerCaseEqualsLiteral("image/svg+xml");
   PRBool supportedSVG = isSVG && (caps & eSupportSVG);
-#else
-  PRBool supportedSVG = PR_FALSE;
-#endif
   if (((caps & eSupportDocuments) || supportedSVG) &&
       IsSupportedDocument(aMIMEType)) {
     return eType_Document;
diff --git a/content/base/src/nsObjectLoadingContent.h b/content/base/src/nsObjectLoadingContent.h
index 68559d662da..aa676b69910 100644
--- a/content/base/src/nsObjectLoadingContent.h
+++ b/content/base/src/nsObjectLoadingContent.h
@@ -195,9 +195,7 @@ class nsObjectLoadingContent : public nsImageLoadingContent
       eSupportDocuments = PR_BIT(2), // Documents are supported
                                      // (nsIDocumentLoaderFactory)
                                      // This flag always includes SVG
-#ifdef MOZ_SVG
       eSupportSVG       = PR_BIT(3), // SVG is supported (image/svg+xml)
-#endif
       eSupportClassID   = PR_BIT(4), // The classid attribute is supported
       eOverrideServerType = PR_BIT(5) // The server-sent MIME type is ignored
                                       // (ignored if no type is specified)
diff --git a/content/base/src/nsPlainTextSerializer.cpp b/content/base/src/nsPlainTextSerializer.cpp
index 6914b94efb3..2adeab9ba7e 100644
--- a/content/base/src/nsPlainTextSerializer.cpp
+++ b/content/base/src/nsPlainTextSerializer.cpp
@@ -58,7 +58,9 @@
 #include "nsCRT.h"
 #include "nsIParserService.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 #define PREF_STRUCTS "converter.html2txt.structs"
@@ -206,28 +208,27 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn,
 
   if (mFlags & nsIDocumentEncoder::OutputFormatted) {
     // Get some prefs that controls how we do formatted output
-    mStructs = nsContentUtils::GetBoolPref(PREF_STRUCTS, mStructs);
+    mStructs = Preferences::GetBool(PREF_STRUCTS, mStructs);
 
     mHeaderStrategy =
-      nsContentUtils::GetIntPref(PREF_HEADER_STRATEGY, mHeaderStrategy);
+      Preferences::GetInt(PREF_HEADER_STRATEGY, mHeaderStrategy);
 
     // The quotesPreformatted pref is a temporary measure. See bug 69638.
     mQuotesPreformatted =
-      nsContentUtils::GetBoolPref("editor.quotesPreformatted",
-                                  mQuotesPreformatted);
+      Preferences::GetBool("editor.quotesPreformatted", mQuotesPreformatted);
 
     // DontWrapAnyQuotes is set according to whether plaintext mail
     // is wrapping to window width -- see bug 134439.
     // We'll only want this if we're wrapping and formatted.
     if (mFlags & nsIDocumentEncoder::OutputWrap || mWrapColumn > 0) {
       mDontWrapAnyQuotes =
-        nsContentUtils::GetBoolPref("mail.compose.wrap_to_window_width",
-                                    mDontWrapAnyQuotes);
+        Preferences::GetBool("mail.compose.wrap_to_window_width",
+                             mDontWrapAnyQuotes);
     }
   }
 
   // XXX We should let the caller pass this in.
-  if (nsContentUtils::GetBoolPref("browser.frames.enabled")) {
+  if (Preferences::GetBool("browser.frames.enabled")) {
     mFlags &= ~nsIDocumentEncoder::OutputNoFramesContent;
   }
   else {
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 99d2bf9c527..13035ba8248 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -46,7 +46,6 @@
 #include "nsReadableUtils.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
diff --git a/content/base/src/nsStyledElement.cpp b/content/base/src/nsStyledElement.cpp
index 3c1a522db1f..27f1dc60ffd 100644
--- a/content/base/src/nsStyledElement.cpp
+++ b/content/base/src/nsStyledElement.cpp
@@ -52,10 +52,7 @@
 #include "mozilla/css/Loader.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsXULElement.h"
-
-#ifdef MOZ_SVG
 #include "nsIDOMSVGStylable.h"
-#endif
 
 namespace css = mozilla::css;
 
@@ -136,7 +133,7 @@ nsStyledElementNotElementCSSInlineStyle::UnsetAttr(PRInt32 aNameSpaceID,
                                                    nsIAtom* aAttribute,
                                                    PRBool aNotify)
 {
-  nsAutoRemovableScriptBlocker scriptBlocker;
+  nsAutoScriptBlocker scriptBlocker;
   if (aAttribute == nsGkAtoms::id && aNameSpaceID == kNameSpaceID_None) {
     // Have to do this before clearing flag. See RemoveFromIdTable
     RemoveFromIdTable();
diff --git a/content/base/src/nsTextNode.cpp b/content/base/src/nsTextNode.cpp
index c3dc9be6da1..ed5bb2e2d1d 100644
--- a/content/base/src/nsTextNode.cpp
+++ b/content/base/src/nsTextNode.cpp
@@ -40,7 +40,6 @@
  */
 
 #include "nsTextNode.h"
-#include "nsIDOM3Text.h"
 #include "nsContentUtils.h"
 #include "nsIDOMEventListener.h"
 #include "nsIDOMEventTarget.h"
@@ -142,7 +141,7 @@ NS_NewTextNode(nsIContent** aInstancePtrResult,
 }
 
 nsTextNode::nsTextNode(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericTextNode(aNodeInfo)
+  : nsGenericDOMDataNode(aNodeInfo)
 {
 }
 
@@ -159,7 +158,6 @@ DOMCI_NODE_DATA(Text, nsTextNode)
 NS_INTERFACE_TABLE_HEAD(nsTextNode)
   NS_NODE_INTERFACE_TABLE3(nsTextNode, nsIDOMNode, nsIDOMText,
                            nsIDOMCharacterData)
-  NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Text, new nsText3Tearoff(this))
   NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsTextNode)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Text)
 NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode)
diff --git a/content/base/src/nsTextNode.h b/content/base/src/nsTextNode.h
index c68a6f63a57..c37107a9f8e 100644
--- a/content/base/src/nsTextNode.h
+++ b/content/base/src/nsTextNode.h
@@ -41,7 +41,6 @@
 
 #include "nsGenericDOMDataNode.h"
 #include "nsIDOMText.h"
-#include "nsIDOM3Text.h"
 #include "nsContentUtils.h"
 #include "nsIDOMEventListener.h"
 #include "nsIDOMEventTarget.h"
@@ -53,7 +52,7 @@
 /**
  * Class used to implement DOM text nodes
  */
-class nsTextNode : public nsGenericTextNode,
+class nsTextNode : public nsGenericDOMDataNode,
                    public nsIDOMText
 {
 public:
diff --git a/content/base/src/nsWebSocket.cpp b/content/base/src/nsWebSocket.cpp
index 9fe8a2fbe9f..dd349278ab9 100644
--- a/content/base/src/nsWebSocket.cpp
+++ b/content/base/src/nsWebSocket.cpp
@@ -75,6 +75,7 @@
 #include "nsIWebSocketProtocol.h"
 #include "nsILoadGroup.h"
 #include "nsIRequest.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -902,7 +903,7 @@ nsWebSocket::CreateAndDispatchCloseEvent(PRBool aWasClean)
 PRBool
 nsWebSocket::PrefEnabled()
 {
-  return nsContentUtils::GetBoolPref("network.websocket.enabled", PR_TRUE);
+  return Preferences::GetBool("network.websocket.enabled", PR_TRUE);
 }
 
 void
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 5b8395f1721..77e7d4b8fb9 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -426,7 +426,8 @@ nsXMLHttpRequest::nsXMLHttpRequest()
     mErrorLoad(PR_FALSE), mTimerIsActive(PR_FALSE),
     mProgressEventWasDelayed(PR_FALSE),
     mLoadLengthComputable(PR_FALSE), mLoadTotal(0),
-    mFirstStartRequestSeen(PR_FALSE)
+    mFirstStartRequestSeen(PR_FALSE),
+    mResultArrayBuffer(nsnull) 
 {
   mResponseBodyUnicode.SetIsVoid(PR_TRUE);
   nsLayoutStatics::AddRef();
@@ -450,6 +451,12 @@ nsXMLHttpRequest::~nsXMLHttpRequest()
   nsLayoutStatics::Release();
 }
 
+void
+nsXMLHttpRequest::RootResultArrayBuffer()
+{
+  nsContentUtils::PreserveWrapper(static_cast<nsPIDOMEventTarget*>(this), this);
+}
+
 /**
  * This Init method is called from the factory constructor.
  */
@@ -572,9 +579,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXMLHttpRequest,
                                                        nsIXMLHttpRequestUpload)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXMLHttpRequest,
                                                 nsXHREventTarget)
+  tmp->mResultArrayBuffer = nsnull;
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mContext)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mChannel)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mReadRequest)
@@ -592,6 +599,14 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXMLHttpRequest,
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mUpload)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(nsXMLHttpRequest,
+                                               nsXHREventTarget)
+  if(tmp->mResultArrayBuffer) {
+    NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(tmp->mResultArrayBuffer,
+                                               "mResultArrayBuffer")
+  }
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
 DOMCI_DATA(XMLHttpRequest, nsXMLHttpRequest)
 
 // QueryInterface implementation for nsXMLHttpRequest
@@ -839,27 +854,20 @@ NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)
   return rv;
 }
 
-nsresult nsXMLHttpRequest::GetResponseArrayBuffer(jsval *aResult)
+nsresult nsXMLHttpRequest::CreateResponseArrayBuffer(JSContext *aCx)
 {
-  JSContext *cx = nsContentUtils::GetCurrentJSContext();
-  if (!cx)
+  if (!aCx)
     return NS_ERROR_FAILURE;
 
-  if (!(mState & (XML_HTTP_REQUEST_DONE |
-                  XML_HTTP_REQUEST_LOADING))) {
-    *aResult = JSVAL_NULL;
-    return NS_OK;
-  }
-
   PRInt32 dataLen = mResponseBody.Length();
-  JSObject *obj = js_CreateArrayBuffer(cx, dataLen);
-  if (!obj)
+  RootResultArrayBuffer();
+  mResultArrayBuffer = js_CreateArrayBuffer(aCx, dataLen);
+  if (!mResultArrayBuffer) {
     return NS_ERROR_FAILURE;
-
-  *aResult = OBJECT_TO_JSVAL(obj);
+  }
 
   if (dataLen > 0) {
-    js::ArrayBuffer *abuf = js::ArrayBuffer::fromJSObject(obj);
+    js::ArrayBuffer *abuf = js::ArrayBuffer::fromJSObject(mResultArrayBuffer);
     NS_ASSERTION(abuf, "What happened?");
     memcpy(abuf->data, mResponseBody.BeginReading(), dataLen);
   }
@@ -954,7 +962,11 @@ NS_IMETHODIMP nsXMLHttpRequest::GetResponse(JSContext *aCx, jsval *aResult)
 
   case XML_HTTP_RESPONSE_TYPE_ARRAYBUFFER:
     if (mState & XML_HTTP_REQUEST_DONE) {
-      rv = GetResponseArrayBuffer(aResult);
+      if (!mResultArrayBuffer) {  
+         rv = CreateResponseArrayBuffer(aCx);
+         NS_ENSURE_SUCCESS(rv, rv);
+      }
+      *aResult = OBJECT_TO_JSVAL(mResultArrayBuffer);
     } else {
       *aResult = JSVAL_NULL;
     }
@@ -1073,7 +1085,8 @@ nsXMLHttpRequest::Abort()
   mResponseBodyUnicode.SetIsVoid(PR_TRUE);
   mResponseBlob = nsnull;
   mState |= XML_HTTP_REQUEST_ABORTED;
-
+  mResultArrayBuffer = nsnull;
+  
   if (!(mState & (XML_HTTP_REQUEST_UNSENT |
                   XML_HTTP_REQUEST_OPENED |
                   XML_HTTP_REQUEST_DONE))) {
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index 2ab09881ed2..8ee3039d738 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -208,11 +208,11 @@ public:
 
   void SetRequestObserver(nsIRequestObserver* aObserver);
 
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsXMLHttpRequest,
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(nsXMLHttpRequest,
                                            nsXHREventTarget)
-
   PRBool AllowUploadProgress();
-
+  void RootResultArrayBuffer();
+  
 protected:
   friend class nsMultipartProxyListener;
 
@@ -224,7 +224,7 @@ protected:
                 PRUint32 toOffset,
                 PRUint32 count,
                 PRUint32 *writeCount);
-  nsresult GetResponseArrayBuffer(jsval *aResult);
+  nsresult CreateResponseArrayBuffer(JSContext* aCx);
   void CreateResponseBlob(nsIRequest *request);
   // Change the state of the object with this. The broadcast argument
   // determines if the onreadystatechange listener should be called.
@@ -345,6 +345,8 @@ protected:
   
   nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback;
   nsCOMPtr<nsIChannel> mNewRedirectChannel;
+  
+  JSObject* mResultArrayBuffer;
 };
 
 // helper class to expose a progress DOM Event
diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html
index 9052729e6b5..4f370b34969 100644
--- a/content/base/test/test_XHR.html
+++ b/content/base/test/test_XHR.html
@@ -134,6 +134,16 @@ ab = xhr.response;
 ok(ab != null, "should have a non-null arraybuffer");
 arraybuffer_equals_to(ab, "\xaa\xee\0\x03\xff\xff\xff\xff\xbb\xbb\xbb\xbb");
 
+// test array buffer GetResult returns the same object
+xhr = new XMLHttpRequest();
+xhr.open("GET", 'file_XHR_binary1.bin', false); 
+xhr.responseType = 'arraybuffer';
+xhr.send(null)
+is(xhr.status, 200, "wrong status");
+checkResponseTextAccessThrows(xhr);
+checkResponseXMLAccessThrows(xhr);
+is(xhr.response, xhr.response, "returns the same ArrayBuffer");
+
 // test response (responseType='blob')
 var onloadCount = 0;
 function checkOnloadCount() {
diff --git a/content/base/test/test_classList.html b/content/base/test/test_classList.html
index 37329e32bfa..9e19e552485 100644
--- a/content/base/test/test_classList.html
+++ b/content/base/test/test_classList.html
@@ -165,22 +165,17 @@ function testClassList(e) {
 
   // item() method
 
-  // TODO out of bounds array indexing should return undefined according to the
-  // WebIDL spec. They are returning an empty string at the moment. (bug 529328)
-  var OOB_VALUE = "";
-  todo_is(OOB_VALUE, undefined, "Wrong out of bounds value");
-
   e.setAttribute("class", "a");
   is(e.classList.item(-1), null, "wrong classList.item() result");
-  is(e.classList[-1], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[-1], undefined, "wrong classList[] result");
   is(e.classList.item(0), "a", "wrong classList.item() result");
-  is(e.classList[0], "a", "wrong classList.item() result");
+  is(e.classList[0], "a", "wrong classList[] result");
   is(e.classList.item(1), null, "wrong classList.item() result");
-  is(e.classList[1], OOB_VALUE, "wrong classList.item() result");
+  is(e.classList[1], undefined, "wrong classList[] result");
 
   e.setAttribute("class", "aa AA aa");
   is(e.classList.item(-1), null, "wrong classList.item() result");
-  is(e.classList[-1], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[-1], undefined, "wrong classList[] result");
   is(e.classList.item(0), "aa", "wrong classList.item() result");
   is(e.classList[0], "aa", "wrong classList[] result");
   is(e.classList.item(1), "AA", "wrong classList.item() result");
@@ -188,22 +183,21 @@ function testClassList(e) {
   is(e.classList.item(2), "aa", "wrong classList.item() result");
   is(e.classList[2], "aa", "wrong classList[] result");
   is(e.classList.item(3), null, "wrong classList.item() result");
-  is(e.classList[3], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[3], undefined, "wrong classList[] result");
   is(e.classList.item(0xffffffff), null, "wrong classList.item() result");
-  // XXX returns undefined for index >= 0xffffffff
-  todo_is(e.classList[0xffffffff], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[0xffffffff], undefined, "wrong classList[] result");
   is(e.classList.item(0xfffffffe), null, "wrong classList.item() result");
-  is(e.classList[0xffffffe], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[0xffffffe], undefined, "wrong classList[] result");
 
   e.setAttribute("class", "a b");
   is(e.classList.item(-1), null, "wrong classList.item() result");
-  is(e.classList[-1], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[-1], undefined, "wrong classList[] result");
   is(e.classList.item(0), "a", "wrong classList.item() result");
   is(e.classList[0], "a", "wrong classList[] result");
   is(e.classList.item(1), "b", "wrong classList.item() result");
   is(e.classList[1], "b", "wrong classList[] result");
   is(e.classList.item(2), null, "wrong classList.item() result");
-  is(e.classList[2], OOB_VALUE, "wrong classList[] result");
+  is(e.classList[2], undefined, "wrong classList[] result");
 
   // contains() method
 
diff --git a/content/base/test/test_text_replaceWholeText.html b/content/base/test/test_text_replaceWholeText.html
index 0fbe28e883b..780a1b6f962 100644
--- a/content/base/test/test_text_replaceWholeText.html
+++ b/content/base/test/test_text_replaceWholeText.html
@@ -25,7 +25,6 @@ SimpleTest.waitForExplicitFinish();
 
 var xmlDoc;
 
-function entity(n) { return xmlDoc.createEntityReference(n); }
 function text(t) { return document.createTextNode(t); }
 function element() { return document.createElement("div"); }
 function cdata(t)
@@ -233,20 +232,6 @@ function endTests()
   is(outer.lastChild, first, "should be no more text at end");
 }
 
-function entityTests()
-{
-  todo_isnot(entity("bar"), null,
-             "need implementation update if we ever support entity nodes!");
-
-  var root = xmlDoc.documentElement;
-  is(root.lastChild.firstChild.nodeType, Node.TEXT_NODE,
-     "uh-oh, did we start supporting entity references as nodes?");
-  is(root.lastChild.lastChild.nodeType, Node.ELEMENT_NODE,
-     "uh-oh, did we start supporting entity references as nodes?");
-
-  // If any of the above ever fails, add tests here!
-}
-
 function test()
 {
   try
@@ -254,7 +239,6 @@ function test()
     startTests();
     middleTests();
     endTests();
-    entityTests();
   }
   catch (e)
   {
diff --git a/content/base/test/test_text_wholeText.html b/content/base/test/test_text_wholeText.html
index 70b1ab4c6e4..35513d49832 100644
--- a/content/base/test/test_text_wholeText.html
+++ b/content/base/test/test_text_wholeText.html
@@ -25,7 +25,6 @@ SimpleTest.waitForExplicitFinish();
 
 var xmlDoc;
 
-function entity(n) { return xmlDoc.createEntityReference(n); }
 function text(t) { return document.createTextNode(t); }
 function element() { return document.createElement("div"); }
 function cdata(t)
@@ -207,20 +206,6 @@ function noParentTests()
      "orphaned cdatasection should have wholeText == data");
 }
 
-function entityTests()
-{
-  todo_isnot(entity("bar"), null,
-             "need implementation update if we ever support entity nodes!");
-
-  var root = xmlDoc.documentElement;
-  is(root.lastChild.firstChild.nodeType, Node.TEXT_NODE,
-     "uh-oh, did we start supporting entity references as nodes?");
-  is(root.lastChild.lastChild.nodeType, Node.ELEMENT_NODE,
-     "uh-oh, did we start supporting entity references as nodes?");
-
-  // If any of the above ever fails, add tests here!
-}
-
 function tests()
 {
   try
@@ -229,7 +214,6 @@ function tests()
     middleTests();
     lastTests();
     noParentTests();
-    entityTests();
   }
   catch (e)
   {
diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index 1cd821a6cb6..d39e496389f 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -64,9 +64,7 @@
 
 #include "gfxCrashReporterUtils.h"
 
-#ifdef MOZ_SVG
 #include "nsSVGEffects.h"
-#endif
 
 #include "prenv.h"
 
@@ -277,9 +275,7 @@ WebGLContext::Invalidate()
     if (!mCanvasElement)
         return;
 
-#ifdef MOZ_SVG
     nsSVGEffects::InvalidateDirectRenderingObservers(HTMLCanvasElement());
-#endif
 
     mInvalidated = PR_TRUE;
     HTMLCanvasElement()->InvalidateCanvasContent(nsnull);
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 245d51d934c..976d890cfaf 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -536,11 +536,9 @@ protected:
     {
         ContextState& state = CurrentState();
 
-        // The spec says we should not draw shadows when the alpha value is 0,
-        // regardless of the operator being used.
         return state.StyleIsColor(STYLE_SHADOW) &&
                NS_GET_A(state.colorStyles[STYLE_SHADOW]) > 0 &&
-               (state.shadowOffset != gfxPoint(0, 0) || state.shadowBlur != 0);
+               mThebes->CurrentOperator() == gfxContext::OPERATOR_OVER;
     }
 
     /**
@@ -1037,9 +1035,7 @@ nsCanvasRenderingContext2D::Redraw()
         return NS_OK;
     }
 
-#ifdef MOZ_SVG
     nsSVGEffects::InvalidateDirectRenderingObservers(HTMLCanvasElement());
-#endif
 
     HTMLCanvasElement()->InvalidateCanvasContent(nsnull);
 
@@ -1064,9 +1060,7 @@ nsCanvasRenderingContext2D::Redraw(const gfxRect& r)
         return NS_OK;
     }
 
-#ifdef MOZ_SVG
     nsSVGEffects::InvalidateDirectRenderingObservers(HTMLCanvasElement());
-#endif
 
     HTMLCanvasElement()->InvalidateCanvasContent(&r);
 
@@ -1430,7 +1424,7 @@ NS_IMETHODIMP
 nsCanvasRenderingContext2D::SetTransform(float m11, float m12, float m21, float m22, float dx, float dy)
 {
     if (!FloatValidate(m11,m12,m21,m22,dx,dy))
-        return NS_ERROR_DOM_SYNTAX_ERR;
+        return NS_OK;
 
     gfxMatrix matrix(m11, m12, m21, m22, dx, dy);
     mThebes->SetMatrix(matrix);
@@ -2097,7 +2091,7 @@ nsCanvasRenderingContext2D::BezierCurveTo(float cp1x, float cp1y,
                                           float x, float y)
 {
     if (!FloatValidate(cp1x,cp1y,cp2x,cp2y,x,y))
-        return NS_ERROR_DOM_SYNTAX_ERR;
+        return NS_OK;
 
     mHasPath = PR_TRUE;
     mThebes->CurveTo(gfxPoint(cp1x, cp1y),
@@ -2111,7 +2105,7 @@ NS_IMETHODIMP
 nsCanvasRenderingContext2D::ArcTo(float x1, float y1, float x2, float y2, float radius)
 {
     if (!FloatValidate(x1,y1,x2,y2,radius))
-        return NS_ERROR_DOM_SYNTAX_ERR;
+        return NS_OK;
 
     if (radius < 0)
         return NS_ERROR_DOM_INDEX_SIZE_ERR;
diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index fa508e2cdb3..3d30e9b3d96 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -80,6 +80,7 @@ _TEST_FILES_0 = \
 	test_2d.composite.uncovered.image.source-in.html \
 	test_2d.composite.uncovered.image.source-out.html \
 	test_toDataURL_lowercase_ascii.html \
+	test_toDataURL_parameters.html \
 	test_mozGetAsFile.html \
 	test_canvas_strokeStyle_getter.html \
 	test_bug613794.html \
diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
index 96fb75ea6cf..f75776b24b2 100644
--- a/content/canvas/test/test_canvas.html
+++ b/content/canvas/test/test_canvas.html
@@ -11880,7 +11880,7 @@ isPixel(ctx, 90,45, 0,255,0,255, 0);
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -12393,7 +12393,7 @@ isPixel(ctx, 90,45, 0,255,0,255, 0);
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -18995,7 +18995,7 @@ isPixel(ctx, 50,25, 0,255,0,255, 0);
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -19537,21 +19537,23 @@ var canvas = document.getElementById('c614');
 var ctx = canvas.getContext('2d');
 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
+var _threw = false;
 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");
+  _threw = true;
 }
+ok(!_threw, "Should not throw an exception for invalid args to png encoder");
 
+_threw = false;
 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");
+  _threw = true;
 }
+ok(!_threw, "Should not throw an exception for invalid args to jpeg encoder");
 
 }
 </script>
@@ -20761,7 +20763,7 @@ ok(/^data:image\/png[;,]/.test(data), "data =~ /^data:image\\/png[;,]/");
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -20788,7 +20790,7 @@ ok(/^data:image\/png[;,]/.test(data), "data =~ /^data:image\\/png[;,]/");
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -20816,7 +20818,7 @@ ok(/^data:image\/png[;,]/.test(data), "data =~ /^data:image\\/png[;,]/");
 } catch (e) {
     _thrown_outer = true;
 }
-todo(!_thrown_outer, 'should not throw exception');
+ok(!_thrown_outer, 'should not throw exception');
 
 
 }
@@ -21410,6 +21412,11 @@ function runTests() {
  // they are in these tests
  //test_2d_shadow_composite_3();
  //test_2d_shadow_composite_4();
+ // Shadows should not be drawn if the operator is not source-over (the spec doesn't
+ // say this yet, but it should be changed). These tests assume shadows will
+ // be drawn with operators other than source-over:
+ //test_2d_shadow_composite_1();
+ //test_2d_shadow_composite_2();
  try {
   test_2d_canvas_readonly();
  } catch (e) {
@@ -23795,16 +23802,6 @@ function runTests() {
  } 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_gradient_alpha();
  } catch (e) {
diff --git a/content/canvas/test/test_toDataURL_parameters.html b/content/canvas/test/test_toDataURL_parameters.html
new file mode 100644
index 00000000000..0a58ec3a441
--- /dev/null
+++ b/content/canvas/test/test_toDataURL_parameters.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<title>Canvas test: toDataURL parameters (Bug 564388)</title>
+<script src="/MochiKit/MochiKit.js"></script>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+<body>
+<p>
+This test covers the JPEG quality parameter. If (when) the HTML5 spec changes the
+allowed parameters for ToDataURL, new tests should go here.
+</p>
+<canvas id="c" width="100" height="100"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+var canvas = document.getElementById('c');
+var ctx = canvas.getContext("2d");
+
+ctx.strokeStyle = '#FF0000';
+ctx.fillStyle = '#00FF00';
+ctx.fillRect(0, 0, 100, 100);
+ctx.beginPath();
+ctx.moveTo(10, 10);
+ctx.lineTo(90, 90);
+ctx.stroke();
+
+var pngData = canvas.toDataURL('image/png');
+var pngQuality = canvas.toDataURL('image/png', 0.1);
+is(pngQuality, pngData, "Quality is not supported for PNG images");
+
+var data = canvas.toDataURL('image/jpeg');
+if (data.match(/^data:image\/jpeg[;,]/)) {
+    // Test the JPEG quality parameter
+    
+    var fullQuality = canvas.toDataURL('image/jpeg', 1.0);
+    var lowQuality = canvas.toDataURL('image/jpeg', 0.1);
+    isnot(lowQuality, fullQuality, "A low quality (0.1) should differ from high quality (1.0)");
+    
+    var medQuality = canvas.toDataURL('image/jpeg', 0.5);
+    isnot(medQuality, fullQuality, "A medium quality (0.5) should differ from high (1.0)");
+    isnot(medQuality, lowQuality, "A medium quality (0.5) should differ from low (0.5)");
+    
+    var tooHigh = canvas.toDataURL('image/jpeg', 2.0);
+    is(tooHigh, data, "Quality above 1.0 is treated as unspecified");
+    
+    var tooLow = canvas.toDataURL('image/jpeg', -1.0);
+    is(tooLow, data, "Quality below 0.0 is treated as unspecified");
+    
+    var lowQualityExtra = canvas.toDataURL('image/jpeg', 0.1, 'foo', 'bar', null);
+    is(lowQualityExtra, lowQuality, "Quality applies even if extra arguments are present");
+    
+    var lowQualityUppercase = canvas.toDataURL('IMAGE/JPEG', 0.1);
+    is(lowQualityUppercase, lowQuality, "Quality applies to image/jpeg regardless of case");
+    
+    var lowQualityString = canvas.toDataURL('image/jpeg', '0.1');
+    isnot(lowQualityString, lowQuality, "Quality must be a number (should not be a string)");
+}
+</script>
diff --git a/content/canvas/test/webgl/failing_tests_mac.txt b/content/canvas/test/webgl/failing_tests_mac.txt
index a5025fcda8e..8faf4eab915 100644
--- a/content/canvas/test/webgl/failing_tests_mac.txt
+++ b/content/canvas/test/webgl/failing_tests_mac.txt
@@ -1,4 +1,3 @@
-conformance/canvas-test.html
 conformance/gl-getshadersource.html
 conformance/gl-object-get-calls.html
 conformance/texture-npot.html
diff --git a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
index b1732e7a516..588c6f5744f 100644
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -365,10 +365,6 @@ function start() {
 
   var testsToIgnore = [];
 
-  // canvas-test.html is currently failing on Windows XP test slaves
-  if (kIsWindows && !kIsWindowsVistaOrHigher)
-      testsToIgnore.push('conformance/canvas-test.html');
-
   var testsSuccessful = [];
 
   runTestSuite();
diff --git a/content/events/public/nsIPrivateDOMEvent.h b/content/events/public/nsIPrivateDOMEvent.h
index 1892cda8ec5..a32f1dab949 100644
--- a/content/events/public/nsIPrivateDOMEvent.h
+++ b/content/events/public/nsIPrivateDOMEvent.h
@@ -97,12 +97,10 @@ nsresult
 NS_NewDOMBeforeUnloadEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, nsEvent* aEvent);
 nsresult
 NS_NewDOMPageTransitionEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, nsEvent* aEvent);
-#ifdef MOZ_SVG
 nsresult
 NS_NewDOMSVGEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsEvent* aEvent);
 nsresult
 NS_NewDOMSVGZoomEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsGUIEvent* aEvent);
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
 nsresult
 NS_NewDOMTimeEvent(nsIDOMEvent** aResult, nsPresContext* aPresContext, class nsEvent* aEvent);
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index a04e80e6654..1fa9cee9a5e 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -57,6 +57,9 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIScriptError.h"
 #include "nsDOMPopStateEvent.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static const char* const sEventNames[] = {
   "mousedown", "mouseup", "click", "dblclick", "mouseover",
@@ -76,10 +79,8 @@ static const char* const sEventNames[] = {
   "DOMActivate", "DOMFocusIn", "DOMFocusOut",
   "pageshow", "pagehide", "DOMMouseScroll", "MozMousePixelScroll",
   "offline", "online", "copy", "cut", "paste", "open", "message",
-#ifdef MOZ_SVG
   "SVGLoad", "SVGUnload", "SVGAbort", "SVGError", "SVGResize", "SVGScroll",
   "SVGZoom",
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
   "beginEvent", "endEvent", "repeatEvent",
 #endif // MOZ_SMIL
@@ -774,7 +775,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
                                static_cast<nsUIEvent*>(mEvent)->detail);
       break;
     }
-#ifdef MOZ_SVG
     case NS_SVG_EVENT:
     {
       newEvent = new nsEvent(PR_FALSE, msg);
@@ -789,7 +789,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       newEvent->eventStructType = NS_SVGZOOM_EVENT;
       break;
     }
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
     case NS_SMIL_TIME_EVENT:
     {
@@ -1088,8 +1087,7 @@ nsDOMEvent::PopupAllowedEventsChanged()
     nsMemory::Free(sPopupAllowedEvents);
   }
 
-  nsAdoptingCString str =
-    nsContentUtils::GetCharPref("dom.popup_allowed_events");
+  nsAdoptingCString str = Preferences::GetCString("dom.popup_allowed_events");
 
   // We'll want to do this even if str is empty to avoid looking up
   // this pref all the time if it's not set.
@@ -1265,7 +1263,6 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_open];
   case NS_MESSAGE:
     return sEventNames[eDOMEvents_message];
-#ifdef MOZ_SVG
   case NS_SVG_LOAD:
     return sEventNames[eDOMEvents_SVGLoad];
   case NS_SVG_UNLOAD:
@@ -1280,7 +1277,6 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_SVGScroll];
   case NS_SVG_ZOOM:
     return sEventNames[eDOMEvents_SVGZoom];
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
   case NS_SMIL_BEGIN:
     return sEventNames[eDOMEvents_beginEvent];
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index 18c7a357ac4..92fd8a75fcd 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -138,7 +138,6 @@ public:
     eDOMEvents_paste,
     eDOMEvents_open,
     eDOMEvents_message,
-#ifdef MOZ_SVG
     eDOMEvents_SVGLoad,
     eDOMEvents_SVGUnload,
     eDOMEvents_SVGAbort,
@@ -146,7 +145,6 @@ public:
     eDOMEvents_SVGResize,
     eDOMEvents_SVGScroll,
     eDOMEvents_SVGZoom,
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
     eDOMEvents_beginEvent,
     eDOMEvents_endEvent,
diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp
index 8fbd374a2c3..a1ac1ed1239 100644
--- a/content/events/src/nsDOMTouchEvent.cpp
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -41,6 +41,9 @@
 #include "nsIClassInfo.h"
 #include "nsIXPCScriptable.h"
 #include "nsContentUtils.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 DOMCI_DATA(Touch, nsDOMTouch)
 
@@ -323,7 +326,7 @@ nsDOMTouchEvent::PrefEnabled()
   static PRBool sPrefValue = PR_FALSE;
   if (!sDidCheckPref) {
     sDidCheckPref = PR_TRUE;
-    sPrefValue = nsContentUtils::GetBoolPref("dom.w3c_touch_events.enabled", PR_FALSE);
+    sPrefValue = Preferences::GetBool("dom.w3c_touch_events.enabled", PR_FALSE);
     if (sPrefValue) {
       nsContentUtils::InitializeTouchEventTable();
     }
diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp
index ec2083ed481..65b165e48a1 100644
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -755,14 +755,12 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
     case NS_TEXT_EVENT:
       return NS_NewDOMTextEvent(aDOMEvent, aPresContext,
                                 static_cast<nsTextEvent*>(aEvent));
-#ifdef MOZ_SVG
     case NS_SVG_EVENT:
       return NS_NewDOMSVGEvent(aDOMEvent, aPresContext,
                                aEvent);
     case NS_SVGZOOM_EVENT:
       return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext,
                                    static_cast<nsGUIEvent*>(aEvent));
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
     case NS_SMIL_TIME_EVENT:
       return NS_NewDOMTimeEvent(aDOMEvent, aPresContext, aEvent);
@@ -822,14 +820,12 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
       aEventType.LowerCaseEqualsLiteral("events") ||
       aEventType.LowerCaseEqualsLiteral("htmlevents"))
     return NS_NewDOMEvent(aDOMEvent, aPresContext, nsnull);
-#ifdef MOZ_SVG
   if (aEventType.LowerCaseEqualsLiteral("svgevent") ||
       aEventType.LowerCaseEqualsLiteral("svgevents"))
     return NS_NewDOMSVGEvent(aDOMEvent, aPresContext, nsnull);
   if (aEventType.LowerCaseEqualsLiteral("svgzoomevent") ||
       aEventType.LowerCaseEqualsLiteral("svgzoomevents"))
     return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext, nsnull);
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
   if (aEventType.LowerCaseEqualsLiteral("timeevent") ||
       aEventType.LowerCaseEqualsLiteral("timeevents"))
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index fd690dd712f..af61f10a3ed 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -53,9 +53,7 @@
 #include "nsIDOMCompositionListener.h"
 #include "nsIDOMUIListener.h"
 #include "nsITextControlFrame.h"
-#ifdef MOZ_SVG
 #include "nsGkAtoms.h"
-#endif // MOZ_SVG
 #include "nsPIDOMWindow.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIJSEventListener.h"
@@ -82,7 +80,6 @@
 #include "nsIScriptObjectOwner.h" // for nsIScriptEventHandlerOwner
 #include "nsFocusManager.h"
 #include "nsIDOMElement.h"
-#include "nsIDOMNSDocument.h"
 #include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "nsIDOMEventGroup.h"
@@ -1006,7 +1003,6 @@ nsEventListenerManager::CompileEventHandlerInternal(nsIScriptContext *aContext,
     if (content) {
       nsAutoString handlerBody;
       nsIAtom* attrName = aName;
-#ifdef MOZ_SVG
       if (aName == nsGkAtoms::onSVGLoad)
         attrName = nsGkAtoms::onload;
       else if (aName == nsGkAtoms::onSVGUnload)
@@ -1021,7 +1017,6 @@ nsEventListenerManager::CompileEventHandlerInternal(nsIScriptContext *aContext,
         attrName = nsGkAtoms::onscroll;
       else if (aName == nsGkAtoms::onSVGZoom)
         attrName = nsGkAtoms::onzoom;
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
       else if (aName == nsGkAtoms::onbeginEvent)
         attrName = nsGkAtoms::onbegin;
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 7855bd56aac..b3a167df205 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -78,8 +78,6 @@
 #include "nsIDOMHTMLBodyElement.h"
 #include "nsIDOMXULControlElement.h"
 #include "nsIDOMXULTextboxElement.h"
-#include "nsImageMapUtils.h"
-#include "nsIHTMLDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsIBaseWindow.h"
 #include "nsIView.h"
@@ -96,7 +94,6 @@
 #include "nsIDocShellTreeNode.h"
 #include "nsIWebNavigation.h"
 #include "nsIContentViewer.h"
-#include "nsIPrefBranch2.h"
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
 #endif
@@ -153,11 +150,15 @@
 #include "nsICommandParams.h"
 #include "mozilla/Services.h"
 #include "mozAutoDocUpdate.h"
+#include "nsHTMLLabelElement.h"
+
+#include "mozilla/Preferences.h"
 
 #ifdef XP_MACOSX
 #import <ApplicationServices/ApplicationServices.h>
 #endif
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //#define DEBUG_DOCSHELL_FOCUS
@@ -325,7 +326,7 @@ GetDocumentFromWindow(nsIDOMWindow *aWindow)
 static PRInt32
 GetAccessModifierMaskFromPref(PRInt32 aItemType)
 {
-  PRInt32 accessKey = nsContentUtils::GetIntPref("ui.key.generalAccessKey", -1);
+  PRInt32 accessKey = Preferences::GetInt("ui.key.generalAccessKey", -1);
   switch (accessKey) {
     case -1:                             break; // use the individual prefs
     case nsIDOMKeyEvent::DOM_VK_SHIFT:   return NS_MODIFIER_SHIFT;
@@ -337,9 +338,9 @@ GetAccessModifierMaskFromPref(PRInt32 aItemType)
 
   switch (aItemType) {
   case nsIDocShellTreeItem::typeChrome:
-    return nsContentUtils::GetIntPref("ui.key.chromeAccess", 0);
+    return Preferences::GetInt("ui.key.chromeAccess", 0);
   case nsIDocShellTreeItem::typeContent:
-    return nsContentUtils::GetIntPref("ui.key.contentAccess", 0);
+    return Preferences::GetInt("ui.key.contentAccess", 0);
   default:
     return 0;
   }
@@ -584,7 +585,7 @@ nsMouseWheelTransaction::OnFailToScrollTarget()
 {
   NS_PRECONDITION(sTargetFrame, "We don't have mouse scrolling transaction");
 
-  if (nsContentUtils::GetBoolPref("test.mousescroll", PR_FALSE)) {
+  if (Preferences::GetBool("test.mousescroll", PR_FALSE)) {
     // This event is used for automated tests, see bug 442774.
     nsContentUtils::DispatchTrustedEvent(
                       sTargetFrame->GetContent()->GetOwnerDoc(),
@@ -612,7 +613,7 @@ nsMouseWheelTransaction::OnTimeout(nsITimer* aTimer, void* aClosure)
   // the next DOM event might create strange situation for us.
   EndTransaction();
 
-  if (nsContentUtils::GetBoolPref("test.mousescroll", PR_FALSE)) {
+  if (Preferences::GetBool("test.mousescroll", PR_FALSE)) {
     // This event is used for automated tests, see bug 442774.
     nsContentUtils::DispatchTrustedEvent(
                       frame->GetContent()->GetOwnerDoc(),
@@ -651,15 +652,13 @@ nsMouseWheelTransaction::GetScreenPoint(nsGUIEvent* aEvent)
 PRUint32
 nsMouseWheelTransaction::GetTimeoutTime()
 {
-  return (PRUint32)
-    nsContentUtils::GetIntPref("mousewheel.transaction.timeout", 1500);
+  return Preferences::GetUint("mousewheel.transaction.timeout", 1500);
 }
 
 PRUint32
 nsMouseWheelTransaction::GetIgnoreMoveDelayTime()
 {
-  return (PRUint32)
-    nsContentUtils::GetIntPref("mousewheel.transaction.ignoremovedelay", 100);
+  return Preferences::GetUint("mousewheel.transaction.ignoremovedelay", 100);
 }
 
 PRBool
@@ -708,13 +707,13 @@ nsMouseWheelTransaction::ComputeAcceleratedWheelDelta(PRInt32 aDelta,
 PRInt32
 nsMouseWheelTransaction::GetAccelerationStart()
 {
-  return nsContentUtils::GetIntPref("mousewheel.acceleration.start", -1);
+  return Preferences::GetInt("mousewheel.acceleration.start", -1);
 }
 
 PRInt32
 nsMouseWheelTransaction::GetAccelerationFactor()
 {
-  return nsContentUtils::GetIntPref("mousewheel.acceleration.factor", -1);
+  return Preferences::GetInt("mousewheel.acceleration.factor", -1);
 }
 
 PRInt32
@@ -828,6 +827,31 @@ nsEventStateManager::UpdateUserActivityTimer(void)
   return NS_OK;
 }
 
+static const char* kObservedPrefs[] = {
+  "accessibility.accesskeycausesactivation",
+  "nglayout.events.dispatchLeftClickOnly",
+  "ui.key.generalAccessKey",
+  "ui.key.chromeAccess",
+  "ui.key.contentAccess",
+  "ui.click_hold_context_menus",
+#if 0
+  "mousewheel.withaltkey.action",
+  "mousewheel.withaltkey.numlines",
+  "mousewheel.withaltkey.sysnumlines",
+  "mousewheel.withcontrolkey.action",
+  "mousewheel.withcontrolkey.numlines",
+  "mousewheel.withcontrolkey.sysnumlines",
+  "mousewheel.withnokey.action",
+  "mousewheel.withnokey.numlines",
+  "mousewheel.withnokey.sysnumlines",
+  "mousewheel.withshiftkey.action",
+  "mousewheel.withshiftkey.numlines",
+  "mousewheel.withshiftkey.sysnumlines",
+#endif
+  "dom.popup_allowed_events",
+  nsnull
+};
+
 nsresult
 nsEventStateManager::Init()
 {
@@ -838,44 +862,19 @@ nsEventStateManager::Init()
 
   observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
 
-  nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-
-  if (prefBranch) {
-    if (sESMInstanceCount == 1) {
-      sLeftClickOnly =
-        nsContentUtils::GetBoolPref("nglayout.events.dispatchLeftClickOnly",
-                                    sLeftClickOnly);
-      sChromeAccessModifier =
-        GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome);
-      sContentAccessModifier =
-        GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent);
-    }
-    prefBranch->AddObserver("accessibility.accesskeycausesactivation", this, PR_TRUE);
-    prefBranch->AddObserver("nglayout.events.dispatchLeftClickOnly", this, PR_TRUE);
-    prefBranch->AddObserver("ui.key.generalAccessKey", this, PR_TRUE);
-    prefBranch->AddObserver("ui.key.chromeAccess", this, PR_TRUE);
-    prefBranch->AddObserver("ui.key.contentAccess", this, PR_TRUE);
-    prefBranch->AddObserver("ui.click_hold_context_menus", this, PR_TRUE);
-#if 0
-    prefBranch->AddObserver("mousewheel.withaltkey.action", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withaltkey.numlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withaltkey.sysnumlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withcontrolkey.action", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withcontrolkey.numlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withcontrolkey.sysnumlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withnokey.action", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withnokey.numlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withnokey.sysnumlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withshiftkey.action", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withshiftkey.numlines", this, PR_TRUE);
-    prefBranch->AddObserver("mousewheel.withshiftkey.sysnumlines", this, PR_TRUE);
-#endif
-
-    prefBranch->AddObserver("dom.popup_allowed_events", this, PR_TRUE);
+  if (sESMInstanceCount == 1) {
+    sLeftClickOnly =
+      Preferences::GetBool("nglayout.events.dispatchLeftClickOnly",
+                           sLeftClickOnly);
+    sChromeAccessModifier =
+      GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome);
+    sContentAccessModifier =
+      GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent);
   }
+  Preferences::AddWeakObservers(this, kObservedPrefs);
 
   mClickHoldContextMenu =
-    nsContentUtils::GetBoolPref("ui.click_hold_context_menus", PR_FALSE);
+    Preferences::GetBool("ui.click_hold_context_menus", PR_FALSE);
 
   return NS_OK;
 }
@@ -923,33 +922,7 @@ nsEventStateManager::~nsEventStateManager()
 nsresult
 nsEventStateManager::Shutdown()
 {
-  nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-
-  if (prefBranch) {
-    prefBranch->RemoveObserver("accessibility.accesskeycausesactivation", this);
-    prefBranch->RemoveObserver("nglayout.events.dispatchLeftClickOnly", this);
-    prefBranch->RemoveObserver("ui.key.generalAccessKey", this);
-    prefBranch->RemoveObserver("ui.key.chromeAccess", this);
-    prefBranch->RemoveObserver("ui.key.contentAccess", this);
-    prefBranch->RemoveObserver("ui.click_hold_context_menus", this);
-#if 0
-    prefBranch->RemoveObserver("mousewheel.withshiftkey.action", this);
-    prefBranch->RemoveObserver("mousewheel.withshiftkey.numlines", this);
-    prefBranch->RemoveObserver("mousewheel.withshiftkey.sysnumlines", this);
-    prefBranch->RemoveObserver("mousewheel.withcontrolkey.action", this);
-    prefBranch->RemoveObserver("mousewheel.withcontrolkey.numlines", this);
-    prefBranch->RemoveObserver("mousewheel.withcontrolkey.sysnumlines", this);
-    prefBranch->RemoveObserver("mousewheel.withaltkey.action", this);
-    prefBranch->RemoveObserver("mousewheel.withaltkey.numlines", this);
-    prefBranch->RemoveObserver("mousewheel.withaltkey.sysnumlines", this);
-    prefBranch->RemoveObserver("mousewheel.withnokey.action", this);
-    prefBranch->RemoveObserver("mousewheel.withnokey.numlines", this);
-    prefBranch->RemoveObserver("mousewheel.withnokey.sysnumlines", this);
-#endif
-
-    prefBranch->RemoveObserver("dom.popup_allowed_events", this);
-  }
-
+  Preferences::RemoveObservers(this, kObservedPrefs);
   m_haveShutdown = PR_TRUE;
   return NS_OK;
 }
@@ -968,12 +941,12 @@ nsEventStateManager::Observe(nsISupports *aSubject,
     nsDependentString data(someData);
     if (data.EqualsLiteral("accessibility.accesskeycausesactivation")) {
       sKeyCausesActivation =
-        nsContentUtils::GetBoolPref("accessibility.accesskeycausesactivation",
-                                    sKeyCausesActivation);
+        Preferences::GetBool("accessibility.accesskeycausesactivation",
+                             sKeyCausesActivation);
     } else if (data.EqualsLiteral("nglayout.events.dispatchLeftClickOnly")) {
       sLeftClickOnly =
-        nsContentUtils::GetBoolPref("nglayout.events.dispatchLeftClickOnly",
-                                    sLeftClickOnly);
+        Preferences::GetBool("nglayout.events.dispatchLeftClickOnly",
+                             sLeftClickOnly);
     } else if (data.EqualsLiteral("ui.key.generalAccessKey")) {
       sChromeAccessModifier =
         GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome);
@@ -987,7 +960,7 @@ nsEventStateManager::Observe(nsISupports *aSubject,
         GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent);
     } else if (data.EqualsLiteral("ui.click_hold_context_menus")) {
       mClickHoldContextMenu =
-        nsContentUtils::GetBoolPref("ui.click_hold_context_menus", PR_FALSE);
+        Preferences::GetBool("ui.click_hold_context_menus", PR_FALSE);
 #if 0
     } else if (data.EqualsLiteral("mousewheel.withaltkey.action")) {
     } else if (data.EqualsLiteral("mousewheel.withaltkey.numlines")) {
@@ -1720,7 +1693,7 @@ nsEventStateManager::CreateClickHoldTimer(nsPresContext* inPresContext,
   mClickHoldTimer = do_CreateInstance("@mozilla.org/timer;1");
   if (mClickHoldTimer) {
     PRInt32 clickHoldDelay =
-      nsContentUtils::GetIntPref("ui.click_hold_context_menus.delay", 500);
+      Preferences::GetInt("ui.click_hold_context_menus.delay", 500);
     mClickHoldTimer->InitWithFuncCallback(sClickHoldCallback, this,
                                           clickHoldDelay,
                                           nsITimer::TYPE_ONE_SHOT);
@@ -2401,8 +2374,8 @@ nsEventStateManager::ChangeTextSize(PRInt32 change)
   NS_ENSURE_SUCCESS(rv, rv);
 
   float textzoom;
-  float zoomMin = ((float)nsContentUtils::GetIntPref("zoom.minPercent", 50)) / 100;
-  float zoomMax = ((float)nsContentUtils::GetIntPref("zoom.maxPercent", 300)) / 100;
+  float zoomMin = ((float)Preferences::GetInt("zoom.minPercent", 50)) / 100;
+  float zoomMax = ((float)Preferences::GetInt("zoom.maxPercent", 300)) / 100;
   mv->GetTextZoom(&textzoom);
   textzoom += ((float)change) / 10;
   if (textzoom < zoomMin)
@@ -2422,8 +2395,8 @@ nsEventStateManager::ChangeFullZoom(PRInt32 change)
   NS_ENSURE_SUCCESS(rv, rv);
 
   float fullzoom;
-  float zoomMin = ((float)nsContentUtils::GetIntPref("zoom.minPercent", 50)) / 100;
-  float zoomMax = ((float)nsContentUtils::GetIntPref("zoom.maxPercent", 300)) / 100;
+  float zoomMin = ((float)Preferences::GetInt("zoom.minPercent", 50)) / 100;
+  float zoomMax = ((float)Preferences::GetInt("zoom.maxPercent", 300)) / 100;
   mv->GetFullZoom(&fullzoom);
   fullzoom += ((float)change) / 10;
   if (fullzoom < zoomMin)
@@ -2464,10 +2437,11 @@ nsEventStateManager::DoScrollZoom(nsIFrame *aTargetFrame,
       // positive adjustment to decrease zoom, negative to increase
       PRInt32 change = (adjustment > 0) ? -1 : 1;
 
-      if (nsContentUtils::GetBoolPref("browser.zoom.full"))
+      if (Preferences::GetBool("browser.zoom.full")) {
         ChangeFullZoom(change);
-      else
+      } else {
         ChangeTextSize(change);
+      }
     }
 }
 
@@ -2608,7 +2582,7 @@ nsEventStateManager::GetWheelActionFor(nsMouseScrollEvent* aMouseEvent)
   nsCAutoString prefName;
   GetBasePrefKeyForMouseWheel(aMouseEvent, prefName);
   prefName.Append(".action");
-  return nsContentUtils::GetIntPref(prefName.get());
+  return Preferences::GetInt(prefName.get());
 }
 
 PRInt32
@@ -2619,7 +2593,7 @@ nsEventStateManager::GetScrollLinesFor(nsMouseScrollEvent* aMouseEvent)
   nsCAutoString prefName;
   GetBasePrefKeyForMouseWheel(aMouseEvent, prefName);
   prefName.Append(".numlines");
-  return nsContentUtils::GetIntPref(prefName.get());
+  return Preferences::GetInt(prefName.get());
 }
 
 PRBool
@@ -2628,7 +2602,7 @@ nsEventStateManager::UseSystemScrollSettingFor(nsMouseScrollEvent* aMouseEvent)
   nsCAutoString prefName;
   GetBasePrefKeyForMouseWheel(aMouseEvent, prefName);
   prefName.Append(".sysnumlines");
-  return nsContentUtils::GetBoolPref(prefName.get());
+  return Preferences::GetBool(prefName.get());
 }
 
 nsresult
@@ -3467,7 +3441,7 @@ nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
       hotspotY = framecursor.mHotspotY;
   }
 
-  if (nsContentUtils::GetBoolPref("ui.use_activity_cursor", PR_FALSE)) {
+  if (Preferences::GetBool("ui.use_activity_cursor", PR_FALSE)) {
     // Check whether or not to show the busy cursor
     nsCOMPtr<nsISupports> pcContainer = aPresContext->GetContainer();
     nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(pcContainer));
@@ -4227,35 +4201,26 @@ nsEventStateManager::GetEventTargetContent(nsEvent* aEvent)
   return content;
 }
 
-static already_AddRefed<nsIContent>
-GetLabelTarget(nsIContent* aLabel)
+static Element*
+GetLabelTarget(nsIContent* aPossibleLabel)
 {
-  nsCOMPtr<nsIDOMHTMLLabelElement> label = do_QueryInterface(aLabel);
+  nsHTMLLabelElement* label = nsHTMLLabelElement::FromContent(aPossibleLabel);
   if (!label)
     return nsnull;
 
-  nsCOMPtr<nsIDOMHTMLElement> target;
-  label->GetControl(getter_AddRefs(target));
-  nsIContent* targetContent = nsnull;
-  if (target) {
-    CallQueryInterface(target, &targetContent);
-  }
-  return targetContent;
+  return label->GetLabeledElement();
 }
 
 static bool
-IsAncestorOf(nsIContent* aPossibleAncestor, nsIContent* aPossibleDescendant,
-             PRBool aFollowLabels)
+IsAncestorOf(nsIContent* aPossibleAncestor, nsIContent* aPossibleDescendant)
 {
   for (; aPossibleDescendant; aPossibleDescendant = aPossibleDescendant->GetParent()) {
     if (aPossibleAncestor == aPossibleDescendant)
       return true;
 
-    if (aFollowLabels) {
-      nsCOMPtr<nsIContent> labelTarget = GetLabelTarget(aPossibleDescendant);
-      if (labelTarget == aPossibleAncestor)
-        return true;
-    }
+    Element* labelTarget = GetLabelTarget(aPossibleDescendant);
+    if (labelTarget == aPossibleAncestor)
+      return true;
   }
   return false;
 }
@@ -4273,14 +4238,14 @@ ShouldShowFocusRing(nsIContent* aContent)
 }
 
 nsEventStates
-nsEventStateManager::GetContentState(nsIContent *aContent, PRBool aFollowLabels)
+nsEventStateManager::GetContentState(nsIContent *aContent)
 {
   nsEventStates state = aContent->IntrinsicState();
 
-  if (IsAncestorOf(aContent, mActiveContent, aFollowLabels)) {
+  if (IsAncestorOf(aContent, mActiveContent)) {
     state |= NS_EVENT_STATE_ACTIVE;
   }
-  if (IsAncestorOf(aContent, mHoverContent, aFollowLabels)) {
+  if (IsAncestorOf(aContent, mHoverContent)) {
     state |= NS_EVENT_STATE_HOVER;
   }
 
@@ -4352,7 +4317,7 @@ NotifyAncestors(nsIDocument* aDocument, nsIContent* aStartNode,
 {
   while (aStartNode && aStartNode != aStopBefore) {
     aDocument->ContentStateChanged(aStartNode, aState);
-    nsCOMPtr<nsIContent> labelTarget = GetLabelTarget(aStartNode);
+    Element* labelTarget = GetLabelTarget(aStartNode);
     if (labelTarget) {
       aDocument->ContentStateChanged(labelTarget, aState);
     }
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 08646892976..c9d5a6afa59 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -122,15 +122,9 @@ public:
   /**
    * Returns the content state of aContent.
    * @param aContent      The control whose state is requested.
-   * @param aFollowLabels Whether to reflect a label's content state on its
-   *                      associated control. If aFollowLabels is true and
-   *                      aContent is a control which has a label that has the 
-   *                      hover or active content state set, GetContentState
-   *                      will pretend that those states are also set on aContent.
    * @return              The content state.
    */
-  virtual nsEventStates GetContentState(nsIContent *aContent,
-                                        PRBool aFollowLabels = PR_FALSE);
+  virtual nsEventStates GetContentState(nsIContent *aContent);
 
   /**
    * Notify that the given NS_EVENT_STATE_* bit has changed for this content.
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 0eb455d8219..b9ef4e527c2 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -104,6 +104,8 @@ _TEST_FILES = \
 		test_bug641477.html \
 		test_bug648573.html \
 		test_bug615597.html \
+		test_bug656379-1.html \
+		test_bug656379-2.html \
 		test_bug656954.html \
 		$(NULL)
 
diff --git a/content/events/test/test_bug656379-1.html b/content/events/test/test_bug656379-1.html
new file mode 100644
index 00000000000..4a0f3b0bdb8
--- /dev/null
+++ b/content/events/test/test_bug656379-1.html
@@ -0,0 +1,199 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=656379
+-->
+<head>
+  <title>Test for Bug 656379</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style>
+    canvas {
+      display: none;
+    }
+    input[type=button] {
+      -moz-appearance: none;
+      padding: 0;
+      border: none;
+      color: black;
+      background: white;
+    }
+    input[type=button]::-moz-focus-inner { border: none; }
+
+    /* Make sure that normal, focused, hover+active, focused+hover+active
+       buttons all have different styles so that the test keeps moving along. */
+    input[type=button]:hover:active {
+      background: red;
+    }
+    input[type=button]:focus {
+      background: green;
+    }
+    input[type=button]:focus:hover:active {
+      background: purple;
+    }
+  </style>
+</head>
+<body onload="runTests()">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=426082">Mozilla Bug 426082</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+
+/** Test for Bug 426082 **/
+SimpleTest.waitForExplicitFinish();
+
+var normalButtonCanvas, pressedButtonCanvas, normalFocusedButtonCanvas,
+    pressedFocusedButtonCanvas, currentSnapshot, button, label, outside;
+
+function runTests() {
+  normalButtonCanvas = $("normalButtonCanvas");
+  pressedButtonCanvas = $("pressedButtonCanvas");
+  normalFocusedButtonCanvas = $("normalFocusedButtonCanvas");
+  pressedFocusedButtonCanvas = $("pressedFocusedButtonCanvas");
+  currentSnapshot = $("currentSnapshot");
+  button = $("button");
+  label = $("label");
+  outside = $("outside");
+  SimpleTest.executeSoon(executeTests);
+}
+
+function isRectContainedInRectFromRegion(rect, region) {
+  return Array.some(region, function (r) {
+    return rect.left >= r.left &&
+           rect.top >= r.top &&
+           rect.right <= r.right &&
+           rect.bottom <= r.bottom;
+  });
+}
+
+function paintListener(e) {
+  if (isRectContainedInRectFromRegion(buttonRect(), e.clientRects)) {
+    gNeedsPaint = false;
+    takeSnapshot(currentSnapshot);
+  }
+}
+
+var gNeedsPaint = false;
+function executeTests() {
+  var testYielder = tests();
+  function execNext() {
+    try {
+      if (!gNeedsPaint) {
+        testYielder.next();
+        button.getBoundingClientRect(); // Flush.
+        gNeedsPaint = true;
+      }
+      SimpleTest.executeSoon(execNext);
+    } catch (e) {}
+  }
+  execNext();
+}
+
+function tests() {
+  window.addEventListener("MozAfterPaint", paintListener, false);
+  takeSnapshot(normalButtonCanvas);
+  // Press the button.
+  sendMouseEvent("mousemove", button);
+  sendMouseEvent("mousedown", button);
+  yield;
+  takeSnapshot(pressedFocusedButtonCanvas);
+  compareSnapshots_(normalButtonCanvas, pressedFocusedButtonCanvas, false, "Pressed focused buttons should look different from normal buttons.");
+  // Release.
+  sendMouseEvent("mouseup", button);
+  yield;
+  // make sure the button is focused as this doesn't happen on click on Mac
+  button.focus();
+  takeSnapshot(normalFocusedButtonCanvas);
+  compareSnapshots_(normalFocusedButtonCanvas, pressedFocusedButtonCanvas, false, "Pressed focused buttons should look different from normal focused buttons.");
+  // Unfocus the button.
+  sendMouseEvent("mousedown", outside);
+  sendMouseEvent("mouseup", outside);
+  yield;
+
+  // Press the label.
+  sendMouseEvent("mousemove", label);
+  sendMouseEvent("mousedown", label);
+  yield;
+  compareSnapshots_(normalButtonCanvas, currentSnapshot, false, "Pressing the label should have pressed the button.");
+  takeSnapshot(pressedButtonCanvas);
+  // Move the mouse down from the label.
+  sendMouseEvent("mousemove", outside);
+  yield;
+  compareSnapshots_(normalButtonCanvas, currentSnapshot, true, "Moving the mouse down from the label should have unpressed the button.");
+  // ... and up again.
+  sendMouseEvent("mousemove", label);
+  yield;
+  compareSnapshots_(pressedButtonCanvas, currentSnapshot, true, "Moving the mouse back on top of the label should have pressed the button.");
+  // Release.
+  sendMouseEvent("mouseup", label);
+  yield;
+  compareSnapshots_(normalFocusedButtonCanvas, currentSnapshot, true, "Releasing the mouse over the label should have unpressed (and focused) the button.");
+  // Press the label and remove it.
+  sendMouseEvent("mousemove", label);
+  sendMouseEvent("mousedown", label);
+  yield;
+  label.parentNode.removeChild(label);
+  yield;
+  compareSnapshots_(normalButtonCanvas, currentSnapshot, true, "Removing the label should have unpressed the button.");
+  sendMouseEvent("mouseup", label);
+  window.removeEventListener("MozAfterPaint", paintListener, false);
+  SimpleTest.finish();
+}
+
+function sendMouseEvent(t, elem) {
+  var r = elem.getBoundingClientRect();
+  synthesizeMouse(elem, r.width / 2, r.height / 2, {type: t});
+}
+
+function compareSnapshots_(c1, c2, shouldBeIdentical, msg) {
+  var [correct, c1url, c2url] = compareSnapshots(c1, c2, shouldBeIdentical);
+  if (correct) {
+    if (shouldBeIdentical) {
+      ok(true, msg + " - expected " + c1url);
+    } else {
+      ok(true, msg + " - got " + c1url + " and " + c2url);
+    }
+  } else {
+    if (shouldBeIdentical) {
+      ok(false, msg + " - expected " + c1url + " but got " + c2url);
+    } else {
+      ok(false, msg + " - expected something other than " + c1url);
+    }
+  }
+}
+
+function takeSnapshot(canvas) {
+  var r = buttonRect();
+  var ctx = canvas.getContext("2d");
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  canvas.width = r.width + 4;
+  canvas.height = r.height + 4;
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+  ctx.drawWindow(window, r.left - 2, r.top - 2, r.width + 4, r.height + 4, "#FFF");
+}
+
+function buttonRect() {
+  return button.getBoundingClientRect();
+}
+
+
+</script>
+</pre>
+<p><input type="button" value="Button" id="button"></p>
+<p><label for="button" id="label">Label</label></p>
+<p id="outside">Something under the label</p>
+
+<canvas id="normalButtonCanvas"></canvas>
+<canvas id="pressedButtonCanvas"></canvas>
+<canvas id="normalFocusedButtonCanvas"></canvas>
+<canvas id="pressedFocusedButtonCanvas"></canvas>
+<canvas id="currentSnapshot"></canvas>
+
+</body>
+</html>
diff --git a/content/events/test/test_bug656379-2.html b/content/events/test/test_bug656379-2.html
new file mode 100644
index 00000000000..30087e4cc10
--- /dev/null
+++ b/content/events/test/test_bug656379-2.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=656379
+-->
+<head>
+  <title>Test for Bug 656379</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style>
+    button:hover { color: green; }
+  </style>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=656379">Mozilla Bug 656379</a>
+<p id="display">
+  <label for="button1" id="label1">Label 1</label>
+  <button id="button1">Button 1</button>
+  <label><span id="label2">Label 2</span><button id="button2">Button 2</button></label>
+</p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.8">
+
+/** Test for Bug 656379 **/
+SimpleTest.waitForExplicitFinish();
+function tests() {
+  synthesizeMouseAtCenter($("label1"), { type: "mousemove" });
+  yield;
+  is($("button1").mozMatchesSelector(":hover"), true,
+     "Button 1 should be hovered");
+  is($("button2").mozMatchesSelector(":hover"), false,
+     "Button 2 should not be hovered");
+  synthesizeMouseAtCenter($("label2"), { type: "mousemove" });
+  yield;
+  is($("button1").mozMatchesSelector(":hover"), false,
+     "Button 1 should not be hovered");
+  is($("button2").mozMatchesSelector(":hover"), true,
+     "Button 2 should be hovered");
+  SimpleTest.finish();
+}
+
+function executeTests() {
+  var testYielder = tests();
+  function execNext() {
+    try {
+      testYielder.next();
+      SimpleTest.executeSoon(execNext);
+    } catch(e) {}
+  }
+  execNext();
+}
+
+SimpleTest.waitForFocus(executeTests);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/content/public/nsHTMLCanvasElement.h b/content/html/content/public/nsHTMLCanvasElement.h
index 630a789899d..bdfc075f123 100644
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@@ -181,7 +181,7 @@ protected:
                        PRUint32& aSize,
                        bool& aFellBackToPNG);
   nsresult ToDataURLImpl(const nsAString& aMimeType,
-                         const nsAString& aEncoderOptions,
+                         nsIVariant* aEncoderOptions,
                          nsAString& aDataURL);
   nsresult MozGetAsFileImpl(const nsAString& aName,
                             const nsAString& aType,
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index 7937c34f84f..26bc9023399 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -48,7 +48,6 @@ LIBXUL_LIBRARY	= 1
 
 
 EXPORTS		= \
-		nsImageMapUtils.h \
 		nsClientRect.h \
 		nsHTMLDNSPrefetch.h \
 		$(NULL)
@@ -58,7 +57,6 @@ CPPSRCS		= \
 		nsHTMLDNSPrefetch.cpp \
 		nsGenericHTMLElement.cpp \
 		nsFormSubmission.cpp \
-		nsImageMapUtils.cpp \
 		nsTextEditorState.cpp \
 		nsHTMLElement.cpp \
 		nsHTMLAnchorElement.cpp \
@@ -68,7 +66,6 @@ CPPSRCS		= \
 		nsHTMLButtonElement.cpp \
 		nsHTMLCanvasElement.cpp \
 		nsHTMLDataListElement.cpp \
-		nsHTMLDelElement.cpp \
 		nsHTMLDivElement.cpp \
 		nsHTMLFieldSetElement.cpp \
 		nsHTMLFontElement.cpp \
@@ -86,6 +83,7 @@ CPPSRCS		= \
 		nsHTMLLinkElement.cpp \
 		nsHTMLMapElement.cpp \
 		nsHTMLMetaElement.cpp \
+		nsHTMLModElement.cpp \
 		nsHTMLObjectElement.cpp \
 		nsHTMLOListElement.cpp \
 		nsHTMLSharedObjectElement.cpp \
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index c72d0dd1bea..3868ed4ed5f 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -48,7 +48,6 @@
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMAttr.h"
 #include "nsIDOMDocumentFragment.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMWindow.h"
@@ -116,6 +115,9 @@
 #include "mozilla/dom/Element.h"
 #include "nsHTMLFieldSetElement.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 using namespace mozilla::dom;
 
 #include "nsThreadUtils.h"
@@ -779,12 +781,12 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
     PRInt32 newChildCount = GetChildCount();
     if (newChildCount && nsContentUtils::
           HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
-      nsCOMArray<nsIContent> childNodes;
+      nsAutoTArray<nsCOMPtr<nsIContent>, 50> childNodes;
       NS_ASSERTION(newChildCount - oldChildCount >= 0,
                    "What, some unexpected dom mutation has happened?");
       childNodes.SetCapacity(newChildCount - oldChildCount);
       for (nsINode::ChildIterator iter(this); !iter.IsDone(); iter.Next()) {
-        childNodes.AppendObject(iter);
+        childNodes.AppendElement(iter);
       }
       nsGenericElement::FireNodeInserted(doc, this, childNodes);
     }
@@ -896,8 +898,7 @@ nsGenericHTMLElement::GetSpellcheck(PRBool* aSpellcheck)
   // NOTE: Do not reflect a pref value of 0 back to the DOM getter.
   // The web page should not know if the user has disabled spellchecking.
   // We'll catch this in the editor itself.
-  PRInt32 spellcheckLevel =
-    nsContentUtils::GetIntPref("layout.spellcheckDefault", 1);
+  PRInt32 spellcheckLevel = Preferences::GetInt("layout.spellcheckDefault", 1);
   if (spellcheckLevel == 2) {           // "Spellcheck multi- and single-line"
     *aSpellcheck = PR_TRUE;             // Spellchecked by default
   }
@@ -2545,7 +2546,7 @@ nsGenericHTMLFormElement::BindToTree(nsIDocument* aDocument,
   // the document should not be already loaded and the "browser.autofocus"
   // preference should be 'true'.
   if (IsAutofocusable() && HasAttr(kNameSpaceID_None, nsGkAtoms::autofocus) &&
-      nsContentUtils::GetBoolPref("browser.autofocus", PR_TRUE)) {
+      Preferences::GetBool("browser.autofocus", PR_TRUE)) {
     nsCOMPtr<nsIRunnable> event = new nsAutoFocusEvent(this);
     rv = NS_DispatchToCurrentThread(event);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp
index 873d8941161..381155a289e 100644
--- a/content/html/content/src/nsHTMLCanvasElement.cpp
+++ b/content/html/content/src/nsHTMLCanvasElement.cpp
@@ -47,6 +47,7 @@
 #include "nsIXPConnect.h"
 #include "jsapi.h"
 #include "nsJSUtils.h"
+#include "nsMathUtils.h"
 
 #include "nsFrameManager.h"
 #include "nsDisplayList.h"
@@ -196,32 +197,17 @@ nsHTMLCanvasElement::ParseAttribute(PRInt32 aNamespaceID,
 // nsHTMLCanvasElement::toDataURL
 
 NS_IMETHODIMP
-nsHTMLCanvasElement::ToDataURL(const nsAString& aType, const nsAString& aParams,
+nsHTMLCanvasElement::ToDataURL(const nsAString& aType, nsIVariant* aParams,
                                PRUint8 optional_argc, nsAString& aDataURL)
 {
   // do a trust check if this is a write-only canvas
-  // or if we're trying to use the 2-arg form
-  if ((mWriteOnly || optional_argc >= 2) &&
-      !nsContentUtils::IsCallerTrustedForRead()) {
+  if (mWriteOnly && !nsContentUtils::IsCallerTrustedForRead()) {
     return NS_ERROR_DOM_SECURITY_ERR;
   }
 
   return ToDataURLImpl(aType, aParams, aDataURL);
 }
 
-
-// nsHTMLCanvasElement::toDataURLAs
-//
-// Native-callers only
-
-NS_IMETHODIMP
-nsHTMLCanvasElement::ToDataURLAs(const nsAString& aMimeType,
-                                 const nsAString& aEncoderOptions,
-                                 nsAString& aDataURL)
-{
-  return ToDataURLImpl(aMimeType, aEncoderOptions, aDataURL);
-}
-
 nsresult
 nsHTMLCanvasElement::ExtractData(const nsAString& aType,
                                  const nsAString& aOptions,
@@ -323,7 +309,7 @@ nsHTMLCanvasElement::ExtractData(const nsAString& aType,
 
 nsresult
 nsHTMLCanvasElement::ToDataURLImpl(const nsAString& aMimeType,
-                                   const nsAString& aEncoderOptions,
+                                   nsIVariant* aEncoderOptions,
                                    nsAString& aDataURL)
 {
   bool fallbackToPNG = false;
@@ -337,11 +323,30 @@ nsHTMLCanvasElement::ToDataURLImpl(const nsAString& aMimeType,
   nsAutoString type;
   nsContentUtils::ASCIIToLower(aMimeType, type);
 
+  nsAutoString params;
+
+  // Quality parameter is only valid for the image/jpeg MIME type
+  if (type.EqualsLiteral("image/jpeg")) {
+    PRUint16 vartype;
+
+    if (aEncoderOptions &&
+        NS_SUCCEEDED(aEncoderOptions->GetDataType(&vartype)) &&
+        vartype <= nsIDataType::VTYPE_DOUBLE) {
+
+      double quality;
+      // Quality must be between 0.0 and 1.0, inclusive
+      if (NS_SUCCEEDED(aEncoderOptions->GetAsDouble(&quality)) &&
+          quality >= 0.0 && quality <= 1.0) {
+        params.AppendLiteral("quality=");
+        params.AppendInt(NS_lround(quality * 100.0));
+      }
+    }
+  }
+
   PRUint32 imgSize = 0;
   char* imgData;
 
-  nsresult rv = ExtractData(type, aEncoderOptions, imgData,
-                            imgSize, fallbackToPNG);
+  nsresult rv = ExtractData(type, params, imgData, imgSize, fallbackToPNG);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // base 64, result will be NULL terminated
diff --git a/content/html/content/src/nsHTMLDNSPrefetch.cpp b/content/html/content/src/nsHTMLDNSPrefetch.cpp
index 36ee2f26a0f..3da3675bbe0 100644
--- a/content/html/content/src/nsHTMLDNSPrefetch.cpp
+++ b/content/html/content/src/nsHTMLDNSPrefetch.cpp
@@ -54,7 +54,6 @@
 #include "nsIDNSRecord.h"
 #include "nsIDNSService.h"
 #include "nsICancelable.h"
-#include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsIDocument.h"
 #include "nsThreadUtils.h"
@@ -62,6 +61,9 @@
 #include "nsIObserverService.h"
 #include "mozilla/dom/Link.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::net;
 
@@ -94,12 +96,12 @@ nsHTMLDNSPrefetch::Initialize()
 
   sPrefetches->Activate();
 
-  nsContentUtils::AddBoolPrefVarCache("network.dns.disablePrefetchFromHTTPS", 
-                                      &sDisablePrefetchHTTPSPref);
+  Preferences::AddBoolVarCache(&sDisablePrefetchHTTPSPref,
+                               "network.dns.disablePrefetchFromHTTPS");
   
   // Default is false, so we need an explicit call to prime the cache.
   sDisablePrefetchHTTPSPref = 
-    nsContentUtils::GetBoolPref("network.dns.disablePrefetchFromHTTPS", PR_TRUE);
+    Preferences::GetBool("network.dns.disablePrefetchFromHTTPS", PR_TRUE);
   
   NS_IF_RELEASE(sDNSService);
   nsresult rv;
diff --git a/content/html/content/src/nsHTMLFieldSetElement.cpp b/content/html/content/src/nsHTMLFieldSetElement.cpp
index 30eb1f21b69..aa4141a3cb2 100644
--- a/content/html/content/src/nsHTMLFieldSetElement.cpp
+++ b/content/html/content/src/nsHTMLFieldSetElement.cpp
@@ -217,8 +217,7 @@ nsHTMLFieldSetElement::InsertChildAt(nsIContent* aChild, PRUint32 aIndex,
 }
 
 nsresult
-nsHTMLFieldSetElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify,
-                                     PRBool aMutationEvent /* = PR_TRUE */)
+nsHTMLFieldSetElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
   bool firstLegendHasChanged = false;
 
@@ -236,7 +235,7 @@ nsHTMLFieldSetElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify,
     }
   }
 
-  nsresult rv = nsGenericHTMLFormElement::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+  nsresult rv = nsGenericHTMLFormElement::RemoveChildAt(aIndex, aNotify);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (firstLegendHasChanged) {
diff --git a/content/html/content/src/nsHTMLFieldSetElement.h b/content/html/content/src/nsHTMLFieldSetElement.h
index a4d2732de5f..a4931569995 100644
--- a/content/html/content/src/nsHTMLFieldSetElement.h
+++ b/content/html/content/src/nsHTMLFieldSetElement.h
@@ -76,8 +76,7 @@ public:
 
   virtual nsresult InsertChildAt(nsIContent* aChild, PRUint32 aIndex,
                                      PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify,
-                                 PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
 
   // nsIFormControl
   NS_IMETHOD_(PRUint32) GetType() const { return NS_FORM_FIELDSET; }
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index 600fa60fdee..4220e40094f 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -328,9 +328,8 @@ DOMCI_NODE_DATA(HTMLFormElement, nsHTMLFormElement)
 
 // QueryInterface implementation for nsHTMLFormElement
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLFormElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE6(nsHTMLFormElement,
+  NS_HTML_CONTENT_INTERFACE_TABLE5(nsHTMLFormElement,
                                    nsIDOMHTMLFormElement,
-                                   nsIDOMNSHTMLFormElement,
                                    nsIForm,
                                    nsIWebProgressListener,
                                    nsIRadioGroupContainer,
diff --git a/content/html/content/src/nsHTMLFormElement.h b/content/html/content/src/nsHTMLFormElement.h
index f464463ada3..6ce99c6cf8c 100644
--- a/content/html/content/src/nsHTMLFormElement.h
+++ b/content/html/content/src/nsHTMLFormElement.h
@@ -44,7 +44,6 @@
 #include "nsFormSubmission.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLFormElement.h"
-#include "nsIDOMNSHTMLFormElement.h"
 #include "nsIWebProgressListener.h"
 #include "nsIRadioGroupContainer.h"
 #include "nsIURI.h"
@@ -93,7 +92,6 @@ private:
 
 class nsHTMLFormElement : public nsGenericHTMLElement,
                           public nsIDOMHTMLFormElement,
-                          public nsIDOMNSHTMLFormElement,
                           public nsIWebProgressListener,
                           public nsIForm,
                           public nsIRadioGroupContainer_MOZILLA_2_0_BRANCH
@@ -119,9 +117,6 @@ public:
   // nsIDOMHTMLFormElement
   NS_DECL_NSIDOMHTMLFORMELEMENT
 
-  // nsIDOMNSHTMLFormElement
-  NS_DECL_NSIDOMNSHTMLFORMELEMENT  
-
   // nsIWebProgressListener
   NS_DECL_NSIWEBPROGRESSLISTENER
 
diff --git a/content/html/content/src/nsHTMLHRElement.cpp b/content/html/content/src/nsHTMLHRElement.cpp
index 951c411bd09..6e0bcdf8a3a 100644
--- a/content/html/content/src/nsHTMLHRElement.cpp
+++ b/content/html/content/src/nsHTMLHRElement.cpp
@@ -34,10 +34,11 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "nsIDOMHTMLHRElement.h"
-#include "nsIDOMNSHTMLHRElement.h"
-#include "nsIDOMEventTarget.h"
+
 #include "nsGenericHTMLElement.h"
+#include "nsIDOMHTMLHRElement.h"
+
+#include "nsIDOMEventTarget.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
@@ -46,8 +47,7 @@
 #include "nsCSSProps.h"
 
 class nsHTMLHRElement : public nsGenericHTMLElement,
-                        public nsIDOMHTMLHRElement,
-                        public nsIDOMNSHTMLHRElement
+                        public nsIDOMHTMLHRElement
 {
 public:
   nsHTMLHRElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@@ -68,9 +68,6 @@ public:
   // nsIDOMHTMLHRElement
   NS_DECL_NSIDOMHTMLHRELEMENT
 
-  // nsIDOMNSHTMLHRElement
-  NS_DECL_NSIDOMNSHTMLHRELEMENT
-
   virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
                                 nsIAtom* aAttribute,
                                 const nsAString& aValue,
@@ -103,9 +100,8 @@ DOMCI_NODE_DATA(HTMLHRElement, nsHTMLHRElement)
 
 // QueryInterface implementation for nsHTMLHRElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLHRElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE2(nsHTMLHRElement,
-                                   nsIDOMHTMLHRElement,
-                                   nsIDOMNSHTMLHRElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLHRElement,
+                                   nsIDOMHTMLHRElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLHRElement,
                                                nsGenericHTMLElement)
 NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLHRElement)
diff --git a/content/html/content/src/nsHTMLIFrameElement.cpp b/content/html/content/src/nsHTMLIFrameElement.cpp
index 11f395a2572..4c7c700b838 100644
--- a/content/html/content/src/nsHTMLIFrameElement.cpp
+++ b/content/html/content/src/nsHTMLIFrameElement.cpp
@@ -37,10 +37,8 @@
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMDocument.h"
-#ifdef MOZ_SVG
 #include "nsIDOMGetSVGDocument.h"
 #include "nsIDOMSVGDocument.h"
-#endif
 #include "nsGkAtoms.h"
 #include "nsIDocument.h"
 #include "nsMappedAttributes.h"
@@ -52,9 +50,7 @@ using namespace mozilla::dom;
 
 class nsHTMLIFrameElement : public nsGenericHTMLFrameElement
                           , public nsIDOMHTMLIFrameElement
-#ifdef MOZ_SVG
                           , public nsIDOMGetSVGDocument
-#endif
 {
 public:
   nsHTMLIFrameElement(already_AddRefed<nsINodeInfo> aNodeInfo,
@@ -76,10 +72,8 @@ public:
   // nsIDOMHTMLIFrameElement
   NS_DECL_NSIDOMHTMLIFRAMEELEMENT
 
-#ifdef MOZ_SVG
   // nsIDOMGetSVGDocument
   NS_DECL_NSIDOMGETSVGDOCUMENT
-#endif
 
   // nsIContent
   virtual PRBool ParseAttribute(PRInt32 aNamespaceID,
@@ -117,9 +111,7 @@ DOMCI_NODE_DATA(HTMLIFrameElement, nsHTMLIFrameElement)
 NS_INTERFACE_TABLE_HEAD(nsHTMLIFrameElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_BEGIN(nsHTMLIFrameElement)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLIFrameElement, nsIDOMHTMLIFrameElement)
-#ifdef MOZ_SVG
     NS_INTERFACE_TABLE_ENTRY(nsHTMLIFrameElement, nsIDOMGetSVGDocument)
-#endif
   NS_OFFSET_AND_INTERFACE_TABLE_END
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLIFrameElement,
                                                nsGenericHTMLFrameElement)
@@ -146,13 +138,11 @@ nsHTMLIFrameElement::GetContentDocument(nsIDOMDocument** aContentDocument)
   return nsGenericHTMLFrameElement::GetContentDocument(aContentDocument);
 }
 
-#ifdef MOZ_SVG
 NS_IMETHODIMP
 nsHTMLIFrameElement::GetSVGDocument(nsIDOMDocument **aResult)
 {
   return GetContentDocument(aResult);
 }
-#endif
 
 PRBool
 nsHTMLIFrameElement::ParseAttribute(PRInt32 aNamespaceID,
diff --git a/content/html/content/src/nsHTMLImageElement.cpp b/content/html/content/src/nsHTMLImageElement.cpp
index 841f3b0e983..b7b77fa3e4b 100644
--- a/content/html/content/src/nsHTMLImageElement.cpp
+++ b/content/html/content/src/nsHTMLImageElement.cpp
@@ -70,12 +70,13 @@
 #include "nsRuleData.h"
 
 #include "nsIJSContextStack.h"
-#include "nsImageMapUtils.h"
 #include "nsIDOMHTMLMapElement.h"
 #include "nsEventDispatcher.h"
 
 #include "nsLayoutUtils.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 // XXX nav attrs: suppress
@@ -150,7 +151,6 @@ public:
   void MaybeLoadImage();
   virtual nsXPCClassInfo* GetClassInfo();
 protected:
-  nsPoint GetXY();
   nsSize GetWidthHeight();
 };
 
@@ -250,42 +250,6 @@ nsHTMLImageElement::GetComplete(PRBool* aComplete)
   return NS_OK;
 }
 
-nsPoint
-nsHTMLImageElement::GetXY()
-{
-  nsPoint point(0, 0);
-
-  nsIFrame* frame = GetPrimaryFrame(Flush_Layout);
-
-  if (!frame) {
-    return point;
-  }
-
-  nsIFrame* layer = nsLayoutUtils::GetClosestLayer(frame->GetParent());
-  nsPoint origin(frame->GetOffsetTo(layer));
-  // Convert to pixels using that scale
-  point.x = nsPresContext::AppUnitsToIntCSSPixels(origin.x);
-  point.y = nsPresContext::AppUnitsToIntCSSPixels(origin.y);
-
-  return point;
-}
-
-NS_IMETHODIMP
-nsHTMLImageElement::GetX(PRInt32* aX)
-{
-  *aX = GetXY().x;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLImageElement::GetY(PRInt32* aY)
-{
-  *aY = GetXY().y;
-
-  return NS_OK;
-}
-
 nsSize
 nsHTMLImageElement::GetWidthHeight()
 {
@@ -456,9 +420,7 @@ nsHTMLImageElement::IsHTMLFocusable(PRBool aWithMouse,
     // XXXbz which document should this be using?  sXBL/XBL2 issue!  I
     // think that GetOwnerDoc() is right, since we don't want to
     // assume stuff about the document we're bound to.
-    nsCOMPtr<nsIDOMHTMLMapElement> imageMap =
-      nsImageMapUtils::FindImageMap(GetOwnerDoc(), usemap);
-    if (imageMap) {
+    if (GetOwnerDoc() && GetOwnerDoc()->FindImageMap(usemap)) {
       if (aTabIndex) {
         // Use tab index on individual map areas
         *aTabIndex = (sTabFocusModel & eTabFocus_linksMask)? 0 : -1;
@@ -500,7 +462,7 @@ nsHTMLImageElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 
     // If caller is not chrome and dom.disable_image_src_set is true,
     // prevent setting image.src by exiting early
-    if (nsContentUtils::GetBoolPref("dom.disable_image_src_set") &&
+    if (Preferences::GetBool("dom.disable_image_src_set") &&
         !nsContentUtils::IsCallerChrome()) {
       return NS_OK;
     }
diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp
index b626925d8b7..99379545110 100644
--- a/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/content/html/content/src/nsHTMLLabelElement.cpp
@@ -34,11 +34,14 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Implementation of HTML <label> elements.
+ */
+#include "nsHTMLLabelElement.h"
 #include "nsCOMPtr.h"
-#include "nsIDOMHTMLLabelElement.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsIDOMEventTarget.h"
-#include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
@@ -51,73 +54,9 @@
 #include "nsPIDOMWindow.h"
 #include "nsFocusManager.h"
 
-class nsHTMLLabelElement : public nsGenericHTMLFormElement,
-                           public nsIDOMHTMLLabelElement
-{
-public:
-  nsHTMLLabelElement(already_AddRefed<nsINodeInfo> aNodeInfo);
-  virtual ~nsHTMLLabelElement();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIDOMNode
-  NS_FORWARD_NSIDOMNODE(nsGenericHTMLFormElement::)
-
-  // nsIDOMElement
-  NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLFormElement::)
-
-  // nsIDOMHTMLLabelElement
-  NS_DECL_NSIDOMHTMLLABELELEMENT
-
-  // Forward nsIDOMHTMLElement -- We don't override Click()
-  NS_FORWARD_NSIDOMHTMLELEMENT_NOFOCUSCLICK(nsGenericHTMLFormElement::)
-  NS_IMETHOD Click() { 
-    return nsGenericHTMLFormElement::Click(); 
-  }
-  NS_IMETHOD Focus();
-
-  // nsIFormControl
-  NS_IMETHOD_(PRUint32) GetType() const { return NS_FORM_LABEL; }
-  NS_IMETHOD Reset();
-  NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
-
-  virtual bool IsDisabled() const { return PR_FALSE; }
-
-  // nsIContent
-  virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
-                              nsIContent* aBindingParent,
-                              PRBool aCompileEventHandlers);
-  virtual void UnbindFromTree(PRBool aDeep = PR_TRUE,
-                              PRBool aNullParent = PR_TRUE);
-
-  virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
-
-  nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                   const nsAString& aValue, PRBool aNotify)
-  {
-    return SetAttr(aNameSpaceID, aName, nsnull, aValue, aNotify);
-  }
-  virtual nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
-                           nsIAtom* aPrefix, const nsAString& aValue,
-                           PRBool aNotify);
-  virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
-                             PRBool aNotify);
-  virtual void PerformAccesskey(PRBool aKeyCausesActivation,
-                                PRBool aIsTrustedEvent);
-  virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-
-  virtual nsXPCClassInfo* GetClassInfo();
-protected:
-  already_AddRefed<nsIContent> GetControlContent();
-  already_AddRefed<nsIContent> GetFirstFormControl(nsIContent *current);
-
-  // XXX It would be nice if we could use an event flag instead.
-  PRPackedBool mHandlingEvent;
-};
-
 // construction, destruction
 
+using namespace mozilla::dom;
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Label)
 
@@ -167,8 +106,7 @@ nsHTMLLabelElement::GetControl(nsIDOMHTMLElement** aElement)
 {
   *aElement = nsnull;
 
-  nsCOMPtr<nsIContent> content = GetControlContent();
-  nsCOMPtr<nsIDOMHTMLElement> element = do_QueryInterface(content);
+  nsCOMPtr<nsIDOMHTMLElement> element = do_QueryInterface(GetLabeledElement());
 
   element.swap(*aElement);
   return NS_OK;
@@ -183,9 +121,7 @@ nsHTMLLabelElement::Focus()
   // retarget the focus method at the for content
   nsIFocusManager* fm = nsFocusManager::GetFocusManager();
   if (fm) {
-    nsCOMPtr<nsIContent> content = GetControlContent();
-
-    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(content);
+    nsCOMPtr<nsIDOMElement> elem = do_QueryInterface(GetLabeledElement());
     if (elem)
       fm->SetFocus(elem, 0);
   }
@@ -249,7 +185,8 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
     return NS_OK;
   }
 
-  nsCOMPtr<nsIContent> content = GetControlContent();
+  // Strong ref because event dispatch is going to happen.
+  nsRefPtr<Element> content = GetLabeledElement();
 
   if (content && !EventTargetIn(aVisitor.mEvent, content, this)) {
     mHandlingEvent = PR_TRUE;
@@ -361,9 +298,9 @@ nsHTMLLabelElement::PerformAccesskey(PRBool aKeyCausesActivation,
                                      PRBool aIsTrustedEvent)
 {
   if (!aKeyCausesActivation) {
-    nsCOMPtr<nsIContent> content = GetControlContent();
-    if (content)
-      content->PerformAccesskey(aKeyCausesActivation, aIsTrustedEvent);
+    nsRefPtr<Element> element = GetLabeledElement();
+    if (element)
+      element->PerformAccesskey(aKeyCausesActivation, aIsTrustedEvent);
   } else {
     nsPresContext *presContext = GetPresContext();
     if (!presContext)
@@ -382,15 +319,15 @@ nsHTMLLabelElement::PerformAccesskey(PRBool aKeyCausesActivation,
   }
 }
 
-already_AddRefed<nsIContent>
-nsHTMLLabelElement::GetControlContent()
+Element*
+nsHTMLLabelElement::GetLabeledElement()
 {
   nsAutoString elementId;
 
   if (!GetAttr(kNameSpaceID_None, nsGkAtoms::_for, elementId)) {
     // No @for, so we are a label for our first form control element.
     // Do a depth-first traversal to look for the first form control element.
-    return GetFirstFormControl(this);
+    return GetFirstDescendantFormControl();
   }
 
   // We have a @for. The id has to be linked to an element in the same document
@@ -400,41 +337,31 @@ nsHTMLLabelElement::GetControlContent()
     return nsnull;
   }
 
-  nsIContent* content = doc->GetElementById(elementId);
-  if (!content) {
+  Element* element = doc->GetElementById(elementId);
+  if (!element) {
     return nsnull;
   }
 
-  nsCOMPtr<nsIFormControl> element = do_QueryInterface(content);
-  if (element && element->IsLabelableControl()) {
+  nsCOMPtr<nsIFormControl> controlElement = do_QueryInterface(element);
+  if (controlElement && controlElement->IsLabelableControl()) {
     // Transfer the reference count of element to the returned value.
-    element.forget();
-    return content;
+    return element;
   }
 
   return nsnull;
 }
 
-already_AddRefed<nsIContent>
-nsHTMLLabelElement::GetFirstFormControl(nsIContent *current)
+Element*
+nsHTMLLabelElement::GetFirstDescendantFormControl()
 {
-  PRUint32 numNodes = current->GetChildCount();
-
-  for (PRUint32 i = 0; i < numNodes; i++) {
-    nsIContent *child = current->GetChildAt(i);
-    if (!child) {
-      continue;
-    }
-
-    nsCOMPtr<nsIFormControl> element = do_QueryInterface(child);
+  // Have to cast do disambiguate GetFirstChild from the DOM method of that name
+  for (nsINode* cur = static_cast<nsINode*>(this)->GetFirstChild();
+       cur;
+       cur = cur->GetNextNode(this)) {
+    nsCOMPtr<nsIFormControl> element = do_QueryInterface(cur);
     if (element && element->IsLabelableControl()) {
-      NS_ADDREF(child);
-      return child;
-    }
-
-    nsIContent* content = GetFirstFormControl(child).get();
-    if (content) {
-      return content;
+      NS_ASSERTION(cur->IsElement(), "How did that happen?");
+      return cur->AsElement();
     }
   }
 
diff --git a/content/html/content/src/nsHTMLLabelElement.h b/content/html/content/src/nsHTMLLabelElement.h
new file mode 100644
index 00000000000..74215fce86a
--- /dev/null
+++ b/content/html/content/src/nsHTMLLabelElement.h
@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+/**
+ * Declaration of HTML <label> elements.
+ */
+#ifndef nsHTMLLabelElement_h
+#define nsHTMLLabelElement_h
+
+#include "nsGenericHTMLElement.h"
+#include "nsIDOMHTMLLabelElement.h"
+
+class nsHTMLLabelElement : public nsGenericHTMLFormElement,
+                           public nsIDOMHTMLLabelElement
+{
+public:
+  nsHTMLLabelElement(already_AddRefed<nsINodeInfo> aNodeInfo);
+  virtual ~nsHTMLLabelElement();
+
+  static nsHTMLLabelElement* FromContent(nsIContent* aPossibleLabel)
+  {
+    if (aPossibleLabel->IsHTML(nsGkAtoms::label)) {
+      return static_cast<nsHTMLLabelElement*>(aPossibleLabel);
+    }
+
+    return nsnull;
+  }
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIDOMNode
+  NS_FORWARD_NSIDOMNODE(nsGenericHTMLFormElement::)
+
+  // nsIDOMElement
+  NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLFormElement::)
+
+  // nsIDOMHTMLLabelElement
+  NS_DECL_NSIDOMHTMLLABELELEMENT
+
+  // Forward nsIDOMHTMLElement -- We don't override Click()
+  NS_FORWARD_NSIDOMHTMLELEMENT_NOFOCUSCLICK(nsGenericHTMLFormElement::)
+  NS_IMETHOD Click() { 
+    return nsGenericHTMLFormElement::Click(); 
+  }
+  NS_IMETHOD Focus();
+
+  // nsIFormControl
+  NS_IMETHOD_(PRUint32) GetType() const { return NS_FORM_LABEL; }
+  NS_IMETHOD Reset();
+  NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
+
+  virtual bool IsDisabled() const { return PR_FALSE; }
+
+  // nsIContent
+  virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
+                              nsIContent* aBindingParent,
+                              PRBool aCompileEventHandlers);
+  virtual void UnbindFromTree(PRBool aDeep = PR_TRUE,
+                              PRBool aNullParent = PR_TRUE);
+
+  virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
+
+  nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
+                   const nsAString& aValue, PRBool aNotify)
+  {
+    return SetAttr(aNameSpaceID, aName, nsnull, aValue, aNotify);
+  }
+  virtual nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
+                           nsIAtom* aPrefix, const nsAString& aValue,
+                           PRBool aNotify);
+  virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
+                             PRBool aNotify);
+  virtual void PerformAccesskey(PRBool aKeyCausesActivation,
+                                PRBool aIsTrustedEvent);
+  virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
+
+  virtual nsXPCClassInfo* GetClassInfo();
+
+  mozilla::dom::Element* GetLabeledElement();
+protected:
+  mozilla::dom::Element* GetFirstDescendantFormControl();
+
+  // XXX It would be nice if we could use an event flag instead.
+  PRPackedBool mHandlingEvent;
+};
+
+#endif /* nsHTMLLabelElement_h */
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 4f35b8e00dc..4f262fd98df 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -119,6 +119,9 @@ static PRLogModuleInfo* gMediaElementEventsLog;
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;
 
@@ -838,7 +841,7 @@ void nsHTMLMediaElement::ResumeLoad(PreloadAction aAction)
 
 static PRBool IsAutoplayEnabled()
 {
-  return nsContentUtils::GetBoolPref("media.autoplay.enabled");
+  return Preferences::GetBool("media.autoplay.enabled");
 }
 
 void nsHTMLMediaElement::UpdatePreloadAction()
@@ -854,10 +857,12 @@ void nsHTMLMediaElement::UpdatePreloadAction()
     // Find the appropriate preload action by looking at the attribute.
     const nsAttrValue* val = mAttrsAndChildren.GetAttr(nsGkAtoms::preload,
                                                        kNameSpaceID_None);
-    PRUint32 preloadDefault = nsContentUtils::GetIntPref("media.preload.default",
-                            nsHTMLMediaElement::PRELOAD_ATTR_METADATA);
-    PRUint32 preloadAuto = nsContentUtils::GetIntPref("media.preload.auto",
-                            nsHTMLMediaElement::PRELOAD_ENOUGH);
+    PRUint32 preloadDefault =
+      Preferences::GetInt("media.preload.default",
+                          nsHTMLMediaElement::PRELOAD_ATTR_METADATA);
+    PRUint32 preloadAuto =
+      Preferences::GetInt("media.preload.auto",
+                          nsHTMLMediaElement::PRELOAD_ENOUGH);
     if (!val) {
       // Attribute is not set. Use the preload action specified by the 
       // media.preload.default pref, or just preload metadata if not present.
@@ -1536,7 +1541,7 @@ static const char* gRawCodecs[] = {
 
 static PRBool IsRawEnabled()
 {
-  return nsContentUtils::GetBoolPref("media.raw.enabled");
+  return Preferences::GetBool("media.raw.enabled");
 }
 
 static PRBool IsRawType(const nsACString& aType)
@@ -1568,7 +1573,7 @@ char const *const nsHTMLMediaElement::gOggCodecs[3] = {
 bool
 nsHTMLMediaElement::IsOggEnabled()
 {
-  return nsContentUtils::GetBoolPref("media.ogg.enabled");
+  return Preferences::GetBool("media.ogg.enabled");
 }
 
 bool
@@ -1603,7 +1608,7 @@ char const *const nsHTMLMediaElement::gWaveCodecs[2] = {
 bool
 nsHTMLMediaElement::IsWaveEnabled()
 {
-  return nsContentUtils::GetBoolPref("media.wave.enabled");
+  return Preferences::GetBool("media.wave.enabled");
 }
 
 bool
@@ -1635,7 +1640,7 @@ char const *const nsHTMLMediaElement::gWebMCodecs[4] = {
 bool
 nsHTMLMediaElement::IsWebMEnabled()
 {
-  return nsContentUtils::GetBoolPref("media.webm.enabled");
+  return Preferences::GetBool("media.webm.enabled");
 }
 
 bool
@@ -2083,8 +2088,7 @@ void nsHTMLMediaElement::DownloadStalled()
 
 PRBool nsHTMLMediaElement::ShouldCheckAllowOrigin()
 {
-  return nsContentUtils::GetBoolPref("media.enforce_same_site_origin",
-                                     PR_TRUE);
+  return Preferences::GetBool("media.enforce_same_site_origin", PR_TRUE);
 }
 
 void nsHTMLMediaElement::UpdateReadyStateForData(NextFrameStatus aNextFrame)
diff --git a/content/html/content/src/nsHTMLDelElement.cpp b/content/html/content/src/nsHTMLModElement.cpp
similarity index 81%
rename from content/html/content/src/nsHTMLDelElement.cpp
rename to content/html/content/src/nsHTMLModElement.cpp
index 6ba6526dd79..50059532bb4 100644
--- a/content/html/content/src/nsHTMLDelElement.cpp
+++ b/content/html/content/src/nsHTMLModElement.cpp
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Ms2ger <ms2ger@gmail.com>
  *
  * 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"),
@@ -34,13 +35,13 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
 #include "nsIDOMHTMLModElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 
-
 class nsHTMLModElement : public nsGenericHTMLElement,
                          public nsIDOMHTMLModElement
 {
@@ -64,11 +65,8 @@ public:
   NS_DECL_NSIDOMHTMLMODELEMENT
 
   virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-  virtual nsXPCClassInfo* GetClassInfo()
-  {
-    return static_cast<nsXPCClassInfo*>(GetClassInfoInternal());
-  }
-  nsIClassInfo* GetClassInfoInternal();
+
+  virtual nsXPCClassInfo* GetClassInfo();
 };
 
 
@@ -87,28 +85,15 @@ nsHTMLModElement::~nsHTMLModElement()
 NS_IMPL_ADDREF_INHERITED(nsHTMLModElement, nsGenericElement)
 NS_IMPL_RELEASE_INHERITED(nsHTMLModElement, nsGenericElement)
 
-DOMCI_DATA(HTMLDelElement, nsHTMLModElement)
-DOMCI_DATA(HTMLInsElement, nsHTMLModElement)
-
-nsIClassInfo* 
-nsHTMLModElement::GetClassInfoInternal()
-{
-  if (mNodeInfo->Equals(nsGkAtoms::del)) {
-    return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLDelElement_id);
-  }
-  if (mNodeInfo->Equals(nsGkAtoms::ins)) {
-    return NS_GetDOMClassInfoInstance(eDOMClassInfo_HTMLInsElement_id);
-  }
-  return nsnull;
-}
+DOMCI_NODE_DATA(HTMLModElement, nsHTMLModElement)
 
 // QueryInterface implementation for nsHTMLModElement
 NS_INTERFACE_TABLE_HEAD(nsHTMLModElement)
-  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLModElement, nsIDOMHTMLModElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLModElement,
+                                   nsIDOMHTMLModElement)
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLModElement,
                                                nsGenericHTMLElement)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_GETTER(GetClassInfoInternal)
-NS_HTML_CONTENT_INTERFACE_MAP_END
+NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLModElement)
 
 
 NS_IMPL_ELEMENT_CLONE(nsHTMLModElement)
diff --git a/content/html/content/src/nsHTMLObjectElement.cpp b/content/html/content/src/nsHTMLObjectElement.cpp
index 46c7c981e77..bd3135e22db 100644
--- a/content/html/content/src/nsHTMLObjectElement.cpp
+++ b/content/html/content/src/nsHTMLObjectElement.cpp
@@ -43,10 +43,8 @@
 #include "nsDOMError.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
-#ifdef MOZ_SVG
 #include "nsIDOMSVGDocument.h"
 #include "nsIDOMGetSVGDocument.h"
-#endif
 #include "nsIDOMHTMLObjectElement.h"
 #include "nsFormSubmission.h"
 #include "nsIObjectFrame.h"
@@ -59,9 +57,7 @@ class nsHTMLObjectElement : public nsGenericHTMLFormElement
                           , public nsObjectLoadingContent
                           , public nsIDOMHTMLObjectElement
                           , public nsIConstraintValidation
-#ifdef MOZ_SVG
                           , public nsIDOMGetSVGDocument
-#endif
 {
 public:
   using nsIConstraintValidation::GetValidationMessage;
@@ -85,10 +81,8 @@ public:
   // nsIDOMHTMLObjectElement
   NS_DECL_NSIDOMHTMLOBJECTELEMENT
 
-#ifdef MOZ_SVG
   // nsIDOMGetSVGDocument
   NS_DECL_NSIDOMGETSVGDOCUMENT
-#endif
 
   virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
                               nsIContent *aBindingParent,
@@ -220,9 +214,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLObjectElement)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLObjectElement, nsIInterfaceRequestor)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLObjectElement, nsIChannelEventSink)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLObjectElement, nsIConstraintValidation)
-#ifdef MOZ_SVG
     NS_INTERFACE_TABLE_ENTRY(nsHTMLObjectElement, nsIDOMGetSVGDocument)
-#endif
   NS_OFFSET_AND_INTERFACE_TABLE_END
   NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLObjectElement,
                                                nsGenericHTMLFormElement)
@@ -448,13 +440,11 @@ nsHTMLObjectElement::GetContentDocument(nsIDOMDocument **aContentDocument)
   return CallQueryInterface(sub_doc, aContentDocument);
 }
 
-#ifdef MOZ_SVG
 NS_IMETHODIMP
 nsHTMLObjectElement::GetSVGDocument(nsIDOMDocument **aResult)
 {
   return GetContentDocument(aResult);
 }
-#endif
 
 PRBool
 nsHTMLObjectElement::ParseAttribute(PRInt32 aNamespaceID,
diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp
index 53ea9a6453e..086d551c30b 100644
--- a/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -75,7 +75,7 @@ public:
   // nsGenericElement
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
 
   // nsIContent
   virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
@@ -182,10 +182,11 @@ nsHTMLOptGroupElement::InsertChildAt(nsIContent* aKid,
 }
 
 nsresult
-nsHTMLOptGroupElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsHTMLOptGroupElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  nsSafeOptionListMutation safeMutation(GetSelect(), this, nsnull, aIndex, aNotify);
-  nsresult rv = nsGenericHTMLElement::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+  nsSafeOptionListMutation safeMutation(GetSelect(), this, nsnull, aIndex,
+                                        aNotify);
+  nsresult rv = nsGenericHTMLElement::RemoveChildAt(aIndex, aNotify);
   if (NS_FAILED(rv)) {
     safeMutation.MutationFailed();
   }
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index 21a5336e9fd..818671c9398 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -67,6 +67,26 @@
 
 using namespace mozilla::dom;
 
+/**
+ * This macro is similar to NS_IMPL_STRING_ATTR except that the getter method
+ * falls back to GetText if the content attribute isn't set. GetText returns a
+ * whitespace compressed .textContent value.
+ */
+#define NS_IMPL_STRING_ATTR_WITH_TEXTCONTENT(_class, _method, _atom) \
+  NS_IMETHODIMP                                                      \
+  _class::Get##_method(nsAString& aValue)                            \
+  {                                                                  \
+    if (!GetAttr(kNameSpaceID_None, nsGkAtoms::_atom, aValue)) {     \
+      GetText(aValue);                                               \
+    }                                                                \
+    return NS_OK;                                                    \
+  }                                                                  \
+  NS_IMETHODIMP                                                      \
+  _class::Set##_method(const nsAString& aValue)                      \
+  {                                                                  \
+    return SetAttrHelper(nsGkAtoms::_atom, aValue);                  \
+  }
+
 /**
  * Implementation of &lt;option&gt;
  */
@@ -160,25 +180,6 @@ nsHTMLOptionElement::SetSelectedInternal(PRBool aValue, PRBool aNotify)
   }
 }
 
-NS_IMETHODIMP
-nsHTMLOptionElement::SetValue(const nsAString& aValue)
-{
-  SetAttr(kNameSpaceID_None, nsGkAtoms::value, aValue, PR_TRUE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLOptionElement::GetValue(nsAString& aValue)
-{
-  // If the value attr is there, that is *exactly* what we use.  If it is
-  // not, we compress whitespace .text.
-  if (!GetAttr(kNameSpaceID_None, nsGkAtoms::value, aValue)) {
-    GetText(aValue);
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP 
 nsHTMLOptionElement::GetSelected(PRBool* aValue)
 {
@@ -216,8 +217,8 @@ nsHTMLOptionElement::SetSelected(PRBool aValue)
 }
 
 NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, DefaultSelected, selected)
-NS_IMPL_STRING_ATTR(nsHTMLOptionElement, Label, label)
-//NS_IMPL_STRING_ATTR(nsHTMLOptionElement, Value, value)
+NS_IMPL_STRING_ATTR_WITH_TEXTCONTENT(nsHTMLOptionElement, Label, label)
+NS_IMPL_STRING_ATTR_WITH_TEXTCONTENT(nsHTMLOptionElement, Value, value)
 NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, Disabled, disabled)
 
 NS_IMETHODIMP 
diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp
index fc7fd41c824..10968f6108f 100644
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -38,6 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsHTMLSelectElement.h"
+
 #include "nsHTMLOptionElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsContentCreatorFunctions.h"
@@ -51,12 +52,9 @@
 #include "nsContentCreatorFunctions.h"
 
 #include "nsIDOMHTMLOptGroupElement.h"
-#include "nsHTMLOptionElement.h"
 #include "nsEventStates.h"
 #include "nsGUIEvent.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsIBoxObject.h"
-#include "nsIDOMNSDocument.h"
 
 // Notify/query select frame for selectedIndex
 #include "nsIDocument.h"
@@ -237,11 +235,10 @@ nsHTMLSelectElement::InsertChildAt(nsIContent* aKid,
 }
 
 nsresult
-nsHTMLSelectElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsHTMLSelectElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on select child removal.");
   nsSafeOptionListMutation safeMutation(this, this, nsnull, aIndex, aNotify);
-  nsresult rv = nsGenericHTMLFormElement::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+  nsresult rv = nsGenericHTMLFormElement::RemoveChildAt(aIndex, aNotify);
   if (NS_FAILED(rv)) {
     safeMutation.MutationFailed();
   }
diff --git a/content/html/content/src/nsHTMLSelectElement.h b/content/html/content/src/nsHTMLSelectElement.h
index 44cc86c0e79..16021ccd9e2 100644
--- a/content/html/content/src/nsHTMLSelectElement.h
+++ b/content/html/content/src/nsHTMLSelectElement.h
@@ -280,7 +280,7 @@ public:
   virtual PRBool IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRInt32 *aTabIndex);
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
 
   // Overriden nsIFormControl methods
   NS_IMETHOD_(PRUint32) GetType() const { return NS_FORM_SELECT; }
diff --git a/content/html/content/src/nsHTMLSharedObjectElement.cpp b/content/html/content/src/nsHTMLSharedObjectElement.cpp
index bc8d565c3c1..7de5a3a1b05 100644
--- a/content/html/content/src/nsHTMLSharedObjectElement.cpp
+++ b/content/html/content/src/nsHTMLSharedObjectElement.cpp
@@ -45,10 +45,8 @@
 #include "nsIDOMHTMLAppletElement.h"
 #include "nsIDOMHTMLEmbedElement.h"
 #include "nsThreadUtils.h"
-#ifdef MOZ_SVG
 #include "nsIDOMGetSVGDocument.h"
 #include "nsIDOMSVGDocument.h"
-#endif
 
 // XXX this is to get around conflicts with windows.h defines
 // introduced through jni.h
@@ -63,9 +61,7 @@ class nsHTMLSharedObjectElement : public nsGenericHTMLElement
                                 , public nsObjectLoadingContent
                                 , public nsIDOMHTMLAppletElement
                                 , public nsIDOMHTMLEmbedElement
-#ifdef MOZ_SVG
                                 , public nsIDOMGetSVGDocument
-#endif
 {
 public:
   nsHTMLSharedObjectElement(already_AddRefed<nsINodeInfo> aNodeInfo,
@@ -96,10 +92,8 @@ public:
   NS_IMETHOD GetType(nsAString &aType);
   NS_IMETHOD SetType(const nsAString &aType);
 
-#ifdef MOZ_SVG
   // nsIDOMGetSVGDocument
   NS_DECL_NSIDOMGETSVGDOCUMENT
-#endif
 
   virtual nsresult BindToTree(nsIDocument *aDocument, nsIContent *aParent,
                               nsIContent *aBindingParent,
@@ -258,9 +252,7 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLSharedObjectElement)
                                                          nsIDOMHTMLAppletElement)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLAppletElement, applet)
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMHTMLEmbedElement, embed)
-#ifdef MOZ_SVG
   NS_INTERFACE_MAP_ENTRY_IF_TAG(nsIDOMGetSVGDocument, embed)
-#endif
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_GETTER(GetClassInfoInternal)
 NS_HTML_CONTENT_INTERFACE_MAP_END
 
@@ -368,7 +360,6 @@ NS_IMPL_STRING_ATTR(nsHTMLSharedObjectElement, Type, type)
 NS_IMPL_INT_ATTR(nsHTMLSharedObjectElement, Vspace, vspace)
 NS_IMPL_STRING_ATTR(nsHTMLSharedObjectElement, Width, width)
 
-#ifdef MOZ_SVG
 NS_IMETHODIMP
 nsHTMLSharedObjectElement::GetSVGDocument(nsIDOMDocument **aResult)
 {
@@ -388,7 +379,6 @@ nsHTMLSharedObjectElement::GetSVGDocument(nsIDOMDocument **aResult)
 
   return CallQueryInterface(sub_doc, aResult);
 }
-#endif
 
 PRBool
 nsHTMLSharedObjectElement::ParseAttribute(PRInt32 aNamespaceID,
@@ -489,11 +479,7 @@ nsHTMLSharedObjectElement::GetCapabilities() const
 {
   PRUint32 capabilities = eSupportPlugins | eOverrideServerType;
   if (mNodeInfo->Equals(nsGkAtoms::embed)) {
-    capabilities |=
-#ifdef MOZ_SVG
-                    eSupportSVG |
-#endif
-                    eSupportImages;
+    capabilities |= eSupportSVG | eSupportImages;
   }
 
   return capabilities;
diff --git a/content/html/content/src/nsImageMapUtils.cpp b/content/html/content/src/nsImageMapUtils.cpp
deleted file mode 100644
index 2983bd931d6..00000000000
--- a/content/html/content/src/nsImageMapUtils.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsCOMPtr.h"
-#include "nsIDocument.h"
-#include "mozilla/dom/Element.h"
-#include "nsIHTMLDocument.h"
-#include "nsIDOMHTMLMapElement.h"
-#include "nsImageMapUtils.h"
-
-using namespace mozilla::dom;
-
-/*static*/
-already_AddRefed<nsIDOMHTMLMapElement>
-nsImageMapUtils::FindImageMap(nsIDocument *aDocument, 
-                              const nsAString &aUsemap)
-{
-  if (!aDocument)
-    return nsnull;
-
-  // We used to strip the whitespace from the usemap value as a Quirk,
-  // but it was too quirky and didn't really work correctly - see bug
-  // 87050
-
-  if (aUsemap.IsEmpty())
-    return nsnull;
-
-  nsAString::const_iterator start, end;
-  aUsemap.BeginReading(start);
-  aUsemap.EndReading(end);
-
-  PRInt32 hash = aUsemap.FindChar('#');
-  if (hash > -1) {
-    // aUsemap contains a '#', set start to point right after the '#'
-    start.advance(hash + 1);
-
-    if (start == end) {
-      return nsnull; // aUsemap == "#"
-    }
-  } else {
-    return nsnull;
-  }
-
-  const nsAString& usemap = Substring(start, end);
-
-  nsCOMPtr<nsIHTMLDocument> htmlDoc(do_QueryInterface(aDocument));
-  if (htmlDoc) {
-    nsCOMPtr<nsIDOMHTMLMapElement> map =
-      do_QueryInterface(htmlDoc->GetImageMap(usemap));
-    return map.forget();
-  } else {
-    // For XHTML elements embedded in non-XHTML documents we get the
-    // map by id since XHTML requires that where a "name" attribute
-    // was used in HTML 4.01, the "id" attribute must be used in
-    // XHTML. The attribute "name" is officially deprecated.  This
-    // simplifies our life becase we can simply get the map with
-    // getElementById().
-    Element* element = aDocument->GetElementById(usemap);
-
-    if (element) {
-      nsIDOMHTMLMapElement* map;
-      CallQueryInterface(element, &map);
-      return map;
-    }
-  }
-  
-  return nsnull;
-}
diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 874cc0c5819..b7011121b3c 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -277,6 +277,8 @@ _TEST_FILES = \
 		test_bug560112.html \
 		test_bug649134.html \
 		test_bug658746.html \
+		test_bug659596.html \
+		test_bug659743.xml \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug389797.html b/content/html/content/test/test_bug389797.html
index ffca1211bd9..b15a9e2bc09 100644
--- a/content/html/content/test/test_bug389797.html
+++ b/content/html/content/test/test_bug389797.html
@@ -52,11 +52,9 @@ function HTML_TAG(aTagName, aImplClass) {
   if (interfaceName in Components.interfaces) {  // no nsIDOMHTMLSpanElement
     interfaces[aTagName].push(interfaceName);
     interfacesNonClassinfo[aTagName].push("nsIDOMHTMLElement");
-  } else if (aTagName != "ins" && aTagName != "del") {
-    // Inherits directly from nsIDOMHTMLElement, unless it's "ins" or "del",
-    // which are weird.
+  } else {
+    // Inherits directly from nsIDOMHTMLElement.
     interfaces[aTagName].push("nsIDOMHTMLElement");
-    
   }
 
   var interfaceNameNS = "nsIDOMNS" + getClassName(aTagName);
@@ -95,11 +93,9 @@ objectIfaces2.push("nsIImageLoadingContent");
    applet
    base
    blockquote
-   del
    dir
    dl
    embed
-   ins
    isindex
    menu
    ol
@@ -112,45 +108,45 @@ objectIfaces2.push("nsIImageLoadingContent");
  */
 
 HTML_TAG("a", "Anchor");
-HTML_TAG("abbr", ""); // HTMLElement
-HTML_TAG("acronym", ""); // HTMLElement
-HTML_TAG("address", ""); // HTMLElement
+HTML_TAG("abbr", "");
+HTML_TAG("acronym", "");
+HTML_TAG("address", "");
 HTML_TAG("applet", "Applet", [], objectIfaces);
 HTML_TAG("area", "Area");
-HTML_TAG("article", ""); // HTMLElement
-HTML_TAG("aside", ""); // HTMLElement
-HTML_TAG("b", ""); // HTMLElement
+HTML_TAG("article", "");
+HTML_TAG("aside", "");
+HTML_TAG("b", "");
 HTML_TAG("base", "Base");
-HTML_TAG("bdo", ""); // HTMLElement
+HTML_TAG("bdo", "");
 HTML_TAG("bgsound", "Span");
-HTML_TAG("big", ""); // HTMLElement
-HTML_TAG("blink", ""); // HTMLElement
+HTML_TAG("big", "");
+HTML_TAG("blink", "");
 HTML_TAG("blockquote", "Quote");
 HTML_TAG("body", "Body");
 HTML_TAG("br", "BR");
 HTML_TAG("button", "Button");
 HTML_TAG("canvas", "Canvas");
 HTML_TAG("caption", "TableCaption");
-HTML_TAG("center", ""); // HTMLElement
-HTML_TAG("cite", ""); // HTMLElement
-HTML_TAG("code", ""); // HTMLElement
+HTML_TAG("center", "");
+HTML_TAG("cite", "");
+HTML_TAG("code", "");
 HTML_TAG("col", "TableCol");
 HTML_TAG("colgroup", "TableCol");
 HTML_TAG("datalist", "DataList");
-HTML_TAG("dd", ""); // HTMLElement
-HTML_TAG("del", "Del", [ "nsIDOMHTMLModElement" ]);
-HTML_TAG("dfn", ""); // HTMLElement
+HTML_TAG("dd", "");
+HTML_TAG("del", "Mod");
+HTML_TAG("dfn", "");
 HTML_TAG("dir", "Directory");
 HTML_TAG("div", "Div");
 HTML_TAG("dl", "DList");
-HTML_TAG("dt", ""); // HTMLElement
-HTML_TAG("em", ""); // HTMLElement
+HTML_TAG("dt", "");
+HTML_TAG("em", "");
 HTML_TAG("embed", "Embed", [ "nsIDOMGetSVGDocument" ], objectIfaces);
 HTML_TAG("fieldset", "FieldSet");
-HTML_TAG("figcaption", "") // HTMLElement
-HTML_TAG("figure", "") // HTMLElement
+HTML_TAG("figcaption", "")
+HTML_TAG("figure", "")
 HTML_TAG("font", "Font");
-HTML_TAG("footer", "") // HTMLElement
+HTML_TAG("footer", "")
 HTML_TAG("form", "Form", [], [ "nsIWebProgressListener" ]);
 HTML_TAG("frame", "Frame", [], [ "nsIFrameLoaderOwner" ]);
 HTML_TAG("frameset", "FrameSet");
@@ -161,11 +157,11 @@ HTML_TAG("h4", "Heading");
 HTML_TAG("h5", "Heading");
 HTML_TAG("h6", "Heading");
 HTML_TAG("head", "Head");
-HTML_TAG("header", "") // HTMLElement
-HTML_TAG("hgroup", "") // HTMLElement
+HTML_TAG("header", "")
+HTML_TAG("hgroup", "")
 HTML_TAG("hr", "HR");
 HTML_TAG("html", "Html");
-HTML_TAG("i", ""); // HTMLElement
+HTML_TAG("i", "");
 HTML_TAG("iframe", "IFrame", [ "nsIDOMNSHTMLFrameElement", "nsIDOMGetSVGDocument" ],
                              [ "nsIFrameLoaderOwner" ]);
 HTML_TAG("image", "Span");
@@ -174,26 +170,26 @@ HTML_TAG("img", "Image", [], [ "imgIDecoderObserver",
 HTML_TAG("input", "Input", [], [ "imgIDecoderObserver",
                                  "nsIImageLoadingContent",
                                  "nsIDOMNSEditableElement" ]);
-HTML_TAG("ins", "Ins", [ "nsIDOMHTMLModElement" ]);
-HTML_TAG("isindex", ""); // HTMLElement
-HTML_TAG("kbd", ""); // HTMLElement
+HTML_TAG("ins", "Mod");
+HTML_TAG("isindex", "");
+HTML_TAG("kbd", "");
 HTML_TAG("keygen", "Span");
 HTML_TAG("label", "Label");
 HTML_TAG("legend", "Legend");
 HTML_TAG("li", "LI");
 HTML_TAG("link", "Link", [ "nsIDOMLinkStyle" ]);
-HTML_TAG("listing", ""); // HTMLElement
+HTML_TAG("listing", "");
 HTML_TAG("map", "Map");
-HTML_TAG("mark", ""); // HTMLElement
+HTML_TAG("mark", "");
 HTML_TAG("marquee", "Div");
 HTML_TAG("menu", "Menu");
 HTML_TAG("meta", "Meta");
 HTML_TAG("multicol", "Span");
-HTML_TAG("nav", "") // HTMLElement
-HTML_TAG("nobr", ""); // HTMLElement
-HTML_TAG("noembed", ""); // HTMLElement
-HTML_TAG("noframes", ""); // HTMLElement
-HTML_TAG("noscript", ""); // HTMLElement
+HTML_TAG("nav", "")
+HTML_TAG("nobr", "");
+HTML_TAG("noembed", "");
+HTML_TAG("noframes", "");
+HTML_TAG("noscript", "");
 HTML_TAG("object", "Object", [ "nsIDOMGetSVGDocument" ],
                              objectIfaces.concat([ "nsIImageLoadingContent" ]));
 HTML_TAG("ol", "OList");
@@ -201,21 +197,21 @@ HTML_TAG("optgroup", "OptGroup");
 HTML_TAG("option", "Option");
 HTML_TAG("p", "Paragraph");
 HTML_TAG("param", "Param");
-HTML_TAG("plaintext", ""); // HTMLElement
+HTML_TAG("plaintext", "");
 HTML_TAG("pre", "Pre");
 HTML_TAG("q", "Quote");
-HTML_TAG("s", ""); // HTMLElement
-HTML_TAG("samp", ""); // HTMLElement
+HTML_TAG("s", "");
+HTML_TAG("samp", "");
 HTML_TAG("script", "Script", [], [ "nsIScriptLoaderObserver" ]);
-HTML_TAG("section", "") // HTMLElement
+HTML_TAG("section", "")
 HTML_TAG("select", "Select", ["nsIDOMHTMLSelectElement"]);
-HTML_TAG("small", ""); // HTMLElement
+HTML_TAG("small", "");
 HTML_TAG("span", "Span");
-HTML_TAG("strike", ""); // HTMLElement
-HTML_TAG("strong", ""); // HTMLElement
+HTML_TAG("strike", "");
+HTML_TAG("strong", "");
 HTML_TAG("style", "Style", [ "nsIDOMLinkStyle" ]);
-HTML_TAG("sub", ""); // HTMLElement
-HTML_TAG("sup", ""); // HTMLElement
+HTML_TAG("sub", "");
+HTML_TAG("sup", "");
 HTML_TAG("table", "Table");
 HTML_TAG("tbody", "TableSection");
 HTML_TAG("td", "TableCell");
@@ -225,12 +221,12 @@ HTML_TAG("th", "TableCell");
 HTML_TAG("thead", "TableSection");
 HTML_TAG("title", "Title");
 HTML_TAG("tr", "TableRow");
-HTML_TAG("tt", ""); // HTMLElement
-HTML_TAG("u", ""); // HTMLElement
+HTML_TAG("tt", "");
+HTML_TAG("u", "");
 HTML_TAG("ul", "UList");
-HTML_TAG("var", ""); // HTMLElement
-HTML_TAG("wbr", ""); // HTMLElement
-HTML_TAG("xmp", ""); // HTMLElement
+HTML_TAG("var", "");
+HTML_TAG("wbr", "");
+HTML_TAG("xmp", "");
 
 function tagName(aTag) {
   return "<" + aTag + ">";
diff --git a/content/html/content/test/test_bug659596.html b/content/html/content/test/test_bug659596.html
new file mode 100644
index 00000000000..e15091ccb83
--- /dev/null
+++ b/content/html/content/test/test_bug659596.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=659596
+-->
+<head>
+  <title>Test for Bug 659596</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=659596">Mozilla Bug 659596</a>
+<p id="display"></p>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 659596 **/
+
+function checkReflection(option, attribute) {
+  /**
+   * Getting.
+   */
+
+  // When attribute isn't present.
+  var tests = [ "", "foo" ];
+  for each (var test in tests) {
+    option.removeAttribute(attribute);
+    option.textContent = test;
+    is(option.getAttribute(attribute), null,
+       "option " + attribute + "'s value should be null");
+    is(option[attribute], option.textContent,
+       "option." + attribute + " should reflect the text content when the attribute isn't set");
+  }
+
+  // When attribute is present.
+  tests = [
+    [ "", "" ],
+    [ "", "foo" ],
+    [ "foo", "bar" ],
+    [ "foo", "" ],
+  ];
+  for each (var test in tests) {
+    option.setAttribute(attribute, test[0]);
+    option.textContent = test[1];
+    is(option[attribute], option.getAttribute(attribute),
+       "option." + attribute + " should reflect the content attribute when it is set");
+  }
+
+  /**
+   * Setting.
+   */
+
+  // When attribute isn't present.
+  tests = [
+    [ "", "new" ],
+    [ "foo", "new" ],
+  ];
+  for each (var test in tests) {
+    option.removeAttribute(attribute);
+    option.textContent = test[0];
+    option[attribute] = test[1]
+
+    is(option.getAttribute(attribute), test[1],
+       "when setting, the content attribute should change");
+    is(option.textContent, test[0],
+       "when setting, the text content should not change");
+  }
+
+  // When attribute is present.
+  tests = [
+    [ "", "", "new" ],
+    [ "", "foo", "new" ],
+    [ "foo", "bar", "new" ],
+    [ "foo", "", "new" ],
+  ];
+  for each (var test in tests) {
+    option.setAttribute(attribute, test[0]);
+    option.textContent = test[1];
+    option[attribute] = test[2];
+
+    is(option.getAttribute(attribute), test[2],
+       "when setting, the content attribute should change");
+    is(option.textContent, test[1],
+       "when setting, the text content should not change");
+  }
+}
+
+var option = document.createElement("option");
+
+checkReflection(option, "value");
+checkReflection(option, "label");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/content/test/test_bug659743.xml b/content/html/content/test/test_bug659743.xml
new file mode 100644
index 00000000000..9f093978a43
--- /dev/null
+++ b/content/html/content/test/test_bug659743.xml
@@ -0,0 +1,56 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=659743
+-->
+<head>
+  <title>Test for Bug 659743</title>
+  <script src="/MochiKit/packed.js"></script>
+  <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=659743">Mozilla Bug 659743</a>
+<p id="display">
+<map name="a">
+<area shape="rect" coords="25,25,75,75" href="#x"/>
+</map>
+<map id="b">
+<area shape="rect" coords="25,25,75,75" href="#y"/>
+</map>
+<map name="a">
+<area shape="rect" coords="25,25,75,75" href="#FAIL"/>
+</map>
+<map id="b">
+<area shape="rect" coords="25,25,75,75" href="#FAIL"/>
+</map>
+
+<img usemap="#a" src="image.png"/>
+<img usemap="#b" src="image.png"/>
+</p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 659743 **/
+SimpleTest.waitForExplicitFinish();
+var images = document.getElementsByTagName("img");
+var second = false;
+onhashchange = function() {
+  if (!second) {
+    second = true;
+    is(location.hash, "#x", "First map");
+    SimpleTest.waitForFocus(function() synthesizeMouse(images[1], 50, 50, {}));
+  } else {
+    is(location.hash, "#y", "Second map");
+    SimpleTest.finish();
+  }
+};
+SimpleTest.waitForFocus(function() synthesizeMouse(images[0], 50, 50, {}));
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
similarity index 82%
rename from content/html/document/src/nsImageDocument.cpp
rename to content/html/document/src/ImageDocument.cpp
index a7cf5976cec..a98244448ed 100644
--- a/content/html/document/src/nsImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -38,6 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "MediaDocument.h"
 #include "nsRect.h"
 #include "nsHTMLDocument.h"
 #include "nsIImageDocument.h"
@@ -57,7 +58,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsAutoPtr.h"
-#include "nsMediaDocument.h"
 #include "nsStyleSet.h"
 #include "nsIChannel.h"
 #include "nsIContentPolicy.h"
@@ -74,34 +74,36 @@
 #include "nsThreadUtils.h"
 #include "nsIScrollableFrame.h"
 #include "mozilla/dom/Element.h"
-
-using namespace mozilla::dom;
+#include "mozilla/Preferences.h"
 
 #define AUTOMATIC_IMAGE_RESIZING_PREF "browser.enable_automatic_image_resizing"
 #define CLICK_IMAGE_RESIZING_PREF "browser.enable_click_image_resizing"
 //XXX A hack needed for Firefox's site specific zoom.
 #define SITE_SPECIFIC_ZOOM "browser.zoom.siteSpecific"
 
-class nsImageDocument;
+namespace mozilla {
+namespace dom {
+ 
+class ImageDocument;
 
-class ImageListener: public nsMediaDocumentStreamListener
+class ImageListener : public MediaDocumentStreamListener
 {
 public:
-  ImageListener(nsImageDocument* aDocument);
+  ImageListener(ImageDocument* aDocument);
   virtual ~ImageListener();
 
   /* nsIRequestObserver */
   NS_IMETHOD OnStartRequest(nsIRequest* request, nsISupports *ctxt);
 };
 
-class nsImageDocument : public nsMediaDocument,
-                        public nsIImageDocument,
-                        public nsStubImageDecoderObserver,
-                        public nsIDOMEventListener
+class ImageDocument : public MediaDocument
+                    , public nsIImageDocument
+                    , public nsStubImageDecoderObserver
+                    , public nsIDOMEventListener
 {
 public:
-  nsImageDocument();
-  virtual ~nsImageDocument();
+  ImageDocument();
+  virtual ~ImageDocument();
 
   NS_DECL_ISUPPORTS_INHERITED
 
@@ -129,7 +131,7 @@ public:
   // nsIDOMEventListener
   NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
 
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsImageDocument, nsMediaDocument)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ImageDocument, MediaDocument)
 
   friend class ImageListener;
 
@@ -176,8 +178,8 @@ protected:
   float                         mOriginalZoomLevel;
 };
 
-ImageListener::ImageListener(nsImageDocument* aDocument)
-  : nsMediaDocumentStreamListener(aDocument)
+ImageListener::ImageListener(ImageDocument* aDocument)
+  : MediaDocumentStreamListener(aDocument)
 {
 }
 
@@ -190,7 +192,7 @@ ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
 {
   NS_ENSURE_TRUE(mDocument, NS_ERROR_FAILURE);
 
-  nsImageDocument *imgDoc = (nsImageDocument*)mDocument.get();
+  ImageDocument *imgDoc = static_cast<ImageDocument*>(mDocument.get());
   nsCOMPtr<nsIChannel> channel = do_QueryInterface(request);
   if (!channel) {
     return NS_ERROR_FAILURE;
@@ -236,62 +238,55 @@ ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
   imgDoc->mObservingImageLoader = PR_TRUE;
   imageLoader->LoadImageWithChannel(channel, getter_AddRefs(mNextStream));
 
-  return nsMediaDocumentStreamListener::OnStartRequest(request, ctxt);
+  return MediaDocumentStreamListener::OnStartRequest(request, ctxt);
 }
 
-
-  // NOTE! nsDocument::operator new() zeroes out all members, so don't
-  // bother initializing members to 0.
-
-nsImageDocument::nsImageDocument() : mOriginalZoomLevel(1.0)
+ImageDocument::ImageDocument()
+  : mOriginalZoomLevel(1.0)
 {
-
   // NOTE! nsDocument::operator new() zeroes out all members, so don't
   // bother initializing members to 0.
-
 }
 
-nsImageDocument::~nsImageDocument()
+ImageDocument::~ImageDocument()
 {
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsImageDocument)
+NS_IMPL_CYCLE_COLLECTION_CLASS(ImageDocument)
 
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsImageDocument, nsMediaDocument)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ImageDocument, MediaDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mImageContent)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsImageDocument, nsMediaDocument)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ImageDocument, MediaDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mImageContent)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_IMPL_ADDREF_INHERITED(nsImageDocument, nsMediaDocument)
-NS_IMPL_RELEASE_INHERITED(nsImageDocument, nsMediaDocument)
+NS_IMPL_ADDREF_INHERITED(ImageDocument, MediaDocument)
+NS_IMPL_RELEASE_INHERITED(ImageDocument, MediaDocument)
 
-DOMCI_NODE_DATA(ImageDocument, nsImageDocument)
+DOMCI_NODE_DATA(ImageDocument, ImageDocument)
 
-NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsImageDocument)
-  NS_HTML_DOCUMENT_INTERFACE_TABLE_BEGIN(nsImageDocument)
-    NS_INTERFACE_TABLE_ENTRY(nsImageDocument, nsIImageDocument)
-    NS_INTERFACE_TABLE_ENTRY(nsImageDocument, imgIDecoderObserver)
-    NS_INTERFACE_TABLE_ENTRY(nsImageDocument, imgIContainerObserver)
-    NS_INTERFACE_TABLE_ENTRY(nsImageDocument, nsIDOMEventListener)
+NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(ImageDocument)
+  NS_HTML_DOCUMENT_INTERFACE_TABLE_BEGIN(ImageDocument)
+    NS_INTERFACE_TABLE_ENTRY(ImageDocument, nsIImageDocument)
+    NS_INTERFACE_TABLE_ENTRY(ImageDocument, imgIDecoderObserver)
+    NS_INTERFACE_TABLE_ENTRY(ImageDocument, imgIContainerObserver)
+    NS_INTERFACE_TABLE_ENTRY(ImageDocument, nsIDOMEventListener)
   NS_OFFSET_AND_INTERFACE_TABLE_END
   NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ImageDocument)
-NS_INTERFACE_MAP_END_INHERITING(nsMediaDocument)
+NS_INTERFACE_MAP_END_INHERITING(MediaDocument)
 
 
 nsresult
-nsImageDocument::Init()
+ImageDocument::Init()
 {
-  nsresult rv = nsMediaDocument::Init();
+  nsresult rv = MediaDocument::Init();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mResizeImageByDefault =
-    nsContentUtils::GetBoolPref(AUTOMATIC_IMAGE_RESIZING_PREF);
-  mClickResizingEnabled =
-    nsContentUtils::GetBoolPref(CLICK_IMAGE_RESIZING_PREF);
+  mResizeImageByDefault = Preferences::GetBool(AUTOMATIC_IMAGE_RESIZING_PREF);
+  mClickResizingEnabled = Preferences::GetBool(CLICK_IMAGE_RESIZING_PREF);
   mShouldResize = mResizeImageByDefault;
   mFirstResize = PR_TRUE;
 
@@ -299,37 +294,33 @@ nsImageDocument::Init()
 }
 
 nsresult
-nsImageDocument::StartDocumentLoad(const char*         aCommand,
-                                   nsIChannel*         aChannel,
-                                   nsILoadGroup*       aLoadGroup,
-                                   nsISupports*        aContainer,
-                                   nsIStreamListener** aDocListener,
-                                   PRBool              aReset,
-                                   nsIContentSink*     aSink)
+ImageDocument::StartDocumentLoad(const char*         aCommand,
+                                 nsIChannel*         aChannel,
+                                 nsILoadGroup*       aLoadGroup,
+                                 nsISupports*        aContainer,
+                                 nsIStreamListener** aDocListener,
+                                 PRBool              aReset,
+                                 nsIContentSink*     aSink)
 {
   nsresult rv =
-    nsMediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup,
-                                       aContainer, aDocListener, aReset,
-                                       aSink);
+    MediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer,
+                                     aDocListener, aReset, aSink);
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   mOriginalZoomLevel =
-    nsContentUtils::GetBoolPref(SITE_SPECIFIC_ZOOM, PR_FALSE) ?
-      1.0 : GetZoomLevel();
+    Preferences::GetBool(SITE_SPECIFIC_ZOOM, PR_FALSE) ? 1.0 : GetZoomLevel();
 
   NS_ASSERTION(aDocListener, "null aDocListener");
   *aDocListener = new ImageListener(this);
-  if (!*aDocListener)
-    return NS_ERROR_OUT_OF_MEMORY;
   NS_ADDREF(*aDocListener);
 
   return NS_OK;
 }
 
 void
-nsImageDocument::Destroy()
+ImageDocument::Destroy()
 {
   if (mImageContent) {
     // Remove our event listener from the image content.
@@ -352,11 +343,11 @@ nsImageDocument::Destroy()
     mImageContent = nsnull;
   }
 
-  nsMediaDocument::Destroy();
+  MediaDocument::Destroy();
 }
 
 void
-nsImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
+ImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
 {
   // If the script global object is changing, we need to unhook our event
   // listeners on the window.
@@ -393,40 +384,39 @@ nsImageDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObjec
 }
 
 void
-nsImageDocument::OnPageShow(PRBool aPersisted,
-                            nsIDOMEventTarget* aDispatchStartTarget)
+ImageDocument::OnPageShow(PRBool aPersisted,
+                          nsIDOMEventTarget* aDispatchStartTarget)
 {
   if (aPersisted) {
     mOriginalZoomLevel =
-      nsContentUtils::GetBoolPref(SITE_SPECIFIC_ZOOM, PR_FALSE) ?
-        1.0 : GetZoomLevel();
+      Preferences::GetBool(SITE_SPECIFIC_ZOOM, PR_FALSE) ? 1.0 : GetZoomLevel();
   }
-  nsMediaDocument::OnPageShow(aPersisted, aDispatchStartTarget);
+  MediaDocument::OnPageShow(aPersisted, aDispatchStartTarget);
 }
 
 NS_IMETHODIMP
-nsImageDocument::GetImageResizingEnabled(PRBool* aImageResizingEnabled)
+ImageDocument::GetImageResizingEnabled(PRBool* aImageResizingEnabled)
 {
   *aImageResizingEnabled = PR_TRUE;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsImageDocument::GetImageIsOverflowing(PRBool* aImageIsOverflowing)
+ImageDocument::GetImageIsOverflowing(PRBool* aImageIsOverflowing)
 {
   *aImageIsOverflowing = mImageIsOverflowing;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsImageDocument::GetImageIsResized(PRBool* aImageIsResized)
+ImageDocument::GetImageIsResized(PRBool* aImageIsResized)
 {
   *aImageIsResized = mImageIsResized;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsImageDocument::GetImageRequest(imgIRequest** aImageRequest)
+ImageDocument::GetImageRequest(imgIRequest** aImageRequest)
 {
   nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mImageContent);
   if (imageLoader) {
@@ -439,7 +429,7 @@ nsImageDocument::GetImageRequest(imgIRequest** aImageRequest)
 }
 
 NS_IMETHODIMP
-nsImageDocument::ShrinkToFit()
+ImageDocument::ShrinkToFit()
 {
   if (!mImageContent) {
     return NS_OK;
@@ -470,13 +460,13 @@ nsImageDocument::ShrinkToFit()
 }
 
 NS_IMETHODIMP
-nsImageDocument::RestoreImageTo(PRInt32 aX, PRInt32 aY)
+ImageDocument::RestoreImageTo(PRInt32 aX, PRInt32 aY)
 {
   return ScrollImageTo(aX, aY, PR_TRUE);
 }
 
 nsresult
-nsImageDocument::ScrollImageTo(PRInt32 aX, PRInt32 aY, PRBool restoreImage)
+ImageDocument::ScrollImageTo(PRInt32 aX, PRInt32 aY, PRBool restoreImage)
 {
   float ratio = GetRatio();
 
@@ -501,7 +491,7 @@ nsImageDocument::ScrollImageTo(PRInt32 aX, PRInt32 aY, PRBool restoreImage)
 }
 
 NS_IMETHODIMP
-nsImageDocument::RestoreImage()
+ImageDocument::RestoreImage()
 {
   if (!mImageContent) {
     return NS_OK;
@@ -527,7 +517,7 @@ nsImageDocument::RestoreImage()
 }
 
 NS_IMETHODIMP
-nsImageDocument::ToggleImageSize()
+ImageDocument::ToggleImageSize()
 {
   mShouldResize = PR_TRUE;
   if (mImageIsResized) {
@@ -544,12 +534,12 @@ nsImageDocument::ToggleImageSize()
 }
 
 NS_IMETHODIMP
-nsImageDocument::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
+ImageDocument::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
 {
   aImage->GetWidth(&mImageWidth);
   aImage->GetHeight(&mImageHeight);
   nsCOMPtr<nsIRunnable> runnable =
-    NS_NewRunnableMethod(this, &nsImageDocument::DefaultCheckOverflowing);
+    NS_NewRunnableMethod(this, &ImageDocument::DefaultCheckOverflowing);
   nsContentUtils::AddScriptRunner(runnable);
   UpdateTitleAndCharset();
 
@@ -557,9 +547,9 @@ nsImageDocument::OnStartContainer(imgIRequest* aRequest, imgIContainer* aImage)
 }
 
 NS_IMETHODIMP
-nsImageDocument::OnStopDecode(imgIRequest *aRequest,
-                              nsresult aStatus,
-                              const PRUnichar *aStatusArg)
+ImageDocument::OnStopDecode(imgIRequest *aRequest,
+                            nsresult aStatus,
+                            const PRUnichar *aStatusArg)
 {
   UpdateTitleAndCharset();
 
@@ -587,7 +577,7 @@ nsImageDocument::OnStopDecode(imgIRequest *aRequest,
 }
 
 NS_IMETHODIMP
-nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
+ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
 {
   nsAutoString eventType;
   aEvent->GetType(eventType);
@@ -647,10 +637,10 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent)
 }
 
 nsresult
-nsImageDocument::CreateSyntheticDocument()
+ImageDocument::CreateSyntheticDocument()
 {
   // Synthesize an html document that refers to the image
-  nsresult rv = nsMediaDocument::CreateSyntheticDocument();
+  nsresult rv = MediaDocument::CreateSyntheticDocument();
   NS_ENSURE_SUCCESS(rv, rv);
 
   Element* body = GetBodyElement();
@@ -693,7 +683,7 @@ nsImageDocument::CreateSyntheticDocument()
 }
 
 nsresult
-nsImageDocument::CheckOverflowing(PRBool changeState)
+ImageDocument::CheckOverflowing(PRBool changeState)
 {
   /* Create a scope so that the style context gets destroyed before we might
    * call RebuildStyleData.  Also, holding onto pointers to the
@@ -749,7 +739,7 @@ nsImageDocument::CheckOverflowing(PRBool changeState)
 }
 
 void 
-nsImageDocument::UpdateTitleAndCharset()
+ImageDocument::UpdateTitleAndCharset()
 {
   nsCAutoString typeStr;
   nsCOMPtr<imgIRequest> imageRequest;
@@ -807,12 +797,12 @@ nsImageDocument::UpdateTitleAndCharset()
     "ImageTitleWithDimensionsAndFile",
   };
 
-  nsMediaDocument::UpdateTitleAndCharset(typeStr, formatNames,
-                                         mImageWidth, mImageHeight, status);
+  MediaDocument::UpdateTitleAndCharset(typeStr, formatNames,
+                                       mImageWidth, mImageHeight, status);
 }
 
 void
-nsImageDocument::ResetZoomLevel()
+ImageDocument::ResetZoomLevel()
 {
   nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
   if (docShell) {
@@ -830,7 +820,7 @@ nsImageDocument::ResetZoomLevel()
 }
 
 float
-nsImageDocument::GetZoomLevel()
+ImageDocument::GetZoomLevel()
 {
   float zoomLevel = mOriginalZoomLevel;
   nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocumentContainer);
@@ -845,17 +835,18 @@ nsImageDocument::GetZoomLevel()
   return zoomLevel;
 }
 
+} // namespace dom
+} // namespace mozilla
+
+DOMCI_DATA(ImageDocument, mozilla::dom::ImageDocument)
+
 nsresult
 NS_NewImageDocument(nsIDocument** aResult)
 {
-  nsImageDocument* doc = new nsImageDocument();
-  if (!doc) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
+  mozilla::dom::ImageDocument* doc = new mozilla::dom::ImageDocument();
   NS_ADDREF(doc);
-  nsresult rv = doc->Init();
 
+  nsresult rv = doc->Init();
   if (NS_FAILED(rv)) {
     NS_RELEASE(doc);
   }
diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in
index 29e75eb7735..1e3c6592934 100644
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -51,13 +51,13 @@ CPPSRCS		= \
 		nsHTMLContentSink.cpp \
 		nsHTMLFragmentContentSink.cpp \
 		nsHTMLDocument.cpp \
-		nsImageDocument.cpp \
-		nsMediaDocument.cpp \
-		nsPluginDocument.cpp \
+		ImageDocument.cpp \
+		MediaDocument.cpp \
+		PluginDocument.cpp \
 		$(NULL)
 
 ifdef MOZ_MEDIA
-CPPSRCS += nsVideoDocument.cpp
+CPPSRCS += VideoDocument.cpp
 endif
 
 EXPORTS		= \
@@ -73,10 +73,10 @@ INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../content/src \
-		-I$(srcdir)/../../../../layout/style \
-		-I$(srcdir)/../../../../dom/base \
-		-I$(srcdir)/../../../../xpcom/io \
-		-I$(srcdir)/../../../../caps/include \
+		-I$(topsrcdir)/layout/style \
+		-I$(topsrcdir)/dom/base \
+		-I$(topsrcdir)/xpcom/io \
+		-I$(topsrcdir)/caps/include \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/content/html/document/src/nsMediaDocument.cpp b/content/html/document/src/MediaDocument.cpp
similarity index 85%
rename from content/html/document/src/nsMediaDocument.cpp
rename to content/html/document/src/MediaDocument.cpp
index ec4024effff..c99db0b4eee 100644
--- a/content/html/document/src/nsMediaDocument.cpp
+++ b/content/html/document/src/MediaDocument.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsMediaDocument.h"
+#include "MediaDocument.h"
 #include "nsGkAtoms.h"
 #include "nsRect.h"
 #include "nsPresContext.h"
@@ -53,29 +53,32 @@
 #include "nsIDocumentCharsetInfo.h" 
 #include "nsNodeInfoManager.h"
 
-nsMediaDocumentStreamListener::nsMediaDocumentStreamListener(nsMediaDocument *aDocument)
+namespace mozilla {
+namespace dom {
+
+MediaDocumentStreamListener::MediaDocumentStreamListener(MediaDocument *aDocument)
 {
   mDocument = aDocument;
 }
 
-nsMediaDocumentStreamListener::~nsMediaDocumentStreamListener()
+MediaDocumentStreamListener::~MediaDocumentStreamListener()
 {
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsMediaDocumentStreamListener,
+NS_IMPL_THREADSAFE_ISUPPORTS2(MediaDocumentStreamListener,
                               nsIRequestObserver,
                               nsIStreamListener)
 
 
 void
-nsMediaDocumentStreamListener::SetStreamListener(nsIStreamListener *aListener)
+MediaDocumentStreamListener::SetStreamListener(nsIStreamListener *aListener)
 {
   mNextStream = aListener;
 }
 
 NS_IMETHODIMP
-nsMediaDocumentStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
+MediaDocumentStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
 {
   NS_ENSURE_TRUE(mDocument, NS_ERROR_FAILURE);
 
@@ -89,9 +92,9 @@ nsMediaDocumentStreamListener::OnStartRequest(nsIRequest* request, nsISupports *
 }
 
 NS_IMETHODIMP
-nsMediaDocumentStreamListener::OnStopRequest(nsIRequest* request,
-                                             nsISupports *ctxt,
-                                             nsresult status)
+MediaDocumentStreamListener::OnStopRequest(nsIRequest* request,
+                                           nsISupports *ctxt,
+                                           nsresult status)
 {
   nsresult rv = NS_OK;
   if (mNextStream) {
@@ -105,11 +108,11 @@ nsMediaDocumentStreamListener::OnStopRequest(nsIRequest* request,
 }
 
 NS_IMETHODIMP
-nsMediaDocumentStreamListener::OnDataAvailable(nsIRequest* request,
-                                               nsISupports *ctxt,
-                                               nsIInputStream *inStr,
-                                               PRUint32 sourceOffset,
-                                               PRUint32 count)
+MediaDocumentStreamListener::OnDataAvailable(nsIRequest* request,
+                                             nsISupports *ctxt,
+                                             nsIInputStream *inStr,
+                                             PRUint32 sourceOffset,
+                                             PRUint32 count)
 {
   if (mNextStream) {
     return mNextStream->OnDataAvailable(request, ctxt, inStr, sourceOffset, count);
@@ -118,8 +121,8 @@ nsMediaDocumentStreamListener::OnDataAvailable(nsIRequest* request,
   return NS_OK;
 }
 
-// default format names for nsMediaDocument. 
-const char* const nsMediaDocument::sFormatNames[4] = 
+// default format names for MediaDocument. 
+const char* const MediaDocument::sFormatNames[4] = 
 {
   "MediaTitleWithNoInfo",    // eWithNoInfo
   "MediaTitleWithFile",      // eWithFile
@@ -127,15 +130,15 @@ const char* const nsMediaDocument::sFormatNames[4] =
   ""                         // eWithDimAndFile
 };
 
-nsMediaDocument::nsMediaDocument()
+MediaDocument::MediaDocument()
 {
 }
-nsMediaDocument::~nsMediaDocument()
+MediaDocument::~MediaDocument()
 {
 }
 
 nsresult
-nsMediaDocument::Init()
+MediaDocument::Init()
 {
   nsresult rv = nsHTMLDocument::Init();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -152,13 +155,13 @@ nsMediaDocument::Init()
 }
 
 nsresult
-nsMediaDocument::StartDocumentLoad(const char*         aCommand,
-                                   nsIChannel*         aChannel,
-                                   nsILoadGroup*       aLoadGroup,
-                                   nsISupports*        aContainer,
-                                   nsIStreamListener** aDocListener,
-                                   PRBool              aReset,
-                                   nsIContentSink*     aSink)
+MediaDocument::StartDocumentLoad(const char*         aCommand,
+                                 nsIChannel*         aChannel,
+                                 nsILoadGroup*       aLoadGroup,
+                                 nsISupports*        aContainer,
+                                 nsIStreamListener** aDocListener,
+                                 PRBool              aReset,
+                                 nsIContentSink*     aSink)
 {
   nsresult rv = nsDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup,
                                               aContainer, aDocListener, aReset,
@@ -227,7 +230,7 @@ nsMediaDocument::StartDocumentLoad(const char*         aCommand,
 }
 
 nsresult
-nsMediaDocument::CreateSyntheticDocument()
+MediaDocument::CreateSyntheticDocument()
 {
   // Synthesize an empty html document
   nsresult rv;
@@ -273,7 +276,7 @@ nsMediaDocument::CreateSyntheticDocument()
 }
 
 nsresult
-nsMediaDocument::StartLayout()
+MediaDocument::StartLayout()
 {
   mMayStartLayout = PR_TRUE;
   nsCOMPtr<nsIPresShell> shell = GetShell();
@@ -289,7 +292,7 @@ nsMediaDocument::StartLayout()
 }
 
 void
-nsMediaDocument::GetFileName(nsAString& aResult)
+MediaDocument::GetFileName(nsAString& aResult)
 {
   aResult.Truncate();
 
@@ -329,10 +332,10 @@ nsMediaDocument::GetFileName(nsAString& aResult)
 }
 
 void 
-nsMediaDocument::UpdateTitleAndCharset(const nsACString& aTypeStr,
-                                       const char* const* aFormatNames,
-                                       PRInt32 aWidth, PRInt32 aHeight,
-                                       const nsAString& aStatus)
+MediaDocument::UpdateTitleAndCharset(const nsACString& aTypeStr,
+                                     const char* const* aFormatNames,
+                                     PRInt32 aWidth, PRInt32 aHeight,
+                                     const nsAString& aStatus)
 {
   nsXPIDLString fileStr;
   GetFileName(fileStr);
@@ -394,3 +397,6 @@ nsMediaDocument::UpdateTitleAndCharset(const nsACString& aTypeStr,
     SetTitle(titleWithStatus);
   }
 }
+
+} // namespace dom
+} // namespace mozilla
diff --git a/content/html/document/src/nsMediaDocument.h b/content/html/document/src/MediaDocument.h
similarity index 86%
rename from content/html/document/src/nsMediaDocument.h
rename to content/html/document/src/MediaDocument.h
index e3123108213..0d0eaff8bf2 100644
--- a/content/html/document/src/nsMediaDocument.h
+++ b/content/html/document/src/MediaDocument.h
@@ -35,8 +35,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsMediaDocument_h___
-#define nsMediaDocument_h___
+#ifndef mozilla_dom_MediaDocument_h
+#define mozilla_dom_MediaDocument_h
 
 #include "nsHTMLDocument.h"
 #include "nsGenericHTMLElement.h"
@@ -45,11 +45,14 @@
 
 #define NSMEDIADOCUMENT_PROPERTIES_URI "chrome://global/locale/layout/MediaDocument.properties"
 
-class nsMediaDocument : public nsHTMLDocument
+namespace mozilla {
+namespace dom {
+
+class MediaDocument : public nsHTMLDocument
 {
 public:
-  nsMediaDocument();
-  virtual ~nsMediaDocument();
+  MediaDocument();
+  virtual ~MediaDocument();
 
   virtual nsresult Init();
 
@@ -64,7 +67,7 @@ public:
 protected:
   virtual nsresult CreateSyntheticDocument();
 
-  friend class nsMediaDocumentStreamListener;
+  friend class MediaDocumentStreamListener;
   nsresult StartLayout();
 
   void GetFileName(nsAString& aResult);
@@ -77,7 +80,7 @@ protected:
   // "ImageTitleWithDimesions",  "ImageTitleWithDimensionsAndFile".
   //
   // Also see MediaDocument.properties if you want to define format names
-  // for a new subclass. aWidth and aHeight are pixels for |nsImageDocument|,
+  // for a new subclass. aWidth and aHeight are pixels for |ImageDocument|,
   // but could be in other units for other 'media', in which case you have to 
   // define format names accordingly. 
   void UpdateTitleAndCharset(const nsACString&  aTypeStr,
@@ -94,11 +97,11 @@ private:
 };
 
 
-class nsMediaDocumentStreamListener: public nsIStreamListener
+class MediaDocumentStreamListener: public nsIStreamListener
 {
 public:
-  nsMediaDocumentStreamListener(nsMediaDocument *aDocument);
-  virtual ~nsMediaDocumentStreamListener();
+  MediaDocumentStreamListener(MediaDocument *aDocument);
+  virtual ~MediaDocumentStreamListener();
   void SetStreamListener(nsIStreamListener *aListener);
 
   NS_DECL_ISUPPORTS
@@ -107,9 +110,11 @@ public:
 
   NS_DECL_NSISTREAMLISTENER
 
-  nsRefPtr<nsMediaDocument>    mDocument;
+  nsRefPtr<MediaDocument>      mDocument;
   nsCOMPtr<nsIStreamListener>  mNextStream;
 };
 
+} // namespace dom
+} // namespace mozilla
 
-#endif /* nsMediaDocument_h___ */
+#endif /* mozilla_dom_MediaDocument_h */
diff --git a/content/html/document/src/nsPluginDocument.cpp b/content/html/document/src/PluginDocument.cpp
similarity index 78%
rename from content/html/document/src/nsPluginDocument.cpp
rename to content/html/document/src/PluginDocument.cpp
index 4da48c0cab6..09e8e9192ad 100644
--- a/content/html/document/src/nsPluginDocument.cpp
+++ b/content/html/document/src/PluginDocument.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsMediaDocument.h"
+#include "MediaDocument.h"
 #include "nsIPluginDocument.h"
 #include "nsGkAtoms.h"
 #include "nsIPresShell.h"
@@ -48,14 +48,15 @@
 #include "nsIPropertyBag2.h"
 #include "mozilla/dom/Element.h"
 
-using namespace mozilla::dom;
+namespace mozilla {
+namespace dom {
 
-class nsPluginDocument : public nsMediaDocument,
-                         public nsIPluginDocument
+class PluginDocument : public MediaDocument
+                     , public nsIPluginDocument
 {
 public:
-  nsPluginDocument();
-  virtual ~nsPluginDocument();
+  PluginDocument();
+  virtual ~PluginDocument();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPLUGINDOCUMENT
@@ -78,14 +79,14 @@ public:
     mWillHandleInstantiation = PR_FALSE;
   }
 
-  void StartLayout() { nsMediaDocument::StartLayout(); }
+  void StartLayout() { MediaDocument::StartLayout(); }
 
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsPluginDocument, nsMediaDocument)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PluginDocument, MediaDocument)
 protected:
   nsresult CreateSyntheticPluginDocument();
 
   nsCOMPtr<nsIContent>                     mPluginContent;
-  nsRefPtr<nsMediaDocumentStreamListener>  mStreamListener;
+  nsRefPtr<MediaDocumentStreamListener>    mStreamListener;
   nsCString                                mMimeType;
 
   // Hack to handle the fact that plug-in loading lives in frames and that the
@@ -94,21 +95,23 @@ protected:
   PRBool                                   mWillHandleInstantiation;
 };
 
-class nsPluginStreamListener : public nsMediaDocumentStreamListener
+class PluginStreamListener : public MediaDocumentStreamListener
 {
 public:
-  nsPluginStreamListener(nsPluginDocument* doc) :
-    nsMediaDocumentStreamListener(doc),  mPluginDoc(doc) {}
+  PluginStreamListener(PluginDocument* doc)
+    : MediaDocumentStreamListener(doc)
+    , mPluginDoc(doc)
+  {}
   NS_IMETHOD OnStartRequest(nsIRequest* request, nsISupports *ctxt);
 private:
   nsresult SetupPlugin();
 
-  nsRefPtr<nsPluginDocument> mPluginDoc;
+  nsRefPtr<PluginDocument> mPluginDoc;
 };
 
 
 NS_IMETHODIMP
-nsPluginStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
+PluginStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
 {
   // Have to set up our plugin stuff before we call OnStartRequest, so
   // that the plugin listener can get that call.
@@ -116,12 +119,12 @@ nsPluginStreamListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
 
   NS_ASSERTION(NS_FAILED(rv) || mNextStream,
                "We should have a listener by now");
-  nsresult rv2 = nsMediaDocumentStreamListener::OnStartRequest(request, ctxt);
+  nsresult rv2 = MediaDocumentStreamListener::OnStartRequest(request, ctxt);
   return NS_SUCCEEDED(rv) ? rv2 : rv;
 }
 
 nsresult
-nsPluginStreamListener::SetupPlugin()
+PluginStreamListener::SetupPlugin()
 {
   NS_ENSURE_TRUE(mDocument, NS_ERROR_FAILURE);
   mPluginDoc->StartLayout();
@@ -170,38 +173,38 @@ nsPluginStreamListener::SetupPlugin()
   // NOTE! nsDocument::operator new() zeroes out all members, so don't
   // bother initializing members to 0.
 
-nsPluginDocument::nsPluginDocument()
+PluginDocument::PluginDocument()
   : mWillHandleInstantiation(PR_TRUE)
 {
 }
 
-nsPluginDocument::~nsPluginDocument()
+PluginDocument::~PluginDocument()
 {
 }
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(nsPluginDocument)
+NS_IMPL_CYCLE_COLLECTION_CLASS(PluginDocument)
 
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsPluginDocument, nsMediaDocument)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PluginDocument, MediaDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mPluginContent)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsPluginDocument, nsMediaDocument)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PluginDocument, MediaDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mPluginContent)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_IMPL_ADDREF_INHERITED(nsPluginDocument, nsMediaDocument)
-NS_IMPL_RELEASE_INHERITED(nsPluginDocument, nsMediaDocument)
+NS_IMPL_ADDREF_INHERITED(PluginDocument, MediaDocument)
+NS_IMPL_RELEASE_INHERITED(PluginDocument, MediaDocument)
 
-NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsPluginDocument)
-  NS_INTERFACE_TABLE_INHERITED1(nsPluginDocument, nsIPluginDocument)
-NS_INTERFACE_TABLE_TAIL_INHERITING(nsMediaDocument)
+NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(PluginDocument)
+  NS_INTERFACE_TABLE_INHERITED1(PluginDocument, nsIPluginDocument)
+NS_INTERFACE_TABLE_TAIL_INHERITING(MediaDocument)
 
 void
-nsPluginDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
+PluginDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject)
 {
   // Set the script global object on the superclass before doing
   // anything that might require it....
-  nsMediaDocument::SetScriptGlobalObject(aScriptGlobalObject);
+  MediaDocument::SetScriptGlobalObject(aScriptGlobalObject);
 
   if (aScriptGlobalObject) {
     if (!mPluginContent) {
@@ -219,7 +222,7 @@ nsPluginDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObje
 
 
 PRBool
-nsPluginDocument::CanSavePresentation(nsIRequest *aNewRequest)
+PluginDocument::CanSavePresentation(nsIRequest *aNewRequest)
 {
   // Full-page plugins cannot be cached, currently, because we don't have
   // the stream listener data to feed to the plugin instance.
@@ -228,13 +231,13 @@ nsPluginDocument::CanSavePresentation(nsIRequest *aNewRequest)
 
 
 nsresult
-nsPluginDocument::StartDocumentLoad(const char*         aCommand,
-                                    nsIChannel*         aChannel,
-                                    nsILoadGroup*       aLoadGroup,
-                                    nsISupports*        aContainer,
-                                    nsIStreamListener** aDocListener,
-                                    PRBool              aReset,
-                                    nsIContentSink*     aSink)
+PluginDocument::StartDocumentLoad(const char*         aCommand,
+                                  nsIChannel*         aChannel,
+                                  nsILoadGroup*       aLoadGroup,
+                                  nsISupports*        aContainer,
+                                  nsIStreamListener** aDocListener,
+                                  PRBool              aReset,
+                                  nsIContentSink*     aSink)
 {
   // do not allow message panes to host full-page plugins
   // returning an error causes helper apps to take over
@@ -248,9 +251,8 @@ nsPluginDocument::StartDocumentLoad(const char*         aCommand,
   }
 
   nsresult rv =
-    nsMediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup,
-                                       aContainer, aDocListener, aReset,
-                                       aSink);
+    MediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer,
+                                     aDocListener, aReset, aSink);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -260,7 +262,7 @@ nsPluginDocument::StartDocumentLoad(const char*         aCommand,
     return rv;
   }
 
-  mStreamListener = new nsPluginStreamListener(this);
+  mStreamListener = new PluginStreamListener(this);
   if (!mStreamListener) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -271,13 +273,13 @@ nsPluginDocument::StartDocumentLoad(const char*         aCommand,
 }
 
 nsresult
-nsPluginDocument::CreateSyntheticPluginDocument()
+PluginDocument::CreateSyntheticPluginDocument()
 {
   NS_ASSERTION(!GetShell() || !GetShell()->DidInitialReflow(),
                "Creating synthetic plugin document content too late");
 
   // make our generic document
-  nsresult rv = nsMediaDocument::CreateSyntheticDocument();
+  nsresult rv = MediaDocument::CreateSyntheticDocument();
   NS_ENSURE_SUCCESS(rv, rv);
   // then attach our plugin
 
@@ -333,19 +335,19 @@ nsPluginDocument::CreateSyntheticPluginDocument()
 }
 
 NS_IMETHODIMP
-nsPluginDocument::SetStreamListener(nsIStreamListener *aListener)
+PluginDocument::SetStreamListener(nsIStreamListener *aListener)
 {
   if (mStreamListener) {
     mStreamListener->SetStreamListener(aListener);
   }
 
-  nsMediaDocument::UpdateTitleAndCharset(mMimeType);
+  MediaDocument::UpdateTitleAndCharset(mMimeType);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsPluginDocument::Print()
+PluginDocument::Print()
 {
   NS_ENSURE_TRUE(mPluginContent, NS_ERROR_FAILURE);
 
@@ -369,16 +371,19 @@ nsPluginDocument::Print()
 }
 
 NS_IMETHODIMP
-nsPluginDocument::GetWillHandleInstantiation(PRBool* aWillHandle)
+PluginDocument::GetWillHandleInstantiation(PRBool* aWillHandle)
 {
   *aWillHandle = mWillHandleInstantiation;
   return NS_OK;
 }
 
+} // namespace dom
+} // namespace mozilla
+
 nsresult
 NS_NewPluginDocument(nsIDocument** aResult)
 {
-  nsPluginDocument* doc = new nsPluginDocument();
+  mozilla::dom::PluginDocument* doc = new mozilla::dom::PluginDocument();
   if (!doc) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff --git a/content/html/document/src/nsVideoDocument.cpp b/content/html/document/src/VideoDocument.cpp
similarity index 79%
rename from content/html/document/src/nsVideoDocument.cpp
rename to content/html/document/src/VideoDocument.cpp
index b3680be241b..0550d1bba49 100644
--- a/content/html/document/src/nsVideoDocument.cpp
+++ b/content/html/document/src/VideoDocument.cpp
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsMediaDocument.h"
+#include "MediaDocument.h"
 #include "nsGkAtoms.h"
 #include "nsNodeInfoManager.h"
 #include "nsContentCreatorFunctions.h"
@@ -43,9 +43,10 @@
 #include "nsIDocShellTreeItem.h"
 #include "mozilla/dom/Element.h"
 
-using namespace mozilla::dom;
+namespace mozilla {
+namespace dom {
 
-class nsVideoDocument : public nsMediaDocument
+class VideoDocument : public MediaDocument
 {
 public:
   virtual nsresult StartDocumentLoad(const char*         aCommand,
@@ -64,25 +65,24 @@ protected:
   nsresult CreateSyntheticVideoDocument(nsIChannel* aChannel,
                                         nsIStreamListener** aListener);
 
-  nsRefPtr<nsMediaDocumentStreamListener> mStreamListener;
+  nsRefPtr<MediaDocumentStreamListener> mStreamListener;
 };
 
 nsresult
-nsVideoDocument::StartDocumentLoad(const char*         aCommand,
-                                   nsIChannel*         aChannel,
-                                   nsILoadGroup*       aLoadGroup,
-                                   nsISupports*        aContainer,
-                                   nsIStreamListener** aDocListener,
-                                   PRBool              aReset,
-                                   nsIContentSink*     aSink)
+VideoDocument::StartDocumentLoad(const char*         aCommand,
+                                 nsIChannel*         aChannel,
+                                 nsILoadGroup*       aLoadGroup,
+                                 nsISupports*        aContainer,
+                                 nsIStreamListener** aDocListener,
+                                 PRBool              aReset,
+                                 nsIContentSink*     aSink)
 {
   nsresult rv =
-    nsMediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup,
-                                       aContainer, aDocListener, aReset,
-                                       aSink);
+    MediaDocument::StartDocumentLoad(aCommand, aChannel, aLoadGroup, aContainer,
+                                     aDocListener, aReset, aSink);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mStreamListener = new nsMediaDocumentStreamListener(this);
+  mStreamListener = new MediaDocumentStreamListener(this);
   if (!mStreamListener)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -96,11 +96,11 @@ nsVideoDocument::StartDocumentLoad(const char*         aCommand,
 }
 
 nsresult
-nsVideoDocument::CreateSyntheticVideoDocument(nsIChannel* aChannel,
-                                              nsIStreamListener** aListener)
+VideoDocument::CreateSyntheticVideoDocument(nsIChannel* aChannel,
+                                            nsIStreamListener** aListener)
 {
   // make our generic document
-  nsresult rv = nsMediaDocument::CreateSyntheticDocument();
+  nsresult rv = MediaDocument::CreateSyntheticDocument();
   NS_ENSURE_SUCCESS(rv, rv);
 
   Element* body = GetBodyElement();
@@ -137,7 +137,7 @@ nsVideoDocument::CreateSyntheticVideoDocument(nsIChannel* aChannel,
 }
 
 void
-nsVideoDocument::UpdateTitle(nsIChannel* aChannel)
+VideoDocument::UpdateTitle(nsIChannel* aChannel)
 {
   if (!aChannel)
     return;
@@ -147,10 +147,13 @@ nsVideoDocument::UpdateTitle(nsIChannel* aChannel)
   SetTitle(fileName);
 }
 
+} // namespace dom
+} // namespace mozilla
+
 nsresult
 NS_NewVideoDocument(nsIDocument** aResult)
 {
-  nsVideoDocument* doc = new nsVideoDocument();
+  mozilla::dom::VideoDocument* doc = new mozilla::dom::VideoDocument();
   if (!doc) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
index 3054d7d740c..b01ed8b0067 100644
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -63,13 +63,13 @@
 #include "nsNodeUtils.h"
 #include "nsIContent.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/Preferences.h"
 
 #include "nsGenericHTMLElement.h"
 
 #include "nsIDOMText.h"
 #include "nsIDOMComment.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMDOMImplementation.h"
 #include "nsIDOMDocumentType.h"
 #include "nsIDOMHTMLScriptElement.h"
@@ -122,6 +122,7 @@
 #include "nsContentCreatorFunctions.h"
 #include "mozAutoDocUpdate.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 #ifdef NS_DEBUG
@@ -1597,7 +1598,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
 
   // Changed from 8192 to greatly improve page loading performance on
   // large pages.  See bugzilla bug 77540.
-  mMaxTextRun = nsContentUtils::GetIntPref("content.maxtextrun", 8191);
+  mMaxTextRun = Preferences::GetInt("content.maxtextrun", 8191);
 
   nsCOMPtr<nsINodeInfo> nodeInfo;
   nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::html, nsnull,
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 6ed2193882e..fcb36610ac9 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -94,7 +94,6 @@
 #include "nsIComponentManager.h"
 #include "nsParserCIID.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIDOMHTMLMapElement.h"
 #include "nsIDOMHTMLBodyElement.h"
 #include "nsIDOMHTMLHeadElement.h"
 #include "nsINameSpaceManager.h"
@@ -143,7 +142,9 @@
 #include "nsHtml5Module.h"
 #include "prprf.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 #define NS_MAX_DOCUMENT_WRITE_DEPTH 20
@@ -184,14 +185,13 @@ static PRBool ConvertToMidasInternalCommand(const nsAString & inCommandID,
 static int
 MyPrefChangedCallback(const char*aPrefName, void* instance_data)
 {
-  const nsAdoptingString& detector_name =
-    nsContentUtils::GetLocalizedStringPref("intl.charset.detector");
+  const nsAdoptingCString& detector_name =
+    Preferences::GetLocalizedCString("intl.charset.detector");
 
-  if (detector_name.Length() > 0) {
+  if (!detector_name.IsEmpty()) {
     PL_strncpy(g_detector_contractid, NS_CHARSET_DETECTOR_CONTRACTID_BASE,
                DETECTOR_CONTRACTID_MAX);
-    PL_strncat(g_detector_contractid,
-               NS_ConvertUTF16toUTF8(detector_name).get(),
+    PL_strncat(g_detector_contractid, detector_name,
                DETECTOR_CONTRACTID_MAX);
     gPlugDetector = PR_TRUE;
   } else {
@@ -283,8 +283,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsHTMLDocument, nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mForms, nsIDOMNodeList)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mFormControls,
                                                        nsIDOMNodeList)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR_AMBIGUOUS(mImageMaps,
-                                                       nsIDOMNodeList)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mWyciwygChannel)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mMidasCommandManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFragmentParser)
@@ -298,7 +296,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsHTMLDocument, nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mAnchors)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mForms)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFormControls)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mImageMaps)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mWyciwygChannel)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mMidasCommandManager)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFragmentParser)
@@ -315,7 +312,6 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsHTMLDocument)
   NS_DOCUMENT_INTERFACE_TABLE_BEGIN(nsHTMLDocument)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLDocument, nsIHTMLDocument)
     NS_INTERFACE_TABLE_ENTRY(nsHTMLDocument, nsIDOMHTMLDocument)
-    NS_INTERFACE_TABLE_ENTRY(nsHTMLDocument, nsIDOMNSHTMLDocument)
   NS_OFFSET_AND_INTERFACE_TABLE_END
   NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(HTMLDocument)
@@ -542,11 +538,11 @@ nsHTMLDocument::UseWeakDocTypeDefault(PRInt32& aCharsetSource,
   // fallback value in case docshell return error
   aCharset.AssignLiteral("ISO-8859-1");
 
-  const nsAdoptingString& defCharset =
-    nsContentUtils::GetLocalizedStringPref("intl.charset.default");
+  const nsAdoptingCString& defCharset =
+    Preferences::GetLocalizedCString("intl.charset.default");
 
   if (!defCharset.IsEmpty()) {
-    LossyCopyUTF16toASCII(defCharset, aCharset);
+    aCharset = defCharset;
     aCharsetSource = kCharsetFromWeakDocTypeDefault;
   }
   return PR_TRUE;
@@ -588,21 +584,19 @@ nsHTMLDocument::StartAutodetection(nsIDocShell *aDocShell, nsACString& aCharset,
 
   nsresult rv_detect;
   if(!gInitDetector) {
-    const nsAdoptingString& detector_name =
-      nsContentUtils::GetLocalizedStringPref("intl.charset.detector");
+    const nsAdoptingCString& detector_name =
+      Preferences::GetLocalizedCString("intl.charset.detector");
 
     if(!detector_name.IsEmpty()) {
       PL_strncpy(g_detector_contractid, NS_CHARSET_DETECTOR_CONTRACTID_BASE,
                  DETECTOR_CONTRACTID_MAX);
-      PL_strncat(g_detector_contractid,
-                 NS_ConvertUTF16toUTF8(detector_name).get(),
+      PL_strncat(g_detector_contractid, detector_name,
                  DETECTOR_CONTRACTID_MAX);
       gPlugDetector = PR_TRUE;
     }
 
-    nsContentUtils::RegisterPrefCallback("intl.charset.detector",
-                                         MyPrefChangedCallback,
-                                         nsnull);
+    Preferences::RegisterCallback(MyPrefChangedCallback,
+                                  "intl.charset.detector");
 
     gInitDetector = PR_TRUE;
   }
@@ -1147,34 +1141,6 @@ nsHTMLDocument::EndLoad()
   }
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::SetTitle(const nsAString& aTitle)
-{
-  return nsDocument::SetTitle(aTitle);
-}
-
-Element*
-nsHTMLDocument::GetImageMap(const nsAString& aMapName)
-{
-  if (!mImageMaps) {
-    mImageMaps = new nsContentList(this, kNameSpaceID_XHTML, nsGkAtoms::map, nsGkAtoms::map);
-  }
-
-  nsAutoString name;
-  PRUint32 i, n = mImageMaps->Length(PR_TRUE);
-  for (i = 0; i < n; ++i) {
-    nsIContent* map = mImageMaps->GetNodeAt(i);
-    if (map->AttrValueIs(kNameSpaceID_None, nsGkAtoms::id, aMapName,
-                         eCaseMatters) ||
-        map->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name, aMapName,
-                         eIgnoreCase)) {
-      return map->AsElement();
-    }
-  }
-
-  return NULL;
-}
-
 void
 nsHTMLDocument::SetCompatibilityMode(nsCompatibility aMode)
 {
@@ -1195,18 +1161,6 @@ nsHTMLDocument::SetCompatibilityMode(nsCompatibility aMode)
 //
 // nsIDOMHTMLDocument interface implementation
 //
-NS_IMETHODIMP
-nsHTMLDocument::GetTitle(nsAString& aTitle)
-{
-  return nsDocument::GetTitle(aTitle);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetReferrer(nsAString& aReferrer)
-{
-  return nsDocument::GetReferrer(aReferrer);
-}
-
 void
 nsHTMLDocument::GetDomainURI(nsIURI **aURI)
 {
@@ -1562,9 +1516,9 @@ nsHTMLDocument::SetCookie(const nsAString& aCookie)
   return NS_OK;
 }
 
-// XXX TBI: accepting arguments to the open method.
 nsresult
-nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
+nsHTMLDocument::OpenCommon(JSContext* cx, const nsAString& aContentType,
+                           PRBool aReplace)
 {
   if (!IsHTML() || mDisableDocWrite) {
     // No calling document.open() on XHTML
@@ -1732,7 +1686,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
 
     nsCOMPtr<nsIScriptGlobalObject> newScope(do_QueryReferent(mScopeObject));
     if (oldScope && newScope != oldScope) {
-      nsContentUtils::ReparentContentWrappersInScope(oldScope, newScope);
+      nsContentUtils::ReparentContentWrappersInScope(cx, oldScope, newScope);
     }
   }
 
@@ -1754,7 +1708,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
   }
 
   // This will be propagated to the parser when someone actually calls write()
-  SetContentTypeInternal(aContentType);
+  SetContentTypeInternal(NS_ConvertUTF16toUTF8(aContentType));
 
   mWriteState = eDocumentOpened;
 
@@ -1812,17 +1766,40 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
 }
 
 NS_IMETHODIMP
-nsHTMLDocument::Open()
+nsHTMLDocument::Open(const nsAString& aContentTypeOrUrl,
+                     const nsAString& aReplaceOrName,
+                     const nsAString& aFeatures,
+                     JSContext* cx, PRUint8 aOptionalArgCount,
+                     nsISupports** aReturn)
 {
-  nsCOMPtr<nsIDOMDocument> doc;
-  return Open(NS_LITERAL_CSTRING("text/html"), PR_FALSE, getter_AddRefs(doc));
-}
+  // When called with 3 or more arguments, document.open() calls window.open().
+  if (aOptionalArgCount > 2) {
+    nsCOMPtr<nsIDOMWindowInternal> window = GetWindowInternal();
+    if (!window) {
+      return NS_OK;
+    }
+    nsCOMPtr<nsIDOMWindow> newWindow;
+    nsresult rv = window->Open(aContentTypeOrUrl, aReplaceOrName, aFeatures,
+                               getter_AddRefs(newWindow));
+    *aReturn = newWindow.forget().get();
+    return rv;
+  }
 
-NS_IMETHODIMP
-nsHTMLDocument::Open(const nsACString& aContentType, PRBool aReplace,
-                     nsIDOMDocument** aReturn)
-{
-  nsresult rv = OpenCommon(aContentType, aReplace);
+  nsAutoString contentType;
+  contentType.AssignLiteral("text/html");
+  if (aOptionalArgCount > 0) {
+    nsAutoString type;
+    ToLowerCase(aContentTypeOrUrl, type);
+    nsCAutoString actualType, dummy;
+    NS_ParseContentType(NS_ConvertUTF16toUTF8(type), actualType, dummy);
+    if (!actualType.EqualsLiteral("text/html") &&
+        !type.EqualsLiteral("replace")) {
+      contentType.AssignLiteral("text/plain");
+    }
+  }
+
+  nsresult rv = OpenCommon(cx, contentType,
+    aOptionalArgCount > 1 && aReplaceOrName.EqualsLiteral("replace"));
   NS_ENSURE_SUCCESS(rv, rv);
 
   return CallQueryInterface(this, aReturn);
@@ -1896,7 +1873,8 @@ nsHTMLDocument::Close()
 }
 
 nsresult
-nsHTMLDocument::WriteCommon(const nsAString& aText,
+nsHTMLDocument::WriteCommon(JSContext *cx,
+                            const nsAString& aText,
                             PRBool aNewlineTerminate)
 {
   mTooDeepWriteRecursion =
@@ -1944,7 +1922,9 @@ nsHTMLDocument::WriteCommon(const nsAString& aText,
                                       "DOM Events", this);
       return NS_OK;
     }
-    rv = Open();
+    nsCOMPtr<nsISupports> ignored;
+    rv = Open(NS_LITERAL_STRING("text/html"), EmptyString(), EmptyString(), cx,
+              1, getter_AddRefs(ignored));
 
     // If Open() fails, or if it didn't create a parser (as it won't
     // if the user chose to not discard the current document through
@@ -1991,15 +1971,15 @@ nsHTMLDocument::WriteCommon(const nsAString& aText,
 }
 
 NS_IMETHODIMP
-nsHTMLDocument::Write(const nsAString& aText)
+nsHTMLDocument::Write(const nsAString& aText, JSContext *cx)
 {
-  return WriteCommon(aText, PR_FALSE);
+  return WriteCommon(cx, aText, PR_FALSE);
 }
 
 NS_IMETHODIMP
-nsHTMLDocument::Writeln(const nsAString& aText)
+nsHTMLDocument::Writeln(const nsAString& aText, JSContext *cx)
 {
-  return WriteCommon(aText, PR_TRUE);
+  return WriteCommon(cx, aText, PR_TRUE);
 }
 
 PRBool
diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h
index fa94a9714f1..6ff20627aae 100644
--- a/content/html/document/src/nsHTMLDocument.h
+++ b/content/html/document/src/nsHTMLDocument.h
@@ -41,7 +41,6 @@
 #include "nsDocument.h"
 #include "nsIHTMLDocument.h"
 #include "nsIDOMHTMLDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLBodyElement.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsIScriptElement.h"
@@ -69,8 +68,7 @@ class nsICachingChannel;
 
 class nsHTMLDocument : public nsDocument,
                        public nsIHTMLDocument,
-                       public nsIDOMHTMLDocument,
-                       public nsIDOMNSHTMLDocument
+                       public nsIDOMHTMLDocument
 {
 public:
   using nsDocument::SetDocumentURI;
@@ -105,8 +103,6 @@ public:
 
   virtual void EndLoad();
 
-  virtual mozilla::dom::Element* GetImageMap(const nsAString& aMapName);
-
   virtual void SetCompatibilityMode(nsCompatibility aMode);
 
   virtual PRBool IsWriting()
@@ -128,25 +124,7 @@ public:
   NS_FORWARD_NSIDOMNODE(nsDocument::)
 
   // nsIDOMHTMLDocument interface
-  NS_IMETHOD GetTitle(nsAString & aTitle);
-  NS_IMETHOD SetTitle(const nsAString & aTitle);
-  NS_IMETHOD GetReferrer(nsAString & aReferrer);
-  NS_IMETHOD GetURL(nsAString & aURL);
-  NS_IMETHOD GetBody(nsIDOMHTMLElement * *aBody);
-  NS_IMETHOD SetBody(nsIDOMHTMLElement * aBody);
-  NS_IMETHOD GetImages(nsIDOMHTMLCollection * *aImages);
-  NS_IMETHOD GetApplets(nsIDOMHTMLCollection * *aApplets);
-  NS_IMETHOD GetLinks(nsIDOMHTMLCollection * *aLinks);
-  NS_IMETHOD GetForms(nsIDOMHTMLCollection * *aForms);
-  NS_IMETHOD GetAnchors(nsIDOMHTMLCollection * *aAnchors);
-  NS_IMETHOD GetCookie(nsAString & aCookie);
-  NS_IMETHOD SetCookie(const nsAString & aCookie);
-  NS_IMETHOD Open(void);
-  NS_IMETHOD Close(void);
-  NS_IMETHOD Write(const nsAString & text);
-  NS_IMETHOD Writeln(const nsAString & text);
-  NS_IMETHOD GetElementsByName(const nsAString & elementName,
-                               nsIDOMNodeList **_retval);
+  NS_DECL_NSIDOMHTMLDOCUMENT
 
   /**
    * Returns the result of document.all[aID] which can either be a node
@@ -164,8 +142,6 @@ public:
                                        UseExistingNameString, aName);
   }
 
-  // nsIDOMNSHTMLDocument interface
-  NS_DECL_NSIDOMNSHTMLDOCUMENT
 
   virtual nsresult ResolveName(const nsAString& aName,
                                nsIContent *aForm,
@@ -257,9 +233,10 @@ protected:
 
   void GetDomainURI(nsIURI **uri);
 
-  nsresult WriteCommon(const nsAString& aText,
+  nsresult WriteCommon(JSContext *cx, const nsAString& aText,
                        PRBool aNewlineTerminate);
-  nsresult OpenCommon(const nsACString& aContentType, PRBool aReplace);
+  nsresult OpenCommon(JSContext *cx, const nsAString& aContentType,
+                      PRBool aReplace);
 
   nsresult CreateAndAddWyciwygChannel(void);
   nsresult RemoveWyciwygChannel(void);
@@ -283,7 +260,6 @@ protected:
   nsCOMPtr<nsIDOMHTMLCollection> mAnchors;
   nsRefPtr<nsContentList> mForms;
   nsRefPtr<nsContentList> mFormControls;
-  nsRefPtr<nsContentList> mImageMaps;
 
   /** # of forms in the document, synchronously set */
   PRInt32 mNumForms;
@@ -378,7 +354,6 @@ protected:
 #define NS_HTML_DOCUMENT_INTERFACE_TABLE_BEGIN(_class)                        \
     NS_DOCUMENT_INTERFACE_TABLE_BEGIN(_class)                                 \
     NS_INTERFACE_TABLE_ENTRY(_class, nsIHTMLDocument)                         \
-    NS_INTERFACE_TABLE_ENTRY(_class, nsIDOMHTMLDocument)                      \
-    NS_INTERFACE_TABLE_ENTRY(_class, nsIDOMNSHTMLDocument)
+    NS_INTERFACE_TABLE_ENTRY(_class, nsIDOMHTMLDocument)
 
 #endif /* nsHTMLDocument_h___ */
diff --git a/content/html/document/src/nsIHTMLDocument.h b/content/html/document/src/nsIHTMLDocument.h
index 76d93a75d3c..d00c8234855 100644
--- a/content/html/document/src/nsIHTMLDocument.h
+++ b/content/html/document/src/nsIHTMLDocument.h
@@ -48,15 +48,9 @@ class nsIEditor;
 class nsContentList;
 class nsWrapperCache;
 
-namespace mozilla {
-namespace dom {
-class Element;
-} // namespace dom
-} // namespace mozilla
-
 #define NS_IHTMLDOCUMENT_IID \
-{ 0x8cc90664, 0xb0fe, 0x4cdb, \
- { 0xa2, 0xdd, 0x25, 0xcd, 0x8c, 0x2b, 0xfd, 0x08 } }
+{ 0x30001b0c, 0xdb25, 0x4318, \
+  { 0x85, 0xb8, 0x48, 0xb4, 0xea, 0x54, 0x8f, 0x23 } }
 
 
 /**
@@ -67,8 +61,6 @@ class nsIHTMLDocument : public nsISupports
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTMLDOCUMENT_IID)
 
-  virtual mozilla::dom::Element* GetImageMap(const nsAString& aMapName) = 0;
-
   /**
    * Set compatibility mode for this document
    */
diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 507b96e8498..551d3520ba4 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -52,13 +52,15 @@ using namespace mozilla::dom;
 #include "nsAudioStream.h"
 #include "nsAlgorithm.h"
 #include "VideoUtils.h"
-#include "nsContentUtils.h"
 #include "mozilla/Mutex.h"
 extern "C" {
 #include "sydneyaudio/sydney_audio.h"
 }
 #include "mozilla/TimeStamp.h"
 #include "nsThreadUtils.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #if defined(XP_MACOSX)
 #define SA_PER_STREAM_VOLUME 1
@@ -321,8 +323,7 @@ static mozilla::Mutex* gVolumeScaleLock = nsnull;
 static double gVolumeScale = 1.0;
 
 static int VolumeScaleChanged(const char* aPref, void *aClosure) {
-  nsAdoptingString value =
-    nsContentUtils::GetStringPref("media.volume_scale");
+  nsAdoptingString value = Preferences::GetString("media.volume_scale");
   mozilla::MutexAutoLock lock(*gVolumeScaleLock);
   if (value.IsEmpty()) {
     gVolumeScale = 1.0;
@@ -345,16 +346,12 @@ void nsAudioStream::InitLibrary()
 #endif
   gVolumeScaleLock = new mozilla::Mutex("nsAudioStream::gVolumeScaleLock");
   VolumeScaleChanged(nsnull, nsnull);
-  nsContentUtils::RegisterPrefCallback("media.volume_scale",
-                                       VolumeScaleChanged,
-                                       nsnull);
+  Preferences::RegisterCallback(VolumeScaleChanged, "media.volume_scale");
 }
 
 void nsAudioStream::ShutdownLibrary()
 {
-  nsContentUtils::UnregisterPrefCallback("media.volume_scale",
-                                         VolumeScaleChanged,
-                                         nsnull);
+  Preferences::UnregisterCallback(VolumeScaleChanged, "media.volume_scale");
   delete gVolumeScaleLock;
   gVolumeScaleLock = nsnull;
 }
diff --git a/content/media/nsMediaCache.cpp b/content/media/nsMediaCache.cpp
index 1c01cf4155b..023f90180ad 100644
--- a/content/media/nsMediaCache.cpp
+++ b/content/media/nsMediaCache.cpp
@@ -40,7 +40,6 @@
 #include "mozilla/XPCOM.h"
 
 #include "nsMediaCache.h"
-#include "nsContentUtils.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsNetUtil.h"
@@ -50,6 +49,7 @@
 #include "nsMathUtils.h"
 #include "prlog.h"
 #include "nsIPrivateBrowsingService.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -739,7 +739,7 @@ static PRInt32 GetMaxBlocks()
   // We look up the cache size every time. This means dynamic changes
   // to the pref are applied.
   // Cache size is in KB
-  PRInt32 cacheSize = nsContentUtils::GetIntPref("media.cache_size", 500*1024);
+  PRInt32 cacheSize = Preferences::GetInt("media.cache_size", 500*1024);
   PRInt64 maxBlocks = static_cast<PRInt64>(cacheSize)*1024/nsMediaCache::BLOCK_SIZE;
   maxBlocks = PR_MAX(maxBlocks, 1);
   return PRInt32(PR_MIN(maxBlocks, PR_INT32_MAX));
diff --git a/content/media/nsMediaDecoder.cpp b/content/media/nsMediaDecoder.cpp
index c4573a37c56..e1b0b3b6a58 100644
--- a/content/media/nsMediaDecoder.cpp
+++ b/content/media/nsMediaDecoder.cpp
@@ -51,9 +51,7 @@
 #include "nsPresContext.h"
 #include "nsDOMError.h"
 #include "nsDisplayList.h"
-#ifdef MOZ_SVG
 #include "nsSVGEffects.h"
-#endif
 
 using namespace mozilla;
 
@@ -177,9 +175,7 @@ void nsMediaDecoder::Invalidate()
     }
   }
 
-#ifdef MOZ_SVG
   nsSVGEffects::InvalidateDirectRenderingObservers(mElement);
-#endif
 }
 
 static void ProgressCallback(nsITimer* aTimer, void* aClosure)
diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/content/svg/content/src/nsSVGFeatures.cpp
index 748a94ec5c9..d36adb261a1 100644
--- a/content/svg/content/src/nsSVGFeatures.cpp
+++ b/content/svg/content/src/nsSVGFeatures.cpp
@@ -56,6 +56,9 @@
 #include "nsSVGUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIPrefService.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 /*static*/ PRBool
 nsSVGFeatures::HaveFeature(nsISupports* aObject, const nsAString& aFeature)
@@ -239,7 +242,7 @@ nsSVGFeatures::PassesConditionalProcessingTests(nsIContent *aContent,
                         value)) {
 
     const nsAutoString acceptLangs(aAcceptLangs ? *aAcceptLangs :
-      nsContentUtils::GetLocalizedStringPref("intl.accept_languages"));
+      Preferences::GetLocalizedString("intl.accept_languages"));
 
     // Get our language preferences
     if (!acceptLangs.IsEmpty()) {
diff --git a/content/svg/content/src/nsSVGImageElement.cpp b/content/svg/content/src/nsSVGImageElement.cpp
index e4e4932bcaf..fa029f3b76b 100644
--- a/content/svg/content/src/nsSVGImageElement.cpp
+++ b/content/svg/content/src/nsSVGImageElement.cpp
@@ -43,6 +43,7 @@
 #include "imgIContainer.h"
 #include "imgIDecoderObserver.h"
 #include "gfxContext.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -170,7 +171,7 @@ nsSVGImageElement::AfterSetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
   if (aNamespaceID == kNameSpaceID_XLink && aName == nsGkAtoms::href) {
     // If caller is not chrome and dom.disable_image_src_set is true,
     // prevent setting image.src by exiting early
-    if (nsContentUtils::GetBoolPref("dom.disable_image_src_set") &&
+    if (Preferences::GetBool("dom.disable_image_src_set") &&
         !nsContentUtils::IsCallerChrome()) {
       return NS_OK;
     }
diff --git a/content/svg/content/src/nsSVGSwitchElement.cpp b/content/svg/content/src/nsSVGSwitchElement.cpp
index 1bbbd137a3d..a727dfbd813 100644
--- a/content/svg/content/src/nsSVGSwitchElement.cpp
+++ b/content/svg/content/src/nsSVGSwitchElement.cpp
@@ -39,6 +39,9 @@
 #include "nsIFrame.h"
 #include "nsISVGChildFrame.h"
 #include "nsSVGUtils.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 ////////////////////////////////////////////////////////////////////////
 // implementation
@@ -121,10 +124,9 @@ nsSVGSwitchElement::InsertChildAt(nsIContent* aKid,
 }
 
 nsresult
-nsSVGSwitchElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsSVGSwitchElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on switch child removal.");
-  nsresult rv = nsSVGSwitchElementBase::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+  nsresult rv = nsSVGSwitchElementBase::RemoveChildAt(aIndex, aNotify);
   if (NS_SUCCEEDED(rv)) {
     MaybeInvalidate();
   }
@@ -163,7 +165,7 @@ nsSVGSwitchElement::FindActiveChild() const
                                     nsGkAtoms::yes, eCaseMatters);
 
   const nsAdoptingString& acceptLangs =
-    nsContentUtils::GetLocalizedStringPref("intl.accept_languages");
+    Preferences::GetLocalizedString("intl.accept_languages");
 
   PRUint32 count = GetChildCount();
 
diff --git a/content/svg/content/src/nsSVGSwitchElement.h b/content/svg/content/src/nsSVGSwitchElement.h
index f48282c8e85..349ad89d0d8 100644
--- a/content/svg/content/src/nsSVGSwitchElement.h
+++ b/content/svg/content/src/nsSVGSwitchElement.h
@@ -73,7 +73,7 @@ public:
   // nsINode
   virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                                  PRBool aNotify);
-  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
 
   // nsIContent
   NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* aAttribute) const;
diff --git a/content/svg/document/src/nsSVGDocument.cpp b/content/svg/document/src/nsSVGDocument.cpp
index 51d0b6d2f3b..07024456faa 100644
--- a/content/svg/document/src/nsSVGDocument.cpp
+++ b/content/svg/document/src/nsSVGDocument.cpp
@@ -76,20 +76,6 @@ NS_IMPL_RELEASE_INHERITED(nsSVGDocument, nsXMLDocument)
 //----------------------------------------------------------------------
 // nsIDOMSVGDocument methods:
 
-/* readonly attribute DOMString title; */
-NS_IMETHODIMP
-nsSVGDocument::GetTitle(nsAString& aTitle)
-{
-  return nsXMLDocument::GetTitle(aTitle);
-}
-
-/* readonly attribute DOMString referrer; */
-NS_IMETHODIMP
-nsSVGDocument::GetReferrer(nsAString& aReferrer)
-{
-  return nsDocument::GetReferrer(aReferrer);
-}
-
 /* readonly attribute DOMString domain; */
 NS_IMETHODIMP
 nsSVGDocument::GetDomain(nsAString& aDomain)
diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp
index 88f78ca28cc..b4b8f3aceee 100644
--- a/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -80,6 +80,9 @@
 #include "nsCRT.h"
 #include "nsXBLEventHandler.h"
 #include "nsEventDispatcher.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
                      NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -206,8 +209,8 @@ nsXBLPrototypeHandler::InitAccessKeys()
 
   // Get the menu access key value from prefs, overriding the default:
   kMenuAccessKey =
-    nsContentUtils::GetIntPref("ui.key.menuAccessKey", kMenuAccessKey);
-  kAccelKey = nsContentUtils::GetIntPref("ui.key.accelKey", kAccelKey);
+    Preferences::GetInt("ui.key.menuAccessKey", kMenuAccessKey);
+  kAccelKey = Preferences::GetInt("ui.key.accelKey", kAccelKey);
 }
 
 nsresult
diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp
index 38904b878f8..767e9eabc23 100644
--- a/content/xbl/src/nsXBLService.cpp
+++ b/content/xbl/src/nsXBLService.cpp
@@ -90,6 +90,9 @@
 #endif
 #include "nsIDOMLoadListener.h"
 #include "nsIDOMEventGroup.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define NS_MAX_XBL_BINDING_RECURSION 20
 
@@ -162,12 +165,10 @@ PRBool CheckTagNameWhiteList(PRInt32 aNameSpaceID, nsIAtom *aTagName)
       }
     }
   }
-#ifdef MOZ_SVG
   else if (aNameSpaceID == kNameSpaceID_SVG &&
            aTagName == nsGkAtoms::generic) {
     return PR_TRUE;
   }
-#endif
 
   return PR_FALSE;
 }
@@ -511,9 +512,8 @@ nsXBLService::nsXBLService(void)
   if (gRefCnt == 1) {
     gClassTable = new nsHashtable();
   }
-  
-  nsContentUtils::AddBoolPrefVarCache("layout.debug.enable_data_xbl",
-                                      &gAllowDataURIs);
+
+  Preferences::AddBoolVarCache(&gAllowDataURIs, "layout.debug.enable_data_xbl");
 }
 
 nsXBLService::~nsXBLService(void)
diff --git a/content/xbl/src/nsXBLWindowKeyHandler.cpp b/content/xbl/src/nsXBLWindowKeyHandler.cpp
index 49079aa5537..a9609bf4dd2 100644
--- a/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/content/xbl/src/nsXBLWindowKeyHandler.cpp
@@ -62,7 +62,6 @@
 #include "nsContentUtils.h"
 #include "nsXBLPrototypeBinding.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsPIWindowRoot.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"
@@ -70,6 +69,9 @@
 #include "nsIPrivateDOMEvent.h"
 #include "nsISelectionController.h"
 #include "nsGUIEvent.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static nsINativeKeyBindings *sNativeEditorBindings = nsnull;
 
@@ -124,7 +126,7 @@ void nsXBLSpecialDocInfo::LoadDocInfo()
                                       getter_AddRefs(mHTMLBindings));
 
   const nsAdoptingCString& userHTMLBindingStr =
-    nsContentUtils::GetCharPref("dom.userHTMLBindings.uri");
+    Preferences::GetCString("dom.userHTMLBindings.uri");
   if (!userHTMLBindingStr.IsEmpty()) {
     NS_NewURI(getter_AddRefs(bindingURI), userHTMLBindingStr);
     if (!bindingURI) {
diff --git a/content/xml/content/src/nsXMLCDATASection.cpp b/content/xml/content/src/nsXMLCDATASection.cpp
index 9474070cbce..071b0d8729b 100644
--- a/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/content/xml/content/src/nsXMLCDATASection.cpp
@@ -36,14 +36,13 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsIDOMCDATASection.h"
-#include "nsIDOM3Text.h"
 #include "nsGenericDOMDataNode.h"
 #include "nsGkAtoms.h"
 #include "nsIDocument.h"
 #include "nsContentUtils.h"
 
 
-class nsXMLCDATASection : public nsGenericTextNode,
+class nsXMLCDATASection : public nsGenericDOMDataNode,
                           public nsIDOMCDATASection
 {
 public:
@@ -99,7 +98,7 @@ NS_NewXMLCDATASection(nsIContent** aInstancePtrResult,
 }
 
 nsXMLCDATASection::nsXMLCDATASection(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericTextNode(aNodeInfo)
+  : nsGenericDOMDataNode(aNodeInfo)
 {
 }
 
@@ -114,7 +113,6 @@ DOMCI_NODE_DATA(CDATASection, nsXMLCDATASection)
 NS_INTERFACE_TABLE_HEAD(nsXMLCDATASection)
   NS_NODE_INTERFACE_TABLE4(nsXMLCDATASection, nsIDOMNode, nsIDOMCharacterData,
                            nsIDOMText, nsIDOMCDATASection)
-  NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Text, new nsText3Tearoff(this))
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CDATASection)
 NS_INTERFACE_MAP_END_INHERITING(nsGenericDOMDataNode)
 
diff --git a/content/xml/content/src/nsXMLElement.cpp b/content/xml/content/src/nsXMLElement.cpp
index ff4b18a3aed..6f82d3ac493 100644
--- a/content/xml/content/src/nsXMLElement.cpp
+++ b/content/xml/content/src/nsXMLElement.cpp
@@ -72,7 +72,7 @@ nsresult
 nsXMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
                         PRBool aNotify)
 {
-  nsAutoRemovableScriptBlocker scriptBlocker;
+  nsAutoScriptBlocker scriptBlocker;
   PRBool isId = PR_FALSE;
   if (aAttribute == GetIDAttributeName() &&
       aNameSpaceID == kNameSpaceID_None) {
diff --git a/content/xml/document/public/Makefile.in b/content/xml/document/public/Makefile.in
index 99487f757ee..b68bb3579ec 100644
--- a/content/xml/document/public/Makefile.in
+++ b/content/xml/document/public/Makefile.in
@@ -43,7 +43,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
-XPIDL_MODULE	= content_xmldoc
 
 EXPORTS		= \
 		nsIXMLContentSink.h \
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 3cc9326de47..2b5c99ef64e 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -37,6 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
 #include "nsCOMPtr.h"
 #include "nsXMLContentSink.h"
 #include "nsIParser.h"
@@ -44,7 +45,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentType.h"
 #include "nsIDOMDOMImplementation.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIContent.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"
@@ -96,10 +96,7 @@
 #include "nsIHTMLDocument.h"
 #include "mozAutoDocUpdate.h"
 #include "nsMimeTypes.h"
-
-#ifdef MOZ_SVG
 #include "nsHtml5SVGLoadDispatcher.h"
-#endif
 
 using namespace mozilla::dom;
 
@@ -507,9 +504,7 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML)
-#ifdef MOZ_SVG
       || aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG)
-#endif
     ) {
     nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(content);
     sele->SetScriptLineNumber(aLineNumber);
@@ -596,9 +591,7 @@ nsXMLContentSink::CloseElement(nsIContent* aContent)
   nsresult rv = NS_OK;
 
   if (nodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_XHTML)
-#ifdef MOZ_SVG
       || nodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG)
-#endif
     ) {
     mConstrainSize = PR_TRUE; 
 
@@ -732,6 +725,7 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement,
 
   NS_ConvertUTF16toUTF8 type(aType);
   if (type.EqualsIgnoreCase(TEXT_XSL) ||
+      type.EqualsIgnoreCase(APPLICATION_XSLT_XML) ||
       type.EqualsIgnoreCase(TEXT_XML) ||
       type.EqualsIgnoreCase(APPLICATION_XML)) {
     if (aAlternate) {
@@ -1157,7 +1151,6 @@ nsXMLContentSink::HandleEndElement(const PRUnichar *aName,
   }
   DidAddContent();
 
-#ifdef MOZ_SVG
   if (content->GetNameSpaceID() == kNameSpaceID_SVG &&
       content->Tag() == nsGkAtoms::svg) {
     FlushTags();
@@ -1166,7 +1159,6 @@ nsXMLContentSink::HandleEndElement(const PRUnichar *aName,
       NS_WARNING("failed to dispatch svg load dispatcher");
     }
   }
-#endif
 
   return aInterruptable && NS_SUCCEEDED(result) ? DidProcessATokenImpl() :
                                                   result;
diff --git a/content/xml/document/src/nsXMLDocument.cpp b/content/xml/document/src/nsXMLDocument.cpp
index 1cd646e1da7..89eb165342c 100644
--- a/content/xml/document/src/nsXMLDocument.cpp
+++ b/content/xml/document/src/nsXMLDocument.cpp
@@ -140,11 +140,9 @@ NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult,
       isHTML = PR_TRUE;
       isXHTML = PR_TRUE;
     }
-#ifdef MOZ_SVG
     else if (publicId.EqualsLiteral("-//W3C//DTD SVG 1.1//EN")) {
       rv = NS_NewSVGDocument(getter_AddRefs(d));
     }
-#endif
     // XXX Add support for XUL documents.
     else {
       rv = NS_NewXMLDocument(getter_AddRefs(d));
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/content/xml/document/src/nsXMLPrettyPrinter.cpp
index 504db4af51d..7bd17de872f 100644
--- a/content/xml/document/src/nsXMLPrettyPrinter.cpp
+++ b/content/xml/document/src/nsXMLPrettyPrinter.cpp
@@ -52,7 +52,9 @@
 #include "nsIDOMDocumentFragment.h"
 #include "nsBindingManager.h"
 #include "nsIScriptSecurityManager.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 NS_IMPL_ISUPPORTS2(nsXMLPrettyPrinter,
@@ -114,7 +116,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
     }
 
     // check the pref
-    if (!nsContentUtils::GetBoolPref("layout.xml.prettyprint", PR_TRUE)) {
+    if (!Preferences::GetBool("layout.xml.prettyprint", PR_TRUE)) {
         return NS_OK;
     }
 
diff --git a/content/xslt/public/Makefile.in b/content/xslt/public/Makefile.in
index 3df73af0da4..3bfa32ccb8a 100644
--- a/content/xslt/public/Makefile.in
+++ b/content/xslt/public/Makefile.in
@@ -47,7 +47,6 @@ XPIDL_MODULE = content_xslt
 
 EXPORTS		= \
 		nsIDocumentTransformer.h \
-		txDouble.h \
 		$(NULL)
 
 XPIDLSRCS	= \
diff --git a/content/xslt/public/txDouble.h b/content/xslt/public/txDouble.h
deleted file mode 100644
index ec8e964c1b5..00000000000
--- a/content/xslt/public/txDouble.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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
- * Peter Van der Beken.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __txdouble_h__
-#define __txdouble_h__
-
-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
-#ifdef __FreeBSD__
-#include <ieeefp.h>
-#ifdef __alpha__
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-#endif
-static fp_except_t oldmask = fpsetmask(~allmask);
-#endif
-
-/**
- * Macros to workaround math-bugs bugs in various platforms
- */
-
-/**
- * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
- *  ARM is a little endian architecture but 64 bit double words are stored
- * differently: the 32 bit words are in little endian byte order, the two words
- * are stored in big endian`s way.
- */
-
-#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
-#if !defined(__VFP_FP__)
-#define FPU_IS_ARM_FPA
-#endif
-#endif
-
-typedef union txdpun {
-    struct {
-#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
-        PRUint32 lo, hi;
-#else
-        PRUint32 hi, lo;
-#endif
-    } s;
-    PRFloat64 d;
-public:
-    operator double() const {
-        return d;
-    }
-} txdpun;
-
-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
-/**
- * This version of the macros is safe for the alias optimizations
- * that gcc does, but uses gcc-specific extensions.
- */
-#define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
-#define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
-
-#else // __GNUC__
-
-/* We don't know of any non-gcc compilers that perform alias optimization,
- * so this code should work.
- */
-
-#if defined(IS_LITTLE_ENDIAN) && !defined(FPU_IS_ARM_FPA)
-#define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
-#define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
-#else
-#define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
-#define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
-#endif
-
-#endif // __GNUC__
-
-#define TX_DOUBLE_HI32_SIGNBIT   0x80000000
-#define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
-#define TX_DOUBLE_HI32_MANTMASK  0x000fffff
-
-#define TX_DOUBLE_IS_NaN(x)                                                \
-((TX_DOUBLE_HI32(x) & TX_DOUBLE_HI32_EXPMASK) == TX_DOUBLE_HI32_EXPMASK && \
- (TX_DOUBLE_LO32(x) || (TX_DOUBLE_HI32(x) & TX_DOUBLE_HI32_MANTMASK)))
-
-#ifdef IS_BIG_ENDIAN
-#define TX_DOUBLE_NaN {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,   \
-                        0xffffffff}}
-#else
-#define TX_DOUBLE_NaN {{0xffffffff,                                         \
-                        TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}
-#endif
-
-#if defined(XP_WIN)
-#define TX_DOUBLE_COMPARE(LVAL, OP, RVAL)                                  \
-    (!TX_DOUBLE_IS_NaN(LVAL) && !TX_DOUBLE_IS_NaN(RVAL) && (LVAL) OP (RVAL))
-#else
-#define TX_DOUBLE_COMPARE(LVAL, OP, RVAL) ((LVAL) OP (RVAL))
-#endif
-
-#endif /* __txdouble_h__ */
diff --git a/content/xslt/src/base/txCore.h b/content/xslt/src/base/txCore.h
index 1b973c4cc62..a716b661a3c 100644
--- a/content/xslt/src/base/txCore.h
+++ b/content/xslt/src/base/txCore.h
@@ -39,11 +39,11 @@
 #ifndef __txCore_h__
 #define __txCore_h__
 
+#include "nsContentUtils.h"
 #include "nscore.h"
 #include "nsDebug.h"
 #include "nsTraceRefcnt.h"
 #include "prtypes.h"
-#include "txDouble.h"
 
 class nsAString;
 
@@ -73,9 +73,9 @@ public:
     /**
      * Useful constants
      */
-    static const txdpun NaN;
-    static const txdpun POSITIVE_INFINITY;
-    static const txdpun NEGATIVE_INFINITY;
+    static const dpun NaN;
+    static const dpun POSITIVE_INFINITY;
+    static const dpun NEGATIVE_INFINITY;
 
     /**
      * Determines whether the given double represents positive or negative
diff --git a/content/xslt/src/base/txDouble.cpp b/content/xslt/src/base/txDouble.cpp
index 4349bc50d19..e5f4c77f7c8 100644
--- a/content/xslt/src/base/txDouble.cpp
+++ b/content/xslt/src/base/txDouble.cpp
@@ -50,13 +50,13 @@
  */
 
 //-- Initialize Double related constants
-const txdpun Double::NaN = TX_DOUBLE_NaN;
+const dpun Double::NaN = DOUBLE_NaN;
 #ifdef IS_BIG_ENDIAN
-const txdpun Double::POSITIVE_INFINITY = {{TX_DOUBLE_HI32_EXPMASK, 0}};
-const txdpun Double::NEGATIVE_INFINITY = {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
+const dpun Double::POSITIVE_INFINITY = {{DOUBLE_HI32_EXPMASK, 0}};
+const txdpun Double::NEGATIVE_INFINITY = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
 #else
-const txdpun Double::POSITIVE_INFINITY = {{0, TX_DOUBLE_HI32_EXPMASK}};
-const txdpun Double::NEGATIVE_INFINITY = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
+const dpun Double::POSITIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK}};
+const dpun Double::NEGATIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
 #endif
 
 /*
@@ -65,8 +65,8 @@ const txdpun Double::NEGATIVE_INFINITY = {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE
  */
 MBool Double::isInfinite(double aDbl)
 {
-    return ((TX_DOUBLE_HI32(aDbl) & ~TX_DOUBLE_HI32_SIGNBIT) == TX_DOUBLE_HI32_EXPMASK &&
-            !TX_DOUBLE_LO32(aDbl));
+    return ((DOUBLE_HI32(aDbl) & ~DOUBLE_HI32_SIGNBIT) == DOUBLE_HI32_EXPMASK &&
+            !DOUBLE_LO32(aDbl));
 }
 
 /*
@@ -74,7 +74,7 @@ MBool Double::isInfinite(double aDbl)
  */
 MBool Double::isNaN(double aDbl)
 {
-    return TX_DOUBLE_IS_NaN(aDbl);
+    return DOUBLE_IS_NaN(aDbl);
 }
 
 /*
@@ -82,7 +82,7 @@ MBool Double::isNaN(double aDbl)
  */
 MBool Double::isNeg(double aDbl)
 {
-    return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0;
+    return (DOUBLE_HI32(aDbl) & DOUBLE_HI32_SIGNBIT) != 0;
 }
 
 /*
diff --git a/content/xslt/src/xpath/txRelationalExpr.cpp b/content/xslt/src/xpath/txRelationalExpr.cpp
index a97f4b29718..caae4fc3577 100644
--- a/content/xslt/src/xpath/txRelationalExpr.cpp
+++ b/content/xslt/src/xpath/txRelationalExpr.cpp
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsContentUtils.h"
 #include "txExpr.h"
-#include "txDouble.h"
 #include "txNodeSet.h"
 #include "txIXPathContext.h"
 #include "txXPathTreeWalker.h"
@@ -119,7 +119,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
                  rtype == txAExprResult::NUMBER) {
             double lval = aLeft->numberValue();
             double rval = aRight->numberValue();
-            result = TX_DOUBLE_COMPARE(lval, ==, rval);
+            result = DOUBLE_COMPARE(lval, ==, rval);
         }
 
         // Otherwise compare as strings. Try to use the stringobject in
@@ -154,19 +154,19 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
     switch (mOp) {
         case LESS_THAN:
         {
-            return TX_DOUBLE_COMPARE(leftDbl, <, rightDbl);
+            return DOUBLE_COMPARE(leftDbl, <, rightDbl);
         }
         case LESS_OR_EQUAL:
         {
-            return TX_DOUBLE_COMPARE(leftDbl, <=, rightDbl);
+            return DOUBLE_COMPARE(leftDbl, <=, rightDbl);
         }
         case GREATER_THAN:
         {
-            return TX_DOUBLE_COMPARE(leftDbl, >, rightDbl);
+            return DOUBLE_COMPARE(leftDbl, >, rightDbl);
         }
         case GREATER_OR_EQUAL:
         {
-            return TX_DOUBLE_COMPARE(leftDbl, >=, rightDbl);
+            return DOUBLE_COMPARE(leftDbl, >=, rightDbl);
         }
         default:
         {
diff --git a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp b/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
index 718c357900f..61fc2e81ffc 100644
--- a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
+++ b/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
@@ -498,7 +498,7 @@ txCompileObserver::startLoad(nsIURI* aUri, txStylesheetCompiler* aCompiler,
     nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
     if (httpChannel) {
         httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
-                                      NS_LITERAL_CSTRING("text/xml,application/xml,application/xhtml+xml,*/*;q=0.1"),
+                                      NS_LITERAL_CSTRING("text/xml,application/xml,application/xhtml+xml,application/xslt+xml,*/*;q=0.1"),
                                       PR_FALSE);
 
         nsCOMPtr<nsIURI> referrerURI;
diff --git a/content/xslt/src/xslt/txMozillaTextOutput.cpp b/content/xslt/src/xslt/txMozillaTextOutput.cpp
index 189d4936302..6f9ae9f5514 100644
--- a/content/xslt/src/xslt/txMozillaTextOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaTextOutput.cpp
@@ -47,7 +47,6 @@
 #include "nsIDOMText.h"
 #include "nsIDocumentTransformer.h"
 #include "nsNetUtil.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIParser.h"
 #include "nsICharsetAlias.h"
 #include "nsIPrincipal.h"
diff --git a/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index 6108c664a8e..0cbc8547d82 100644
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -44,7 +44,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentType.h"
 #include "nsIScriptElement.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIParser.h"
 #include "nsIRefreshURI.h"
 #include "nsPIDOMWindow.h"
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index 4f0d45fc62d..cdb3a762785 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -271,13 +271,12 @@ nsXTFElementWrapper::InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
 }
 
 nsresult
-nsXTFElementWrapper::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsXTFElementWrapper::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-  NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on xtf child removal.");
   nsresult rv;
   if (mNotificationMask & nsIXTFElement::NOTIFY_WILL_REMOVE_CHILD)
     GetXTFElement()->WillRemoveChild(aIndex);
-  rv = nsXTFElementWrapperBase::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+  rv = nsXTFElementWrapperBase::RemoveChildAt(aIndex, aNotify);
   if (mNotificationMask & nsIXTFElement::NOTIFY_CHILD_REMOVED)
     GetXTFElement()->ChildRemoved(aIndex);
   return rv;
diff --git a/content/xtf/src/nsXTFElementWrapper.h b/content/xtf/src/nsXTFElementWrapper.h
index a24535f4caf..6dd2eabe109 100644
--- a/content/xtf/src/nsXTFElementWrapper.h
+++ b/content/xtf/src/nsXTFElementWrapper.h
@@ -84,7 +84,7 @@ public:
                               PRBool aNullParent = PR_TRUE);
   nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                          PRBool aNotify);
-  nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+  nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
   nsIAtom *GetIDAttributeName() const;
   nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                    nsIAtom* aPrefix, const nsAString& aValue,
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 7b10b309587..e80efb5e1fd 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -946,9 +946,8 @@ nsXULElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
 }
 
 nsresult
-nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent)
+nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
 {
-    NS_ASSERTION(aMutationEvent, "Someone tried to inhibit mutations on XUL child removal.");
     nsresult rv;
     nsCOMPtr<nsIContent> oldKid = mAttrsAndChildren.GetSafeChildAt(aIndex);
     if (!oldKid) {
@@ -1015,7 +1014,7 @@ nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEve
       }
     }
 
-    rv = nsStyledElement::RemoveChildAt(aIndex, aNotify, aMutationEvent);
+    rv = nsStyledElement::RemoveChildAt(aIndex, aNotify);
     
     if (newCurrentIndex == -2)
         controlElement->SetCurrentItem(nsnull);
diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h
index 23d8e8cabda..4cbed66f308 100644
--- a/content/xul/content/src/nsXULElement.h
+++ b/content/xul/content/src/nsXULElement.h
@@ -505,7 +505,7 @@ public:
                                 nsIContent* aBindingParent,
                                 PRBool aCompileEventHandlers);
     virtual void UnbindFromTree(PRBool aDeep, PRBool aNullParent);
-    virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationEvent = PR_TRUE);
+    virtual nsresult RemoveChildAt(PRUint32 aIndex, PRBool aNotify);
     virtual PRBool GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
                            nsAString& aResult) const;
     virtual PRBool HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const;
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index 736f06ce3af..c6b7aaba01b 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -70,6 +70,7 @@
 #include "nsFrameManager.h"
 #include "nsHTMLReflowState.h"
 #include "nsIObjectLoadingContent.h"
+#include "mozilla/Preferences.h"
 
 // for event firing in context menus
 #include "nsPresContext.h"
@@ -80,6 +81,8 @@
 #include "nsDOMError.h"
 #include "nsIMenuFrame.h"
 
+using namespace mozilla;
+
 // on win32 and os/2, context menus come up on mouse up. On other platforms,
 // they appear on mouse down. Certain bits of code care about this difference.
 #if !defined(XP_WIN) && !defined(XP_OS2)
@@ -175,7 +178,7 @@ nsXULPopupListener::PreLaunchPopup(nsIDOMEvent* aMouseEvent)
     // Someone called preventDefault on a context menu.
     // Let's make sure they are allowed to do so.
     PRBool eventEnabled =
-      nsContentUtils::GetBoolPref("dom.event.contextmenu.enabled", PR_TRUE);
+      Preferences::GetBool("dom.event.contextmenu.enabled", PR_TRUE);
     if (!eventEnabled) {
       // If the target node is for plug-in, we should not open XUL context
       // menu on windowless plug-ins.
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index 6ffe838aa2e..c0ba0ae3e3b 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -128,7 +128,9 @@
 #include "nsCCUncollectableMarker.h"
 #include "nsURILoader.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //----------------------------------------------------------------------
@@ -278,9 +280,8 @@ nsXULDocument::~nsXULDocument()
 
     delete mTemplateBuilderTable;
 
-    nsContentUtils::UnregisterPrefCallback("intl.uidirection.",
-                                           nsXULDocument::DirectionChanged,
-                                           this);
+    Preferences::UnregisterCallback(nsXULDocument::DirectionChanged,
+                                    "intl.uidirection.", this);
 
     if (--gRefCnt == 0) {
         NS_IF_RELEASE(gRDFService);
@@ -1984,9 +1985,8 @@ nsXULDocument::Init()
         }
     }
 
-    nsContentUtils::RegisterPrefCallback("intl.uidirection.",
-                                         nsXULDocument::DirectionChanged,
-                                         this);
+    Preferences::RegisterCallback(nsXULDocument::DirectionChanged,
+                                  "intl.uidirection.", this);
 
 #ifdef PR_LOGGING
     if (! gXULLog)
diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h
index e6fb3a99569..22fce04a84f 100644
--- a/content/xul/document/src/nsXULDocument.h
+++ b/content/xul/document/src/nsXULDocument.h
@@ -168,6 +168,9 @@ public:
     // nsIDOMNode interface overrides
     NS_IMETHOD CloneNode(PRBool deep, nsIDOMNode **_retval);
 
+    // nsIDOMDocument
+    NS_IMETHOD GetContentType(nsAString& aContentType);
+
     // nsDocument interface overrides
     NS_IMETHOD GetElementById(const nsAString& aId, nsIDOMElement** aReturn)
     {
@@ -178,9 +181,6 @@ public:
     // nsIDOMXULDocument interface
     NS_DECL_NSIDOMXULDOCUMENT
 
-    // nsIDOMNSDocument
-    NS_IMETHOD GetContentType(nsAString& aContentType);
-
     // nsICSSLoaderObserver
     NS_IMETHOD StyleSheetLoaded(nsCSSStyleSheet* aSheet,
                                 PRBool aWasAlternate,
diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp
index b71fdd2518e..eff6e9d4d5c 100644
--- a/content/xul/document/src/nsXULPrototypeCache.cpp
+++ b/content/xul/document/src/nsXULPrototypeCache.cpp
@@ -42,7 +42,6 @@
 
 #include "nsXULPrototypeCache.h"
 
-#include "nsContentUtils.h"
 #include "plstr.h"
 #include "nsXULPrototypeDocument.h"
 #include "nsCSSStyleSheet.h"
@@ -63,6 +62,10 @@
 
 #include "jsxdrapi.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
+
 static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
 
 static PRBool gDisableXULCache = PR_FALSE; // enabled by default
@@ -74,7 +77,7 @@ static int
 DisableXULCacheChangedCallback(const char* aPref, void* aClosure)
 {
     gDisableXULCache =
-        nsContentUtils::GetBoolPref(kDisableXULCachePref, gDisableXULCache);
+        Preferences::GetBool(kDisableXULCachePref, gDisableXULCache);
 
     // Flush the cache, regardless
     nsXULPrototypeCache* cache = nsXULPrototypeCache::GetInstance();
@@ -132,10 +135,9 @@ NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 
     // XXX Ignore return values.
     gDisableXULCache =
-        nsContentUtils::GetBoolPref(kDisableXULCachePref, gDisableXULCache);
-    nsContentUtils::RegisterPrefCallback(kDisableXULCachePref,
-                                         DisableXULCacheChangedCallback,
-                                         nsnull);
+        Preferences::GetBool(kDisableXULCachePref, gDisableXULCache);
+    Preferences::RegisterCallback(DisableXULCacheChangedCallback,
+                                  kDisableXULCachePref);
 
     nsresult rv = result->QueryInterface(aIID, aResult);
 
@@ -596,8 +598,7 @@ FastLoadPrefChangedCallback(const char* aPref, void* aClosure)
 {
     PRBool wasEnabled = !gDisableXULFastLoad;
     gDisableXULFastLoad =
-        nsContentUtils::GetBoolPref(kDisableXULFastLoadPref,
-                                    gDisableXULFastLoad);
+        Preferences::GetBool(kDisableXULFastLoadPref, gDisableXULFastLoad);
 
     if (wasEnabled && gDisableXULFastLoad) {
         static NS_DEFINE_CID(kXULPrototypeCacheCID, NS_XULPROTOTYPECACHE_CID);
@@ -609,8 +610,8 @@ FastLoadPrefChangedCallback(const char* aPref, void* aClosure)
     }
 
     gChecksumXULFastLoadFile =
-        nsContentUtils::GetBoolPref(kChecksumXULFastLoadFilePref,
-                                    gChecksumXULFastLoadFile);
+        Preferences::GetBool(kChecksumXULFastLoadFilePref,
+                             gChecksumXULFastLoadFile);
 
     return 0;
 }
@@ -725,17 +726,14 @@ nsXULPrototypeCache::StartFastLoad(nsIURI* aURI)
         return NS_ERROR_FAILURE;
 
     gDisableXULFastLoad =
-        nsContentUtils::GetBoolPref(kDisableXULFastLoadPref,
-                                    gDisableXULFastLoad);
+        Preferences::GetBool(kDisableXULFastLoadPref, gDisableXULFastLoad);
     gChecksumXULFastLoadFile =
-        nsContentUtils::GetBoolPref(kChecksumXULFastLoadFilePref,
-                                    gChecksumXULFastLoadFile);
-    nsContentUtils::RegisterPrefCallback(kDisableXULFastLoadPref,
-                                         FastLoadPrefChangedCallback,
-                                         nsnull);
-    nsContentUtils::RegisterPrefCallback(kChecksumXULFastLoadFilePref,
-                                         FastLoadPrefChangedCallback,
-                                         nsnull);
+        Preferences::GetBool(kChecksumXULFastLoadFilePref,
+                             gChecksumXULFastLoadFile);
+    Preferences::RegisterCallback(FastLoadPrefChangedCallback,
+                                  kDisableXULFastLoadPref);
+    Preferences::RegisterCallback(FastLoadPrefChangedCallback,
+                                  kChecksumXULFastLoadFilePref);
 
     if (gDisableXULFastLoad)
         return NS_ERROR_NOT_AVAILABLE;
diff --git a/content/xul/templates/tests/chrome/templates_shared.js b/content/xul/templates/tests/chrome/templates_shared.js
index 941d05c7bcc..267f1178014 100644
--- a/content/xul/templates/tests/chrome/templates_shared.js
+++ b/content/xul/templates/tests/chrome/templates_shared.js
@@ -432,15 +432,21 @@ function expectConsoleMessage(ref, id, isNew, isActive, extra)
 
 function compareConsoleMessages()
 {
-   var consoleService = Components.classes["@mozilla.org/consoleservice;1"].
-                          getService(Components.interfaces.nsIConsoleService);
-   var out = {};
-   consoleService.getMessageArray(out, {});
-   var messages = out.value || [];
-   is(messages.length, expectedConsoleMessages.length, "correct number of logged messages");
-   for (var m = 0; m < messages.length; m++) {
-     is(messages[m].message, expectedConsoleMessages.shift(), "logged message " + (m + 1));
-   }
+  var consoleService = Components.classes["@mozilla.org/consoleservice;1"].
+                         getService(Components.interfaces.nsIConsoleService);
+  var out = {};
+  consoleService.getMessageArray(out, {});
+  var messages = (out.value || []).map(function (m) m.message);
+  // Copy to avoid modifying expectedConsoleMessages
+  var expect = expectedConsoleMessages.concat();
+  for (var m = 0; m < messages.length; m++) {
+    if (messages[m] == expect[0]) {
+      ok(true, "found message " + expect.shift());
+    }
+  }
+  if (expect.length != 0) {
+    ok(false, "failed to find expected console messages: " + expect);
+  }
 }
 
 function copyToProfile(filename)
diff --git a/db/sqlite3/src/sqlite3.c b/db/sqlite3/src/sqlite3.c
index 10833111663..2f12294e07b 100644
--- a/db/sqlite3/src/sqlite3.c
+++ b/db/sqlite3/src/sqlite3.c
@@ -25868,7 +25868,7 @@ SQLITE_API int sqlite3_fullsync_count = 0;
 ** If you know that your system does support fdatasync() correctly,
 ** then simply compile with -Dfdatasync=fdatasync
 */
-#if !defined(fdatasync) && !defined(__linux__)
+#if (!defined(fdatasync) && !defined(__linux__)) || defined(ANDROID)
 # define fdatasync fsync
 #endif
 
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index d150299f20a..5d83b1290f6 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -52,7 +52,6 @@
 #include "mozilla/dom/Element.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMStorageObsolete.h"
 #include "nsIDOMStorage.h"
@@ -7846,6 +7845,56 @@ nsDocShell::CheckLoadingPermissions()
 //*****************************************************************************
 // nsDocShell: Site Loading
 //*****************************************************************************   
+namespace
+{
+
+// Callback used by CopyFavicon to inform the favicon service that one URI
+// (mNewURI) has the same favicon URI (OnFaviconDataAvailable's aFaviconURI) as
+// another.
+class nsCopyFaviconCallback : public nsIFaviconDataCallback
+{
+public:
+    NS_DECL_ISUPPORTS
+
+    nsCopyFaviconCallback(nsIURI *aNewURI)
+      : mNewURI(aNewURI)
+    {
+    }
+
+    NS_IMETHODIMP
+    OnFaviconDataAvailable(nsIURI *aFaviconURI, PRUint32 aDataLen,
+                           const PRUint8 *aData, const nsACString &aMimeType)
+    {
+        NS_ASSERTION(aDataLen == 0,
+                     "We weren't expecting the callback to deliver data.");
+        nsCOMPtr<mozIAsyncFavicons> favSvc =
+            do_GetService("@mozilla.org/browser/favicon-service;1");
+        NS_ENSURE_STATE(favSvc);
+
+        return favSvc->SetAndFetchFaviconForPage(mNewURI, aFaviconURI,
+                                                 PR_FALSE, nsnull);
+    }
+
+private:
+    nsCOMPtr<nsIURI> mNewURI;
+};
+
+NS_IMPL_ISUPPORTS1(nsCopyFaviconCallback, nsIFaviconDataCallback)
+
+// Tell the favicon service that aNewURI has the same favicon as aOldURI.
+void CopyFavicon(nsIURI *aOldURI, nsIURI *aNewURI)
+{
+    nsCOMPtr<mozIAsyncFavicons> favSvc =
+        do_GetService("@mozilla.org/browser/favicon-service;1");
+    if (favSvc) {
+        nsCOMPtr<nsIFaviconDataCallback> callback =
+            new nsCopyFaviconCallback(aNewURI);
+        favSvc->GetFaviconURLForPage(aOldURI, callback);
+    }
+}
+
+} // anonymous namespace
+
 class InternalLoadEvent : public nsRunnable
 {
 public:
@@ -8450,6 +8499,10 @@ nsDocShell::InternalLoad(nsIURI * aURI,
                 }
             }
 
+            // Inform the favicon service that the favicon for oldURI also
+            // applies to aURI.
+            CopyFavicon(oldURI, aURI);
+
             return NS_OK;
         }
     }
@@ -9439,43 +9492,6 @@ nsDocShell::SetReferrerURI(nsIURI * aURI)
 // nsDocShell: Session History
 //*****************************************************************************
 
-namespace
-{
-    // Callback used in nsDocShell::AddState.  When we change URIs with
-    // push/replaceState, we use this callback to ensure that Places associates
-    // a favicon with the new URI.
-    class nsAddStateFaviconCallback : public nsIFaviconDataCallback
-    {
-    public:
-        NS_DECL_ISUPPORTS
-
-        nsAddStateFaviconCallback(nsIURI *aNewURI)
-          : mNewURI(aNewURI)
-        {
-        }
-
-        NS_IMETHODIMP
-        OnFaviconDataAvailable(nsIURI *aFaviconURI, PRUint32 aDataLen,
-                               const PRUint8 *aData, const nsACString &aMimeType)
-        {
-            NS_ASSERTION(aDataLen == 0,
-                         "We weren't expecting the callback to deliver data.");
-            nsCOMPtr<mozIAsyncFavicons> favSvc =
-                do_GetService("@mozilla.org/browser/favicon-service;1");
-            NS_ENSURE_STATE(favSvc);
-
-            return favSvc->SetAndFetchFaviconForPage(mNewURI, aFaviconURI,
-                                                     PR_FALSE, nsnull);
-        }
-
-    private:
-        nsCOMPtr<nsIURI> mNewURI;
-    };
-
-    NS_IMPL_ISUPPORTS1(nsAddStateFaviconCallback, nsIFaviconDataCallback)
-
-} // anonymous namespace
-
 NS_IMETHODIMP
 nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
                      const nsAString& aURL, PRBool aReplace, JSContext* aCx)
@@ -9766,13 +9782,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
 
         // Inform the favicon service that our old favicon applies to this new
         // URI.
-        nsCOMPtr<mozIAsyncFavicons> favSvc =
-            do_GetService("@mozilla.org/browser/favicon-service;1");
-        if (favSvc) {
-            nsCOMPtr<nsIFaviconDataCallback> callback =
-                new nsAddStateFaviconCallback(newURI);
-            favSvc->GetFaviconURLForPage(oldURI, callback);
-        }
+        CopyFavicon(oldURI, newURI);
     }
     else {
         FireDummyOnLocationChange();
@@ -10179,7 +10189,6 @@ struct NS_STACK_CLASS CloneAndReplaceData
 nsDocShell::CloneAndReplaceChild(nsISHEntry *aEntry, nsDocShell *aShell,
                                  PRInt32 aEntryIndex, void *aData)
 {
-    nsresult result = NS_OK;
     nsCOMPtr<nsISHEntry> dest;
 
     CloneAndReplaceData *data = static_cast<CloneAndReplaceData*>(aData);
@@ -10189,55 +10198,44 @@ nsDocShell::CloneAndReplaceChild(nsISHEntry *aEntry, nsDocShell *aShell,
     nsCOMPtr<nsISHContainer> container =
       do_QueryInterface(data->destTreeParent);
     if (!aEntry) {
-      if (container) {
-        container->AddChild(nsnull, aEntryIndex);
-      }
-      return NS_OK;
+        if (container) {
+            container->AddChild(nsnull, aEntryIndex);
+        }
+        return NS_OK;
     }
     
     PRUint32 srcID;
     aEntry->GetID(&srcID);
 
+    nsresult rv = NS_OK;
     if (srcID == cloneID) {
         // Replace the entry
         dest = replaceEntry;
-        dest->SetIsSubFrame(PR_TRUE);
-
-        if (data->cloneChildren) {
-            // Walk the children
-            CloneAndReplaceData childData(cloneID, replaceEntry,
-                                          data->cloneChildren, dest);
-            result = WalkHistoryEntries(aEntry, aShell,
-                                        CloneAndReplaceChild, &childData);
-            if (NS_FAILED(result))
-                return result;
-        }
     } else {
         // Clone the SHEntry...
-        result = aEntry->Clone(getter_AddRefs(dest));
-        if (NS_FAILED(result))
-            return result;
-
-        // This entry is for a subframe navigation
-        dest->SetIsSubFrame(PR_TRUE);
+        rv = aEntry->Clone(getter_AddRefs(dest));
+        NS_ENSURE_SUCCESS(rv, rv);
+    }
+    dest->SetIsSubFrame(PR_TRUE);
 
+    if (srcID != cloneID || data->cloneChildren) {
         // Walk the children
         CloneAndReplaceData childData(cloneID, replaceEntry,
                                       data->cloneChildren, dest);
-        result = WalkHistoryEntries(aEntry, aShell,
-                                    CloneAndReplaceChild, &childData);
-        if (NS_FAILED(result))
-            return result;
+        rv = WalkHistoryEntries(aEntry, aShell,
+                                CloneAndReplaceChild, &childData);
+        NS_ENSURE_SUCCESS(rv, rv);
+    }
 
-        if (aShell)
-            aShell->SwapHistoryEntries(aEntry, dest);
+    if (srcID != cloneID && aShell) {
+        aShell->SwapHistoryEntries(aEntry, dest);
     }
 
     if (container)
         container->AddChild(dest, aEntryIndex);
 
     data->resultEntry = dest;
-    return result;
+    return rv;
 }
 
 /* static */ nsresult
diff --git a/docshell/test/browser/Makefile.in b/docshell/test/browser/Makefile.in
index 6c4ba73736d..6eba0c3ecef 100644
--- a/docshell/test/browser/Makefile.in
+++ b/docshell/test/browser/Makefile.in
@@ -51,6 +51,8 @@ _BROWSER_TEST_FILES =	\
 		browser_bug388121-1.js \
 		browser_bug388121-2.js \
 		browser_bug441169.js \
+		browser_bug420605.js \
+		file_bug420605.html \
 		browser_bug503832.js \
 		browser_loadDisallowInherit.js \
 		file_bug503832.html \
diff --git a/docshell/test/browser/browser_bug420605.js b/docshell/test/browser/browser_bug420605.js
new file mode 100644
index 00000000000..2a48fd68d26
--- /dev/null
+++ b/docshell/test/browser/browser_bug420605.js
@@ -0,0 +1,123 @@
+/* Test for Bug 420605
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=420605
+ */
+
+function test() {
+    waitForExplicitFinish();
+
+    var pageurl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug420605.html";
+    var fragmenturl = "http://mochi.test:8888/browser/docshell/test/browser/file_bug420605.html#firefox";
+
+    var historyService = Cc["@mozilla.org/browser/nav-history-service;1"]
+                         .getService(Ci.nsINavHistoryService);
+
+    /* Queries nsINavHistoryService and returns a single history entry
+     * for a given URI */
+    function getNavHistoryEntry(aURI) {
+        var options = historyService.getNewQueryOptions();
+        options.queryType = Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY;
+        options.maxResults = 1;
+
+        var query = historyService.getNewQuery();
+        query.uri = aURI;
+
+        var result = historyService.executeQuery(query, options);
+        result.root.containerOpen = true;
+
+        if (!result.root.childCount) {
+            return null;
+        }
+        return result.root.getChild(0);
+    }
+
+    // We'll save the favicon URL of the orignal page here and check that the
+    // page with a hash has the same favicon.
+    var originalFavicon;
+
+    // Control flow in this test is a bit complicated.
+    //
+    // When the page loads, onPageLoad (the DOMContentLoaded handler) and
+    // historyObserver::onPageChanged are both called, in some order.  Once
+    // they've both run, we click a fragment link in the content page
+    // (clickLinkIfReady), which should trigger another onPageChanged event,
+    // this time for the fragment's URL.
+
+    var _clickLinkTimes = 0;
+    function clickLinkIfReady() {
+      _clickLinkTimes++;
+      if (_clickLinkTimes == 2) {
+        EventUtils.sendMouseEvent({type:'click'}, 'firefox-link',
+                                  gBrowser.selectedBrowser.contentWindow);
+      }
+    }
+
+    /* Global history observer that triggers for the two test URLs above. */
+    var historyObserver = {
+        onBeginUpdateBatch: function() {},
+        onEndUpdateBatch: function() {},
+        onVisit: function(aURI, aVisitID, aTime, aSessionId, aReferringId,
+                          aTransitionType, _added) {},
+        onTitleChanged: function(aURI, aPageTitle) {},
+        onBeforeDeleteURI: function(aURI) {},
+        onDeleteURI: function(aURI) {},
+        onClearHistory: function() {},
+        onPageChanged: function(aURI, aWhat, aValue) {
+            if (aWhat != Ci.nsINavHistoryObserver.ATTRIBUTE_FAVICON) {
+                return;
+            }
+            aURI = aURI.spec;
+            switch (aURI) {
+            case pageurl:
+                ok(aValue, "Favicon value is not null for page without fragment.");
+                originalFavicon = aValue;
+
+                // Now that the favicon has loaded, click on fragment link.
+                // This should trigger the |case fragmenturl| below.
+                clickLinkIfReady();
+
+                return;
+            case fragmenturl:
+                // If the fragment URL's favicon isn't set, this branch won't
+                // be called and the test will time out.
+
+                is(aValue, originalFavicon, "New favicon should be same as original favicon.");
+
+                // Let's explicitly check that we can get the favicon
+                // from nsINavHistoryService now.
+                let info = getNavHistoryEntry(makeURI(aURI));
+                ok(info, "There must be a history entry for the fragment.");
+                ok(info.icon, "The history entry must have an associated favicon.");
+                historyService.removeObserver(historyObserver, false);
+                gBrowser.removeCurrentTab();
+                finish();
+            }
+        },
+        onPageExpired: function(aURI, aVisitTime, aWholeEntry) {},
+        QueryInterface: function(iid) {
+            if (iid.equals(Ci.nsINavHistoryObserver) ||
+                iid.equals(Ci.nsISupports)) {
+                return this;
+            }
+            throw Cr.NS_ERROR_NO_INTERFACE;
+        }
+    };
+    historyService.addObserver(historyObserver, false);
+
+    function onPageLoad() {
+      gBrowser.selectedBrowser
+              .removeEventListener("DOMContentLoaded", arguments.callee, true);
+      clickLinkIfReady();
+    }
+
+    // Make sure neither of the test pages haven't been loaded before.
+    var info = getNavHistoryEntry(makeURI(pageurl));
+    ok(!info, "The test page must not have been visited already.");
+    info = getNavHistoryEntry(makeURI(fragmenturl));
+    ok(!info, "The fragment test page must not have been visited already.");
+
+    // Now open the test page in a new tab.
+    gBrowser.selectedTab = gBrowser.addTab();
+    gBrowser.selectedBrowser.addEventListener(
+        "DOMContentLoaded", onPageLoad, true);
+    content.location = pageurl;
+}
diff --git a/docshell/test/browser/file_bug420605.html b/docshell/test/browser/file_bug420605.html
new file mode 100644
index 00000000000..8424b92f8fc
--- /dev/null
+++ b/docshell/test/browser/file_bug420605.html
@@ -0,0 +1,31 @@
+<head>
+<link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="/>
+  <title>Page Title for Bug 420605</title>
+</head>
+<body>
+  <h1>Fragment links</h1>
+
+  <p>This page has a bunch of fragment links to sections below:</p>
+
+  <ul>
+    <li><a id="firefox-link" href="#firefox">Firefox</a></li>
+    <li><a id="thunderbird-link" href="#thunderbird">Thunderbird</a></li>
+    <li><a id="seamonkey-link" href="#seamonkey">Seamonkey</a></li>
+  </ul>
+
+  <p>And here are the sections:</p>
+
+  <h2 id="firefox">Firefox</h2>
+
+  <p>Firefox is a browser.</p>
+
+  <h2 id="thunderbird">Thunderbird</h2>
+
+  <p>Thunderbird is an email client</p>
+
+  <h2 id="seamonkey">Seamonkey</h2>
+
+  <p>Seamonkey is the all-in-one application.</p>
+
+</body>
+</html>
diff --git a/dom/Makefile.in b/dom/Makefile.in
index dde4c60530b..8b9f73976ea 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -64,12 +64,9 @@ DIRS = \
   interfaces/geolocation \
   interfaces/threads \
   interfaces/notification \
+  interfaces/svg \
   $(NULL)
 
-ifdef MOZ_SVG
-DIRS += interfaces/svg
-endif
-
 ifdef MOZ_SMIL
 DIRS += interfaces/smil
 endif
diff --git a/dom/base/domerr.msg b/dom/base/domerr.msg
index 45a103270b6..4ecb006cd4b 100644
--- a/dom/base/domerr.msg
+++ b/dom/base/domerr.msg
@@ -71,11 +71,9 @@ DOM_MSG_DEF(NS_ERROR_DOM_TYPE_MISMATCH_ERR, "The type of an object is incompatib
 
 /* SVG DOM error codes from http://www.w3.org/TR/SVG11/svgdom.html */
 
-#ifdef MOZ_SVG
 DOM_MSG_DEF(NS_ERROR_DOM_SVG_WRONG_TYPE_ERR, "Unknown or invalid type")
 DOM_MSG_DEF(NS_ERROR_DOM_SVG_INVALID_VALUE_ERR, "One of the parameters has an invalid value")
 DOM_MSG_DEF(NS_ERROR_DOM_SVG_MATRIX_NOT_INVERTABLE, "The matrix could not be computed")
-#endif
 
 /* DOM error codes from http://www.w3.org/TR/DOM-Level-3-XPath/ */
 
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 9b50677d2a4..37e58718825 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -22,6 +22,7 @@
  *
  * Contributor(s):
  *   Johnny Stenback <jst@netscape.com> (original author)
+ *   Ms2ger <ms2ger@gmail.com>
  *
  * 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"),
@@ -83,7 +84,6 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMXMLDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMKeyEvent.h"
@@ -93,6 +93,7 @@
 #include "nsContentUtils.h"
 #include "nsDOMWindowUtils.h"
 #include "nsIDOMGlobalPropertyInitializer.h"
+#include "mozilla/Preferences.h"
 
 // Window scriptable helper includes
 #include "nsIDocShell.h"
@@ -224,7 +225,6 @@
 #include "nsIDOMDocumentFragment.h"
 #include "nsDOMAttribute.h"
 #include "nsIDOMText.h"
-#include "nsIDOM3Text.h"
 #include "nsIDOMComment.h"
 #include "nsIDOMCDATASection.h"
 #include "nsIDOMProcessingInstruction.h"
@@ -251,12 +251,10 @@
 #ifdef MOZ_CSS_ANIMATIONS
 #include "nsIDOMAnimationEvent.h"
 #endif
-#include "nsIDOMNSDocumentStyle.h"
 #include "nsIDOMDocumentXBL.h"
 #include "nsIDOMElementCSSInlineStyle.h"
 #include "nsIDOMLinkStyle.h"
 #include "nsIDOMHTMLDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsIDOMHTMLAnchorElement.h"
@@ -274,12 +272,10 @@
 #include "nsIDOMHTMLEmbedElement.h"
 #include "nsIDOMHTMLFieldSetElement.h"
 #include "nsIDOMHTMLFontElement.h"
-#include "nsIDOMNSHTMLFormElement.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMHTMLFrameSetElement.h"
 #include "nsIDOMNSHTMLFrameElement.h"
 #include "nsIDOMHTMLHRElement.h"
-#include "nsIDOMNSHTMLHRElement.h"
 #include "nsIDOMHTMLHeadElement.h"
 #include "nsIDOMHTMLHeadingElement.h"
 #include "nsIDOMHTMLHtmlElement.h"
@@ -517,6 +513,7 @@
 #include "nsDOMTouchEvent.h"
 #include "nsIDOMCustomEvent.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -794,8 +791,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDListElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(HTMLDelElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDirectoryElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLDivElement, nsElementSH,
@@ -828,8 +823,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLInputElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(HTMLInsElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLIsIndexElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLLIElement, nsElementSH,
@@ -846,6 +839,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLMetaElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(HTMLModElement, nsElementSH,
+                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLOListElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLObjectElement, nsHTMLPluginObjElementSH,
@@ -1656,7 +1651,6 @@ jsid nsDOMClassInfo::sScrollX_id         = JSID_VOID;
 jsid nsDOMClassInfo::sScrollY_id         = JSID_VOID;
 jsid nsDOMClassInfo::sScrollMaxX_id      = JSID_VOID;
 jsid nsDOMClassInfo::sScrollMaxY_id      = JSID_VOID;
-jsid nsDOMClassInfo::sOpen_id            = JSID_VOID;
 jsid nsDOMClassInfo::sItem_id            = JSID_VOID;
 jsid nsDOMClassInfo::sNamedItem_id       = JSID_VOID;
 jsid nsDOMClassInfo::sEnumerate_id       = JSID_VOID;
@@ -1992,7 +1986,6 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
   SET_JSID_TO_STRING(sScrollY_id,         cx, "scrollY");
   SET_JSID_TO_STRING(sScrollMaxX_id,      cx, "scrollMaxX");
   SET_JSID_TO_STRING(sScrollMaxY_id,      cx, "scrollMaxY");
-  SET_JSID_TO_STRING(sOpen_id,            cx, "open");
   SET_JSID_TO_STRING(sItem_id,            cx, "item");
   SET_JSID_TO_STRING(sNamedItem_id,       cx, "namedItem");
   SET_JSID_TO_STRING(sEnumerate_id,       cx, "enumerateProperties");
@@ -2326,9 +2319,6 @@ nsDOMClassInfo::RegisterExternalClasses()
   }
 
 #define DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES                                    \
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSDocument)                                 \
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentStyle)                              \
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSDocumentStyle)                            \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentXBL)                                \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)                              \
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)                                \
@@ -2547,7 +2537,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Node)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Text)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(Comment, nsIDOMComment)
@@ -2562,7 +2551,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Node)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Text)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(ProcessingInstruction, nsIDOMProcessingInstruction)
@@ -2654,14 +2642,12 @@ nsDOMClassInfo::Init()
   if (nsDOMTouchEvent::PrefEnabled()) {
     DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMDocumentTouch)
       DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
     DOM_CLASSINFO_MAP_END
   } else {
     DOM_CLASSINFO_MAP_BEGIN(HTMLDocument, nsIDOMHTMLDocument)
       DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
-      DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
       DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
     DOM_CLASSINFO_MAP_END
   }
@@ -2729,11 +2715,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLDelElement, nsIDOMHTMLElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
-    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(HTMLDirectoryElement, nsIDOMHTMLDirectoryElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDirectoryElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
@@ -2762,7 +2743,6 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(HTMLFormElement, nsIDOMHTMLFormElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLFormElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLFormElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
@@ -2779,7 +2759,6 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(HTMLHRElement, nsIDOMHTMLHRElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLHRElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLHRElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
@@ -2815,11 +2794,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(HTMLInsElement, nsIDOMHTMLElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
-    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(HTMLIsIndexElement, nsIDOMHTMLIsIndexElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLIsIndexElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
@@ -2861,6 +2835,11 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(HTMLModElement, nsIDOMHTMLModElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLModElement)
+    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(HTMLOListElement, nsIDOMHTMLOListElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLOListElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
@@ -3161,7 +3140,6 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_BEGIN(ImageDocument, nsIImageDocument)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLDocument)
     DOM_CLASSINFO_MAP_ENTRY(nsIImageDocument)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSHTMLDocument)
     DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
@@ -4037,8 +4015,8 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozURLProperty)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(MozBlobBuilder, nsIDOMBlobBuilder)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMBlobBuilder)
+  DOM_CLASSINFO_MAP_BEGIN(MozBlobBuilder, nsIDOMMozBlobBuilder)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozBlobBuilder)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(DOMStringMap, nsIDOMDOMStringMap)
@@ -4435,10 +4413,10 @@ nsDOMClassInfo::Init()
   RegisterExternalClasses();
 
   sDisableDocumentAllSupport =
-    nsContentUtils::GetBoolPref("browser.dom.document.all.disabled");
+    Preferences::GetBool("browser.dom.document.all.disabled");
 
   sDisableGlobalScopePollutionSupport =
-    nsContentUtils::GetBoolPref("browser.dom.global_scope_pollution.disabled");
+    Preferences::GetBool("browser.dom.global_scope_pollution.disabled");
 
   sIsInitialized = PR_TRUE;
 
@@ -5133,7 +5111,6 @@ nsDOMClassInfo::ShutDown()
   sScrollY_id         = JSID_VOID;
   sScrollMaxX_id      = JSID_VOID;
   sScrollMaxY_id      = JSID_VOID;
-  sOpen_id            = JSID_VOID;
   sItem_id            = JSID_VOID;
   sEnumerate_id       = JSID_VOID;
   sNavigator_id       = JSID_VOID;
@@ -8339,7 +8316,15 @@ nsStringListSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
   nsCOMPtr<nsIDOMDOMStringList> list(do_QueryInterface(aNative));
   NS_ENSURE_TRUE(list, NS_ERROR_UNEXPECTED);
 
-  return list->Item(aIndex, aResult);
+  nsresult rv = list->Item(aIndex, aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRUint32 length = 0;
+    list->GetLength(&length);
+    NS_ASSERTION(PRUint32(aIndex) >= length, "Item should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 
@@ -8352,7 +8337,15 @@ nsDOMTokenListSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
   nsCOMPtr<nsIDOMDOMTokenList> list(do_QueryInterface(aNative));
   NS_ENSURE_TRUE(list, NS_ERROR_UNEXPECTED);
 
-  return list->Item(aIndex, aResult);
+  nsresult rv = list->Item(aIndex, aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRUint32 length = 0;
+    list->GetLength(&length);
+    NS_ASSERTION(PRUint32(aIndex) >= length, "Item should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 
@@ -8745,7 +8738,7 @@ nsDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     // Define the location property on the document object itself so
     // that we can intercept getting and setting of document.location.
 
-    nsCOMPtr<nsIDOMNSDocument> doc(do_QueryWrappedNative(wrapper, obj));
+    nsCOMPtr<nsIDOMDocument> doc = do_QueryWrappedNative(wrapper, obj);
     NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
 
     nsCOMPtr<nsIDOMLocation> location;
@@ -8808,11 +8801,10 @@ nsDocumentSH::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                           JSObject *obj, jsid id, jsval *vp, PRBool *_retval)
 {
   if (id == sLocation_id) {
-    nsCOMPtr<nsIDOMNSDocument> doc(do_QueryWrappedNative(wrapper));
+    nsCOMPtr<nsIDOMDocument> doc = do_QueryWrappedNative(wrapper);
     NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
 
     nsCOMPtr<nsIDOMLocation> location;
-
     nsresult rv = doc->GetLocation(getter_AddRefs(location));
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -8920,86 +8912,6 @@ ResolveImpl(JSContext *cx, nsIXPConnectWrappedNative *wrapper, jsid id,
   return doc->ResolveName(depStr, nsnull, result, aCache);
 }
 
-// static
-JSBool
-nsHTMLDocumentSH::DocumentOpen(JSContext *cx, uintN argc, jsval *vp)
-{
-  JSObject *obj = JS_THIS_OBJECT(cx, vp);
-  if (!obj)
-    return JS_FALSE;
-
-  jsval *argv = JS_ARGV(cx, vp);
-  if (argc > 2) {
-    JSObject *global = ::JS_GetGlobalForObject(cx, obj);
-
-    // DOM0 quirk that makes document.open() call window.open() if
-    // called with 3 or more arguments.
-
-    return ::JS_CallFunctionName(cx, global, "open", argc, JS_ARGV(cx, vp), vp);
-  }
-
-  nsCOMPtr<nsISupports> native = do_QueryWrapper(cx, obj);
-  if (!native) {
-    nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_FAILURE);
-
-    return JS_FALSE;
-  }
-
-  nsCOMPtr<nsIDOMNSHTMLDocument> doc = do_QueryInterface(native);
-  NS_ENSURE_TRUE(doc, JS_FALSE);
-
-  nsCAutoString contentType("text/html");
-  if (argc > 0) {
-    JSString* jsstr = JS_ValueToString(cx, argv[0]);
-    if (!jsstr) {
-      nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_OUT_OF_MEMORY);
-      return JS_FALSE;
-    }
-    nsDependentJSString depStr;
-    if (!depStr.init(cx, jsstr)) {
-      nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_OUT_OF_MEMORY);
-      return JS_FALSE;
-    }
-    nsAutoString type;
-    type.Assign(depStr);
-    ToLowerCase(type);
-    nsCAutoString actualType, dummy;
-    NS_ParseContentType(NS_ConvertUTF16toUTF8(type), actualType, dummy);
-    if (!actualType.EqualsLiteral("text/html") &&
-        !type.EqualsLiteral("replace")) {
-      contentType = "text/plain";
-    }
-  }
-  
-  PRBool replace = PR_FALSE;
-  if (argc > 1) {
-    JSString* jsstr = JS_ValueToString(cx, argv[1]);
-    if (!jsstr) {
-      nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_OUT_OF_MEMORY);
-      return JS_FALSE;
-    }
-
-    const jschar *chars = ::JS_GetStringCharsZ(cx, jsstr);
-    if (!chars) {
-      nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_OUT_OF_MEMORY);
-      return JS_FALSE;
-    }
-
-    replace = NS_LITERAL_STRING("replace").Equals(chars);
-  }
-
-  nsCOMPtr<nsIDOMDocument> retval;
-  nsresult rv = doc->Open(contentType, replace, getter_AddRefs(retval));
-  if (NS_FAILED(rv)) {
-    nsDOMClassInfo::ThrowJSException(cx, rv);
-
-    return JS_FALSE;
-  }
-
-  *vp = OBJECT_TO_JSVAL(obj);
-  return NS_SUCCEEDED(rv);
-}
-
 
 static JSClass sHTMLDocumentAllClass = {
   "HTML document.all class",
@@ -9499,14 +9411,6 @@ nsHTMLDocumentSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       }
     }
 
-    if (id == sOpen_id) {
-      JSFunction *fnc =::JS_DefineFunctionById(cx, obj, id, DocumentOpen, 0,
-                                               JSPROP_ENUMERATE);
-      *objp = obj;
-
-      return fnc ? NS_OK : NS_ERROR_UNEXPECTED;
-    }
-
     if (id == sAll_id && !sDisableDocumentAllSupport &&
         !ObjectIsNativeWrapper(cx, obj)) {
       nsIDocument *doc = static_cast<nsIDocument*>(wrapper->Native());
@@ -10402,14 +10306,16 @@ nsStringArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   nsresult rv = GetStringAt(GetNative(wrapper, obj), n, val);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // XXX: Null strings?
-
   JSAutoRequest ar(cx);
 
-  nsStringBuffer* sharedBuffer = nsnull;
-  *vp = XPCStringConvert::ReadableToJSVal(cx, val, &sharedBuffer);
-  if (sharedBuffer) {
-    val.ForgetSharedBuffer();
+  if (DOMStringIsNull(val)) {
+    *vp = JSVAL_VOID;
+  } else {
+    nsStringBuffer* sharedBuffer = nsnull;
+    *vp = XPCStringConvert::ReadableToJSVal(cx, val, &sharedBuffer);
+    if (sharedBuffer) {
+      val.ForgetSharedBuffer();
+    }
   }
 
   return NS_SUCCESS_I_DID_SOMETHING;
@@ -10458,7 +10364,15 @@ nsHistorySH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
 
   nsCOMPtr<nsIDOMHistory> history(do_QueryInterface(aNative));
 
-  return history->Item(aIndex, aResult);
+  nsresult rv = history->Item(aIndex, aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRInt32 length = 0;
+    history->GetLength(&length);
+    NS_ASSERTION(aIndex >= length, "Item should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 
@@ -10474,7 +10388,15 @@ nsMediaListSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
 
   nsCOMPtr<nsIDOMMediaList> media_list(do_QueryInterface(aNative));
 
-  return media_list->Item(PRUint32(aIndex), aResult);
+  nsresult rv = media_list->Item(PRUint32(aIndex), aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRUint32 length = 0;
+    media_list->GetLength(&length);
+    NS_ASSERTION(PRUint32(aIndex) >= length, "Item should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 
@@ -10537,7 +10459,15 @@ nsCSSStyleDeclSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
 
   nsCOMPtr<nsIDOMCSSStyleDeclaration> style_decl(do_QueryInterface(aNative));
 
-  return style_decl->Item(PRUint32(aIndex), aResult);
+  nsresult rv = style_decl->Item(PRUint32(aIndex), aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRUint32 length = 0;
+    style_decl->GetLength(&length);
+    NS_ASSERTION(PRUint32(aIndex) >= length, "Item should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 
@@ -11158,7 +11088,15 @@ nsOfflineResourceListSH::GetStringAt(nsISupports *aNative, PRInt32 aIndex,
   nsCOMPtr<nsIDOMOfflineResourceList> list(do_QueryInterface(aNative));
   NS_ENSURE_TRUE(list, NS_ERROR_UNEXPECTED);
 
-  return list->MozItem(aIndex, aResult);
+  nsresult rv = list->MozItem(aIndex, aResult);
+#ifdef DEBUG
+  if (DOMStringIsNull(aResult)) {
+    PRUint32 length = 0;
+    list->GetMozLength(&length);
+    NS_ASSERTION(PRUint32(aIndex) >= length, "MozItem should only return null for out-of-bounds access");
+  }
+#endif
+  return rv;
 }
 
 // nsFileListSH
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 2fe873d2589..bf6a003ecbd 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -310,7 +310,6 @@ public:
   static jsid sScrollY_id;
   static jsid sScrollMaxX_id;
   static jsid sScrollMaxY_id;
-  static jsid sOpen_id;
   static jsid sItem_id;
   static jsid sNamedItem_id;
   static jsid sEnumerate_id;
@@ -979,7 +978,6 @@ protected:
   {
   }
 
-  static JSBool DocumentOpen(JSContext *cx, uintN argc, jsval *vp);
   static JSBool GetDocumentAllNodeList(JSContext *cx, JSObject *obj,
                                        nsDocument *doc,
                                        nsContentList **nodeList);
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 62030ec8576..4ab501c1178 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -94,7 +94,6 @@ DOMCI_CLASS(HTMLBodyElement)
 DOMCI_CLASS(HTMLButtonElement)
 DOMCI_CLASS(HTMLDataListElement)
 DOMCI_CLASS(HTMLDListElement)
-DOMCI_CLASS(HTMLDelElement)
 DOMCI_CLASS(HTMLDirectoryElement)
 DOMCI_CLASS(HTMLDivElement)
 DOMCI_CLASS(HTMLEmbedElement)
@@ -110,7 +109,6 @@ DOMCI_CLASS(HTMLHtmlElement)
 DOMCI_CLASS(HTMLIFrameElement)
 DOMCI_CLASS(HTMLImageElement)
 DOMCI_CLASS(HTMLInputElement)
-DOMCI_CLASS(HTMLInsElement)
 DOMCI_CLASS(HTMLIsIndexElement)
 DOMCI_CLASS(HTMLLIElement)
 DOMCI_CLASS(HTMLLabelElement)
@@ -119,6 +117,7 @@ DOMCI_CLASS(HTMLLinkElement)
 DOMCI_CLASS(HTMLMapElement)
 DOMCI_CLASS(HTMLMenuElement)
 DOMCI_CLASS(HTMLMetaElement)
+DOMCI_CLASS(HTMLModElement)
 DOMCI_CLASS(HTMLOListElement)
 DOMCI_CLASS(HTMLObjectElement)
 DOMCI_CLASS(HTMLOptGroupElement)
@@ -226,7 +225,6 @@ DOMCI_CLASS(CSSMozDocumentRule)
 
 DOMCI_CLASS(BeforeUnloadEvent)
 
-#ifdef MOZ_SVG
 // The SVG document
 DOMCI_CLASS(SVGDocument)
 
@@ -344,7 +342,6 @@ DOMCI_CLASS(SVGRect)
 DOMCI_CLASS(SVGTransform)
 DOMCI_CLASS(SVGTransformList)
 DOMCI_CLASS(SVGZoomEvent)
-#endif // MOZ_SVG
 
 // Canvas
 DOMCI_CLASS(HTMLCanvasElement)
@@ -394,9 +391,7 @@ DOMCI_CLASS(EventSource)
 DOMCI_CLASS(ClientRect)
 DOMCI_CLASS(ClientRectList)
 
-#ifdef MOZ_SVG
 DOMCI_CLASS(SVGForeignObjectElement)
-#endif
 
 DOMCI_CLASS(XULCommandEvent)
 DOMCI_CLASS(CommandEvent)
diff --git a/dom/base/nsDOMClassInfoID.h b/dom/base/nsDOMClassInfoID.h
index 9bbd4517e59..c02ad3e0ffb 100644
--- a/dom/base/nsDOMClassInfoID.h
+++ b/dom/base/nsDOMClassInfoID.h
@@ -80,13 +80,12 @@ DOMCI_CASTABLE_INTERFACE(nsIContent, nsIContent, 1, _extra)                   \
 DOMCI_CASTABLE_INTERFACE(nsIDocument, nsIDocument, 2, _extra)                 \
 DOMCI_CASTABLE_INTERFACE(nsINodeList, nsINodeList, 3, _extra)                 \
 DOMCI_CASTABLE_INTERFACE(nsICSSDeclaration, nsICSSDeclaration, 4, _extra)     \
-DOMCI_CASTABLE_INTERFACE(nsGenericTextNode, nsGenericTextNode, 5, _extra)     \
-DOMCI_CASTABLE_INTERFACE(nsDocument, nsIDocument, 6, _extra)                  \
-DOMCI_CASTABLE_INTERFACE(nsGenericHTMLElement, nsGenericHTMLElement, 7,       \
+DOMCI_CASTABLE_INTERFACE(nsDocument, nsIDocument, 5, _extra)                  \
+DOMCI_CASTABLE_INTERFACE(nsGenericHTMLElement, nsGenericHTMLElement, 6,       \
                          _extra)                                              \
-DOMCI_CASTABLE_INTERFACE(nsHTMLDocument, nsIDocument, 8, _extra)              \
-DOMCI_CASTABLE_INTERFACE(nsStyledElement, nsStyledElement, 9, _extra)         \
-DOMCI_CASTABLE_INTERFACE(nsSVGStylableElement, nsIContent, 10, _extra)
+DOMCI_CASTABLE_INTERFACE(nsHTMLDocument, nsIDocument, 7, _extra)              \
+DOMCI_CASTABLE_INTERFACE(nsStyledElement, nsStyledElement, 8, _extra)         \
+DOMCI_CASTABLE_INTERFACE(nsSVGStylableElement, nsIContent, 9, _extra)
 
 // Make sure all classes mentioned in DOMCI_CASTABLE_INTERFACES
 // have been declared.
diff --git a/dom/base/nsDOMError.h b/dom/base/nsDOMError.h
index 9e79f3e737b..cb4f77ab14f 100644
--- a/dom/base/nsDOMError.h
+++ b/dom/base/nsDOMError.h
@@ -79,11 +79,9 @@
 
 /* SVG DOM error codes from http://www.w3.org/TR/SVG11/svgdom.html */
 
-#ifdef MOZ_SVG
 #define NS_ERROR_DOM_SVG_WRONG_TYPE_ERR          NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SVG,0)
 #define NS_ERROR_DOM_SVG_INVALID_VALUE_ERR       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SVG,1)
 #define NS_ERROR_DOM_SVG_MATRIX_NOT_INVERTABLE   NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SVG,2)
-#endif
 
 /* DOM error codes from http://www.w3.org/TR/DOM-Level-3-XPath/ */
 
diff --git a/dom/base/nsDOMException.cpp b/dom/base/nsDOMException.cpp
index 442610702f8..ed0e13ed039 100644
--- a/dom/base/nsDOMException.cpp
+++ b/dom/base/nsDOMException.cpp
@@ -44,9 +44,7 @@
 #include "nsIDOMDOMException.h"
 #include "nsIDOMRangeException.h"
 #include "nsIDOMFileException.h"
-#ifdef MOZ_SVG
 #include "nsIDOMSVGException.h"
-#endif
 #include "nsIDOMXPathException.h"
 #include "nsIIDBDatabaseException.h"
 #include "nsString.h"
@@ -185,7 +183,6 @@ nsRangeException::GetCode(PRUint16* aCode)
   return NS_OK;
 }
 
-#ifdef MOZ_SVG
 IMPL_INTERNAL_DOM_EXCEPTION_HEAD(nsSVGException, nsIDOMSVGException)
   NS_DECL_NSIDOMSVGEXCEPTION
 IMPL_INTERNAL_DOM_EXCEPTION_TAIL(nsSVGException, nsIDOMSVGException,
@@ -202,7 +199,6 @@ nsSVGException::GetCode(PRUint16* aCode)
 
   return NS_OK;
 }
-#endif // MOZ_SVG
 
 IMPL_INTERNAL_DOM_EXCEPTION_HEAD(nsXPathException, nsIDOMXPathException)
   NS_DECL_NSIDOMXPATHEXCEPTION
diff --git a/dom/base/nsDOMException.h b/dom/base/nsDOMException.h
index 191e0f031a2..87dc5197efc 100644
--- a/dom/base/nsDOMException.h
+++ b/dom/base/nsDOMException.h
@@ -73,9 +73,7 @@ NS_New##domname(nsresult aNSResult, nsIException* aDefaultException,         \
 
 DECL_INTERNAL_DOM_EXCEPTION(DOMException)
 DECL_INTERNAL_DOM_EXCEPTION(RangeException)
-#ifdef MOZ_SVG
 DECL_INTERNAL_DOM_EXCEPTION(SVGException)
-#endif
 DECL_INTERNAL_DOM_EXCEPTION(XPathException)
 DECL_INTERNAL_DOM_EXCEPTION(FileException)
 DECL_INTERNAL_DOM_EXCEPTION(EventException)
diff --git a/dom/base/nsDOMScriptObjectFactory.cpp b/dom/base/nsDOMScriptObjectFactory.cpp
index aa0aeb72cf9..e04b9e55155 100644
--- a/dom/base/nsDOMScriptObjectFactory.cpp
+++ b/dom/base/nsDOMScriptObjectFactory.cpp
@@ -88,9 +88,7 @@ nsDOMScriptObjectFactory::nsDOMScriptObjectFactory() :
     if (xs) {
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM);
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_RANGE);
-#ifdef MOZ_SVG
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_SVG);
-#endif
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_XPATH);
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_INDEXEDDB);
       xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_XPCONNECT);
@@ -291,10 +289,8 @@ nsDOMScriptObjectFactory::Observe(nsISupports *aSubject,
                                         NS_ERROR_MODULE_DOM);
         xs->UnregisterExceptionProvider(gExceptionProvider,
                                         NS_ERROR_MODULE_DOM_RANGE);
-#ifdef MOZ_SVG
         xs->UnregisterExceptionProvider(gExceptionProvider,
                                         NS_ERROR_MODULE_SVG);
-#endif
         xs->UnregisterExceptionProvider(gExceptionProvider,
                                         NS_ERROR_MODULE_DOM_XPATH);
         xs->UnregisterExceptionProvider(gExceptionProvider,
@@ -392,10 +388,8 @@ nsDOMExceptionProvider::GetException(nsresult result,
   {
     case NS_ERROR_MODULE_DOM_RANGE:
       return NS_NewRangeException(result, aDefaultException, _retval);
-#ifdef MOZ_SVG
     case NS_ERROR_MODULE_SVG:
       return NS_NewSVGException(result, aDefaultException, _retval);
-#endif
     case NS_ERROR_MODULE_DOM_XPATH:
       return NS_NewXPathException(result, aDefaultException, _retval);
     case NS_ERROR_MODULE_XPCONNECT:
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index 43f972e49af..88b91327944 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -42,7 +42,6 @@
 #include "nsIEnumerator.h"
 #include "nsTPtrArray.h"
 #include "nsGkAtoms.h"
-#include "nsIPrefBranch2.h"
 #include "nsContentUtils.h"
 #include "nsIDocument.h"
 #include "nsIDOMWindow.h"
@@ -79,18 +78,19 @@
 #include "nsIViewManager.h"
 #include "nsFrameSelection.h"
 #include "nsXULPopupManager.h"
-#include "nsImageMapUtils.h"
 #include "nsIDOMNodeFilter.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIPrincipal.h"
 #include "mozilla/dom/Element.h"
 #include "mozAutoDocUpdate.h"
+#include "mozilla/Preferences.h"
 
 #ifdef MOZ_XUL
 #include "nsIDOMXULTextboxElement.h"
 #include "nsIDOMXULMenuListElement.h"
 #endif
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //#define DEBUG_FOCUS 1
@@ -159,19 +159,20 @@ static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
 nsFocusManager* nsFocusManager::sInstance = nsnull;
 PRBool nsFocusManager::sMouseFocusesFormControl = PR_FALSE;
 
+static const char* kObservedPrefs[] = {
+  "accessibility.browsewithcaret",
+  "accessibility.tabfocus_applies_to_xul",
+  "accessibility.mouse_focuses_formcontrol",
+  NULL
+};
+
 nsFocusManager::nsFocusManager()
 { }
 
 nsFocusManager::~nsFocusManager()
 {
-  nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
+  Preferences::RemoveObservers(this, kObservedPrefs);
 
-  if (prefBranch) {
-    prefBranch->RemoveObserver("accessibility.browsewithcaret", this);
-    prefBranch->RemoveObserver("accessibility.tabfocus_applies_to_xul", this);
-    prefBranch->RemoveObserver("accessibility.mouse_focuses_formcontrol", this);
-  }
-  
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
     obs->RemoveObserver(this, "xpcom-shutdown");
@@ -188,18 +189,13 @@ nsFocusManager::Init()
   sInstance = fm;
 
   nsIContent::sTabFocusModelAppliesToXUL =
-    nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
-                                nsIContent::sTabFocusModelAppliesToXUL);
+    Preferences::GetBool("accessibility.tabfocus_applies_to_xul",
+                         nsIContent::sTabFocusModelAppliesToXUL);
 
   sMouseFocusesFormControl =
-    nsContentUtils::GetBoolPref("accessibility.mouse_focuses_formcontrol", PR_FALSE);
+    Preferences::GetBool("accessibility.mouse_focuses_formcontrol", PR_FALSE);
 
-  nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-  if (prefBranch) {
-    prefBranch->AddObserver("accessibility.browsewithcaret", fm, PR_TRUE);
-    prefBranch->AddObserver("accessibility.tabfocus_applies_to_xul", fm, PR_TRUE);
-    prefBranch->AddObserver("accessibility.mouse_focuses_formcontrol", fm, PR_TRUE);
-  }
+  Preferences::AddWeakObservers(fm, kObservedPrefs);
 
   nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
   if (obs) {
@@ -228,12 +224,13 @@ nsFocusManager::Observe(nsISupports *aSubject,
     }
     else if (data.EqualsLiteral("accessibility.tabfocus_applies_to_xul")) {
       nsIContent::sTabFocusModelAppliesToXUL =
-        nsContentUtils::GetBoolPref("accessibility.tabfocus_applies_to_xul",
-                                    nsIContent::sTabFocusModelAppliesToXUL);
+        Preferences::GetBool("accessibility.tabfocus_applies_to_xul",
+                             nsIContent::sTabFocusModelAppliesToXUL);
     }
     else if (data.EqualsLiteral("accessibility.mouse_focuses_formcontrol")) {
       sMouseFocusesFormControl =
-        nsContentUtils::GetBoolPref("accessibility.mouse_focuses_formcontrol", PR_FALSE);
+        Preferences::GetBool("accessibility.mouse_focuses_formcontrol",
+                             PR_FALSE);
     }
   } else if (!nsCRT::strcmp(aTopic, "xpcom-shutdown")) {
     mActiveWindow = nsnull;
@@ -1955,7 +1952,7 @@ nsFocusManager::UpdateCaret(PRBool aMoveCaretToFocus,
     return;  // Never browse with caret in chrome
 
   PRPackedBool browseWithCaret =
-    nsContentUtils::GetBoolPref("accessibility.browsewithcaret");
+    Preferences::GetBool("accessibility.browsewithcaret");
 
   nsCOMPtr<nsIPresShell> presShell;
   focusedDocShell->GetPresShell(getter_AddRefs(presShell));
@@ -2803,10 +2800,9 @@ nsFocusManager::GetNextTabbableMapArea(PRBool aForward,
 
   nsCOMPtr<nsIDocument> doc = aImageContent->GetDocument();
   if (doc) {
-    nsCOMPtr<nsIDOMHTMLMapElement> imageMap = nsImageMapUtils::FindImageMap(doc, useMap);
-    if (!imageMap)
+    nsCOMPtr<nsIContent> mapContent = doc->FindImageMap(useMap);
+    if (!mapContent)
       return nsnull;
-    nsCOMPtr<nsIContent> mapContent = do_QueryInterface(imageMap);
     PRUint32 count = mapContent->GetChildCount();
     // First see if the the start content is in this map
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 0723fab9dc8..b1216898762 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -69,6 +69,7 @@
 #include "nsJSEnvironment.h"
 #include "nsCharSeparatedTokenizer.h" // for Accept-Language parsing
 #include "nsUnicharUtils.h"
+#include "mozilla/Preferences.h"
 
 // Other Classes
 #include "nsIEventListenerManager.h"
@@ -113,7 +114,6 @@
 #include "nsIDOMCrypto.h"
 #endif
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMEvent.h"
 #include "nsIDOMHTMLAnchorElement.h"
@@ -244,6 +244,7 @@ static PRLogModuleInfo* gDOMLeakPRLog;
 
 static const char kStorageEnabled[] = "dom.storage.enabled";
 
+using namespace mozilla;
 using namespace mozilla::dom;
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
@@ -906,20 +907,20 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
 
   if (gRefCnt == 1) {
 #if !(defined(NS_DEBUG) || defined(MOZ_ENABLE_JS_DUMP))
-    nsContentUtils::AddBoolPrefVarCache("browser.dom.window.dump.enabled",
-                                        &gDOMWindowDumpEnabled);
+    Preferences::AddBoolVarCache(&gDOMWindowDumpEnabled,
+                                 "browser.dom.window.dump.enabled");
 #endif
-    nsContentUtils::AddIntPrefVarCache("dom.min_timeout_value",
-                                       &gMinTimeoutValue,
-                                       DEFAULT_MIN_TIMEOUT_VALUE);
-    nsContentUtils::AddIntPrefVarCache("dom.min_background_timeout_value",
-                                       &gMinBackgroundTimeoutValue,
-                                       DEFAULT_MIN_BACKGROUND_TIMEOUT_VALUE);
+    Preferences::AddIntVarCache(&gMinTimeoutValue,
+                                "dom.min_timeout_value",
+                                DEFAULT_MIN_TIMEOUT_VALUE);
+    Preferences::AddIntVarCache(&gMinBackgroundTimeoutValue,
+                                "dom.min_background_timeout_value",
+                                DEFAULT_MIN_BACKGROUND_TIMEOUT_VALUE);
   }
 
   if (gDumpFile == nsnull) {
-    const nsAdoptingCString& fname = 
-      nsContentUtils::GetCharPref("browser.dom.window.dump.file");
+    const nsAdoptingCString& fname =
+      Preferences::GetCString("browser.dom.window.dump.file");
     if (!fname.IsEmpty()) {
       // if this fails to open, Dump() knows to just go to stdout
       // on null.
@@ -2578,8 +2579,8 @@ nsGlobalWindow::DialogOpenAttempted()
                               topWindow->mLastDialogQuitTime);
 
   if (dialogDuration.ToSeconds() <
-      nsContentUtils::GetIntPref("dom.successive_dialog_time_limit",
-                                 SUCCESSIVE_DIALOG_TIME_LIMIT)) {
+        Preferences::GetInt("dom.successive_dialog_time_limit",
+                            SUCCESSIVE_DIALOG_TIME_LIMIT)) {
     topWindow->mDialogAbuseCount++;
 
     return (topWindow->GetPopupControlState() > openAllowed ||
@@ -5005,7 +5006,7 @@ nsGlobalWindow::Home()
     return NS_OK;
 
   nsAdoptingString homeURL =
-    nsContentUtils::GetLocalizedStringPref(PREF_BROWSER_STARTUP_HOMEPAGE);
+    Preferences::GetLocalizedString(PREF_BROWSER_STARTUP_HOMEPAGE);
 
   if (homeURL.IsEmpty()) {
     // if all else fails, use this
@@ -5077,7 +5078,7 @@ nsGlobalWindow::Print()
     nsCOMPtr<nsIPrintSettings> printSettings;
     if (printSettingsService) {
       PRBool printSettingsAreGlobal =
-        nsContentUtils::GetBoolPref("print.use_global_printsettings", PR_FALSE);
+        Preferences::GetBool("print.use_global_printsettings", PR_FALSE);
 
       if (printSettingsAreGlobal) {
         printSettingsService->GetGlobalPrintSettings(getter_AddRefs(printSettings));
@@ -5101,7 +5102,7 @@ nsGlobalWindow::Print()
       LeaveModalState(callerWin);
 
       PRBool savePrintSettings =
-        nsContentUtils::GetBoolPref("print.save_print_settings", PR_FALSE);
+        Preferences::GetBool("print.save_print_settings", PR_FALSE);
       if (printSettingsAreGlobal && savePrintSettings) {
         printSettingsService->
           SavePrintSettingsToPrefs(printSettings,
@@ -5551,7 +5552,7 @@ nsGlobalWindow::CanSetProperty(const char *aPrefName)
 
   // If the pref is set to true, we can not set the property
   // and vice versa.
-  return !nsContentUtils::GetBoolPref(aPrefName, PR_TRUE);
+  return !Preferences::GetBool(aPrefName, PR_TRUE);
 }
 
 PRBool
@@ -5609,7 +5610,7 @@ nsGlobalWindow::RevisePopupAbuseLevel(PopupControlState aControl)
 
   // limit the number of simultaneously open popups
   if (abuse == openAbused || abuse == openControlled) {
-    PRInt32 popupMax = nsContentUtils::GetIntPref("dom.popup_maximum", -1);
+    PRInt32 popupMax = Preferences::GetInt("dom.popup_maximum", -1);
     if (popupMax >= 0 && gOpenPopupSpamCount >= popupMax)
       abuse = openOverridden;
   }
@@ -5888,11 +5889,25 @@ PostMessageEvent::Run()
                     "should have been passed an outer window!");
 
   // Get the JSContext for the target window
+  JSContext* cx = nsnull;
   nsIScriptContext* scriptContext = mTargetWindow->GetContext();
-  NS_ENSURE_TRUE(scriptContext, NS_ERROR_FAILURE);
+  if (scriptContext) {
+    cx = (JSContext*)scriptContext->GetNativeContext();
+  }
 
-  JSContext* cx = (JSContext*)scriptContext->GetNativeContext();
-  NS_ENSURE_TRUE(cx, NS_ERROR_FAILURE);
+  if (!cx) {
+    // This can happen if mTargetWindow has been closed.  To avoid leaking,
+    // we need to find a JSContext.
+    nsIThreadJSContextStack* cxStack = nsContentUtils::ThreadJSContextStack();
+    if (cxStack) {
+      cxStack->GetSafeJSContext(&cx);
+    }
+
+    if (!cx) {
+      NS_WARNING("Cannot find a JSContext!  Leaking PostMessage buffer.");
+      return NS_ERROR_FAILURE;
+    }
+  }
 
   // If we bailed before this point we're going to leak mMessage, but
   // that's probably better than crashing.
@@ -6173,8 +6188,7 @@ nsGlobalWindow::Close()
   // that were not opened by script
   if (!mHadOriginalOpener && !nsContentUtils::IsCallerTrustedForWrite()) {
     PRBool allowClose =
-      nsContentUtils::GetBoolPref("dom.allow_scripts_to_close_windows",
-                                  PR_TRUE);
+      Preferences::GetBool("dom.allow_scripts_to_close_windows", PR_TRUE);
     if (!allowClose) {
       // We're blocking the close operation
       // report localized error msg in JS console
@@ -7830,8 +7844,9 @@ nsGlobalWindow::DispatchSyncPopState()
                "Must be safe to run script here.");
 
   // Check that PopState hasn't been pref'ed off.
-  if (!nsContentUtils::GetBoolPref(sPopStatePrefStr, PR_FALSE))
+  if (!Preferences::GetBool(sPopStatePrefStr, PR_FALSE)) {
     return NS_OK;
+  }
 
   nsresult rv = NS_OK;
 
@@ -8008,7 +8023,7 @@ nsGlobalWindow::GetSessionStorage(nsIDOMStorage ** aSessionStorage)
     return NS_OK;
   }
 
-  if (!nsContentUtils::GetBoolPref(kStorageEnabled)) {
+  if (!Preferences::GetBool(kStorageEnabled)) {
     *aSessionStorage = nsnull;
     return NS_OK;
   }
@@ -8072,7 +8087,7 @@ nsGlobalWindow::GetGlobalStorage(nsIDOMStorageList ** aGlobalStorage)
   NS_ENSURE_ARG_POINTER(aGlobalStorage);
 
 #ifdef MOZ_STORAGE
-  if (!nsContentUtils::GetBoolPref(kStorageEnabled)) {
+  if (!Preferences::GetBool(kStorageEnabled)) {
     *aGlobalStorage = nsnull;
     return NS_OK;
   }
@@ -8098,7 +8113,7 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
 
   NS_ENSURE_ARG(aLocalStorage);
 
-  if (!nsContentUtils::GetBoolPref(kStorageEnabled)) {
+  if (!Preferences::GetBool(kStorageEnabled)) {
     *aLocalStorage = nsnull;
     return NS_OK;
   }
@@ -8940,7 +8955,7 @@ nsGlobalWindow::SetTimeoutOrInterval(nsIScriptTimeoutHandler *aHandler,
     // "dom.disable_open_click_delay" is set to (in ms).
 
     PRInt32 delay =
-      nsContentUtils::GetIntPref("dom.disable_open_click_delay");
+      Preferences::GetInt("dom.disable_open_click_delay");
 
     // This is checking |interval|, not realInterval, on purpose,
     // because our lower bound for |realInterval| could be pretty high
@@ -10053,6 +10068,13 @@ nsGlobalWindow::GetURL(nsIDOMMozURLProperty** aURL)
   return NS_OK;
 }
 
+// static
+bool
+nsGlobalWindow::HasIndexedDBSupport()
+{
+  return Preferences::GetBool("indexedDB.feature.enabled", PR_TRUE);
+}
+
 // nsGlobalChromeWindow implementation
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsGlobalChromeWindow)
@@ -10524,11 +10546,11 @@ nsresult
 NS_GetNavigatorPlatform(nsAString& aPlatform)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override =
-      nsContentUtils::GetCharPref("general.platform.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.platform.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aPlatform);
+      aPlatform = override;
       return NS_OK;
     }
   }
@@ -10568,11 +10590,11 @@ nsresult
 NS_GetNavigatorAppVersion(nsAString& aAppVersion)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override = 
-      nsContentUtils::GetCharPref("general.appversion.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.appversion.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aAppVersion);
+      aAppVersion = override;
       return NS_OK;
     }
   }
@@ -10605,11 +10627,11 @@ nsresult
 NS_GetNavigatorAppName(nsAString& aAppName)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override =
-      nsContentUtils::GetCharPref("general.appname.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.appname.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aAppName);
+      aAppName = override;
       return NS_OK;
     }
   }
@@ -10668,7 +10690,7 @@ nsNavigator::GetLanguage(nsAString& aLanguage)
 {
   // e.g. "de-de, en-us,en"
   const nsAdoptingString& acceptLang =
-      nsContentUtils::GetLocalizedStringPref("intl.accept_languages");
+    Preferences::GetLocalizedString("intl.accept_languages");
   // take everything before the first "," or ";", without trailing space
   nsCharSeparatedTokenizer langTokenizer(acceptLang, ',');
   const nsSubstring &firstLangPart = langTokenizer.nextToken();
@@ -10713,11 +10735,11 @@ NS_IMETHODIMP
 nsNavigator::GetOscpu(nsAString& aOSCPU)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override =
-      nsContentUtils::GetCharPref("general.oscpu.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.oscpu.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aOSCPU);
+      aOSCPU = override;
       return NS_OK;
     }
   }
@@ -10768,21 +10790,21 @@ NS_IMETHODIMP
 nsNavigator::GetProductSub(nsAString& aProductSub)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override =
-      nsContentUtils::GetCharPref("general.productSub.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.productSub.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aProductSub);
+      aProductSub = override;
       return NS_OK;
-    } else {
-      // 'general.useragent.productSub' backwards compatible with 1.8 branch.
-      const nsAdoptingCString& override2 =
-        nsContentUtils::GetCharPref("general.useragent.productSub");
+    }
 
-      if (override2) {
-        CopyUTF8toUTF16(override2, aProductSub);
-        return NS_OK;
-      }
+    // 'general.useragent.productSub' backwards compatible with 1.8 branch.
+    const nsAdoptingString& override2 =
+      Preferences::GetString("general.useragent.productSub");
+
+    if (override2) {
+      aProductSub = override2;
+      return NS_OK;
     }
   }
 
@@ -10836,9 +10858,8 @@ NS_IMETHODIMP
 nsNavigator::GetCookieEnabled(PRBool *aCookieEnabled)
 {
   *aCookieEnabled =
-    (nsContentUtils::GetIntPref("network.cookie.cookieBehavior",
-                                COOKIE_BEHAVIOR_REJECT) !=
-     COOKIE_BEHAVIOR_REJECT);
+    (Preferences::GetInt("network.cookie.cookieBehavior",
+                         COOKIE_BEHAVIOR_REJECT) != COOKIE_BEHAVIOR_REJECT);
 
   return NS_OK;
 }
@@ -10856,11 +10877,11 @@ NS_IMETHODIMP
 nsNavigator::GetBuildID(nsAString& aBuildID)
 {
   if (!nsContentUtils::IsCallerTrustedForRead()) {
-    const nsAdoptingCString& override =
-      nsContentUtils::GetCharPref("general.buildID.override");
+    const nsAdoptingString& override =
+      Preferences::GetString("general.buildID.override");
 
     if (override) {
-      CopyUTF8toUTF16(override, aBuildID);
+      aBuildID = override;
       return NS_OK;
     }
   }
@@ -10961,7 +10982,7 @@ nsNavigator::RefreshMIMEArray()
 bool
 nsNavigator::HasDesktopNotificationSupport()
 {
-  return nsContentUtils::GetBoolPref("notification.feature.enabled", PR_FALSE);
+  return Preferences::GetBool("notification.feature.enabled", PR_FALSE);
 }
 
 //*****************************************************************************
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 360d0c445d3..9233d18295e 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -109,7 +109,6 @@
 #include "nsIIDBFactory.h"
 #include "nsFrameMessageManager.h"
 #include "mozilla/TimeStamp.h"
-#include "nsContentUtils.h"
 
 // JS includes
 #include "jsapi.h"
@@ -568,9 +567,7 @@ public:
     return sOuterWindowsById ? sOuterWindowsById->Get(aWindowID) : nsnull;
   }
 
-  static bool HasIndexedDBSupport() {
-    return nsContentUtils::GetBoolPref("indexedDB.feature.enabled", PR_TRUE);
-  }
+  static bool HasIndexedDBSupport();
 
 private:
   // Enable updates for the accelerometer.
diff --git a/dom/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp
index f6f6c1b0738..770dd742752 100644
--- a/dom/base/nsGlobalWindowCommands.cpp
+++ b/dom/base/nsGlobalWindowCommands.cpp
@@ -44,7 +44,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsCRT.h"
 #include "nsString.h"
-#include "nsContentUtils.h"
+#include "mozilla/Preferences.h"
 
 #include "nsIControllerCommandTable.h"
 #include "nsICommandParams.h"
@@ -64,6 +64,8 @@
 #include "nsIClipboardDragDropHooks.h"
 #include "nsIClipboardDragDropHookList.h"
 
+using namespace mozilla;
+
 const char * const sSelectAllString = "cmd_selectAll";
 const char * const sSelectNoneString = "cmd_selectNone";
 const char * const sCopyImageLocationString = "cmd_copyImageLocation";
@@ -246,7 +248,7 @@ nsSelectMoveScrollCommand::DoSelectCommand(const char *aCommandName, nsIDOMWindo
   PRBool caretOn = PR_FALSE;
   selCont->GetCaretEnabled(&caretOn);
   if (!caretOn) {
-    caretOn = nsContentUtils::GetBoolPref("accessibility.browsewithcaret");
+    caretOn = Preferences::GetBool("accessibility.browsewithcaret");
     if (caretOn) {
       nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(aWindow);
       if (piWindow) {
diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp
index 356ebe183dc..d65e9c95455 100644
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -58,8 +58,10 @@
 #include "nsReadableUtils.h"
 #include "nsDOMClassInfo.h"
 #include "nsContentUtils.h"
-#include "nsIDOMNSDocument.h"
 #include "nsISHistoryInternal.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static const char* sAllowPushStatePrefStr  =
   "browser.history.allowPushState";
@@ -287,8 +289,9 @@ nsHistory::PushState(nsIVariant *aData, const nsAString& aTitle,
                      const nsAString& aURL, JSContext* aCx)
 {
   // Check that PushState hasn't been pref'ed off.
-  if (!nsContentUtils::GetBoolPref(sAllowPushStatePrefStr, PR_FALSE))
+  if (!Preferences::GetBool(sAllowPushStatePrefStr, PR_FALSE)) {
     return NS_OK;
+  }
 
   nsCOMPtr<nsPIDOMWindow> win(do_QueryReferent(mInnerWindow));
   if (!win)
@@ -316,8 +319,9 @@ nsHistory::ReplaceState(nsIVariant *aData, const nsAString& aTitle,
                         const nsAString& aURL, JSContext* aCx)
 {
   // Check that ReplaceState hasn't been pref'ed off
-  if (!nsContentUtils::GetBoolPref(sAllowReplaceStatePrefStr, PR_FALSE))
+  if (!Preferences::GetBool(sAllowReplaceStatePrefStr, PR_FALSE)) {
     return NS_OK;
+  }
 
   nsCOMPtr<nsPIDOMWindow> win(do_QueryReferent(mInnerWindow));
   if (!win)
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index e5f36d140ab..08d12db60a5 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -116,6 +116,7 @@
 #include "prthread.h"
 
 #include "mozilla/FunctionTimer.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 
@@ -820,13 +821,8 @@ nsJSContext::DOMOperationCallback(JSContext *cx)
     // Allow the script to continue running
 
     if (neverShowDlgChk) {
-      nsIPrefBranch *prefBranch = nsContentUtils::GetPrefBranch();
-
-      if (prefBranch) {
-        prefBranch->SetIntPref(isTrackingChromeCodeTime ?
-                               "dom.max_chrome_script_run_time" :
-                               "dom.max_script_run_time", 0);
-      }
+      Preferences::SetInt(isTrackingChromeCodeTime ?
+        "dom.max_chrome_script_run_time" : "dom.max_script_run_time", 0);
     }
 
     ctx->mOperationCallbackTime = PR_Now();
@@ -926,9 +922,9 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
   PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions;
   PRUint32 newDefaultJSOptions = oldDefaultJSOptions;
 
-  sPostGCEventsToConsole = nsContentUtils::GetBoolPref(js_memlog_option_str);
+  sPostGCEventsToConsole = Preferences::GetBool(js_memlog_option_str);
 
-  PRBool strict = nsContentUtils::GetBoolPref(js_strict_option_str);
+  PRBool strict = Preferences::GetBool(js_strict_option_str);
   if (strict)
     newDefaultJSOptions |= JSOPTION_STRICT;
   else
@@ -939,16 +935,16 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
   // XXX components be covered by the chrome pref instead of the content one?
   nsCOMPtr<nsIDOMChromeWindow> chromeWindow(do_QueryInterface(global));
 
-  PRBool useTraceJIT = nsContentUtils::GetBoolPref(chromeWindow ?
-                                                   js_tracejit_chrome_str :
-                                                   js_tracejit_content_str);
-  PRBool useMethodJIT = nsContentUtils::GetBoolPref(chromeWindow ?
-                                                    js_methodjit_chrome_str :
-                                                    js_methodjit_content_str);
-  PRBool useProfiling = nsContentUtils::GetBoolPref(chromeWindow ?
-                                                    js_profiling_chrome_str :
-                                                    js_profiling_content_str);
-  PRBool useMethodJITAlways = nsContentUtils::GetBoolPref(js_methodjit_always_str);
+  PRBool useTraceJIT = Preferences::GetBool(chromeWindow ?
+                                              js_tracejit_chrome_str :
+                                              js_tracejit_content_str);
+  PRBool useMethodJIT = Preferences::GetBool(chromeWindow ?
+                                               js_methodjit_chrome_str :
+                                               js_methodjit_content_str);
+  PRBool useProfiling = Preferences::GetBool(chromeWindow ?
+                                               js_profiling_chrome_str :
+                                               js_profiling_content_str);
+  PRBool useMethodJITAlways = Preferences::GetBool(js_methodjit_always_str);
   nsCOMPtr<nsIXULRuntime> xr = do_GetService(XULRUNTIME_SERVICE_CONTRACTID);
   if (xr) {
     PRBool safeMode = PR_FALSE;
@@ -984,7 +980,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 #ifdef DEBUG
   // In debug builds, warnings are enabled in chrome context if
   // javascript.options.strict.debug is true
-  PRBool strictDebug = nsContentUtils::GetBoolPref(js_strict_debug_option_str);
+  PRBool strictDebug = Preferences::GetBool(js_strict_debug_option_str);
   // Note this callback is also called from context's InitClasses thus we don't
   // need to enable this directly from InitContext
   if (strictDebug && (newDefaultJSOptions & JSOPTION_STRICT) == 0) {
@@ -993,13 +989,13 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
   }
 #endif
 
-  PRBool werror = nsContentUtils::GetBoolPref(js_werror_option_str);
+  PRBool werror = Preferences::GetBool(js_werror_option_str);
   if (werror)
     newDefaultJSOptions |= JSOPTION_WERROR;
   else
     newDefaultJSOptions &= ~JSOPTION_WERROR;
 
-  PRBool relimit = nsContentUtils::GetBoolPref(js_relimit_option_str);
+  PRBool relimit = Preferences::GetBool(js_relimit_option_str);
   if (relimit)
     newDefaultJSOptions |= JSOPTION_RELIMIT;
   else
@@ -1011,7 +1007,7 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
   context->mDefaultJSOptions = newDefaultJSOptions;
 
 #ifdef JS_GC_ZEAL
-  PRInt32 zeal = nsContentUtils::GetIntPref(js_zeal_option_str, -1);
+  PRInt32 zeal = Preferences::GetInt(js_zeal_option_str, -1);
   if (zeal >= 0)
     ::JS_SetGCZeal(context->mContext, (PRUint8)zeal);
 #endif
@@ -1039,9 +1035,8 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime)
     ::JS_SetOptions(mContext, mDefaultJSOptions);
 
     // Watch for the JS boolean options
-    nsContentUtils::RegisterPrefCallback(js_options_dot_str,
-                                         JSOptionChangedCallback,
-                                         this);
+    Preferences::RegisterCallback(JSOptionChangedCallback,
+                                  js_options_dot_str, this);
 
     ::JS_SetOperationCallback(mContext, DOMOperationCallback);
 
@@ -1093,9 +1088,8 @@ nsJSContext::DestroyJSContext()
   ::JS_SetContextPrivate(mContext, nsnull);
 
   // Unregister our "javascript.options.*" pref-changed callback.
-  nsContentUtils::UnregisterPrefCallback(js_options_dot_str,
-                                         JSOptionChangedCallback,
-                                         this);
+  Preferences::UnregisterCallback(JSOptionChangedCallback,
+                                  js_options_dot_str, this);
 
   PRBool do_gc = mGCOnDestruction && !sGCTimer;
 
@@ -3356,7 +3350,7 @@ nsJSContext::PokeGC()
   CallCreateInstance("@mozilla.org/timer;1", &sGCTimer);
 
   if (!sGCTimer) {
-    NS_WARNING("Failed to create timer");
+    // Failed to create timer (probably because we're in XPCOM shutdown)
     return;
   }
 
@@ -3607,7 +3601,7 @@ MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure)
   // scripts run forever.
   PRBool isChromePref =
     strcmp(aPrefName, "dom.max_chrome_script_run_time") == 0;
-  PRInt32 time = nsContentUtils::GetIntPref(aPrefName, isChromePref ? 20 : 10);
+  PRInt32 time = Preferences::GetInt(aPrefName, isChromePref ? 20 : 10);
 
   PRTime t;
   if (time <= 0) {
@@ -3629,7 +3623,7 @@ MaxScriptRunTimePrefChangedCallback(const char *aPrefName, void *aClosure)
 static int
 ReportAllJSExceptionsPrefChangedCallback(const char* aPrefName, void* aClosure)
 {
-  PRBool reportAll = nsContentUtils::GetBoolPref(aPrefName, PR_FALSE);
+  PRBool reportAll = Preferences::GetBool(aPrefName, PR_FALSE);
   nsContentUtils::XPConnect()->SetReportAllJSExceptions(reportAll);
   return 0;
 }
@@ -3637,7 +3631,7 @@ ReportAllJSExceptionsPrefChangedCallback(const char* aPrefName, void* aClosure)
 static int
 SetMemoryHighWaterMarkPrefChangedCallback(const char* aPrefName, void* aClosure)
 {
-  PRInt32 highwatermark = nsContentUtils::GetIntPref(aPrefName, 128);
+  PRInt32 highwatermark = Preferences::GetInt(aPrefName, 128);
 
   JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_MALLOC_BYTES,
                     highwatermark * 1024L * 1024L);
@@ -3647,7 +3641,7 @@ SetMemoryHighWaterMarkPrefChangedCallback(const char* aPrefName, void* aClosure)
 static int
 SetMemoryMaxPrefChangedCallback(const char* aPrefName, void* aClosure)
 {
-  PRInt32 pref = nsContentUtils::GetIntPref(aPrefName, -1);
+  PRInt32 pref = Preferences::GetInt(aPrefName, -1);
   // handle overflow and negative pref values
   PRUint32 max = (pref <= 0 || pref >= 0x1000) ? -1 : (PRUint32)pref * 1024 * 1024;
   JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MAX_BYTES, max);
@@ -3657,7 +3651,7 @@ SetMemoryMaxPrefChangedCallback(const char* aPrefName, void* aClosure)
 static int
 SetMemoryGCModePrefChangedCallback(const char* aPrefName, void* aClosure)
 {
-  PRBool enableCompartmentGC = nsContentUtils::GetBoolPref(aPrefName);
+  PRBool enableCompartmentGC = Preferences::GetBool(aPrefName);
   JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_MODE, enableCompartmentGC
                                                       ? JSGC_MODE_COMPARTMENT
                                                       : JSGC_MODE_GLOBAL);
@@ -3767,38 +3761,32 @@ nsJSRuntime::Init()
   JS_SetStructuredCloneCallbacks(sRuntime, &cloneCallbacks);
 
   // Set these global xpconnect options...
-  nsContentUtils::RegisterPrefCallback("dom.max_script_run_time",
-                                       MaxScriptRunTimePrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(MaxScriptRunTimePrefChangedCallback,
+                                "dom.max_script_run_time");
   MaxScriptRunTimePrefChangedCallback("dom.max_script_run_time", nsnull);
 
-  nsContentUtils::RegisterPrefCallback("dom.max_chrome_script_run_time",
-                                       MaxScriptRunTimePrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(MaxScriptRunTimePrefChangedCallback,
+                                "dom.max_chrome_script_run_time");
   MaxScriptRunTimePrefChangedCallback("dom.max_chrome_script_run_time",
                                       nsnull);
 
-  nsContentUtils::RegisterPrefCallback("dom.report_all_js_exceptions",
-                                       ReportAllJSExceptionsPrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(ReportAllJSExceptionsPrefChangedCallback,
+                                "dom.report_all_js_exceptions");
   ReportAllJSExceptionsPrefChangedCallback("dom.report_all_js_exceptions",
                                            nsnull);
 
-  nsContentUtils::RegisterPrefCallback("javascript.options.mem.high_water_mark",
-                                       SetMemoryHighWaterMarkPrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(SetMemoryHighWaterMarkPrefChangedCallback,
+                                "javascript.options.mem.high_water_mark");
   SetMemoryHighWaterMarkPrefChangedCallback("javascript.options.mem.high_water_mark",
                                             nsnull);
 
-  nsContentUtils::RegisterPrefCallback("javascript.options.mem.max",
-                                       SetMemoryMaxPrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(SetMemoryMaxPrefChangedCallback,
+                                "javascript.options.mem.max");
   SetMemoryMaxPrefChangedCallback("javascript.options.mem.max",
                                   nsnull);
 
-  nsContentUtils::RegisterPrefCallback("javascript.options.mem.gc_per_compartment",
-                                       SetMemoryGCModePrefChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(SetMemoryGCModePrefChangedCallback,
+                                "javascript.options.mem.gc_per_compartment");
   SetMemoryGCModePrefChangedCallback("javascript.options.mem.gc_per_compartment",
                                      nsnull);
 
diff --git a/dom/indexedDB/CheckPermissionsHelper.cpp b/dom/indexedDB/CheckPermissionsHelper.cpp
index f6490e84c4c..f46d9c38550 100644
--- a/dom/indexedDB/CheckPermissionsHelper.cpp
+++ b/dom/indexedDB/CheckPermissionsHelper.cpp
@@ -51,6 +51,7 @@
 #include "nsNetUtil.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
 
 #include "IndexedDatabaseManager.h"
 
@@ -59,6 +60,7 @@
 #define TOPIC_PERMISSIONS_PROMPT "indexedDB-permissions-prompt"
 #define TOPIC_PERMISSIONS_RESPONSE "indexedDB-permissions-response"
 
+using namespace mozilla;
 USING_INDEXEDDB_NAMESPACE
 using namespace mozilla::services;
 
@@ -71,7 +73,7 @@ GetIndexedDBPermissions(const nsACString& aASCIIOrigin,
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  if (!nsContentUtils::GetBoolPref(PREF_INDEXEDDB_ENABLED)) {
+  if (!Preferences::GetBool(PREF_INDEXEDDB_ENABLED)) {
     return nsIPermissionManager::DENY_ACTION;
   }
 
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index 794ae10a06a..53c8df1e519 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -67,6 +67,9 @@
 #include "IndexedDatabaseManager.h"
 #include "LazyIdleThread.h"
 #include "nsIObserverService.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define PREF_INDEXEDDB_QUOTA "dom.indexedDB.warningQuota"
 
@@ -536,8 +539,8 @@ IDBFactory::Create(nsPIDOMWindow* aWindow)
       return nsnull;
     }
 
-    nsContentUtils::AddIntPrefVarCache(PREF_INDEXEDDB_QUOTA, &gIndexedDBQuota,
-                                       DEFAULT_QUOTA);
+    Preferences::AddIntVarCache(&gIndexedDBQuota, PREF_INDEXEDDB_QUOTA,
+                                DEFAULT_QUOTA);
   }
 
   nsRefPtr<IDBFactory> factory = new IDBFactory();
diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl
index 1a4496dddad..6d9d73f4055 100644
--- a/dom/interfaces/base/domstubs.idl
+++ b/dom/interfaces/base/domstubs.idl
@@ -51,9 +51,6 @@ interface nsIDOMDocument;
 interface nsIDOMDocumentFragment;
 interface nsIDOMDocumentType;
 interface nsIDOMElement;
-interface nsIDOMEntity;
-interface nsIDOMEntityReference;
-interface nsIDOMNSDocument;
 interface nsIDOMNSElement;
 interface nsIDOMNamedNodeMap;
 interface nsIDOMNode;
diff --git a/dom/interfaces/core/Makefile.in b/dom/interfaces/core/Makefile.in
index 85c1a0917d2..00f416d272d 100644
--- a/dom/interfaces/core/Makefile.in
+++ b/dom/interfaces/core/Makefile.in
@@ -57,8 +57,6 @@ SDK_XPIDLSRCS =                                 \
 	nsIDOMDocumentFragment.idl		\
 	nsIDOMDocumentType.idl			\
 	nsIDOMElement.idl			\
-	nsIDOMEntity.idl			\
-	nsIDOMEntityReference.idl		\
 	nsIDOMNamedNodeMap.idl			\
 	nsIDOMNode.idl				\
 	nsIDOMNodeList.idl			\
@@ -68,12 +66,10 @@ SDK_XPIDLSRCS =                                 \
 	$(NULL)
 XPIDLSRCS =                                     \
 	nsIDOM3Node.idl				\
-	nsIDOM3Text.idl				\
 	nsIDOM3TypeInfo.idl			\
 	nsIDOM3Attr.idl				\
 	nsIDOMDOMStringList.idl			\
 	nsIDOMNameList.idl			\
-	nsIDOMNSDocument.idl			\
 	nsIDOMXMLDocument.idl			\
 	nsIDOMUserDataHandler.idl		\
 	nsIDOMNSEditableElement.idl		\
diff --git a/dom/interfaces/core/nsIDOM3Text.idl b/dom/interfaces/core/nsIDOM3Text.idl
deleted file mode 100644
index c50dad59d84..00000000000
--- a/dom/interfaces/core/nsIDOM3Text.idl
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ***** 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 DOM 3 Core interface definitions.
- *
- * The Initial Developer of the Original Code is
- * Jeff Walden <jwalden+code@mit.edu>.
- * Portions created by the Initial Developer are Copyright (C) 2008
- * 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 ***** */
-
-#include "domstubs.idl"
-
-[scriptable, uuid(BCCA052E-46F4-4B8E-8859-A86776C2F1D7)]
-interface nsIDOM3Text : nsISupports
-{
-  /**
-   * Indicates whether this text node contains element content whitespace.
-   * A text node is element content whitespace if it contains only XML
-   * white space characters and is a child of an element whose content
-   * model allows only child elements optionally separated by white space.
-   */
-  readonly attribute boolean isElementContentWhitespace;
-
-  /**
-   * The concatenation of all logically adjacent text nodes with this text
-   * node, where "logically adjacent" consists of all text nodes which can be
-   * reached by traversing the document tree in either direction without
-   * passing an element, comment, or processing-instruction boundary.  
-   */
-  readonly attribute DOMString wholeText;
-
-  /**
-   * If content is empty, removes all logically adjacent text nodes (including
-   * this node) from the DOM tree, returning null; otherwise, replaces the
-   * contents of this node with aContent and removes all other logically
-   * adjacent text nodes from the DOM tree, returning this node.
-   */
-  nsIDOMText replaceWholeText(in DOMString content) raises(DOMException);
-};
diff --git a/dom/interfaces/core/nsIDOMCDATASection.idl b/dom/interfaces/core/nsIDOMCDATASection.idl
index 510810840cd..028c4a022ed 100644
--- a/dom/interfaces/core/nsIDOMCDATASection.idl
+++ b/dom/interfaces/core/nsIDOMCDATASection.idl
@@ -49,7 +49,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Core/
  */
 
-[scriptable, uuid(f8da723d-0d32-4bbc-a11e-898e506cd908)]
+[scriptable, uuid(f1eea89d-8af3-4c2a-90df-6c3a75cb5005)]
 interface nsIDOMCDATASection : nsIDOMText
 {
 };
diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl
index 1d5ee52d5df..79450ce8506 100644
--- a/dom/interfaces/core/nsIDOMDocument.idl
+++ b/dom/interfaces/core/nsIDOMDocument.idl
@@ -25,6 +25,8 @@
  *   Jonas Sicking <sicking@bigfoot.com>
  *   Ms2ger <ms2ger@gmail.com>
  *   Tom Pixley <joki@netscape.com>
+ *   Boris Zbarsky <bzbarsky@mit.edu>
+ *   Robert Sayre <sayrer@gmail.com>
  *
  * 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"),
@@ -45,6 +47,7 @@
 interface nsIDOMNodeIterator;
 interface nsIDOMNodeFilter;
 interface nsIDOMTreeWalker;
+interface nsIDOMLocation;
 
 /**
  * The nsIDOMDocument interface represents the entire HTML or XML document.
@@ -59,7 +62,7 @@ interface nsIDOMTreeWalker;
  * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(61b2159c-614e-4aff-a626-f34af9bb1759)]
+[scriptable, uuid(d53c3d3d-2413-4abc-b54e-11c5c8380776)]
 interface nsIDOMDocument : nsIDOMNode
 {
   readonly attribute nsIDOMDocumentType         doctype;
@@ -77,8 +80,6 @@ interface nsIDOMDocument : nsIDOMNode
                                   raises(DOMException);
   nsIDOMAttr                    createAttribute(in DOMString name)
                                   raises(DOMException);
-  nsIDOMEntityReference         createEntityReference(in DOMString name)
-                                  raises(DOMException);
   nsIDOMNodeList                getElementsByTagName(in DOMString tagname);
 
   // Introduced in DOM Level 2:
@@ -113,15 +114,6 @@ interface nsIDOMDocument : nsIDOMNode
   // Introduced in DOM Level 3:
   nsIDOMNode         adoptNode(in nsIDOMNode source)
                                         raises(DOMException);
-  // Introduced in DOM Level 3:
-  void               normalizeDocument();
-
-  /**
-   * The window associated with this document.
-   *
-   * @see http://www.whatwg.org/html/#dom-document-defaultview
-   */
-  readonly attribute nsIDOMWindow    defaultView;
 
   /**
    * Create a range
@@ -143,4 +135,231 @@ interface nsIDOMDocument : nsIDOMNode
 
   nsIDOMEvent               createEvent(in DOMString eventType)
                                                raises(DOMException);
+
+
+  // HTML
+  /**
+   * The window associated with this document.
+   *
+   * @see <http://www.whatwg.org/html/#dom-document-defaultview>
+   */
+  readonly attribute nsIDOMWindow   defaultView;
+
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-characterset>
+   */
+  readonly attribute DOMString      characterSet;
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-dir>
+   */
+           attribute DOMString      dir;
+
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-location>
+   */
+  readonly attribute nsIDOMLocation location;
+
+  /**
+   * @see <http://www.whatwg.org/html/#document.title>
+   */
+           attribute DOMString      title;
+
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-readystate>
+   */
+  readonly attribute DOMString      readyState;
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-lastmodified>
+   */
+  readonly attribute DOMString      lastModified;
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-referrer>
+   */
+  readonly attribute DOMString      referrer;
+
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-hasfocus>
+   */
+  boolean      hasFocus();
+
+  /**
+   * @see <http://www.whatwg.org/html/#dom-document-activeelement>
+   */
+  readonly attribute nsIDOMElement  activeElement;
+
+  /**
+   * Retrieve elements matching all classes listed in a
+   * space-separated string.
+   *
+   * @see <http://www.whatwg.org/html/#dom-document-getelementsbyclassname>
+   */
+  nsIDOMNodeList getElementsByClassName(in DOMString classes);
+
+
+  // CSSOM
+  /**
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-stylesheets>
+   */
+  readonly attribute nsIDOMStyleSheetList   styleSheets;
+
+  /**
+   * This attribute must return the preferred style sheet set as set by the
+   * author. It is determined from the order of style sheet declarations and
+   * the Default-Style HTTP headers, as eventually defined elsewhere in the Web
+   * Apps 1.0 specification. If there is no preferred style sheet set, this
+   * attribute must return the empty string. The case of this attribute must
+   * exactly match the case given by the author where the preferred style sheet
+   * is specified or implied. This attribute must never return null.
+   *
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-preferredStyleSheetSet>
+   */
+  readonly attribute DOMString preferredStyleSheetSet;
+
+  /**
+   * This attribute indicates which style sheet set is in use. This attribute
+   * is live; changing the disabled attribute on style sheets directly will
+   * change the value of this attribute.
+   *
+   * If all the sheets that are enabled and have a title have the same title
+   * (by case-sensitive comparisons) then the value of this attribute must be
+   * exactly equal to the title of the first enabled style sheet with a title
+   * in the styleSheets list. Otherwise, if style sheets from different sets
+   * are enabled, then the return value must be null (there is no way to
+   * determine what the currently selected style sheet set is in those
+   * conditions). Otherwise, either all style sheets that have a title are
+   * disabled, or there are no alternate style sheets, and
+   * selectedStyleSheetSet must return the empty string.
+   *
+   * Setting this attribute to the null value must have no effect.
+   *
+   * Setting this attribute to a non-null value must call
+   * enableStyleSheetsForSet() with that value as the function's argument, and
+   * set lastStyleSheetSet to that value.
+   *
+   * From the DOM's perspective, all views have the same
+   * selectedStyleSheetSet. If a UA supports multiple views with different
+   * selected alternate style sheets, then this attribute (and the StyleSheet
+   * interface's disabled attribute) must return and set the value for the
+   * default view.
+   *
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-selectedStyleSheetSet>
+   */
+  attribute DOMString selectedStyleSheetSet;
+
+  /*
+   * This property must initially have the value null. Its value changes when
+   * the selectedStyleSheetSet attribute is set.
+   *
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-lastStyleSheetSet>
+   */
+  readonly attribute DOMString lastStyleSheetSet;
+  
+  /**
+   * This must return the live list of the currently available style sheet
+   * sets. This list is constructed by enumerating all the style sheets for
+   * this document available to the implementation, in the order they are
+   * listed in the styleSheets attribute, adding the title of each style sheet
+   * with a title to the list, avoiding duplicates by dropping titles that
+   * match (case-sensitively) titles that have already been added to the
+   * list.
+   *
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-styleSheetSets>
+   */
+  readonly attribute nsIDOMDOMStringList styleSheetSets;
+
+  /**
+   * Calling this method must change the disabled attribute on each StyleSheet
+   * object with a title attribute with a length greater than 0 in the
+   * styleSheets attribute, so that all those whose title matches the name
+   * argument are enabled, and all others are disabled. Title matches must be
+   * case-sensitive. Calling this method with the empty string disables all
+   * alternate and preferred style sheets (but does not change the state of
+   * persistent style sheets, that is those with no title attribute).
+   *
+   * Calling this method with a null value must have no effect.
+   *
+   * Style sheets that do not have a title are never affected by this
+   * method. This method does not change the values of the lastStyleSheetSet or
+   * preferredStyleSheetSet attributes.
+   *
+   * @see <http://dev.w3.org/csswg/cssom/#dom-document-enableStyleSheetsForSet>
+   */
+  void enableStyleSheetsForSet(in DOMString name);
+
+
+  // CSSOM-View
+  /**
+   * Returns the element from the caller's document at the given point,
+   * relative to the upper-left-most point in the (possibly scrolled)
+   * window or frame.
+   *
+   * If the element at the given point belongs to another document (such as
+   * an iframe's subdocument), the element in the calling document's DOM
+   * (e.g. the iframe) is returned. If the element at the given point is
+   * anonymous or XBL generated content, such as a textbox's scrollbars, then
+   * the first non-anonymous parent element (that is, the textbox) is returned.
+   *
+   * This method returns null if either coordinate is negative, or if the
+   * specified point lies outside the visible bounds of the document.
+   *
+   * Callers from XUL documents should wait until the onload event has fired
+   * before calling this method.
+   *
+   * @see <http://dev.w3.org/csswg/cssom-view/#dom-document-elementfrompoint>
+   */
+  nsIDOMElement             elementFromPoint(in float x, in float y);
+
+
+  // Mozilla extensions
+  /**
+   * @see <https://developer.mozilla.org/en/DOM/document.contentType>
+   */
+  readonly attribute DOMString      contentType;
+
+  /**
+   * Returns the script element whose script is currently being processed.
+   *
+   * @see <https://developer.mozilla.org/en/DOM/document.currentScript>
+   */
+  readonly attribute nsIDOMElement  currentScript;
+
+  /**
+   * Release the current mouse capture if it is on an element within this
+   * document.
+   *
+   * @see <https://developer.mozilla.org/en/DOM/document.releaseCapture>
+   */
+  void releaseCapture();
+
+  /**
+   * Use the given DOM element as the source image of target |-moz-element()|.
+   *
+   * This function introduces a new special ID (called "image element ID"),
+   * which is only used by |-moz-element()|, and associates it with the given
+   * DOM element.  Image elements ID's have the higher precedence than general
+   * HTML id's, so if |document.mozSetImageElement(<id>, <element>)| is called,
+   * |-moz-element(#<id>)| uses |<element>| as the source image even if there
+   * is another element with id attribute = |<id>|.  To unregister an image
+   * element ID |<id>|, call |document.mozSetImageElement(<id>, null)|.
+   *
+   * Example:
+   * <script>
+   *   canvas = document.createElement("canvas");
+   *   canvas.setAttribute("width", 100);
+   *   canvas.setAttribute("height", 100);
+   *   // draw to canvas
+   *   document.mozSetImageElement("canvasbg", canvas);
+   * </script>
+   * <div style="background-image: -moz-element(#canvasbg);"></div>
+   *
+   * @param aImageElementId an image element ID to associate with
+   * |aImageElement|
+   * @param aImageElement a DOM element to be used as the source image of
+   * |-moz-element(#aImageElementId)|. If this is null, the function will
+   * unregister the image element ID |aImageElementId|.
+   *
+   * @see <https://developer.mozilla.org/en/DOM/document.mozSetImageElement>
+   */
+  void mozSetImageElement(in DOMString aImageElementId,
+                          in nsIDOMElement aImageElement);
 };
diff --git a/dom/interfaces/core/nsIDOMEntity.idl b/dom/interfaces/core/nsIDOMEntity.idl
deleted file mode 100644
index 28f9a80125f..00000000000
--- a/dom/interfaces/core/nsIDOMEntity.idl
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *
- * 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 "nsIDOMNode.idl"
-
-/**
- * The nsIDOMEntity interface represents an entity, either parsed 
- * or unparsed, in an XML document.
- *
- * For more information on this interface please see 
- * http://www.w3.org/TR/DOM-Level-2-Core/
- */
-
-[scriptable, uuid(944d8c6a-631d-408d-846f-d4ff5fa93ae6)]
-interface nsIDOMEntity : nsIDOMNode
-{
-   readonly attribute  DOMString            publicId;
-   readonly attribute  DOMString            systemId;
-   readonly attribute  DOMString            notationName;
-};
diff --git a/dom/interfaces/core/nsIDOMEntityReference.idl b/dom/interfaces/core/nsIDOMEntityReference.idl
deleted file mode 100644
index 180872b256b..00000000000
--- a/dom/interfaces/core/nsIDOMEntityReference.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *
- * 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 "nsIDOMNode.idl"
-
-/**
- * nsIDOMEntityReference is an interface to a node that represents a 
- * reference to one of the entities defined in the document.
- *
- * For more information on this interface please see 
- * http://www.w3.org/TR/DOM-Level-2-Core/
- */
-
-[scriptable, uuid(ab7e88aa-7c95-4d0a-94de-c632ca0c25cc)]
-interface nsIDOMEntityReference : nsIDOMNode
-{
-};
diff --git a/dom/interfaces/core/nsIDOMNSDocument.idl b/dom/interfaces/core/nsIDOMNSDocument.idl
deleted file mode 100644
index 9482c0c4431..00000000000
--- a/dom/interfaces/core/nsIDOMNSDocument.idl
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *   Robert Sayre <sayrer@gmail.com>
- *
- * 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 "domstubs.idl"
-
-interface nsIBoxObject;
-interface nsIDOMLocation;
-interface nsIVariant;
-
-[scriptable, uuid(92f2c6f8-3668-4a47-8251-2a900afe11fa)]
-interface nsIDOMNSDocument : nsISupports
-{
-  readonly attribute DOMString      characterSet;
-           attribute DOMString      dir;
-
-  readonly attribute nsIDOMLocation location;
-
-           attribute DOMString      title;
-
-  readonly attribute DOMString      contentType;
-  readonly attribute DOMString      readyState;
-  readonly attribute DOMString      lastModified;
-  readonly attribute DOMString      referrer;
-
-  boolean      hasFocus();
-
-  readonly attribute nsIDOMElement  activeElement;
-
-  readonly attribute nsIDOMElement  currentScript;
-
-  /*
-   * Retrieve elements matching all classes listed in a
-   * space-separated string.
-   *
-   * See <http://whatwg.org/specs/web-apps/current-work/>
-   */
-  nsIDOMNodeList getElementsByClassName(in DOMString classes);
-
-  /**
-  * Returns the element from the caller's document at the given point,
-  * relative to the upper-left-most point in the (possibly scrolled)
-  * window or frame.
-  *
-  * If the element at the given point belongs to another document (such as
-  * an iframe's subdocument), the element in the calling document's DOM
-  * (e.g. the iframe) is returned. If the element at the given point is
-  * anonymous or XBL generated content, such as a textbox's scrollbars, then
-  * the first non-anonymous parent element (that is, the textbox) is returned.
-  *
-  * This method returns null if either coordinate is negative, or if the
-  * specified point lies outside the visible bounds of the document.
-  *
-  * Callers from XUL documents should wait until the onload event has fired
-  * before calling this method.
-  *
-  * See <http://www.w3.org/TR/cssom-view/#the-documentview-interface>
-  */
-  nsIDOMElement             elementFromPoint(in float x, in float y);
-
-  /**
-   * Release the current mouse capture if it is on an element within this
-   * document.
-   */
-  void releaseCapture();
-
-  /**
-   * Use the given DOM element as the source image of target |-moz-element()|.
-   *
-   * This function introduces a new special ID (called "image element ID"),
-   * which is only used by |-moz-element()|, and associates it with the given
-   * DOM element.  Image elements ID's have the higher precedence than general
-   * HTML id's, so if |document.mozSetImageElement(<id>, <element>)| is called,
-   * |-moz-element(#<id>)| uses |<element>| as the source image even if there
-   * is another element with id attribute = |<id>|.  To unregister an image
-   * element ID |<id>|, call |document.mozSetImageElement(<id>, null)|.
-   *
-   * Example:
-   * <script>
-   *   canvas = document.createElement("canvas");
-   *   canvas.setAttribute("width", 100);
-   *   canvas.setAttribute("height", 100);
-   *   // draw to canvas
-   *   document.mozSetImageElement("canvasbg", canvas);
-   * </script>
-   * <div style="background-image: -moz-element(#canvasbg);"></div>
-   *
-   * @param aImageElementId an image element ID to associate with
-   * |aImageElement|
-   * @param aImageElement a DOM element to be used as the source image of
-   * |-moz-element(#aImageElementId)|. If this is null, the function will
-   * unregister the image element ID |aImageElementId|.
-   */
-  void mozSetImageElement(in DOMString aImageElementId,
-                          in nsIDOMElement aImageElement);
-};
diff --git a/dom/interfaces/core/nsIDOMText.idl b/dom/interfaces/core/nsIDOMText.idl
index 2aa2fd8c524..7b55e068d55 100644
--- a/dom/interfaces/core/nsIDOMText.idl
+++ b/dom/interfaces/core/nsIDOMText.idl
@@ -44,12 +44,36 @@
  * the textual content (termed character data in XML) of an Element or Attr.
  *
  * For more information on this interface please see 
- * http://www.w3.org/TR/DOM-Level-2-Core/
+ * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
  */
 
-[scriptable, uuid(48642156-d686-46b7-8e96-35edd5b2afa8)]
+[scriptable, uuid(04a1ec2b-491f-4a80-8db4-694c37e31a6f)]
 interface nsIDOMText : nsIDOMCharacterData
 {
   nsIDOMText                      splitText(in unsigned long offset)
                                        raises(DOMException);
+
+  /**
+   * Indicates whether this text node contains element content whitespace.
+   * A text node is element content whitespace if it contains only XML
+   * white space characters and is a child of an element whose content
+   * model allows only child elements optionally separated by white space.
+   */
+  readonly attribute boolean isElementContentWhitespace;
+
+  /**
+   * The concatenation of all logically adjacent text nodes with this text
+   * node, where "logically adjacent" consists of all text nodes which can be
+   * reached by traversing the document tree in either direction without
+   * passing an element, comment, or processing-instruction boundary.  
+   */
+  readonly attribute DOMString wholeText;
+
+  /**
+   * If content is empty, removes all logically adjacent text nodes (including
+   * this node) from the DOM tree, returning null; otherwise, replaces the
+   * contents of this node with aContent and removes all other logically
+   * adjacent text nodes from the DOM tree, returning this node.
+   */
+  nsIDOMText replaceWholeText(in DOMString content) raises(DOMException);
 };
diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl
index 16a6fca6de7..30483673b5f 100644
--- a/dom/interfaces/core/nsIDOMXMLDocument.idl
+++ b/dom/interfaces/core/nsIDOMXMLDocument.idl
@@ -38,7 +38,7 @@
 
 #include "nsIDOMDocument.idl"
 
-[scriptable, uuid(75f617b4-1c61-4122-9fd7-f4243672848b)]
+[scriptable, uuid(f97b36ff-425f-4c87-b6dc-fcfcfb4d5c77)]
 interface nsIDOMXMLDocument : nsIDOMDocument
 {
   // DOM Level 3 Load & Save, DocumentLS
diff --git a/dom/interfaces/css/Makefile.in b/dom/interfaces/css/Makefile.in
index b432a249adb..ff95037f28f 100644
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -68,7 +68,6 @@ XPIDLSRCS =					\
 	nsIDOMCSSStyleRule.idl			\
 	nsIDOMCSSUnknownRule.idl		\
 	nsIDOMCounter.idl			\
-	nsIDOMDocumentCSS.idl			\
 	nsIDOMRGBColor.idl			\
 	nsIDOMRect.idl				\
 	nsIDOMNSRGBAColor.idl			\
diff --git a/dom/interfaces/html/Makefile.in b/dom/interfaces/html/Makefile.in
index 5c3b5e44794..b0e680a0957 100644
--- a/dom/interfaces/html/Makefile.in
+++ b/dom/interfaces/html/Makefile.in
@@ -120,11 +120,8 @@ SDK_XPIDLSRCS =					\
 XPIDLSRCS = 					\
 	nsIDOMHTMLCanvasElement.idl		\
 	nsIDOMHTMLUnknownElement.idl \
-	nsIDOMNSHTMLDocument.idl		\
 	nsIDOMNSHTMLElement.idl			\
-	nsIDOMNSHTMLFormElement.idl		\
 	nsIDOMNSHTMLFrameElement.idl		\
-	nsIDOMNSHTMLHRElement.idl		\
 	nsIDOMNSHTMLOptionCollectn.idl		\
 	nsIDOMNSHTMLTextAreaElement.idl		\
 	$(NULL)
diff --git a/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl b/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
index cdc0d91a429..92058282255 100644
--- a/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
@@ -53,8 +53,9 @@
  */
 
 interface nsIDOMFile;
+interface nsIVariant;
 
-[scriptable, uuid(2e98cd39-2269-493a-a3bb-abe85be2523c)]
+[scriptable, uuid(010d8e6f-86ba-47ad-a04f-1a4d75f1caf8)]
 interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement
 {
   attribute unsigned long width;
@@ -68,18 +69,10 @@ interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement
   // Valid calls are:
   //  toDataURL();              -- defaults to image/png
   //  toDataURL(type);          -- uses given type
-  //  toDataURL(type, params);  -- only available to trusted callers
+  //  toDataURL(type, params);  -- uses given type, and any valid parameters
   [optional_argc] DOMString toDataURL([optional] in DOMString type,
-                                      [optional] in DOMString params);
+                                      [optional] in nsIVariant params);
 
-  // This version lets you specify different image types and pass parameters
-  // to the encoder. For example toDataURLAs("image/png", "transparency=none")
-  // gives you a PNG with the alpha channel discarded. See the encoder for
-  // the options string that it supports. Separate multiple options with
-  // semicolons.
-  [noscript] DOMString toDataURLAs(in DOMString mimeType, in DOMString encoderOptions);
-
- 
   // Valid calls are
   // mozGetAsFile(name);              -- defaults to image/png
   // mozGetAsFile(name, type);        -- uses given type
diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl
index b745c658b9f..723b4a71ac9 100644
--- a/dom/interfaces/html/nsIDOMHTMLDocument.idl
+++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl
@@ -39,43 +39,108 @@
 
 #include "nsIDOMDocument.idl"
 
+%{C++
+#include "jspubtd.h"
+%}
+
 /**
  * The nsIDOMHTMLDocument interface is the interface to a [X]HTML
  * document object.
  *
- * This interface is trying to follow the DOM Level 2 HTML specification:
- * http://www.w3.org/TR/DOM-Level-2-HTML/
- *
- * with changes from the work-in-progress WHATWG HTML specification:
- * http://www.whatwg.org/specs/web-apps/current-work/
+ * @see <http://www.whatwg.org/html/>
  */
 
-[scriptable, uuid(eb3750ae-d156-4b97-b200-f35276c6510f)]
+[scriptable, uuid(3c0ca40f-72c5-4d15-935e-ccaff7953f2c)]
 interface nsIDOMHTMLDocument : nsIDOMDocument
 {
-           attribute DOMString            title;
-  readonly attribute DOMString            referrer;
-  // domain is readonly per spec, but it's settable in
-  // nsIDOMNSHTMLDocument
-  [noscript] readonly attribute DOMString domain;
   readonly attribute DOMString            URL;
+           attribute DOMString            domain;
+           attribute DOMString            cookie;
+  // returns "BackCompat" if we're in quirks mode,
+  // or "CSS1Compat" if we're in strict mode
+  readonly attribute DOMString            compatMode;
+
+  readonly attribute nsIDOMHTMLHeadElement head;
            attribute nsIDOMHTMLElement    body;
+
   readonly attribute nsIDOMHTMLCollection images;
-  readonly attribute nsIDOMHTMLCollection applets;
+  readonly attribute nsIDOMHTMLCollection embeds;
+  // mapped to attribute embeds for NS4 compat
+  readonly attribute nsIDOMHTMLCollection plugins;
   readonly attribute nsIDOMHTMLCollection links;
   readonly attribute nsIDOMHTMLCollection forms;
-  readonly attribute nsIDOMHTMLCollection anchors;
-           attribute DOMString            cookie;
-                                             // raises(DOMException) on setting
+  nsIDOMNodeList            getElementsByName(in DOMString elementName);
 
-  // open() is noscript here since the DOM Level 0 version of open()
-  // returned nsIDOMDocument, and not void. The script version of
-  // open() is defined in nsIDOMNSHTMLDocument.
-  [noscript] void           open();
+  // If aContentType is not something supported by nsHTMLDocument and
+  // the HTML content sink, trying to write to the document will
+  // probably throw.
+  // Pass aReplace = true to trigger a replacement of the previous
+  // document in session history; pass false for normal history handling.
+  [implicit_jscontext, optional_argc]
+  nsISupports               open([optional] in DOMString aContentTypeOrUrl,
+                                 [optional] in DOMString aReplaceOrName,
+                                 [optional] in DOMString aFeatures);
   void                      close();
 
+  [implicit_jscontext]
   void                      write([optional, Null(Stringify)] in DOMString text);
+  [implicit_jscontext]
   void                      writeln([optional, Null(Stringify)] in DOMString text);
 
-  nsIDOMNodeList            getElementsByName(in DOMString elementName);
+  /**
+   * Midas additions
+   */
+  attribute DOMString       designMode;
+
+  boolean                   execCommand(in DOMString commandID,
+                                        in boolean doShowUI,
+                                        in DOMString value);
+
+  // returns true if the help is being shown for command (false if not)
+  boolean                   execCommandShowHelp(in DOMString commandID);
+
+  // returns true if the command is enabled (false otherwise)
+  boolean                   queryCommandEnabled(in DOMString commandID);
+  
+  // returns true if the command is in a indeterminate state (false otherwise)
+  boolean                   queryCommandIndeterm(in DOMString commandID);
+
+  // returns true if the command has been executed (false otherwise)
+  boolean                   queryCommandState(in DOMString commandID);
+
+  // returns true if the command is supported on the current range
+  boolean                   queryCommandSupported(in DOMString commandID);
+
+  //
+  DOMString                 queryCommandText(in DOMString commandID);
+
+  // returns the current value of the document or current selection for command
+  DOMString                 queryCommandValue(in DOMString commandID);
+
+
+  // Obsolete APIs
+           attribute DOMString            fgColor;
+           attribute DOMString            bgColor;
+           attribute DOMString            linkColor;
+           attribute DOMString            vlinkColor;
+           attribute DOMString            alinkColor;
+
+  readonly attribute nsIDOMHTMLCollection anchors;
+  readonly attribute nsIDOMHTMLCollection applets;
+
+  void                      clear();
+
+
+  // DOM Range
+  DOMString                 getSelection();
+
+
+  // Mozilla extensions
+  /**
+   * @deprecated These are old Netscape 4 methods. Do not use,
+   *             the implementation is no-op.
+   */
+  void                      captureEvents(in long eventFlags);
+  void                      releaseEvents(in long eventFlags);
+  void                      routeEvent(in nsIDOMEvent evt);
 };
diff --git a/dom/interfaces/html/nsIDOMHTMLFormElement.idl b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
index aa7d817a2f7..ab7b78eefd6 100644
--- a/dom/interfaces/html/nsIDOMHTMLFormElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLFormElement.idl
@@ -50,16 +50,16 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(e8624d8a-0e9c-49d4-848c-75afcfd6f048)]
+[scriptable, uuid(b7892cbf-a23b-460a-817a-798d490b12df)]
 interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 {
-           attribute DOMString            name;
-
            attribute DOMString            acceptCharset;
            attribute DOMString            action;
            attribute DOMString            autocomplete;
            attribute DOMString            enctype;
+           attribute DOMString            encoding;
            attribute DOMString            method;
+           attribute DOMString            name;
            attribute boolean              noValidate;
            attribute DOMString            target;
 
@@ -68,4 +68,5 @@ interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
 
   void                      submit();
   void                      reset();
+  boolean                   checkValidity();
 };
diff --git a/dom/interfaces/html/nsIDOMHTMLHRElement.idl b/dom/interfaces/html/nsIDOMHTMLHRElement.idl
index e4e1685454c..1ca57c67b10 100644
--- a/dom/interfaces/html/nsIDOMHTMLHRElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLHRElement.idl
@@ -22,6 +22,7 @@
  * Contributor(s):
  *   Vidur Apparao <vidur@netscape.com> (original author)
  *   Johnny Stenback <jst@netscape.com>
+ *   Ian Hickson <ian@hixie.ch>
  *
  * 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"),
@@ -50,11 +51,12 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(b72f9f2d-4c6c-4264-a713-4423724379c0)]
+[scriptable, uuid(32342e24-b209-4f50-8518-f7af339d4ae2)]
 interface nsIDOMHTMLHRElement : nsIDOMHTMLElement
 {
            attribute DOMString        align;
            attribute boolean          noShade;
            attribute DOMString        size;
            attribute DOMString        width;
+           attribute DOMString        color;
 };
diff --git a/dom/interfaces/html/nsIDOMHTMLImageElement.idl b/dom/interfaces/html/nsIDOMHTMLImageElement.idl
index ac42fa25757..188a337e8cc 100644
--- a/dom/interfaces/html/nsIDOMHTMLImageElement.idl
+++ b/dom/interfaces/html/nsIDOMHTMLImageElement.idl
@@ -50,7 +50,7 @@
  * http://www.whatwg.org/specs/web-apps/current-work/
  */
 
-[scriptable, uuid(c4ef8a40-dd56-4b95-a007-630a0ac04341)]
+[scriptable, uuid(cf8a8744-ec3b-474e-8f2b-8def3da2344a)]
 interface nsIDOMHTMLImageElement : nsIDOMHTMLElement
 {
            attribute DOMString        alt;
@@ -71,9 +71,4 @@ interface nsIDOMHTMLImageElement : nsIDOMHTMLElement
            attribute DOMString        longDesc;
            attribute long             vspace;
            attribute DOMString        lowsrc;
-
-  // These attributes are offsets from the closest view (to mimic
-  // NS4's "offset-from-layer" behavior).
-  readonly attribute long             x;
-  readonly attribute long             y;
 };
diff --git a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl b/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
deleted file mode 100644
index 24ca60fd88b..00000000000
--- a/dom/interfaces/html/nsIDOMNSHTMLDocument.idl
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *
- * 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 "domstubs.idl"
-
-[scriptable, uuid(386e9eee-1f06-40a6-a1a7-ed986646b793)]
-interface nsIDOMNSHTMLDocument : nsISupports
-{
-           attribute DOMString            alinkColor;
-           attribute DOMString            linkColor;
-           attribute DOMString            vlinkColor;
-           attribute DOMString            bgColor;
-           attribute DOMString            fgColor;
-           attribute DOMString            domain;
-
-  readonly attribute nsIDOMHTMLCollection embeds;
-
-  DOMString                 getSelection();
-
-  // This is the internal version of open(); note that the version
-  // scriptable with JS is defined entirely in classinfo.
-  // If aContentType is not something supported by nsHTMLDocument and
-  // the HTML content sink, trying to write to the document will
-  // probably throw.
-  // Pass aReplace = true to trigger a replacement of the previous
-  // document in session history; pass false for normal history handling.
-  nsIDOMDocument            open(in ACString aContentType,
-                                 in boolean aReplace);
-
-  // Scriptable version of clear().
-  void                      clear();
-
-  /**
-   * @deprecated These are old Netscape 4 methods. Do not use,
-   *             the implementation is no-op.
-   */
-  void                      captureEvents(in long eventFlags);
-  void                      releaseEvents(in long eventFlags);
-  void                      routeEvent(in nsIDOMEvent evt);
-
-  // returns "BackCompat" if we're in quirks mode,
-  // or "CSS1Compat" if we're in strict mode
-  readonly attribute DOMString            compatMode;
-
-  // mapped to attribute embeds for NS4 compat
-  readonly attribute nsIDOMHTMLCollection plugins;
-  
-
-  /**
-    * Midas additions
-    */
-  attribute DOMString       designMode;
-
-  boolean                   execCommand(in DOMString commandID,
-                                        in boolean doShowUI,
-                                        in DOMString value);
-
-  // returns true if the help is being shown for command (false if not)
-  boolean                   execCommandShowHelp(in DOMString commandID);
-
-  // returns true if the command is enabled (false otherwise)
-  boolean                   queryCommandEnabled(in DOMString commandID);
-  
-  // returns true if the command is in a indeterminate state (false otherwise)
-  boolean                   queryCommandIndeterm(in DOMString commandID);
-
-  // returns true if the command has been executed (false otherwise)
-  boolean                   queryCommandState(in DOMString commandID);
-
-  // returns true if the command is supported on the current range
-  boolean                   queryCommandSupported(in DOMString commandID);
-
-  //
-  DOMString                 queryCommandText(in DOMString commandID);
-
-  // returns the current value of the document or current selection for command
-  DOMString                 queryCommandValue(in DOMString commandID);
-
-  readonly attribute nsIDOMHTMLHeadElement    head;
-};
diff --git a/dom/interfaces/html/nsIDOMNSHTMLFormElement.idl b/dom/interfaces/html/nsIDOMNSHTMLFormElement.idl
deleted file mode 100644
index bd6a15c90f1..00000000000
--- a/dom/interfaces/html/nsIDOMNSHTMLFormElement.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *
- * 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 "domstubs.idl"
-
-interface nsIDOMFormData;
-
-[scriptable, uuid(d38a782f-f33c-4a8d-85a9-0d5da3650064)]
-interface nsIDOMNSHTMLFormElement : nsISupports
-{
-           attribute DOMString        encoding;
-  boolean        checkValidity();
-};
diff --git a/dom/interfaces/html/nsIDOMNSHTMLHRElement.idl b/dom/interfaces/html/nsIDOMNSHTMLHRElement.idl
deleted file mode 100644
index f19b1f176f3..00000000000
--- a/dom/interfaces/html/nsIDOMNSHTMLHRElement.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Ian Hickson <ian@hixie.ch>.
- * Portions created by the Initial Developer are Copyright (C) 2003
- * 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 "nsISupports.idl"
-
-/**
- * The nsIDOMNSHTMLHRElement interface contains extensions to the
- * interface for [X]HTML hr elements, for compatibility with IE.
- */
-
-[scriptable, uuid(63c0ae1b-8aa7-4e72-82a1-aff486bfdaf5)]
-interface nsIDOMNSHTMLHRElement : nsISupports
-{
-           attribute DOMString        color;
-};
diff --git a/dom/interfaces/stylesheets/Makefile.in b/dom/interfaces/stylesheets/Makefile.in
index d12f367fcdc..5851714aab4 100644
--- a/dom/interfaces/stylesheets/Makefile.in
+++ b/dom/interfaces/stylesheets/Makefile.in
@@ -47,7 +47,6 @@ XPIDL_MODULE	= dom_stylesheets
 GRE_MODULE	= 1
 
 SDK_XPIDLSRCS =                                 \
-	nsIDOMDocumentStyle.idl			\
 	nsIDOMMediaList.idl			\
 	nsIDOMStyleSheet.idl			\
 	nsIDOMStyleSheetList.idl		\
@@ -55,7 +54,6 @@ SDK_XPIDLSRCS =                                 \
 
 XPIDLSRCS = 					\
 	nsIDOMLinkStyle.idl			\
-	nsIDOMNSDocumentStyle.idl		\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/stylesheets/nsIDOMDocumentStyle.idl b/dom/interfaces/stylesheets/nsIDOMDocumentStyle.idl
deleted file mode 100644
index 44c16ee0ea5..00000000000
--- a/dom/interfaces/stylesheets/nsIDOMDocumentStyle.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *   Johnny Stenback <jst@netscape.com>
- *
- * 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 "domstubs.idl"
-
-/**
- * The nsIDOMDocumentStyle interface is an interface to a document
- * object that supports style sheets in the Document Object Model.
- *
- * For more information on this interface please see
- * http://www.w3.org/TR/DOM-Level-2-Style
- */
-
-[scriptable, uuid(3d9f4973-dd2e-48f5-b5f7-2634e09eadd9)]
-interface nsIDOMDocumentStyle : nsISupports
-{
-  readonly attribute nsIDOMStyleSheetList   styleSheets;
-};
diff --git a/dom/interfaces/stylesheets/nsIDOMNSDocumentStyle.idl b/dom/interfaces/stylesheets/nsIDOMNSDocumentStyle.idl
deleted file mode 100644
index 7ffaeba91d9..00000000000
--- a/dom/interfaces/stylesheets/nsIDOMNSDocumentStyle.idl
+++ /dev/null
@@ -1,129 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is nsIDOMNSDocumentStyle interface definition.
- *
- * The Initial Developer of the Original Code is 
- * Boris Zbarsky <bzbarsky@mit.edu>
- * Portions created by the Initial Developer are Copyright (C) 2003
- * 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 "domstubs.idl"
-#include "nsIDOMDocumentStyle.idl"
-
-/**
- * The nsIDOMNSDocumentStyle interface is an extension to the
- * nsIDOMDocumentStyle interface.  This interface exposes more ways to interact
- * with style sheets in the Document Object Model.  This interface is currently
- * very much experimental.
- *
- * NOTE: This interface represents the additions to nsIDOMDocumentStyle defined
- * by <http://whatwg.org/specs/web-apps/current-work/#alternate-style-sheets>.
- * The comments here describe our implementation; if those comments don't match
- * that spec, file bugs.
- */
-
-[scriptable, uuid(26311d10-7e24-4c7b-bb3d-17aad86f4d88)]
-interface nsIDOMNSDocumentStyle : nsIDOMDocumentStyle
-{
-  /**
-   * This attribute must return the preferred style sheet set as set by the
-   * author. It is determined from the order of style sheet declarations and
-   * the Default-Style HTTP headers, as eventually defined elsewhere in the Web
-   * Apps 1.0 specification. If there is no preferred style sheet set, this
-   * attribute must return the empty string. The case of this attribute must
-   * exactly match the case given by the author where the preferred style sheet
-   * is specified or implied. This attribute must never return null.
-   */
-  readonly attribute DOMString preferredStyleSheetSet;
-
-  /**
-   * This attribute indicates which style sheet set is in use. This attribute
-   * is live; changing the disabled attribute on style sheets directly will
-   * change the value of this attribute.
-   *
-   * If all the sheets that are enabled and have a title have the same title
-   * (by case-sensitive comparisons) then the value of this attribute must be
-   * exactly equal to the title of the first enabled style sheet with a title
-   * in the styleSheets list. Otherwise, if style sheets from different sets
-   * are enabled, then the return value must be null (there is no way to
-   * determine what the currently selected style sheet set is in those
-   * conditions). Otherwise, either all style sheets that have a title are
-   * disabled, or there are no alternate style sheets, and
-   * selectedStyleSheetSet must return the empty string.
-   *
-   * Setting this attribute to the null value must have no effect.
-   *
-   * Setting this attribute to a non-null value must call
-   * enableStyleSheetsForSet() with that value as the function's argument, and
-   * set lastStyleSheetSet to that value.
-   *
-   * From the DOM's perspective, all views have the same
-   * selectedStyleSheetSet. If a UA supports multiple views with different
-   * selected alternate style sheets, then this attribute (and the StyleSheet
-   * interface's disabled attribute) must return and set the value for the
-   * default view.
-   */
-  attribute DOMString selectedStyleSheetSet;
-
-  /*
-   * This property must initially have the value null. Its value changes when
-   * the selectedStyleSheetSet attribute is set.
-   */
-  readonly attribute DOMString lastStyleSheetSet;
-  
-  /**
-   * This must return the live list of the currently available style sheet
-   * sets. This list is constructed by enumerating all the style sheets for
-   * this document available to the implementation, in the order they are
-   * listed in the styleSheets attribute, adding the title of each style sheet
-   * with a title to the list, avoiding duplicates by dropping titles that
-   * match (case-sensitively) titles that have already been added to the
-   * list.
-   */
-  readonly attribute nsIDOMDOMStringList styleSheetSets;
-
-  /**
-   * Calling this method must change the disabled attribute on each StyleSheet
-   * object with a title attribute with a length greater than 0 in the
-   * styleSheets attribute, so that all those whose title matches the name
-   * argument are enabled, and all others are disabled. Title matches must be
-   * case-sensitive. Calling this method with the empty string disables all
-   * alternate and preferred style sheets (but does not change the state of
-   * persistent style sheets, that is those with no title attribute).
-   *
-   * Calling this method with a null value must have no effect.
-   *
-   * Style sheets that do not have a title are never affected by this
-   * method. This method does not change the values of the lastStyleSheetSet or
-   * preferredStyleSheetSet attributes.
-   */
-  void enableStyleSheetsForSet(in DOMString name);
-};
diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl
index c7c4a55caa2..fafc04bf2de 100644
--- a/dom/interfaces/svg/nsIDOMSVGDocument.idl
+++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl
@@ -39,11 +39,9 @@
 
 interface nsIDOMSVGSVGElement;
 
-[scriptable, uuid(2de25143-3fcb-4afc-8900-2c046fb6dc94)]
+[scriptable, uuid(880e6976-844c-4614-99db-a580790231eb)]
 interface nsIDOMSVGDocument : nsIDOMDocument
 {
-  readonly attribute DOMString title;
-  readonly attribute DOMString referrer;
   readonly attribute DOMString domain;
   readonly attribute DOMString URL;
   readonly attribute nsIDOMSVGSVGElement rootElement;
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index ba61c2ec47e..5c6606f5df5 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -264,7 +264,7 @@ ContentChild::Init(MessageLoop* aIOLoop,
     PCrashReporterChild* crashreporter = SendPCrashReporterConstructor();
     InfallibleTArray<Mapping> mappings;
     const struct mapping_info *info = getLibraryMapping();
-    while (info->name) {
+    while (info && info->name) {
         mappings.AppendElement(Mapping(nsDependentCString(info->name),
                                        nsDependentCString(info->file_id),
                                        info->base,
diff --git a/dom/locales/jar.mn b/dom/locales/jar.mn
index 03339b5d8a9..551c31612ce 100644
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -16,9 +16,7 @@
   locale/@AB_CD@/global/nsWebBrowserPersist.properties         (%chrome/nsWebBrowserPersist.properties)
   locale/@AB_CD@/global/xslt/xslt.properties                   (%chrome/xslt/xslt.properties)
   locale/@AB_CD@/global/dom/dom.properties                     (%chrome/dom/dom.properties)
-#ifdef MOZ_SVG
   locale/@AB_CD@/global/svg/svg.properties                     (%chrome/svg/svg.properties)
-#endif
   locale/@AB_CD@/global/layout/MediaDocument.properties        (%chrome/layout/MediaDocument.properties)
   locale/@AB_CD@/global/layout/xmlparser.properties            (%chrome/layout/xmlparser.properties)
   locale/@AB_CD@/global/layout/HtmlForm.properties             (%chrome/layout/HtmlForm.properties)
diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp
index 7d37e524fc0..a43d5cacf27 100644
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -2159,13 +2159,6 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
     return NPERR_GENERIC_ERROR;
   }
 
-#if (MOZ_PLATFORM_MAEMO == 5)
-  case NPNVSupportsWindowlessLocal: {
-    *(NPBool*)result = PR_TRUE;
-    return NPERR_NO_ERROR;
-  }
-#endif
-
 #ifdef XP_MACOSX
   case NPNVpluginDrawingModel: {
     if (npp) {
@@ -2282,12 +2275,6 @@ _setvalue(NPP npp, NPPVariable variable, void *result)
       return inst->SetWindowless(bWindowless);
 #endif
     }
-#if (MOZ_PLATFORM_MAEMO == 5)
-    case NPPVpluginWindowlessLocalBool: {
-      NPBool bWindowlessLocal = (result != nsnull);
-      return inst->SetWindowlessLocal(bWindowlessLocal);
-    }
-#endif
     case NPPVpluginTransparentBool: {
       NPBool bTransparent = (result != nsnull);
       return inst->SetTransparent(bTransparent);
diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp
index 568d7c73bc8..d9965e6a62a 100644
--- a/dom/plugins/base/nsNPAPIPluginInstance.cpp
+++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp
@@ -597,15 +597,6 @@ nsresult nsNPAPIPluginInstance::HandleEvent(void* event, PRInt16* result)
 
 nsresult nsNPAPIPluginInstance::GetValueFromPlugin(NPPVariable variable, void* value)
 {
-#if (MOZ_PLATFORM_MAEMO == 5)
-  // The maemo flash plugin does not remember this.  It sets the
-  // value, but doesn't support the get value.
-  if (variable == NPPVpluginWindowlessLocalBool) {
-    *(NPBool*)value = mWindowlessLocal;
-    return NS_OK;
-  }
-#endif
-
   if (!mPlugin || !mPlugin->GetLibrary())
     return NS_ERROR_FAILURE;
 
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index 93c2413e5be..d2ebe18689e 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -966,8 +966,7 @@ nsresult nsPluginHost::InstantiatePluginForChannel(nsIChannel* aChannel,
 
 nsresult
 nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType, nsIURI* aURL,
-                                        nsIPluginInstanceOwner* aOwner,
-                                        PRBool aAllowOpeningStreams)
+                                        nsIPluginInstanceOwner* aOwner)
 {
   NS_ENSURE_ARG_POINTER(aOwner);
 
@@ -1000,14 +999,9 @@ nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType, nsIURI* aURL,
     return rv;
   }
 
-  // Security checks
-  // Can't do security checks without a URI - hopefully the plugin will take
-  // care of that
-  // No need to do the security check if aAllowOpeningStreams is
-  // false; we don't plan to do any network access in that case.
-  // Furthermore, doing it could reenter plugin instantiation, which
-  // would be Bad.
-  if (aURL && aAllowOpeningStreams) {
+  // Security checks. Can't do security checks without a URI - hopefully the plugin
+  // will take care of that.
+  if (aURL) {
     nsCOMPtr<nsIScriptSecurityManager> secMan =
                     do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv))
@@ -1044,14 +1038,14 @@ nsPluginHost::InstantiateEmbeddedPlugin(const char *aMimeType, nsIURI* aURL,
     isJava = pluginTag->mIsJavaPlugin;
   }
 
-  // Determine if the scheme of this URL is one we can handle internaly because we should
+  // Determine if the scheme of this URL is one we can handle internally because we should
   // only open the initial stream if it's one that we can handle internally. Otherwise
   // |NS_OpenURI| in |InstantiateEmbeddedPlugin| may open up a OS protocal registered helper app
   // Also set bCanHandleInternally to true if aAllowOpeningStreams is
   // false; we don't want to do any network traffic in that case.
   PRBool bCanHandleInternally = PR_FALSE;
   nsCAutoString scheme;
-  if (aURL && aAllowOpeningStreams && NS_SUCCEEDED(aURL->GetScheme(scheme))) {
+  if (aURL && NS_SUCCEEDED(aURL->GetScheme(scheme))) {
       nsCAutoString contractID(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX);
       contractID += scheme;
       ToLowerCase(contractID);
@@ -1622,8 +1616,7 @@ nsPluginHost::GetPluginTags(PRUint32* aPluginCount, nsIPluginTag*** aResults)
   *aPluginCount = count;
 
   plugin = mPlugins;
-  PRUint32 i;
-  for (i = 0; i < count; i++) {
+  for (PRUint32 i = 0; i < count; i++) {
     (*aResults)[i] = plugin;
     NS_ADDREF((*aResults)[i]);
     plugin = plugin->mNext;
@@ -2020,46 +2013,6 @@ PRBool nsPluginHost::IsDuplicatePlugin(nsPluginTag * aPluginTag)
   return PR_FALSE;
 }
 
-// Structure for collecting plugin files found during directory scanning
-struct pluginFileinDirectory
-{
-  nsString mFilePath;
-  PRInt64  mModTime;
-
-  pluginFileinDirectory()
-  {
-    mModTime = LL_ZERO;
-  }
-};
-
-// QuickSort callback for comparing the modification time of two files
-// if the times are the same, compare the filenames
-
-NS_SPECIALIZE_TEMPLATE
-class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory>
-{
-  public:
-  PRBool Equals(const pluginFileinDirectory& aA,
-                const pluginFileinDirectory& aB) const {
-    if (aA.mModTime == aB.mModTime &&
-        Compare(aA.mFilePath, aB.mFilePath,
-                nsCaseInsensitiveStringComparator()) == 0)
-      return PR_TRUE;
-    else
-      return PR_FALSE;
-  }
-  PRBool LessThan(const pluginFileinDirectory& aA,
-                  const pluginFileinDirectory& aB) const {
-    if (aA.mModTime < aB.mModTime)
-      return PR_TRUE;
-    else if(aA.mModTime == aB.mModTime)
-      return Compare(aA.mFilePath, aB.mFilePath,
-                     nsCaseInsensitiveStringComparator()) < 0;
-    else
-      return PR_FALSE;
-  }
-};
-
 typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void);
 
 nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
@@ -2083,8 +2036,7 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
   if (NS_FAILED(rv))
     return rv;
 
-  // Collect all the files in this directory in an array we can sort later
-  nsAutoTArray<pluginFileinDirectory, 8> pluginFilesArray;
+  nsAutoTArray<nsCOMPtr<nsILocalFile>, 6> pluginFiles;
 
   PRBool hasMore;
   while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
@@ -2100,41 +2052,26 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
     // See bug 197855.
     dirEntry->Normalize();
 
-    nsAutoString filePath;
-    rv = dirEntry->GetPath(filePath);
-    if (NS_FAILED(rv))
-      continue;
-
     if (nsPluginsDir::IsPluginFile(dirEntry)) {
-      pluginFileinDirectory * item = pluginFilesArray.AppendElement();
-      if (!item)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-      // Get file mod time
-      PRInt64 fileModTime = LL_ZERO;
-      dirEntry->GetLastModifiedTime(&fileModTime);
-
-      item->mModTime = fileModTime;
-      item->mFilePath = filePath;
+      pluginFiles.AppendElement(dirEntry);
     }
-  } // end round of up of plugin files
-
-  // now sort the array by file modification time or by filename, if equal
-  // put newer plugins first to weed out dups and catch upgrades, see bug 119966
-  pluginFilesArray.Sort();
+  }
 
   PRBool warnOutdated = PR_FALSE;
 
-  // finally, go through the array, looking at each entry and continue processing it
-  for (PRUint32 i = 0; i < pluginFilesArray.Length(); i++) {
-    pluginFileinDirectory &pfd = pluginFilesArray[i];
-    nsCOMPtr <nsIFile> file = do_CreateInstance("@mozilla.org/file/local;1");
-    nsCOMPtr <nsILocalFile> localfile = do_QueryInterface(file);
-    localfile->InitWithPath(pfd.mFilePath);
-    PRInt64 fileModTime = pfd.mModTime;
+  for (PRUint32 i = 0; i < pluginFiles.Length(); i++) {
+    nsCOMPtr<nsILocalFile>& localfile = pluginFiles[i];
+
+    nsString utf16FilePath;
+    rv = localfile->GetPath(utf16FilePath);
+    if (NS_FAILED(rv))
+      continue;
+
+    PRInt64 fileModTime = LL_ZERO;
+    localfile->GetLastModifiedTime(&fileModTime);
 
     // Look for it in our cache
-    NS_ConvertUTF16toUTF8 filePath(pfd.mFilePath);
+    NS_ConvertUTF16toUTF8 filePath(utf16FilePath);
     nsRefPtr<nsPluginTag> pluginTag;
     RemoveCachedPluginsInfo(filePath.get(),
                             getter_AddRefs(pluginTag));
@@ -2199,7 +2136,7 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
 
     // if it is not found in cache info list or has been changed, create a new one
     if (!pluginTag) {
-      nsPluginFile pluginFile(file);
+      nsPluginFile pluginFile(localfile);
 
       // create a tag describing this plugin.
       PRLibrary *library = nsnull;
@@ -2299,16 +2236,42 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir,
       }
 
       pluginTag->SetHost(this);
-      pluginTag->mNext = mPlugins;
-      mPlugins = pluginTag;
 
-      if (pluginTag->IsEnabled())
+      // Add plugin tags such that the list is ordered by modification date,
+      // newest to oldest. This is ugly, it'd be easier with just about anything
+      // other than a single-directional linked list.
+      if (mPlugins) {
+        nsPluginTag *prev = nsnull;
+        nsPluginTag *next = mPlugins;
+        while (next) {
+          if (pluginTag->mLastModifiedTime >= next->mLastModifiedTime) {
+            pluginTag->mNext = next;
+            if (prev) {
+              prev->mNext = pluginTag;
+            } else {
+              mPlugins = pluginTag;
+            }
+            break;
+          }
+          prev = next;
+          next = prev->mNext;
+          if (!next) {
+            prev->mNext = pluginTag;
+          }
+        }
+      } else {
+        mPlugins = pluginTag;
+      }
+
+      if (pluginTag->IsEnabled()) {
         pluginTag->RegisterWithCategoryManager(mOverrideInternalTypes);
+      }
     }
   }
-  
-  if (warnOutdated)
+
+  if (warnOutdated) {
     mPrefService->SetBoolPref("plugins.update.notifyUser", PR_TRUE);
+  }
 
   return NS_OK;
 }
@@ -2552,17 +2515,6 @@ nsresult nsPluginHost::FindPlugins(PRBool aCreatePluginList, PRBool * aPluginsCh
   NS_ITERATIVE_UNREF_LIST(nsRefPtr<nsPluginTag>, mCachedPlugins, mNext);
   NS_ITERATIVE_UNREF_LIST(nsRefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
 
-  // reverse our list of plugins
-  nsRefPtr<nsPluginTag> next;
-  nsRefPtr<nsPluginTag> prev;
-  for (nsRefPtr<nsPluginTag> cur = mPlugins; cur; cur = next) {
-    next = cur->mNext;
-    cur->mNext = prev;
-    prev = cur;
-  }
-
-  mPlugins = prev;
-
   NS_TIMELINE_STOP_TIMER("LoadPlugins");
   NS_TIMELINE_MARK_TIMER("LoadPlugins");
 
diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h
index b1b87590446..cb43042344b 100644
--- a/dom/plugins/base/nsPluginHost.h
+++ b/dom/plugins/base/nsPluginHost.h
@@ -219,8 +219,7 @@ public:
   // The last argument should be false if we already have an in-flight stream
   // and don't need to set up a new stream.
   nsresult InstantiateEmbeddedPlugin(const char *aMimeType, nsIURI* aURL,
-                                     nsIPluginInstanceOwner* aOwner,
-                                     PRBool aAllowOpeningStreams);
+                                     nsIPluginInstanceOwner* aOwner);
 
   nsresult InstantiateFullPagePlugin(const char *aMimeType,
                                      nsIURI* aURI,
diff --git a/dom/plugins/base/nsPluginNativeWindow.h b/dom/plugins/base/nsPluginNativeWindow.h
index 1e147da5e6e..eaf0e8085bb 100644
--- a/dom/plugins/base/nsPluginNativeWindow.h
+++ b/dom/plugins/base/nsPluginNativeWindow.h
@@ -104,15 +104,6 @@ public:
     SetPluginInstance(aPluginInstance);
     return NS_OK;
   }
-#if (MOZ_PLATFORM_MAEMO == 5) && defined(MOZ_WIDGET_GTK2)
-#define MOZ_COMPOSITED_PLUGINS
-#endif
-#ifdef MOZ_COMPOSITED_PLUGINS
-  /* XXX: we use this to leak the socket widget out from nsPlugNativeWindowGtk2
-     so that Renderer::NativeDraw() in nsObjectFrame.cpp can draw the widget.
-     I don't currently know a better way to do this... */
-  void *mPlugWindow;
-#endif
 
 protected:
   nsRefPtr<nsNPAPIPluginInstance> mPluginInstance;
diff --git a/dom/plugins/base/nsPluginNativeWindowGtk2.cpp b/dom/plugins/base/nsPluginNativeWindowGtk2.cpp
index 67eaba0c188..e90831b7150 100644
--- a/dom/plugins/base/nsPluginNativeWindowGtk2.cpp
+++ b/dom/plugins/base/nsPluginNativeWindowGtk2.cpp
@@ -49,17 +49,6 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
 
-#if (MOZ_PLATFORM_MAEMO == 5)
-#define MOZ_COMPOSITED_PLUGINS
-#endif
-
-#ifdef MOZ_COMPOSITED_PLUGINS
-extern "C" {
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xcomposite.h>
-}
-#endif
-
 #include "gtk2xtbin.h"
 
 class nsPluginNativeWindowGtk2 : public nsPluginNativeWindow {
@@ -78,15 +67,6 @@ private:
   nsresult  CreateXEmbedWindow();
   nsresult  CreateXtWindow();
   void      SetAllocation();
-#ifdef MOZ_COMPOSITED_PLUGINS
-  nsresult  CreateXCompositedWindow();
-  static GdkFilterReturn    plugin_composite_filter_func (GdkXEvent *xevent,
-    GdkEvent *event,
-    gpointer data);
-
-  Damage     mDamage;
-  GtkWidget* mParentWindow;
-#endif
 };
 
 static gboolean plug_removed_cb   (GtkWidget *widget, gpointer data);
@@ -109,10 +89,6 @@ nsPluginNativeWindowGtk2::nsPluginNativeWindowGtk2() : nsPluginNativeWindow()
   mWsInfo.visual = nsnull;
   mWsInfo.colormap = 0;
   mWsInfo.depth = 0;
-#ifdef MOZ_COMPOSITED_PLUGINS
-  mDamage = 0;
-  mParentWindow = 0;
-#endif
 }
 
 nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2() 
@@ -120,16 +96,6 @@ nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2()
   if(mSocketWidget) {
     gtk_widget_destroy(mSocketWidget);
   }
-
-#ifdef MOZ_COMPOSITED_PLUGINS
-  if (mParentWindow) {
-    gtk_widget_destroy(mParentWindow);
-  }
-
-  if (mDamage) {
-    gdk_window_remove_filter (nsnull, plugin_composite_filter_func, this);
-  }
-#endif
 }
 
 nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
@@ -147,38 +113,6 @@ nsresult PLUG_DeletePluginNativeWindow(nsPluginNativeWindow * aPluginNativeWindo
   return NS_OK;
 }
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-/* the base xdamage event number.*/
-static int xdamage_event_base;
-
-GdkFilterReturn
-nsPluginNativeWindowGtk2::plugin_composite_filter_func (GdkXEvent *xevent,
-    GdkEvent *event,
-    gpointer data)
-{
-  nsPluginNativeWindowGtk2 *native_window = (nsPluginNativeWindowGtk2*)data;
-  XDamageNotifyEvent *ev;
-  ev = (XDamageNotifyEvent *) xevent;
-  if (ev->type != xdamage_event_base + XDamageNotify)
-    return GDK_FILTER_CONTINUE;
-
-  //printf("Damage event %d %d %d %d\n",ev->area.x, ev->area.y, ev->area.width, ev->area.height);
-  XDamageSubtract (GDK_DISPLAY(), native_window->mDamage, None, None);
-
-  /* We try to do our area invalidation here */
-  NPRect rect;
-  rect.top = ev->area.x;
-  rect.left = ev->area.y;
-  rect.right = ev->area.x + ev->area.width;
-  rect.bottom = ev->area.y + ev->area.height;
-
-  if (native_window->mPluginInstance)
-    native_window->mPluginInstance->InvalidateRect(&rect);
-
-  return GDK_FILTER_REMOVE;
-}
-#endif
-
 nsresult nsPluginNativeWindowGtk2::CallSetWindow(nsRefPtr<nsNPAPIPluginInstance> &aPluginInstance)
 {
   if (aPluginInstance) {
@@ -197,11 +131,7 @@ nsresult nsPluginNativeWindowGtk2::CallSetWindow(nsRefPtr<nsNPAPIPluginInstance>
 #endif
 
         if (needXEmbed) {
-#ifdef MOZ_COMPOSITED_PLUGINS
-          rv = CreateXCompositedWindow();
-#else
           rv = CreateXEmbedWindow();
-#endif
         }
         else {
           rv = CreateXtWindow();
@@ -300,94 +230,6 @@ nsresult nsPluginNativeWindowGtk2::CreateXEmbedWindow() {
   return NS_OK;
 }
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-#include <dlfcn.h>
-nsresult nsPluginNativeWindowGtk2::CreateXCompositedWindow() {
-  NS_ASSERTION(!mSocketWidget,"Already created a socket widget!");
-
-  mParentWindow = gtk_window_new(GTK_WINDOW_POPUP);
-  mSocketWidget = gtk_socket_new();
-  GdkWindow *parent_win = mParentWindow->window;
-
-  //attach the socket to the container widget
-  gtk_widget_set_parent_window(mSocketWidget, parent_win);
-
-  // Make sure to handle the plug_removed signal.  If we don't the
-  // socket will automatically be destroyed when the plug is
-  // removed, which means we're destroying it more than once.
-  // SYNTAX ERROR.
-  g_signal_connect(mSocketWidget, "plug_removed",
-                   G_CALLBACK(plug_removed_cb), NULL);
-
-  g_signal_connect(mSocketWidget, "destroy",
-                   G_CALLBACK(gtk_widget_destroyed), &mSocketWidget);
-
-  /*gpointer user_data = NULL;
-  gdk_window_get_user_data(parent_win, &user_data);
-  */
-  GtkContainer *container = GTK_CONTAINER(mParentWindow);
-  gtk_container_add(container, mSocketWidget);
-  gtk_widget_realize(mSocketWidget);
-
-  // Resize before we show
-  SetAllocation();
-  gtk_widget_set_size_request (mSocketWidget, width, height);
-  /* move offscreen */
-  gtk_window_move (GTK_WINDOW(mParentWindow), width+1000, height+1000);
-
-
-  gtk_widget_show(mSocketWidget);
-  gtk_widget_show_all(mParentWindow);
-
-  /* store away a reference to the socketwidget */
-  mPlugWindow = (mSocketWidget);
-
-  gdk_flush();
-  window = (void*)gtk_socket_get_id(GTK_SOCKET(mSocketWidget));
-
-  /* This is useful if we still have the plugin window inline
-   * i.e. firefox vs. fennec */
-  // gdk_window_set_composited(mSocketWidget->window, TRUE);
-
-  if (!mDamage) {
-    /* we install a general handler instead of one specific to a particular window
-     * because we don't have a GdkWindow for the plugin window */
-    gdk_window_add_filter (parent_win, plugin_composite_filter_func, this);
-
-    int junk;
-    if (!XDamageQueryExtension (GDK_DISPLAY (), &xdamage_event_base, &junk))
-      printf ("This requires the XDamage extension");
-
-    mDamage = XDamageCreate(GDK_DISPLAY(), (Drawable)window, XDamageReportNonEmpty);
-    XCompositeRedirectWindow (GDK_DISPLAY(),
-        (Drawable)window,
-        CompositeRedirectManual);
-
-    /* this is a hack to avoid having flash causing a crash when it is unloaded.
-     * libplayback sets up dbus_connection_filters. When flash is unloaded it takes
-     * libplayback with it, however the connection filters are not removed
-     * which causes a crash when dbus tries to execute them. dlopening libplayback
-     * ensures that those functions stay around even after flash is gone. */
-    static void *libplayback_handle;
-    if (!libplayback_handle) {
-      libplayback_handle = dlopen("libplayback-1.so.0", RTLD_NOW);
-    }
-
-  }
-
-  // Fill out the ws_info structure.
-  // (The windowless case is done in nsObjectFrame.cpp.)
-  GdkWindow *gdkWindow = gdk_window_lookup((XID)window);
-  mWsInfo.display = GDK_WINDOW_XDISPLAY(gdkWindow);
-  mWsInfo.colormap = GDK_COLORMAP_XCOLORMAP(gdk_drawable_get_colormap(gdkWindow));
-  GdkVisual* gdkVisual = gdk_drawable_get_visual(gdkWindow);
-  mWsInfo.visual = GDK_VISUAL_XVISUAL(gdkVisual);
-  mWsInfo.depth = gdkVisual->depth;
-
-  return NS_OK;
-}
-#endif
-
 void nsPluginNativeWindowGtk2::SetAllocation() {
   if (!mSocketWidget)
     return;
diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 6385c7f0736..39d38c1ac65 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -653,22 +653,8 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request,
     mOwner->GetWindow(window);
     if (!mPluginInstance && window) {
       nsRefPtr<nsPluginHost> pluginHost = dont_AddRef(nsPluginHost::GetInst());
-      
-      // determine if we need to try embedded again. FullPage takes a different code path
-      PRInt32 mode;
-      mOwner->GetMode(&mode);
-      if (mode == NP_EMBED) {
-        // Make sure to not allow new streams to be opened here; we've
-        // already got a stream for this data; we just need a properly
-        // set up plugin instance.
-        rv = pluginHost->InstantiateEmbeddedPlugin(aContentType.get(), aURL,
-                                                   mOwner, PR_FALSE);
-      }
-      else {
-        rv = pluginHost->SetUpPluginInstance(aContentType.get(), aURL, mOwner);
-      }
-      
-      if (NS_OK == rv) {
+      rv = pluginHost->SetUpPluginInstance(aContentType.get(), aURL, mOwner);
+      if (NS_SUCCEEDED(rv)) {
         mOwner->GetInstance(getter_AddRefs(pluginInstRefPtr));
         mPluginInstance = pluginInstRefPtr.get();
         if (mPluginInstance) {
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
index 9029db62f6c..2d523d0d748 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -152,7 +152,7 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface)
     , mHasPainted(false)
     , mSurfaceDifferenceRect(0,0,0,0)
 #if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
-    , mMaemoImageRendering(PR_FALSE)
+    , mMaemoImageRendering(PR_TRUE)
 #endif
 {
     memset(&mWindow, 0, sizeof(mWindow));
diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp
index 0694fb7fd87..3e4588826be 100644
--- a/dom/plugins/ipc/PluginInstanceParent.cpp
+++ b/dom/plugins/ipc/PluginInstanceParent.cpp
@@ -96,7 +96,6 @@ PluginInstanceParent::PluginInstanceParent(PluginModuleParent* parent,
     , mPluginHWND(NULL)
     , mPluginWndProc(NULL)
     , mNestedEventState(false)
-    , mInAnswerFocusChange(false)
 #endif // defined(XP_WIN)
     , mQuirks(0)
 #if defined(XP_MACOSX)
@@ -1560,8 +1559,7 @@ PluginInstanceParent::PluginWindowHookProc(HWND hWnd,
     switch (message) {
         case WM_SETFOCUS:
         // Let the child plugin window know it should take focus.
-        if (!self->mInAnswerFocusChange)
-          self->CallSetPluginFocus();
+        self->CallSetPluginFocus();
         break;
 
         case WM_CLOSE:
@@ -1741,8 +1739,6 @@ PluginInstanceParent::AnswerPluginFocusChange(const bool& gotFocus)
     // focus. We forward the event down to widget so the dom/focus manager can
     // be updated.
 #if defined(OS_WIN)
-    AutoRestore<bool> ar(mInAnswerFocusChange);
-    mInAnswerFocusChange = true;
     ::SendMessage(mPluginHWND, gOOPPPluginFocusEvent, gotFocus ? 1 : 0, 0);
     return true;
 #else
diff --git a/dom/plugins/ipc/PluginInstanceParent.h b/dom/plugins/ipc/PluginInstanceParent.h
index f3c526198f8..77c486876a0 100644
--- a/dom/plugins/ipc/PluginInstanceParent.h
+++ b/dom/plugins/ipc/PluginInstanceParent.h
@@ -349,7 +349,6 @@ private:
     HWND               mPluginHWND;
     WNDPROC            mPluginWndProc;
     bool               mNestedEventState;
-    bool               mInAnswerFocusChange;
 #endif // defined(XP_WIN)
 #if defined(OS_MACOSX)
 private:
diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
index c67dfaa04de..e5f0033ba28 100644
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -51,6 +51,7 @@
 
 #include "base/process_util.h"
 
+#include "mozilla/Preferences.h"
 #include "mozilla/unused.h"
 #include "mozilla/ipc/SyncChannel.h"
 #include "mozilla/plugins/PluginModuleParent.h"
@@ -58,7 +59,6 @@
 #include "PluginIdentifierParent.h"
 
 #include "nsAutoPtr.h"
-#include "nsContentUtils.h"
 #include "nsCRT.h"
 #ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
@@ -71,6 +71,7 @@ using base::KillProcess;
 using mozilla::PluginLibrary;
 using mozilla::ipc::SyncChannel;
 
+using namespace mozilla;
 using namespace mozilla::plugins;
 
 static const char kTimeoutPref[] = "dom.ipc.plugins.timeoutSecs";
@@ -90,7 +91,7 @@ PluginModuleParent::LoadModule(const char* aFilePath)
 {
     PLUGIN_LOG_DEBUG_FUNCTION;
 
-    PRInt32 prefSecs = nsContentUtils::GetIntPref(kLaunchTimeoutPref, 0);
+    PRInt32 prefSecs = Preferences::GetInt(kLaunchTimeoutPref, 0);
 
     // Block on the child process being launched and initialized.
     nsAutoPtr<PluginModuleParent> parent(new PluginModuleParent(aFilePath));
@@ -125,7 +126,7 @@ PluginModuleParent::PluginModuleParent(const char* aFilePath)
         NS_ERROR("Out of memory");
     }
 
-    nsContentUtils::RegisterPrefCallback(kTimeoutPref, TimeoutChanged, this);
+    Preferences::RegisterCallback(TimeoutChanged, kTimeoutPref, this);
 }
 
 PluginModuleParent::~PluginModuleParent()
@@ -150,7 +151,7 @@ PluginModuleParent::~PluginModuleParent()
         mSubprocess = nsnull;
     }
 
-    nsContentUtils::UnregisterPrefCallback(kTimeoutPref, TimeoutChanged, this);
+    Preferences::UnregisterCallback(TimeoutChanged, kTimeoutPref, this);
 }
 
 #ifdef MOZ_CRASHREPORTER
@@ -223,7 +224,7 @@ PluginModuleParent::TimeoutChanged(const char* aPref, void* aModule)
     NS_ABORT_IF_FALSE(!strcmp(aPref, kTimeoutPref),
                       "unexpected pref callback");
 
-    PRInt32 timeoutSecs = nsContentUtils::GetIntPref(kTimeoutPref, 0);
+    PRInt32 timeoutSecs = Preferences::GetInt(kTimeoutPref, 0);
     int32 timeoutMs = (timeoutSecs > 0) ? (1000 * timeoutSecs) :
                       SyncChannel::kNoTimeout;
 
diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp
index 82a4b8ca89a..3f42dab2f3f 100644
--- a/dom/src/geolocation/nsGeolocation.cpp
+++ b/dom/src/geolocation/nsGeolocation.cpp
@@ -72,6 +72,7 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Services.h"
 #include "mozilla/unused.h"
+#include "mozilla/Preferences.h"
 
 #include <math.h>
 
@@ -91,6 +92,7 @@
 #define MAX_GEO_REQUESTS_PER_WINDOW  1500
 
 using mozilla::unused;          // <snicker>
+using namespace mozilla;
 using namespace mozilla::dom;
 
 class RequestPromptEvent : public nsRunnable
@@ -499,33 +501,30 @@ static PRBool sGeoIgnoreLocationFilter = PR_FALSE;
 static int
 GeoEnabledChangedCallback(const char *aPrefName, void *aClosure)
 {
-  sGeoEnabled = nsContentUtils::GetBoolPref("geo.enabled", PR_TRUE);
+  sGeoEnabled = Preferences::GetBool("geo.enabled", PR_TRUE);
   return 0;
 }
 
 static int
 GeoIgnoreLocationFilterChangedCallback(const char *aPrefName, void *aClosure)
 {
-  sGeoIgnoreLocationFilter = nsContentUtils::GetBoolPref("geo.ignore.location_filter",
-                                                         PR_TRUE);
+  sGeoIgnoreLocationFilter =
+    Preferences::GetBool("geo.ignore.location_filter", PR_TRUE);
   return 0;
 }
 
 
 nsresult nsGeolocationService::Init()
 {
-  mTimeout = nsContentUtils::GetIntPref("geo.timeout", 6000);
+  mTimeout = Preferences::GetInt("geo.timeout", 6000);
 
-  nsContentUtils::RegisterPrefCallback("geo.ignore.location_filter",
-                                       GeoIgnoreLocationFilterChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(GeoIgnoreLocationFilterChangedCallback,
+                                "geo.ignore.location_filter");
 
   GeoIgnoreLocationFilterChangedCallback("geo.ignore.location_filter", nsnull);
 
 
-  nsContentUtils::RegisterPrefCallback("geo.enabled",
-                                       GeoEnabledChangedCallback,
-                                       nsnull);
+  Preferences::RegisterCallback(GeoEnabledChangedCallback, "geo.enabled");
 
   GeoEnabledChangedCallback("geo.enabled", nsnull);
 
@@ -1053,9 +1052,10 @@ nsGeolocation::RegisterRequestWithPrompt(nsGeolocationRequest* request)
     return true;
   }
 
-  if (nsContentUtils::GetBoolPref("geo.prompt.testing", PR_FALSE))
-  {
-    nsCOMPtr<nsIRunnable> ev  = new RequestAllowEvent(nsContentUtils::GetBoolPref("geo.prompt.testing.allow", PR_FALSE), request);
+  if (Preferences::GetBool("geo.prompt.testing", PR_FALSE)) {
+    nsCOMPtr<nsIRunnable> ev =
+      new RequestAllowEvent(Preferences::GetBool("geo.prompt.testing.allow",
+                                                 PR_FALSE), request);
     NS_DispatchToMainThread(ev);
     return true;
   }
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index e3074a5a2e5..62ba36329a6 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -61,6 +61,7 @@ EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
+		-I$(topsrcdir)/netwerk/base/src \
 
 EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp
index 72f248c44ae..e291c1aabdd 100644
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -22,6 +22,7 @@
  *
  * Contributor(s):
  *   Pierre Phaneuf <pp@ludusdesign.com>
+ *   Emanuele Costa <emanuele.costa@gmail.com>
  *
  * 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"),
@@ -1219,10 +1220,7 @@ nsJSProtocolHandler::NewURI(const nsACString &aSpec,
     // provided by standard URLs, so there is no "outer" object given to
     // CreateInstance.
 
-    nsCOMPtr<nsIURI> url = do_CreateInstance(NS_SIMPLEURI_CONTRACTID, &rv);
-
-    if (NS_FAILED(rv))
-        return rv;
+    nsCOMPtr<nsIURI> url = new nsJSURI(aBaseURI);
 
     if (!aCharset || !nsCRT::strcasecmp("UTF-8", aCharset))
       rv = url->SetSpec(aSpec);
@@ -1241,10 +1239,7 @@ nsJSProtocolHandler::NewURI(const nsACString &aSpec,
         return rv;
     }
 
-    *result = new nsJSURI(aBaseURI, url);
-    NS_ENSURE_TRUE(*result, NS_ERROR_OUT_OF_MEMORY);
-
-    NS_ADDREF(*result);
+    url.forget(result);
     return rv;
 }
 
@@ -1281,34 +1276,34 @@ nsJSProtocolHandler::AllowPort(PRInt32 port, const char *scheme, PRBool *_retval
 
 ////////////////////////////////////////////////////////////
 // nsJSURI implementation
+static NS_DEFINE_CID(kThisSimpleURIImplementationCID,
+                     NS_THIS_SIMPLEURI_IMPLEMENTATION_CID);
 
-NS_IMPL_ADDREF(nsJSURI)
-NS_IMPL_RELEASE(nsJSURI)
+
+NS_IMPL_ADDREF_INHERITED(nsJSURI, nsSimpleURI)
+NS_IMPL_RELEASE_INHERITED(nsJSURI, nsSimpleURI)
 
 NS_INTERFACE_MAP_BEGIN(nsJSURI)
-  NS_INTERFACE_MAP_ENTRY(nsIURI)
-  NS_INTERFACE_MAP_ENTRY(nsISerializable)
-  NS_INTERFACE_MAP_ENTRY(nsIClassInfo)
-  NS_INTERFACE_MAP_ENTRY(nsIMutable)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURI)
   if (aIID.Equals(kJSURICID))
       foundInterface = static_cast<nsIURI*>(this);
+  else if (aIID.Equals(kThisSimpleURIImplementationCID)) {
+      // Need to return explicitly here, because if we just set foundInterface
+      // to null the NS_INTERFACE_MAP_END_INHERITING will end up calling into
+      // nsSimplURI::QueryInterface and finding something for this CID.
+      *aInstancePtr = nsnull;
+      return NS_NOINTERFACE;
+  }
   else
-NS_INTERFACE_MAP_END
+NS_INTERFACE_MAP_END_INHERITING(nsSimpleURI)
 
 // nsISerializable methods:
 
 NS_IMETHODIMP
 nsJSURI::Read(nsIObjectInputStream* aStream)
 {
-    nsresult rv;
-
-    rv = aStream->ReadObject(PR_TRUE, getter_AddRefs(mSimpleURI));
+    nsresult rv = nsSimpleURI::Read(aStream);
     if (NS_FAILED(rv)) return rv;
 
-    mMutable = do_QueryInterface(mSimpleURI);
-    NS_ENSURE_TRUE(mMutable, NS_ERROR_UNEXPECTED);
-
     PRBool haveBase;
     rv = aStream->ReadBoolean(&haveBase);
     if (NS_FAILED(rv)) return rv;
@@ -1324,9 +1319,7 @@ nsJSURI::Read(nsIObjectInputStream* aStream)
 NS_IMETHODIMP
 nsJSURI::Write(nsIObjectOutputStream* aStream)
 {
-    nsresult rv;
-
-    rv = aStream->WriteObject(mSimpleURI, PR_TRUE);
+    nsresult rv = nsSimpleURI::Write(aStream);
     if (NS_FAILED(rv)) return rv;
 
     rv = aStream->WriteBoolean(mBaseURI != nsnull);
@@ -1340,100 +1333,53 @@ nsJSURI::Write(nsIObjectOutputStream* aStream)
     return NS_OK;
 }
 
-// nsIURI methods:
-
-NS_IMETHODIMP
-nsJSURI::Clone(nsIURI** aClone)
+// nsSimpleURI methods:
+/* virtual */ nsSimpleURI*
+nsJSURI::StartClone(nsSimpleURI::RefHandlingEnum /* ignored */)
 {
-    nsCOMPtr<nsIURI> simpleClone;
-    nsresult rv = mSimpleURI->Clone(getter_AddRefs(simpleClone));
-    NS_ENSURE_SUCCESS(rv, rv);
-
     nsCOMPtr<nsIURI> baseClone;
     if (mBaseURI) {
-        rv = mBaseURI->Clone(getter_AddRefs(baseClone));
-        NS_ENSURE_SUCCESS(rv, rv);
+      // Note: We preserve ref on *base* URI, regardless of ref handling mode.
+      nsresult rv = mBaseURI->Clone(getter_AddRefs(baseClone));
+      if (NS_FAILED(rv)) {
+        return nsnull;
+      }
     }
 
-    nsIURI* newURI = new nsJSURI(baseClone, simpleClone);
-    NS_ENSURE_TRUE(newURI, NS_ERROR_OUT_OF_MEMORY);
-
-    NS_ADDREF(*aClone = newURI);
-    return NS_OK;
+    return new nsJSURI(baseClone);
 }
 
-NS_IMETHODIMP
-nsJSURI::Equals(nsIURI* aOther, PRBool *aResult)
+/* virtual */ nsresult
+nsJSURI::EqualsInternal(nsIURI* aOther,
+                        nsSimpleURI::RefHandlingEnum aRefHandlingMode,
+                        PRBool* aResult)
 {
-    if (!aOther) {
-        *aResult = PR_FALSE;
+    NS_ENSURE_ARG_POINTER(aOther);
+    NS_PRECONDITION(aResult, "null pointer for outparam");
+
+    nsRefPtr<nsJSURI> otherJSURI;
+    nsresult rv = aOther->QueryInterface(kJSURICID,
+                                         getter_AddRefs(otherJSURI));
+    if (NS_FAILED(rv)) {
+        *aResult = PR_FALSE; // aOther is not a nsJSURI --> not equal.
         return NS_OK;
     }
-    
-    nsRefPtr<nsJSURI> otherJSUri;
-    aOther->QueryInterface(kJSURICID, getter_AddRefs(otherJSUri));
-    if (!otherJSUri) {
+
+    // Compare the member data that our base class knows about.
+    if (!nsSimpleURI::EqualsInternal(otherJSURI, aRefHandlingMode)) {
         *aResult = PR_FALSE;
         return NS_OK;
     }
 
-    return mSimpleURI->Equals(otherJSUri->mSimpleURI, aResult);
-}
+    // Compare the piece of additional member data that we add to base class.
+    nsIURI* otherBaseURI = otherJSURI->GetBaseURI();
 
-// nsIClassInfo methods:
-NS_IMETHODIMP 
-nsJSURI::GetInterfaces(PRUint32 *count, nsIID * **array)
-{
-    *count = 0;
-    *array = nsnull;
-    return NS_OK;
-}
+    if (mBaseURI) {
+        // (As noted in StartClone, we always honor refs on mBaseURI)
+        return mBaseURI->Equals(otherBaseURI, aResult);
+    }
 
-NS_IMETHODIMP 
-nsJSURI::GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
-{
-    *_retval = nsnull;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJSURI::GetContractID(char * *aContractID)
-{
-    // Make sure to modify any subclasses as needed if this ever
-    // changes.
-    *aContractID = nsnull;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJSURI::GetClassDescription(char * *aClassDescription)
-{
-    *aClassDescription = nsnull;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJSURI::GetClassID(nsCID * *aClassID)
-{
-    // Make sure to modify any subclasses as needed if this ever
-    // changes to not call the virtual GetClassIDNoAlloc.
-    *aClassID = (nsCID*) nsMemory::Alloc(sizeof(nsCID));
-    if (!*aClassID)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return GetClassIDNoAlloc(*aClassID);
-}
-
-NS_IMETHODIMP 
-nsJSURI::GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-{
-    *aImplementationLanguage = nsIProgrammingLanguage::CPLUSPLUS;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJSURI::GetFlags(PRUint32 *aFlags)
-{
-    *aFlags = nsIClassInfo::MAIN_THREAD_ONLY;
+    *aResult = !otherBaseURI;
     return NS_OK;
 }
 
@@ -1443,3 +1389,4 @@ nsJSURI::GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
     *aClassIDNoAlloc = kJSURICID;
     return NS_OK;
 }
+
diff --git a/dom/src/jsurl/nsJSProtocolHandler.h b/dom/src/jsurl/nsJSProtocolHandler.h
index 69ce392c577..43ff492e22f 100644
--- a/dom/src/jsurl/nsJSProtocolHandler.h
+++ b/dom/src/jsurl/nsJSProtocolHandler.h
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Emanuele Costa <emanuele.costa@gmail.com>
  *
  * 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"),
@@ -44,6 +45,7 @@
 #include "nsIMutable.h"
 #include "nsISerializable.h"
 #include "nsIClassInfo.h"
+#include "nsSimpleURI.h"
 
 #define NS_JSPROTOCOLHANDLER_CID                     \
 { /* bfc310d2-38a0-11d3-8cd3-0060b0fc14a3 */         \
@@ -90,58 +92,40 @@ protected:
     nsCOMPtr<nsITextToSubURI>  mTextToSubURI;
 };
 
-// Use an extra base object to avoid having to manually retype all the
-// nsIURI methods.  I wish we could just inherit from nsSimpleURI instead.
-class nsJSURI_base : public nsIURI,
-                     public nsIMutable
+
+class nsJSURI : public nsSimpleURI
 {
 public:
-    nsJSURI_base(nsIURI* aSimpleURI) :
-        mSimpleURI(aSimpleURI)
+
+    nsJSURI() {}
+
+    nsJSURI(nsIURI* aBaseURI) : mBaseURI(aBaseURI) {}
+
+    nsIURI* GetBaseURI() const
     {
-        mMutable = do_QueryInterface(mSimpleURI);
-        NS_ASSERTION(aSimpleURI && mMutable, "This isn't going to work out");
-    }
-    virtual ~nsJSURI_base() {}
-
-    // For use only from deserialization
-    nsJSURI_base() {}
-    
-    NS_FORWARD_NSIURI(mSimpleURI->)
-    NS_FORWARD_NSIMUTABLE(mMutable->)
-
-protected:
-    nsCOMPtr<nsIURI> mSimpleURI;
-    nsCOMPtr<nsIMutable> mMutable;
-};
-
-class nsJSURI : public nsJSURI_base,
-                public nsISerializable,
-                public nsIClassInfo
-{
-public:
-    nsJSURI(nsIURI* aBaseURI, nsIURI* aSimpleURI) :
-        nsJSURI_base(aSimpleURI), mBaseURI(aBaseURI)
-    {}
-    virtual ~nsJSURI() {}
-
-    // For use only from deserialization
-    nsJSURI() : nsJSURI_base() {}
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSISERIALIZABLE
-    NS_DECL_NSICLASSINFO
-
-    // Override Clone() and Equals()
-    NS_IMETHOD Clone(nsIURI** aClone);
-    NS_IMETHOD Equals(nsIURI* aOther, PRBool *aResult);
-
-    nsIURI* GetBaseURI() const {
         return mBaseURI;
     }
 
+    NS_DECL_ISUPPORTS_INHERITED
+
+    // nsIURI overrides
+    virtual nsSimpleURI* StartClone(RefHandlingEnum refHandlingMode);
+
+    // nsISerializable overrides
+    NS_IMETHOD Read(nsIObjectInputStream* aStream);
+    NS_IMETHOD Write(nsIObjectOutputStream* aStream);
+
+    // Override the nsIClassInfo method GetClassIDNoAlloc to make sure our
+    // nsISerializable impl works right.
+    NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc);
+    //NS_IMETHOD QueryInterface( const nsIID& aIID, void** aInstancePtr );
+
+protected:
+    virtual nsresult EqualsInternal(nsIURI* other,
+                                    RefHandlingEnum refHandlingMode,
+                                    PRBool* result);
 private:
     nsCOMPtr<nsIURI> mBaseURI;
 };
-    
+
 #endif /* nsJSProtocolHandler_h___ */
diff --git a/dom/src/notification/nsDesktopNotification.cpp b/dom/src/notification/nsDesktopNotification.cpp
index 92f90e9e1e1..581cff6d330 100644
--- a/dom/src/notification/nsDesktopNotification.cpp
+++ b/dom/src/notification/nsDesktopNotification.cpp
@@ -41,7 +41,9 @@
 
 #include "mozilla/dom/PBrowserChild.h"
 #include "TabChild.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 /* ------------------------------------------------------------------------ */
@@ -109,13 +111,14 @@ nsDOMDesktopNotification::nsDOMDesktopNotification(const nsAString & title,
   mOwner = aWindow;
   mScriptContext = aScriptContext;
 
-  if (nsContentUtils::GetBoolPref("notification.disabled", PR_FALSE))
+  if (Preferences::GetBool("notification.disabled", PR_FALSE)) {
     return;
+  }
 
   // If we are in testing mode (running mochitests, for example)
   // and we are suppose to allow requests, then just post an allow event.
-  if (nsContentUtils::GetBoolPref("notification.prompt.testing", PR_FALSE) &&
-      nsContentUtils::GetBoolPref("notification.prompt.testing.allow", PR_TRUE)) {
+  if (Preferences::GetBool("notification.prompt.testing", PR_FALSE) &&
+      Preferences::GetBool("notification.prompt.testing.allow", PR_TRUE)) {
     mAllow = PR_TRUE;
     return;
   }
diff --git a/dom/src/offline/nsDOMOfflineResourceList.cpp b/dom/src/offline/nsDOMOfflineResourceList.cpp
index 381d95c4485..fdb7332e440 100644
--- a/dom/src/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/src/offline/nsDOMOfflineResourceList.cpp
@@ -56,11 +56,14 @@
 #include "nsIObserverService.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"
+#include "mozilla/Preferences.h"
 
 #include "nsXULAppAPI.h"
 #define IS_CHILD_PROCESS() \
     (GeckoProcessType_Default != XRE_GetProcessType())
 
+using namespace mozilla;
+
 // Event names
 
 #define CHECKING_STR    "checking"
@@ -392,8 +395,8 @@ nsDOMOfflineResourceList::MozAdd(const nsAString& aURI)
   PRUint32 length;
   rv = GetMozLength(&length);
   NS_ENSURE_SUCCESS(rv, rv);
-  PRUint32 maxEntries = nsContentUtils::GetIntPref(kMaxEntriesPref,
-                                                   DEFAULT_MAX_ENTRIES);
+  PRUint32 maxEntries =
+    Preferences::GetUint(kMaxEntriesPref, DEFAULT_MAX_ENTRIES);
 
   if (length > maxEntries) return NS_ERROR_NOT_AVAILABLE;
 
diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp
index b34a41a86c9..78b985ab927 100644
--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -71,6 +71,9 @@ using mozilla::dom::StorageChild;
 #include "nsDOMString.h"
 #include "nsNetCID.h"
 #include "nsIProxyObjectManager.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static const PRUint32 ASK_BEFORE_ACCEPT = 1;
 static const PRUint32 ACCEPT_SESSION = 2;
@@ -202,22 +205,21 @@ GetQuota(const nsACString &aDomain, PRInt32 *aQuota, PRInt32 *aWarnQuota,
   PRUint32 perm = GetOfflinePermission(aDomain);
   if (IS_PERMISSION_ALLOWED(perm) || aOverrideQuota) {
     // This is an offline app, give more space by default.
-    *aQuota = ((PRInt32)nsContentUtils::GetIntPref(kOfflineAppQuota,
-                                                   DEFAULT_OFFLINE_APP_QUOTA) * 1024);
+    *aQuota = Preferences::GetInt(kOfflineAppQuota,
+                                  DEFAULT_OFFLINE_APP_QUOTA) * 1024;
 
     if (perm == nsIOfflineCacheUpdateService::ALLOW_NO_WARN ||
         aOverrideQuota) {
       *aWarnQuota = -1;
     } else {
-      *aWarnQuota = ((PRInt32)nsContentUtils::GetIntPref(kOfflineAppWarnQuota,
-                                                         DEFAULT_OFFLINE_WARN_QUOTA) * 1024);
+      *aWarnQuota = Preferences::GetInt(kOfflineAppWarnQuota,
+                                        DEFAULT_OFFLINE_WARN_QUOTA) * 1024;
     }
     return perm;
   }
 
   // FIXME: per-domain quotas?
-  *aQuota = ((PRInt32)nsContentUtils::GetIntPref(kDefaultQuota,
-                                                 DEFAULT_QUOTA) * 1024);
+  *aQuota = Preferences::GetInt(kDefaultQuota, DEFAULT_QUOTA) * 1024;
   *aWarnQuota = -1;
 
   return perm;
@@ -1459,8 +1461,9 @@ nsDOMStorage::CanUseStorage(PRPackedBool* aSessionOnly)
   NS_ASSERTION(aSessionOnly, "null session flag");
   *aSessionOnly = PR_FALSE;
 
-  if (!nsContentUtils::GetBoolPref(kStorageEnabled))
+  if (!Preferences::GetBool(kStorageEnabled)) {
     return PR_FALSE;
+  }
 
   // chrome can always use storage regardless of permission preferences
   if (nsContentUtils::IsCallerChrome())
@@ -1500,8 +1503,8 @@ nsDOMStorage::CanUseStorage(PRPackedBool* aSessionOnly)
     *aSessionOnly = PR_TRUE;
   }
   else if (perm != nsIPermissionManager::ALLOW_ACTION) {
-    PRUint32 cookieBehavior = nsContentUtils::GetIntPref(kCookiesBehavior);
-    PRUint32 lifetimePolicy = nsContentUtils::GetIntPref(kCookiesLifetimePolicy);
+    PRUint32 cookieBehavior = Preferences::GetUint(kCookiesBehavior);
+    PRUint32 lifetimePolicy = Preferences::GetUint(kCookiesLifetimePolicy);
 
     // Treat "ask every time" as "reject always".
     // Chrome persistent pages can bypass this check.
diff --git a/dom/src/threads/nsDOMThreadService.cpp b/dom/src/threads/nsDOMThreadService.cpp
index 80c599982a1..85ff2da696d 100644
--- a/dom/src/threads/nsDOMThreadService.cpp
+++ b/dom/src/threads/nsDOMThreadService.cpp
@@ -71,6 +71,7 @@
 #include "nsXPCOMCIDInternal.h"
 #include "pratom.h"
 #include "prthread.h"
+#include "mozilla/Preferences.h"
 
 // DOMWorker includes
 #include "nsDOMWorker.h"
@@ -1566,8 +1567,7 @@ nsDOMThreadService::RegisterPrefCallbacks()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   for (PRUint32 index = 0; index < NS_ARRAY_LENGTH(sPrefsToWatch); index++) {
-    nsContentUtils::RegisterPrefCallback(sPrefsToWatch[index], PrefCallback,
-                                         nsnull);
+    Preferences::RegisterCallback(PrefCallback, sPrefsToWatch[index]);
     PrefCallback(sPrefsToWatch[index], nsnull);
   }
 }
@@ -1577,8 +1577,7 @@ nsDOMThreadService::UnregisterPrefCallbacks()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   for (PRUint32 index = 0; index < NS_ARRAY_LENGTH(sPrefsToWatch); index++) {
-    nsContentUtils::UnregisterPrefCallback(sPrefsToWatch[index], PrefCallback,
-                                           nsnull);
+    Preferences::UnregisterCallback(PrefCallback, sPrefsToWatch[index]);
   }
 }
 
@@ -1593,7 +1592,7 @@ nsDOMThreadService::PrefCallback(const char* aPrefName,
     // some wacky platform then the worst that could happen is that the close
     // handler will run for a slightly different amount of time.
     PRUint32 timeoutMS =
-      nsContentUtils::GetIntPref(aPrefName, gWorkerCloseHandlerTimeoutMS);
+      Preferences::GetUint(aPrefName, gWorkerCloseHandlerTimeoutMS);
 
     // We must have a timeout value, 0 is not ok. If the pref is set to 0 then
     // fall back to our default.
diff --git a/dom/src/threads/test/Makefile.in b/dom/src/threads/test/Makefile.in
index e2311aa4d71..ebae5372bc4 100644
--- a/dom/src/threads/test/Makefile.in
+++ b/dom/src/threads/test/Makefile.in
@@ -45,12 +45,6 @@ relativesrcdir   = dom/src/threads/test
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-  WorkerTest.jsm \
-  WorkerTest_worker.js \
-  WorkerTest_subworker.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
@@ -132,6 +126,9 @@ _CHROME_TEST_FILES = \
   test_chromeWorker.xul \
   test_chromeWorkerComponent.xul \
   test_chromeWorkerJSM.xul \
+  WorkerTest.jsm \
+  WorkerTest_worker.js \
+  WorkerTest_subworker.js \
   chromeWorker_worker.js \
   chromeWorker_subworker.js \
   $(NULL)
diff --git a/dom/src/threads/test/test_chromeWorkerJSM.xul b/dom/src/threads/test/test_chromeWorkerJSM.xul
index d774ce8333e..4626990de60 100644
--- a/dom/src/threads/test/test_chromeWorkerJSM.xul
+++ b/dom/src/threads/test/test_chromeWorkerJSM.xul
@@ -72,7 +72,7 @@
         done();
       }
 
-      Components.utils.import("resource://gre/modules/WorkerTest.jsm");
+      Components.utils.import("chrome://mochitests/content/chrome/dom/src/threads/test/WorkerTest.jsm");
 
       worker = WorkerTest.go(window.location.href, messageCallback,
                              errorCallback);
diff --git a/dom/system/GPSDGeolocationProvider.manifest b/dom/system/GPSDGeolocationProvider.manifest
index 7e503cd7476..b9dd19f10f7 100644
--- a/dom/system/GPSDGeolocationProvider.manifest
+++ b/dom/system/GPSDGeolocationProvider.manifest
@@ -1,3 +1,3 @@
-component {0A3BE523-0F2A-32CC-CCD8-1E5986D5A79D} GPSDGeolocationProvider.manifest
+component {0A3BE523-0F2A-32CC-CCD8-1E5986D5A79D} GPSDGeolocationProvider.js
 contract @mozilla.org/geolocation/gpsd/provider;1 {0A3BE523-0F2A-32CC-CCD8-1E5986D5A79D}
 category geolocation-provider GPSDProvider @mozilla.org/geolocation/gpsd/provider;1
diff --git a/dom/tests/mochitest/ajax/prototype/test/lib/unittest.js b/dom/tests/mochitest/ajax/prototype/test/lib/unittest.js
index b961ca98ec1..904c0fb2103 100644
--- a/dom/tests/mochitest/ajax/prototype/test/lib/unittest.js
+++ b/dom/tests/mochitest/ajax/prototype/test/lib/unittest.js
@@ -219,9 +219,13 @@ Test.Unit.Runner = Class.create({
     if (!test.isWaiting) this.logger.start(test.name);
     test.run();
     if (test.isWaiting) {
-      this.logger.message("Waiting for " + test.timeToWait + "ms");
+      if (test.timeToWait) {
+        this.logger.message("Waiting for " + test.timeToWait + "ms");
+        test.timerID = setTimeout(this.runTests.bind(this), test.timeToWait);
+      } else {
+        this.logger.message("Waiting for finish");
+      }
       test.runner = this;
-      test.timerID = setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
       return;
     }
     
@@ -488,7 +492,7 @@ Test.Unit.Testcase = Class.create(Test.Unit.Assertions, {
   },
   
   isWaiting:  false,
-  timeToWait: 1000,
+  timeToWait: null,
   timerID:   -1,
   runner:     null,
   assertions: 0,
@@ -502,15 +506,20 @@ Test.Unit.Testcase = Class.create(Test.Unit.Assertions, {
     this.timeToWait = time;
   },
   
-  cancelWait: function() {
+  waitForFinish: function() {
+    this.isWaiting = true;
+  },
+
+  finish: function() {
     if (this.timerID > 0) {
       clearTimeout(this.timerID);
       this.timerID = -1;
-      this.test = function(){};
-      // continue test
-      if (this.runner)
-        this.runner.runTests();
+      this.timeToWait = null;
     }
+    this.test = function(){};
+    // continue test
+    if (this.runner)
+      this.runner.runTests();
   },
 
   run: function(rethrow) {
diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/ajax_test.js b/dom/tests/mochitest/ajax/prototype/test/unit/ajax_test.js
index 9d004650f24..9ceb9851862 100644
--- a/dom/tests/mochitest/ajax/prototype/test/unit/ajax_test.js
+++ b/dom/tests/mochitest/ajax/prototype/test/unit/ajax_test.js
@@ -32,69 +32,6 @@ new Test.Unit.Runner({
     this.assertEqual("Hello world!", h2.innerHTML);
   },
   
-  testAsynchronousRequest: function() {
-    this.assertEqual("", $("content").innerHTML);
-    
-    new Ajax.Request("../fixtures/hello.js", extendDefault({
-      asynchronous: true,
-      method: 'get',
-      evalJS: 'force'
-    }));
-    this.wait(1000, function() {
-      var h2 = $("content").firstChild;
-      this.assertEqual("Hello world!", h2.innerHTML);
-    });
-  },
-  
-  testUpdater: function() {
-    this.assertEqual("", $("content").innerHTML);
-    
-    new Ajax.Updater("content", "../fixtures/content.html", { method:'get', onComplete: function() {
-        this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
-        $('content').update('');
-        this.assertEqual("", $("content").innerHTML);
-        new Ajax.Updater({ success:"content", failure:"content2" },
-          "../fixtures/content.html",
-          { method:'get', parameters:{ pet:'monkey' }, onComplete: function() {
-            this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
-            this.assertEqual("", $("content2").innerHTML);
-            $('content').update('');
-            this.assertEqual("", $("content").innerHTML);
-            new Ajax.Updater("", "../fixtures/content.html",
-              { method:'get', parameters:"pet=monkey", onComplete: function() {
-                this.assertEqual("", $("content").innerHTML);
-                this.cancelWait();
-              }.bind(this)
-            });
-          }.bind(this)
-        });
-      }.bind(this)
-    });
-
-    this.wait(1000, function() {
-      this.flunk("The request was timeouted.");
-    }); 
-  },
-  
-  testUpdaterWithInsertion: function() {
-    $('content').update();
-    new Ajax.Updater("content", "../fixtures/content.html", { method:'get', insertion: Insertion.Top });
-    this.wait(1000, function() {
-      // bug 452706       this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
-      $('content').update();
-      new Ajax.Updater("content", "../fixtures/content.html", { method:'get', insertion: 'bottom' });      
-      this.wait(1000, function() {
-        this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
-        
-        $('content').update();
-        new Ajax.Updater("content", "../fixtures/content.html", { method:'get', insertion: 'after' });      
-        this.wait(1000, function() {
-          this.assertEqual('five dozen', $("content").next().innerHTML.strip().toLowerCase());
-        });
-      });
-    });
-  },
-  
   testUpdaterOptions: function() {
     var options = {
       method: 'get',
@@ -107,43 +44,6 @@ new Test.Unit.Runner({
     this.assertIdentical(Prototype.emptyFunction, options.onComplete);
   },
   
-  testResponders: function(){
-    // check for internal responder
-    this.assertEqual(1, Ajax.Responders.responders.length);
-    
-    var dummyResponder = {
-      onComplete: function(req) { /* dummy */ }
-    };
-    
-    Ajax.Responders.register(dummyResponder);
-    this.assertEqual(2, Ajax.Responders.responders.length);
-    
-    // don't add twice
-    Ajax.Responders.register(dummyResponder);
-    this.assertEqual(2, Ajax.Responders.responders.length);
-    
-    Ajax.Responders.unregister(dummyResponder);
-    this.assertEqual(1, Ajax.Responders.responders.length);
-    
-    var responder = {
-      onCreate:   function(req){ responderCounter++ },
-      onLoading:  function(req){ responderCounter++ },
-      onComplete: function(req){ responderCounter++ }
-    };
-    Ajax.Responders.register(responder);
-    
-    this.assertEqual(0, responderCounter);
-    this.assertEqual(0, Ajax.activeRequestCount);
-    new Ajax.Request("../fixtures/content.html", { method:'get', parameters:"pet=monkey" });
-    this.assertEqual(1, responderCounter);
-    this.assertEqual(1, Ajax.activeRequestCount);
-    
-    this.wait(1000,function() {
-      this.assertEqual(3, responderCounter);
-      this.assertEqual(0, Ajax.activeRequestCount);
-    });
-  },
-  
   testEvalResponseShouldBeCalledBeforeOnComplete: function() {
     if (this.isRunningFromRake) {
       this.assertEqual("", $("content").innerHTML);
diff --git a/dom/tests/mochitest/ajax/scriptaculous/test/unit/ajax_inplaceeditor_test.html b/dom/tests/mochitest/ajax/scriptaculous/test/unit/ajax_inplaceeditor_test.html
index b902479c7dc..c68f0942204 100644
--- a/dom/tests/mochitest/ajax/scriptaculous/test/unit/ajax_inplaceeditor_test.html
+++ b/dom/tests/mochitest/ajax/scriptaculous/test/unit/ajax_inplaceeditor_test.html
@@ -43,71 +43,6 @@
       inPlaceEditor.dispose();
     }},
 
-    // Integration test, tests the entire cycle
-    testInPlaceEditor: function() { with(this) {
-      Event.simulateMouse('tobeedited','click');
-      assertHidden($('tobeedited'));
-      assertNotNull(document.forms[0]);
-      assertEqual("cancel", document.forms[0].lastChild.innerHTML);
-      assertVisible(document.forms[0]);
-
-      Event.simulateMouse(document.forms[0].lastChild,'click');
-      assertNull(document.forms[0]);
-      assertVisible($('tobeedited'));
-      assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
-
-      Event.simulateMouse('tobeedited','mouseover');
-      Event.simulateMouse('tobeedited','click');
-
-      assertEqual("INPUT", document.forms[0].firstChild.tagName);
-      assertEqual("To be edited", document.forms[0].firstChild.value);
-      assertEqual("INPUT", document.forms[0].childNodes[1].tagName);
-      assertEqual("submit", document.forms[0].childNodes[1].type);
-      assertEqual("To be edited", document.forms[0].firstChild.value);
-      assert(Element.hasClassName(document.forms[0], 'inplaceeditor-form'),
-        "form doesn't have proper class: " + document.forms[0].className);
-
-      Event.simulateMouse(document.forms[0].childNodes[1],'click');
-
-      assertVisible($('tobeedited'));
-      assertEqual("Saving...", $('tobeedited').innerHTML);
-      assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
-      assert(Element.hasClassName($('tobeedited'), 'inplaceeditor-saving'),
-        "doesn't have saving class");
-
-      wait(1000, function() {
-        assertEqual("Server received: To be edited", $('tobeedited').innerHTML);
-        assertNull(document.forms[0]);
-        assertVisible($('tobeedited'));
-        assert(!Element.hasClassName($('tobeedited'), 'inplaceeditor-saving'));
-      });
-    }},
-
-    testHovering: function() { with(this) {
-      Event.simulateMouse('tobeedited','mouseover');
-      assertEqual("rgb(255, 255, 153)", Element.getStyle('tobeedited','background-color'));
-
-      Event.simulateMouse('tobeedited','mouseout');
-      wait(1100, function() {
-        assertEqual("transparent", Element.getStyle('tobeedited','background-color'),
-          "should be transparent after mouse leaves element");
-
-        Event.simulateMouse('tobeedited','click');
-      })
-    }},
-
-    testLoadsTextFromServer: function() { with(this) {
-      inPlaceEditor.options.loadTextURL = '_ajax_inplaceeditor_text.html';
-      inPlaceEditor.enterEditMode();
-      assertEqual('Loading...', inPlaceEditor.form.value.value);
-      assert(inPlaceEditor.form.value.disabled);
-      assert(Element.hasClassName(inPlaceEditor.form, 'inplaceeditor-loading'));
-      wait(1000, function() {
-        assertEqual('Text from server', inPlaceEditor.form.value.value);
-        assert(!inPlaceEditor.form.value.disabled);
-      });
-    }},
-
     testDisposesProperly: function() { with(this) {
       assertEqual("transparent", Element.getStyle('tobeedited','background-color'));
       inPlaceEditor.dispose();
@@ -214,4 +149,4 @@
 // ]]>
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in
index 3228d2185ea..420e7dcbbc4 100644
--- a/dom/tests/mochitest/bugs/Makefile.in
+++ b/dom/tests/mochitest/bugs/Makefile.in
@@ -108,6 +108,7 @@ _TEST_FILES	= \
 		child_bug260264.html \
 		grandchild_bug260264.html \
 		utils_bug260264.js \
+		test_bug529328.html \
 		test_bug531176.html \
 		test_bug531542.html \
 		test_bug456151.html \
diff --git a/dom/tests/mochitest/bugs/test_bug529328.html b/dom/tests/mochitest/bugs/test_bug529328.html
new file mode 100644
index 00000000000..c42ad79d544
--- /dev/null
+++ b/dom/tests/mochitest/bugs/test_bug529328.html
@@ -0,0 +1,143 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=529328
+-->
+<head>
+  <title>Test for Bug 529328</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=529328">Mozilla Bug 529328</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+/** Test for Bug 529328 **/
+function testDOMTokenList() {
+  is(document.body.classList[-1], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList[0], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList[1], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList[2], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(-1), null, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(0), null, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(1), null, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(2), null, "Wrong value for out of bounds access (DOMTokenList)");
+
+  document.body.className = "a b";
+  is(document.body.classList[-1], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList[0], "a", "Wrong value for in bounds access (DOMTokenList)");
+  is(document.body.classList[1], "b", "Wrong value for in bounds access (DOMTokenList)");
+  is(document.body.classList[2], undefined, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(-1), null, "Wrong value for out of bounds access (DOMTokenList)");
+  is(document.body.classList.item(0), "a", "Wrong value for in bounds access (DOMTokenList)");
+  is(document.body.classList.item(1), "b", "Wrong value for in bounds access (DOMTokenList)");
+  is(document.body.classList.item(2), null, "Wrong value for out of bounds access (DOMTokenList)");
+}
+
+function testDOMStringList() {
+  is(document.styleSheetSets[-1], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets[0], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets[1], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets[2], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(-1), null, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(0), null, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(1), null, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(2), null, "Wrong value for out of bounds access (DOMStringList)");
+
+  var s = document.createElement("style");
+  s.title = "a";
+  document.head.appendChild(s);
+  s = document.createElement("style");
+  s.title = "b";
+  document.head.appendChild(s);
+
+  is(document.styleSheetSets[-1], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets[0], "a", "Wrong value for in bounds access (DOMStringList)");
+  is(document.styleSheetSets[1], "b", "Wrong value for in bounds access (DOMStringList)");
+  is(document.styleSheetSets[2], undefined, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(-1), null, "Wrong value for out of bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(0), "a", "Wrong value for in bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(1), "b", "Wrong value for in bounds access (DOMStringList)");
+  is(document.styleSheetSets.item(2), null, "Wrong value for out of bounds access (DOMStringList)");
+}
+
+function testMediaList() {
+  var s = document.createElement("style");
+  document.head.appendChild(s);
+  try {
+    is(s.sheet.media[-1], undefined, "Wrong value for out of bounds access (MediaList)");
+    todo(true, "Didn't throw");
+  } catch (e) {
+    todo(false, "Shouldn't throw");
+  }
+  is(s.sheet.media[0], undefined, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media[1], undefined, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media[2], undefined, "Wrong value for out of bounds access (MediaList) (MediaList)");
+  is(s.sheet.media.item(-1), null, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media.item(0), null, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media.item(1), null, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media.item(2), null, "Wrong value for out of bounds access (MediaList) (MediaList)");
+
+  s.setAttribute("media", "a, b");
+
+  try {
+    is(s.sheet.media[-1], undefined, "Wrong value for out of bounds access (MediaList)");
+    todo(true, "Didn't throw");
+  } catch (e) {
+    todo(false, "Shouldn't throw");
+  }
+  is(s.sheet.media[0], "a", "Wrong value for in bounds access (MediaList)");
+  is(s.sheet.media[1], "b", "Wrong value for in bounds access (MediaList)");
+  is(s.sheet.media[2], undefined, "Wrong value for out of bounds access (MediaList) (MediaList)");
+  is(s.sheet.media.item(-1), null, "Wrong value for out of bounds access (MediaList)");
+  is(s.sheet.media.item(0), "a", "Wrong value for in bounds access (MediaList)");
+  is(s.sheet.media.item(1), "b", "Wrong value for in bounds access (MediaList)");
+  is(s.sheet.media.item(2), null, "Wrong value for out of bounds access (MediaList) (MediaList)");
+}
+
+function testCSSStyleDeclaration() {
+  var s = document.createElement("span");
+
+  try {
+    is(s.style[-1], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+    todo(true, "Didn't throw");
+  } catch (e) {
+    todo(false, "Shouldn't throw");
+  }
+  is(s.style[0], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style[1], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style[2], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(-1), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(0), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(1), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(2), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+
+  s.setAttribute("style", "color: blue; z-index: 42;");
+
+  try {
+    is(s.style[-1], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+    todo(true, "Didn't throw");
+  } catch (e) {
+    todo(false, "Shouldn't throw");
+  }
+  is(s.style[0], "color", "Wrong value for in bounds access (CSSStyleDeclaration)");
+  is(s.style[1], "z-index", "Wrong value for in bounds access (CSSStyleDeclaration)");
+  is(s.style[2], "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(-1), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+  is(s.style.item(0), "color", "Wrong value for in bounds access (CSSStyleDeclaration)");
+  is(s.style.item(1), "z-index", "Wrong value for in bounds access (CSSStyleDeclaration)");
+  is(s.style.item(2), "", "Wrong value for out of bounds access (CSSStyleDeclaration)");
+}
+
+testDOMTokenList();
+testDOMStringList();
+testMediaList();
+testCSSStyleDeclaration();
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/tests/mochitest/chrome/test_activation.xul b/dom/tests/mochitest/chrome/test_activation.xul
index f68eb840ebb..49db508741d 100644
--- a/dom/tests/mochitest/chrome/test_activation.xul
+++ b/dom/tests/mochitest/chrome/test_activation.xul
@@ -3,11 +3,11 @@
 <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <?xml-stylesheet href="data:text/css,
 
-#box {
+%23box {
   background: blue;
 }
 
-#box:-moz-window-inactive {
+%23box:-moz-window-inactive {
   background: cyan;
 }
 
diff --git a/dom/tests/mochitest/chrome/window_activation.xul b/dom/tests/mochitest/chrome/window_activation.xul
index 9a7567eac8a..cbfa548d7fd 100644
--- a/dom/tests/mochitest/chrome/window_activation.xul
+++ b/dom/tests/mochitest/chrome/window_activation.xul
@@ -2,11 +2,11 @@
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 <?xml-stylesheet href="data:text/css,
 
-#box {
+%23box {
   background: blue;
 }
 
-#box:-moz-window-inactive {
+%23box:-moz-window-inactive {
   background: cyan;
 }
 
diff --git a/dom/tests/mochitest/dom-level1-core/exclusions.js b/dom/tests/mochitest/dom-level1-core/exclusions.js
index a88568b10e9..cd21e391a4b 100644
--- a/dom/tests/mochitest/dom-level1-core/exclusions.js
+++ b/dom/tests/mochitest/dom-level1-core/exclusions.js
@@ -83,8 +83,13 @@ var attributeModTests = ["hc_attrappendchild1", "hc_attrappendchild3", "hc_attra
 var modTests = ["hc_elementwrongdocumenterr", "hc_namednodemapwrongdocumenterr", "hc_nodeappendchildnewchilddiffdocument", "hc_nodeinsertbeforenewchilddiffdocument",
                 "hc_nodereplacechildnewchilddiffdocument", "hc_elementwrongdocumenterr", "hc_namednodemapwrongdocumenterr", "hc_nodeappendchildnewchilddiffdocument",
                 "hc_nodeinsertbeforenewchilddiffdocument", "hc_nodereplacechildnewchilddiffdocument", "elementwrongdocumenterr", "namednodemapwrongdocumenterr",
-		            "nodeappendchildnewchilddiffdocument", "nodeinsertbeforenewchilddiffdocument", "nodereplacechildnewchilddiffdocument"];
+                "nodeappendchildnewchilddiffdocument", "nodeinsertbeforenewchilddiffdocument", "nodereplacechildnewchilddiffdocument"];
+// These tests rely on an implementation of document.createEntityReference.
+var createEntityRef = ["documentinvalidcharacterexceptioncreateentref",
+                       "documentinvalidcharacterexceptioncreateentref1",
+                       "hc_attrgetvalue2", "hc_nodevalue03"];
+
 
 var todoTests = {};
-var exclusions = concat(dtdTests, indexErrTests, attributeModTests, modTests);
+var exclusions = concat(dtdTests, indexErrTests, attributeModTests, modTests, createEntityRef);
 for (var excludedTestName in exclusions) { todoTests[exclusions[excludedTestName]] = true; }
diff --git a/editor/composer/src/nsEditingSession.cpp b/editor/composer/src/nsEditingSession.cpp
index 3c201481edb..e9eb7ae1009 100644
--- a/editor/composer/src/nsEditingSession.cpp
+++ b/editor/composer/src/nsEditingSession.cpp
@@ -43,7 +43,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindowUtils.h"
 #include "nsIDOMWindowInternal.h"
-#include "nsIDOMNSHTMLDocument.h"
+#include "nsIDOMHTMLDocument.h"
 #include "nsIDocument.h"
 #include "nsIHTMLDocument.h"
 #include "nsIDOMDocument.h"
@@ -78,7 +78,6 @@
 #include "nsIPlaintextEditor.h"
 #include "nsIEditor.h"
 
-#include "nsIDOMNSDocument.h"
 #include "nsIScriptContext.h"
 #include "imgIContainer.h"
 
@@ -349,33 +348,29 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
   //then lets check the mime type
   if (NS_SUCCEEDED(aWindow->GetDocument(getter_AddRefs(doc))) && doc)
   {
-    nsCOMPtr<nsIDOMNSDocument> nsdoc = do_QueryInterface(doc);
-    if (nsdoc)
+    nsAutoString mimeType;
+    if (NS_SUCCEEDED(doc->GetContentType(mimeType)))
+      AppendUTF16toUTF8(mimeType, mimeCType);
+
+    if (IsSupportedTextType(mimeCType.get()))
     {
-      nsAutoString mimeType;
-      if (NS_SUCCEEDED(nsdoc->GetContentType(mimeType)))
-        AppendUTF16toUTF8(mimeType, mimeCType);
+      mEditorType.AssignLiteral("text");
+      mimeCType = "text/plain";
+    }
+    else if (!mimeCType.EqualsLiteral("text/html") &&
+             !mimeCType.EqualsLiteral("application/xhtml+xml"))
+    {
+      // Neither an acceptable text or html type.
+      mEditorStatus = eEditorErrorCantEditMimeType;
 
-      if (IsSupportedTextType(mimeCType.get()))
-      {
-        mEditorType.AssignLiteral("text");
-        mimeCType = "text/plain";
-      }
-      else if (!mimeCType.EqualsLiteral("text/html") &&
-               !mimeCType.EqualsLiteral("application/xhtml+xml"))
-      {
-        // Neither an acceptable text or html type.
-        mEditorStatus = eEditorErrorCantEditMimeType;
-
-        // Turn editor into HTML -- we will load blank page later
-        mEditorType.AssignLiteral("html");
-        mimeCType.AssignLiteral("text/html");
-      }
+      // Turn editor into HTML -- we will load blank page later
+      mEditorType.AssignLiteral("html");
+      mimeCType.AssignLiteral("text/html");
     }
 
     // Flush out frame construction to make sure that the subframe's
     // presshell is set up if it needs to be.
-    nsCOMPtr<nsIDocument> document(do_QueryInterface(doc));
+    nsCOMPtr<nsIDocument> document = do_QueryInterface(doc);
     if (document) {
       document->FlushPendingNotifications(Flush_Frames);
       if (mMakeWholeDocumentEditable) {
@@ -719,9 +714,8 @@ nsEditingSession::OnStateChange(nsIWebProgress *aWebProgress,
 
         if (htmlDoc && htmlDoc->IsWriting())
         {
-          nsCOMPtr<nsIDOMNSHTMLDocument> htmlDomDoc(do_QueryInterface(doc));
+          nsCOMPtr<nsIDOMHTMLDocument> htmlDomDoc = do_QueryInterface(doc);
           nsAutoString designMode;
-
           htmlDomDoc->GetDesignMode(designMode);
 
           if (designMode.EqualsLiteral("on"))
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index 677f1d773eb..27973f427b3 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -5807,7 +5807,8 @@ nsHTMLEditRules::GetNodesForOperation(nsCOMArray<nsIDOMRange>& inArrayOfRanges,
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    NS_ASSERTION(rangeCount == rangeItemArray.Length(), "How did that happen?");
+    NS_ASSERTION(static_cast<PRUint32>(rangeCount) == rangeItemArray.Length(),
+                 "How did that happen?");
 
     // first register ranges for special editor gravity
     for (i = 0; i < rangeCount; i++)
diff --git a/editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js b/editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
index 46589cc16aa..b5083336d40 100644
--- a/editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
+++ b/editor/libeditor/html/tests/browserscope/lib/richtext2/currentStatus.js
@@ -4484,7 +4484,7 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "FB:BQ_BR.BR-1_SM": {
@@ -4515,7 +4515,7 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "BC:blue_TEXT-1_SI": {
@@ -4861,7 +4861,7 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "JC_TEXT-1_SC": {
@@ -13657,14 +13657,14 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004003 (NS_ERROR_INVALID_POINTER) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004003 (NS_ERROR_INVALID_POINTER)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004003 (NS_ERROR_INVALID_POINTER) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004003 (NS_ERROR_INVALID_POINTER)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004003 (NS_ERROR_INVALID_POINTER) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004003 (NS_ERROR_INVALID_POINTER)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004003 (NS_ERROR_INVALID_POINTER) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004003 (NS_ERROR_INVALID_POINTER)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "DIV:ce:false-1_SL": {
@@ -16656,21 +16656,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "IIMG:._IMG-1_SO": {
@@ -16679,21 +16679,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.execCommand]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 143\"  data: no]"
         }
       },
       "IOL_TEXT-1_SC": {
@@ -17021,21 +17021,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "UNSELECT_TEXT-1": {
@@ -17044,21 +17044,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "UNDO_TEXT-1": {
@@ -17067,21 +17067,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "REDO_TEXT-1": {
@@ -17090,21 +17090,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "BOLD_TEXT-1": {
@@ -17113,21 +17113,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "BOLD_B": {
@@ -17136,21 +17136,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "ITALIC_TEXT-1": {
@@ -17159,21 +17159,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "ITALIC_I": {
@@ -17182,21 +17182,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "UNDERLINE_TEXT-1": {
@@ -17205,21 +17205,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "STRIKETHROUGH_TEXT-1": {
@@ -17228,21 +17228,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "SUBSCRIPT_TEXT-1": {
@@ -17251,21 +17251,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "SUPERSCRIPT_TEXT-1": {
@@ -17274,21 +17274,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "FORMATBLOCK_TEXT-1": {
@@ -17297,21 +17297,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "CREATELINK_TEXT-1": {
@@ -17320,21 +17320,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "UNLINK_TEXT-1": {
@@ -17343,21 +17343,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTHTML_TEXT-1": {
@@ -17366,21 +17366,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTHORIZONTALRULE_TEXT-1": {
@@ -17389,21 +17389,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTIMAGE_TEXT-1": {
@@ -17412,21 +17412,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTLINEBREAK_TEXT-1": {
@@ -17435,21 +17435,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTPARAGRAPH_TEXT-1": {
@@ -17458,21 +17458,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTORDEREDLIST_TEXT-1": {
@@ -17481,21 +17481,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTUNORDEREDLIST_TEXT-1": {
@@ -17504,21 +17504,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INSERTTEXT_TEXT-1": {
@@ -17527,21 +17527,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "DELETE_TEXT-1": {
@@ -17550,21 +17550,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "FORWARDDELETE_TEXT-1": {
@@ -17573,21 +17573,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "STYLEWITHCSS_TEXT-1": {
@@ -17596,21 +17596,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "CONTENTREADONLY_TEXT-1": {
@@ -17619,21 +17619,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "BACKCOLOR_TEXT-1": {
@@ -17642,21 +17642,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "FORECOLOR_TEXT-1": {
@@ -17665,21 +17665,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "HILITECOLOR_TEXT-1": {
@@ -17688,21 +17688,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "FONTNAME_TEXT-1": {
@@ -17711,21 +17711,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "FONTSIZE_TEXT-1": {
@@ -17734,21 +17734,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INCREASEFONTSIZE_TEXT-1": {
@@ -17757,21 +17757,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "DECREASEFONTSIZE_TEXT-1": {
@@ -17780,21 +17780,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "HEADING_TEXT-1": {
@@ -17803,21 +17803,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "INDENT_TEXT-1": {
@@ -17826,21 +17826,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "OUTDENT_TEXT-1": {
@@ -17849,21 +17849,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "CREATEBOOKMARK_TEXT-1": {
@@ -17872,21 +17872,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "UNBOOKMARK_TEXT-1": {
@@ -17895,21 +17895,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "JUSTIFYCENTER_TEXT-1": {
@@ -17918,21 +17918,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "JUSTIFYFULL_TEXT-1": {
@@ -17941,21 +17941,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "JUSTIFYLEFT_TEXT-1": {
@@ -17964,21 +17964,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "JUSTIFYRIGHT_TEXT-1": {
@@ -17987,21 +17987,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "REMOVEFORMAT_TEXT-1": {
@@ -18010,21 +18010,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "COPY_TEXT-1": {
@@ -18033,21 +18033,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "CUT_TEXT-1": {
@@ -18056,21 +18056,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "PASTE_TEXT-1": {
@@ -18079,21 +18079,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       },
       "garbage-1_TEXT-1": {
@@ -18102,21 +18102,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandSupported]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 148\"  data: no]"
         }
       }
     }
@@ -18152,21 +18152,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "UNDO_TEXT-1": {
@@ -18497,21 +18497,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "INSERTPARAGRAPH_TEXT-1": {
@@ -18589,21 +18589,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "DELETE_TEXT-1": {
@@ -18635,21 +18635,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "STYLEWITHCSS_TEXT-1": {
@@ -18934,21 +18934,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "UNBOOKMARK_TEXT-1": {
@@ -18957,21 +18957,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       },
       "JUSTIFYCENTER_TEXT-1": {
@@ -19164,21 +19164,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandEnabled]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 150\"  data: no]"
         }
       }
     }
@@ -19191,21 +19191,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "UNSELECT_TEXT-1": {
@@ -19214,21 +19214,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "UNDO_TEXT-1": {
@@ -19237,21 +19237,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "REDO_TEXT-1": {
@@ -19260,21 +19260,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "BOLD_TEXT-1": {
@@ -19421,21 +19421,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "CREATELINK_TEXT-1": {
@@ -19444,21 +19444,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "UNLINK_TEXT-1": {
@@ -19490,21 +19490,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "INSERTHORIZONTALRULE_TEXT-1": {
@@ -19513,21 +19513,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "INSERTIMAGE_TEXT-1": {
@@ -19536,21 +19536,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "INSERTLINEBREAK_TEXT-1": {
@@ -19559,21 +19559,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "INSERTPARAGRAPH_TEXT-1": {
@@ -19651,21 +19651,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "DELETE_TEXT-1": {
@@ -19674,21 +19674,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "FORWARDDELETE_TEXT-1": {
@@ -19697,21 +19697,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "STYLEWITHCSS_TEXT-1": {
@@ -19720,21 +19720,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "CONTENTREADONLY_TEXT-1": {
@@ -19743,21 +19743,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "BACKCOLOR_TEXT-1": {
@@ -19881,21 +19881,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "DECREASEFONTSIZE_TEXT-1": {
@@ -19904,21 +19904,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "HEADING_TEXT-1": {
@@ -19927,21 +19927,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "INDENT_TEXT-1": {
@@ -19950,21 +19950,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "OUTDENT_TEXT-1": {
@@ -19973,21 +19973,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "CREATEBOOKMARK_TEXT-1": {
@@ -19996,21 +19996,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "UNBOOKMARK_TEXT-1": {
@@ -20019,21 +20019,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "JUSTIFYCENTER_TEXT-1": {
@@ -20134,21 +20134,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "COPY_TEXT-1": {
@@ -20157,21 +20157,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "CUT_TEXT-1": {
@@ -20180,21 +20180,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "PASTE_TEXT-1": {
@@ -20203,21 +20203,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004005 (NS_ERROR_FAILURE)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       },
       "garbage-1_TEXT-1": {
@@ -20226,21 +20226,21 @@ const TEST_RESULTS = {
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "body": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         },
         "div": {
           "valscore": 0,
           "selscore": 0,
           "valresult": 2,
           "selresult": 3,
-          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMNSHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
+          "output": "EXECUTION EXCEPTION: [Exception... \"Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIDOMHTMLDocument.queryCommandIndeterm]\"  nsresult: \"0x80004001 (NS_ERROR_NOT_IMPLEMENTED)\"  location: \"JS frame :: http://mochi.test:8888/tests/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/static/js/run.js :: runSingleTest :: line 152\"  data: no]"
         }
       }
     }
diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp
index e413f0a4e3e..fb2ce300bf9 100644
--- a/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -79,6 +79,7 @@
 #include "nsEventDispatcher.h"
 #include "nsGkAtoms.h"
 #include "nsDebug.h"
+#include "mozilla/Preferences.h"
 
 // Drag & Drop, Clipboard
 #include "nsIClipboard.h"
@@ -87,6 +88,8 @@
 
 #include "mozilla/FunctionTimer.h"
 
+using namespace mozilla;
+
 nsPlaintextEditor::nsPlaintextEditor()
 : nsEditor()
 , mIgnoreSpuriousDragEvent(PR_FALSE)
@@ -171,10 +174,11 @@ static int
 EditorPrefsChangedCallback(const char *aPrefName, void *)
 {
   if (nsCRT::strcmp(aPrefName, "editor.singleLine.pasteNewlines") == 0) {
-    sNewlineHandlingPref = nsContentUtils::GetIntPref("editor.singleLine.pasteNewlines",
-                                                      nsIPlaintextEditor::eNewlinesPasteToFirst);
+    sNewlineHandlingPref =
+      Preferences::GetInt("editor.singleLine.pasteNewlines",
+                          nsIPlaintextEditor::eNewlinesPasteToFirst);
   } else if (nsCRT::strcmp(aPrefName, "layout.selection.caret_style") == 0) {
-    sCaretStylePref = nsContentUtils::GetIntPref("layout.selection.caret_style",
+    sCaretStylePref = Preferences::GetInt("layout.selection.caret_style",
 #ifdef XP_WIN
                                                  1);
     if (sCaretStylePref == 0)
@@ -192,13 +196,11 @@ nsPlaintextEditor::GetDefaultEditorPrefs(PRInt32 &aNewlineHandling,
                                          PRInt32 &aCaretStyle)
 {
   if (sNewlineHandlingPref == -1) {
-    nsContentUtils::RegisterPrefCallback("editor.singleLine.pasteNewlines",
-                                         EditorPrefsChangedCallback,
-                                         nsnull);
+    Preferences::RegisterCallback(EditorPrefsChangedCallback,
+                                  "editor.singleLine.pasteNewlines");
     EditorPrefsChangedCallback("editor.singleLine.pasteNewlines", nsnull);
-    nsContentUtils::RegisterPrefCallback("layout.selection.caret_style",
-                                         EditorPrefsChangedCallback,
-                                         nsnull);
+    Preferences::RegisterCallback(EditorPrefsChangedCallback,
+                                  "layout.selection.caret_style");
     EditorPrefsChangedCallback("layout.selection.caret_style", nsnull);
   }
 
@@ -1696,7 +1698,27 @@ nsPlaintextEditor::SelectEntireDocument(nsISelection *aSelection)
     return aSelection->Collapse(rootElement, 0);
   }
 
-  return nsEditor::SelectEntireDocument(aSelection);
+  nsresult rv = nsEditor::SelectEntireDocument(aSelection);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Don't select the trailing BR node if we have one
+  PRInt32 selOffset;
+  nsCOMPtr<nsIDOMNode> selNode;
+  rv = GetEndNodeAndOffset(aSelection, getter_AddRefs(selNode), &selOffset);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIDOMNode> childNode = GetChildAt(selNode, selOffset - 1);
+
+  if (childNode && nsTextEditUtils::IsMozBR(childNode)) {
+    nsCOMPtr<nsIDOMNode> parentNode;
+    PRInt32 parentOffset;
+    rv = GetNodeLocation(childNode, address_of(parentNode), &parentOffset);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return aSelection->Extend(parentNode, parentOffset);
+  }
+
+  return NS_OK;
 }
 
 already_AddRefed<nsPIDOMEventTarget>
diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index d9b358ed025..f93222853a8 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -243,55 +243,6 @@ abstract public class GeckoApp
             surfaceView.mSplashStatusMsg =
                 getResources().getString(R.string.splash_screen_label);
         mLibLoadThread.start();
-        if (IsNewInstall() && IsUnsupportedDevice()) {
-            new AlertDialog.Builder(this)
-                .setMessage(R.string.incompatable_device)
-                .setCancelable(false)
-                .setPositiveButton(R.string.continue_label, null)
-                .setNegativeButton(R.string.exit_label,
-                                   new DialogInterface.OnClickListener() {
-                                       public void onClick(DialogInterface dialog,
-                                                           int id)
-                                       {
-                                           GeckoApp.this.finish();
-                                           System.exit(0);
-                                       }
-                                   })
-                .show();
-        }
-    }
-
-    boolean IsNewInstall() {
-        File appIni = new File(sGREDir, "application.ini");
-        return !appIni.exists();
-    }
-
-    boolean IsUnsupportedDevice() {
-        // We don't currently support devices with less than 512Mb of RAM, 
-        // and want to warn if run on such devices. Most 512Mb devices
-        // report about 350Mb available, so we check - somewhat arbitrarily - 
-        // for a minimum of 300Mb here.
-        File meminfo = new File("/proc/meminfo");
-        try {
-            BufferedReader br = new BufferedReader(new FileReader(meminfo));
-            String totalMem = "";
-            while(!totalMem.contains("MemTotal:") && totalMem != null)
-                totalMem = br.readLine();
-            StringTokenizer st = new StringTokenizer(totalMem, " ");
-            st.nextToken(); // "MemInfo:"
-            totalMem = st.nextToken();
-
-            Log.i("GeckoMemory", "MemTotal: " + Integer.parseInt(totalMem));
-            return Integer.parseInt(totalMem) < 300000L;
-        } catch (Exception ex) {
-            // Will catch  NullPointerException if totalMem isn't found,
-            // a NumberFormatException if the token isn't parsible
-            // IOException from the file reading or NoSuchElementException
-            // if totalMem doesn't have 2 tokens. None of these are fatal,
-            // so log it and move on.
-            Log.w("GeckoMemTest", "Exception when finding total memory", ex);
-        }
-        return false;
     }
 
     @Override
diff --git a/embedding/android/locales/en-US/android_strings.dtd b/embedding/android/locales/en-US/android_strings.dtd
index 1e9d2375063..5896628b604 100644
--- a/embedding/android/locales/en-US/android_strings.dtd
+++ b/embedding/android/locales/en-US/android_strings.dtd
@@ -1,7 +1,6 @@
 <!ENTITY  splash_screen_label "loading">
 <!ENTITY  splash_screen_installing "installing libraries\u2026">
 <!ENTITY  splash_firstrun "Setting up &brandShortName;\u2026">
-<!ENTITY  incompatable_cpu_error "This device does not meet the minimum system requirements for &brandShortName;.">
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
@@ -14,6 +13,4 @@
 <!ENTITY  crash_restart_label "Restart &brandShortName;">
 <!ENTITY  sending_crash_report "Sending crash report\u2026">
 <!ENTITY  exit_label "Exit">
-<!ENTITY  incompatable_device "&brandShortName; does not support this device and you may experience
-problems.">
 <!ENTITY  continue_label "Continue">
diff --git a/embedding/android/strings.xml.in b/embedding/android/strings.xml.in
index 230ca5dcbdb..1f5b6aee181 100644
--- a/embedding/android/strings.xml.in
+++ b/embedding/android/strings.xml.in
@@ -20,6 +20,5 @@
   <string name="crash_restart_label">&crash_restart_label;</string>
   <string name="sending_crash_report">&sending_crash_report;</string>
   <string name="exit_label">&exit_label;</string>
-  <string name="incompatable_device">&incompatable_device;</string>
   <string name="continue_label">&continue_label;</string>
 </resources>
diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index cc8e5c5cf43..69e8e64ba85 100644
--- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -68,11 +68,9 @@
 #include "nsIDOMDocumentType.h"
 #include "nsIDOMElement.h"
 #include "Link.h"
-#ifdef MOZ_SVG
 #include "nsIDOMSVGElement.h"
 #include "nsIDOMSVGTitleElement.h"
 #include "nsIDOMSVGForeignObjectElem.h"
-#endif
 #include "nsIDOMEvent.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsIDOMNSUIEvent.h"
@@ -1055,7 +1053,6 @@ DefaultTooltipTextProvider::DefaultTooltipTextProvider()
     mTag_window       = do_GetAtom("window");   
 }
 
-#ifdef MOZ_SVG
 //
 // UseSVGTitle
 //
@@ -1084,7 +1081,6 @@ UseSVGTitle(nsIDOMElement *currElement)
   return (parentSVGContent != nsnull);
 }
 
-#endif
 /* void getNodeText (in nsIDOMNode aNode, out wstring aText); */
 NS_IMETHODIMP
 DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, PRUnichar **aText,
@@ -1146,7 +1142,6 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, PRUnichar **aText,
                   found = PR_TRUE;
               }
             }
-#ifdef MOZ_SVG
             else {
               if (lookingForSVGTitle) {
                 lookingForSVGTitle = UseSVGTitle(currElement);
@@ -1170,7 +1165,6 @@ DefaultTooltipTextProvider::GetNodeText(nsIDOMNode *aNode, PRUnichar **aText,
                 }
               }
             }
-#endif
           }
         }
       }
diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
index 3297a873095..fb810aca473 100644
--- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -77,7 +77,6 @@
 #include "nsIDOMComment.h"
 #include "nsIDOMNamedNodeMap.h"
 #include "nsIDOMNodeList.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIWebProgressListener.h"
 #include "nsIAuthPrompt.h"
 #include "nsIPrompt.h"
@@ -108,10 +107,8 @@
 #include "nsIDOMHTMLTextAreaElement.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMText.h"
-#ifdef MOZ_SVG
 #include "nsIDOMSVGImageElement.h"
 #include "nsIDOMSVGScriptElement.h"
-#endif // MOZ_SVG
 #ifdef MOZ_MEDIA
 #include "nsIDOMHTMLSourceElement.h"
 #include "nsIDOMHTMLMediaElement.h"
@@ -1467,15 +1464,9 @@ nsWebBrowserPersist::GetDocEncoderContentType(nsIDOMDocument *aDocument, const P
     else
     {
         // Get the content type from the document
-        nsCOMPtr<nsIDOMNSDocument> nsDoc = do_QueryInterface(aDocument);
-        if (nsDoc)
-        {
-            nsAutoString type;
-            if (NS_SUCCEEDED(nsDoc->GetContentType(type)) && !type.IsEmpty())
-            {
-                contentType.Assign(type);
-            }
-        }
+        nsAutoString type;
+        if (NS_SUCCEEDED(aDocument->GetContentType(type)) && !type.IsEmpty())
+            contentType.Assign(type);
     }
 
     // Check that an encoder actually exists for the desired output type. The
@@ -2776,14 +2767,12 @@ nsresult nsWebBrowserPersist::OnWalkDOMNode(nsIDOMNode *aNode)
         return NS_OK;
     }
 
-#ifdef MOZ_SVG
     nsCOMPtr<nsIDOMSVGImageElement> nodeAsSVGImage = do_QueryInterface(aNode);
     if (nodeAsSVGImage)
     {
         StoreURIAttributeNS(aNode, "http://www.w3.org/1999/xlink", "href");
         return NS_OK;
     }
-#endif // MOZ_SVG
 
 #ifdef MOZ_MEDIA
     nsCOMPtr<nsIDOMHTMLMediaElement> nodeAsMedia = do_QueryInterface(aNode);
@@ -2835,14 +2824,12 @@ nsresult nsWebBrowserPersist::OnWalkDOMNode(nsIDOMNode *aNode)
         return NS_OK;
     }
 
-#ifdef MOZ_SVG
     nsCOMPtr<nsIDOMSVGScriptElement> nodeAsSVGScript = do_QueryInterface(aNode);
     if (nodeAsSVGScript)
     {
         StoreURIAttributeNS(aNode, "http://www.w3.org/1999/xlink", "href");
         return NS_OK;
     }
-#endif // MOZ_SVG
 
     nsCOMPtr<nsIDOMHTMLEmbedElement> nodeAsEmbed = do_QueryInterface(aNode);
     if (nodeAsEmbed)
@@ -3175,7 +3162,6 @@ nsWebBrowserPersist::CloneNodeWithFixedUpAttributes(
     }
 #endif // MOZ_MEDIA
 
-#ifdef MOZ_SVG
     nsCOMPtr<nsIDOMSVGImageElement> nodeAsSVGImage = do_QueryInterface(aNodeIn);
     if (nodeAsSVGImage)
     {
@@ -3193,7 +3179,6 @@ nsWebBrowserPersist::CloneNodeWithFixedUpAttributes(
         }
         return rv;
     }
-#endif // MOZ_SVG
 
     nsCOMPtr<nsIDOMHTMLScriptElement> nodeAsScript = do_QueryInterface(aNodeIn);
     if (nodeAsScript)
@@ -3206,7 +3191,6 @@ nsWebBrowserPersist::CloneNodeWithFixedUpAttributes(
         return rv;
     }
 
-#ifdef MOZ_SVG
     nsCOMPtr<nsIDOMSVGScriptElement> nodeAsSVGScript = do_QueryInterface(aNodeIn);
     if (nodeAsSVGScript)
     {
@@ -3217,7 +3201,6 @@ nsWebBrowserPersist::CloneNodeWithFixedUpAttributes(
         }
         return rv;
     }
-#endif // MOZ_SVG
 
     nsCOMPtr<nsIDOMHTMLEmbedElement> nodeAsEmbed = do_QueryInterface(aNodeIn);
     if (nodeAsEmbed)
diff --git a/extensions/widgetutils/Makefile.in b/extensions/widgetutils/Makefile.in
index a701d738476..69a0574b669 100644
--- a/extensions/widgetutils/Makefile.in
+++ b/extensions/widgetutils/Makefile.in
@@ -16,7 +16,6 @@ USE_EXTENSION_MANIFEST = 1
 XPI_PKGNAME            = widgetutils-$(MOZ_APP_VERSION)
 
 XULAPP_DEFINES = \
-	-DFIREFOX_VERSION=$(FIREFOX_VERSION) \
 	-DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
 	-DEXTENSION_VERSION=$(MOZILLA_VERSION) \
 	$(NULL)
diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp
index affc72cdc0c..6b252d34b1a 100644
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp
+++ b/extensions/widgetutils/src/nsWidgetUtils.cpp
@@ -43,7 +43,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMNSElement.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsIDOMNode.h"
diff --git a/gfx/angle/src/common/debug.cpp b/gfx/angle/src/common/debug.cpp
index 1c372528317..4dd7327e796 100644
--- a/gfx/angle/src/common/debug.cpp
+++ b/gfx/angle/src/common/debug.cpp
@@ -1,97 +1,97 @@
-//
-// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-
-// debug.cpp: Debugging utilities.
-
-#include "common/debug.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <d3d9.h>
-#include <windows.h>
-
-namespace gl
-{
-
-typedef void (WINAPI *PerfOutputFunction)(D3DCOLOR, LPCWSTR);
-
-static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
-{
-#if !defined(ANGLE_DISABLE_PERF)
-    if (perfActive())
-    {
-        char message[4096];
-        int len = vsprintf_s(message, format, vararg);
-        if (len < 0)
-        {
-            return;
-        }
-
-        // There are no ASCII variants of these D3DPERF functions.
-        wchar_t wideMessage[4096];
-        for (int i = 0; i < len; ++i)
-        {
-            wideMessage[i] = message[i];
-        }
-        wideMessage[len] = 0;
-
-        perfFunc(0, wideMessage);
-    }
-#endif
-
-#if !defined(ANGLE_DISABLE_TRACE)
-#if defined(NDEBUG)
-    if (traceFileDebugOnly)
-    {
-        return;
-    }
-#endif
-
-    FILE* file = fopen(TRACE_OUTPUT_FILE, "a");
-    if (file)
-    {
-        vfprintf(file, format, vararg);
-        fclose(file);
-    }
-#endif
-}
-
-void trace(bool traceFileDebugOnly, const char *format, ...)
-{
-    va_list vararg;
-    va_start(vararg, format);
-    output(traceFileDebugOnly, D3DPERF_SetMarker, format, vararg);
-    va_end(vararg);
-}
-
-bool perfActive()
-{
-#if defined(ANGLE_DISABLE_PERF)
-    return false;
-#else
+//
+// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// debug.cpp: Debugging utilities.
+
+#include "common/debug.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <d3d9.h>
+#include <windows.h>
+
+namespace gl
+{
+
+typedef void (WINAPI *PerfOutputFunction)(D3DCOLOR, LPCWSTR);
+
+static void output(bool traceFileDebugOnly, PerfOutputFunction perfFunc, const char *format, va_list vararg)
+{
+#if !defined(ANGLE_DISABLE_PERF)
+    if (perfActive())
+    {
+        char message[4096];
+        int len = vsprintf_s(message, format, vararg);
+        if (len < 0)
+        {
+            return;
+        }
+
+        // There are no ASCII variants of these D3DPERF functions.
+        wchar_t wideMessage[4096];
+        for (int i = 0; i < len; ++i)
+        {
+            wideMessage[i] = message[i];
+        }
+        wideMessage[len] = 0;
+
+        perfFunc(0, wideMessage);
+    }
+#endif
+
+#if !defined(ANGLE_DISABLE_TRACE)
+#if defined(NDEBUG)
+    if (traceFileDebugOnly)
+    {
+        return;
+    }
+#endif
+
+    FILE* file = fopen(TRACE_OUTPUT_FILE, "a");
+    if (file)
+    {
+        vfprintf(file, format, vararg);
+        fclose(file);
+    }
+#endif
+}
+
+void trace(bool traceFileDebugOnly, const char *format, ...)
+{
+    va_list vararg;
+    va_start(vararg, format);
+    output(traceFileDebugOnly, D3DPERF_SetMarker, format, vararg);
+    va_end(vararg);
+}
+
+bool perfActive()
+{
+#if defined(ANGLE_DISABLE_PERF)
+    return false;
+#else
     static bool active = D3DPERF_GetStatus() != 0;
-    return active;
-#endif
-}
-
-ScopedPerfEventHelper::ScopedPerfEventHelper(const char* format, ...)
-{
-    va_list vararg;
-    va_start(vararg, format);
-    output(true, reinterpret_cast<PerfOutputFunction>(D3DPERF_BeginEvent), format, vararg);
-    va_end(vararg);
-}
-
-ScopedPerfEventHelper::~ScopedPerfEventHelper()
-{
-#if !defined(ANGLE_DISABLE_PERF)
-    if (perfActive())
-    {
-        D3DPERF_EndEvent();
-    }
-#endif
-}
-}
+    return active;
+#endif
+}
+
+ScopedPerfEventHelper::ScopedPerfEventHelper(const char* format, ...)
+{
+    va_list vararg;
+    va_start(vararg, format);
+    output(true, reinterpret_cast<PerfOutputFunction>(D3DPERF_BeginEvent), format, vararg);
+    va_end(vararg);
+}
+
+ScopedPerfEventHelper::~ScopedPerfEventHelper()
+{
+#if !defined(ANGLE_DISABLE_PERF)
+    if (perfActive())
+    {
+        D3DPERF_EndEvent();
+    }
+#endif
+}
+}
diff --git a/gfx/angle/src/libGLESv2/Texture.cpp b/gfx/angle/src/libGLESv2/Texture.cpp
index 8858cedb430..3f0a1644e25 100644
--- a/gfx/angle/src/libGLESv2/Texture.cpp
+++ b/gfx/angle/src/libGLESv2/Texture.cpp
@@ -14,9 +14,9 @@
 
 #include <algorithm>
 
-#if _MSC_VER <= 1400
-#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
-#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
+#if _MSC_VER <= 1400
+#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
+#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
 #endif
 
 #include <intrin.h>
diff --git a/gfx/angle/src/libGLESv2/mathutil.h b/gfx/angle/src/libGLESv2/mathutil.h
index 5111b9805f1..20cc6a3f1c9 100644
--- a/gfx/angle/src/libGLESv2/mathutil.h
+++ b/gfx/angle/src/libGLESv2/mathutil.h
@@ -8,10 +8,10 @@
 
 #ifndef LIBGLESV2_MATHUTIL_H_
 #define LIBGLESV2_MATHUTIL_H_
-
-#if _MSC_VER <= 1400
-#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
-#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
+
+#if _MSC_VER <= 1400
+#define _interlockedbittestandreset _interlockedbittestandreset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
+#define _interlockedbittestandset _interlockedbittestandset_NAME_CHANGED_TO_AVOID_MSVS2005_ERROR
 #endif
 
 #include <intrin.h>
diff --git a/gfx/angle/src/libGLESv2/utilities.cpp b/gfx/angle/src/libGLESv2/utilities.cpp
index 6191deb47d2..ba23fd365c6 100644
--- a/gfx/angle/src/libGLESv2/utilities.cpp
+++ b/gfx/angle/src/libGLESv2/utilities.cpp
@@ -865,7 +865,7 @@ std::string getTempPath()
         return std::string();
     }
     
-    return path;
+    return path;
 }
 
 void writeFile(const char* path, const void* content, size_t size)
@@ -878,5 +878,5 @@ void writeFile(const char* path, const void* content, size_t size)
     }
 
     fwrite(content, sizeof(char), size, file);
-    fclose(file);
+    fclose(file);
 }
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 820dd783d65..be7db9798e8 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -70,20 +70,25 @@ CSRCS   = \
         cairo-arc.c \
         cairo-array.c \
 	cairo-atomic.c \
+        cairo-base64-stream.c \
         cairo-bentley-ottmann.c \
 	cairo-bentley-ottmann-rectilinear.c \
 	cairo-bentley-ottmann-rectangular.c \
-        cairo-base64-stream.c \
+	cairo-botor-scan-converter.c \
+	cairo-boxes.c \
 	cairo-cache.c \
         cairo-clip.c \
         cairo-color.c \
+	cairo-composite-rectangles.c \
         cairo-debug.c \
         cairo-deflate-stream.c \
+	cairo-device.c \
         cairo-fixed.c \
 	cairo-font-face.c \
 	cairo-font-face-twin.c \
 	cairo-font-face-twin-data.c \
         cairo-font-options.c \
+	cairo-freed-pool.c \
         cairo-freelist.c \
         cairo-gstate.c \
         cairo-hash.c \
@@ -94,6 +99,7 @@ CSRCS   = \
         cairo-matrix.c \
 	cairo-misc.c \
 	cairo-mutex.c \
+	cairo-observer.c \
         cairo-output-stream.c \
         cairo-paginated-surface.c \
         cairo-path.c \
@@ -107,6 +113,7 @@ CSRCS   = \
         cairo-polygon.c \
 	cairo-recording-surface.c \
         cairo-rectangle.c \
+	cairo-rectangular-scan-converter.c \
         cairo-region.c \
         cairo-scaled-font.c \
         cairo-scaled-font-subsets.c \
@@ -117,6 +124,9 @@ CSRCS   = \
         cairo-surface.c \
 	cairo-surface-clipper.c \
         cairo-surface-fallback.c \
+	cairo-surface-offset.c \
+	cairo-surface-snapshot.c \
+	cairo-surface-subsurface.c \
 	cairo-surface-wrapper.c \
 	cairo-tee-surface.c \
         cairo-tor-scan-converter.c \
@@ -130,7 +140,7 @@ CSRCS   = \
 
 EXPORTS_NAMESPACES = cairo
 
-EXPORTS_cairo = cairo.h cairo-version.h cairo-features.h cairo-platform.h cairo-deprecated.h cairo-rename.h
+EXPORTS_cairo = cairo.h cairo-version.h cairo-features.h cairo-platform.h cairo-deprecated.h cairo-rename.h cairo-tee.h
 
 # cairo-type1-subset.c should be here, but it's only supported on freetype platforms
 
@@ -153,6 +163,7 @@ PDF_EXPORTS = cairo-pdf.h
 PS_EXPORTS = cairo-ps.h
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+DEFINES += -DDISABLE_SOME_FLOATING_POINT
 CSRCS	+=	cairo-win32-surface.c
 
 ifndef WINCE
diff --git a/gfx/cairo/cairo/src/cairo-analysis-surface-private.h b/gfx/cairo/cairo/src/cairo-analysis-surface-private.h
index f67caf904ef..12c82f8892f 100644
--- a/gfx/cairo/cairo/src/cairo-analysis-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-analysis-surface-private.h
@@ -11,7 +11,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,8 @@
 
 #include "cairoint.h"
 
+CAIRO_BEGIN_DECLS
+
 cairo_private cairo_surface_t *
 _cairo_analysis_surface_create (cairo_surface_t		*target);
 
@@ -71,4 +73,6 @@ _cairo_analysis_surface_merge_status (cairo_int_status_t status_a,
 cairo_private cairo_surface_t *
 _cairo_null_surface_create (cairo_content_t content);
 
+CAIRO_END_DECLS
+
 #endif /* CAIRO_ANALYSIS_SURFACE_H */
diff --git a/gfx/cairo/cairo/src/cairo-analysis-surface.c b/gfx/cairo/cairo/src/cairo-analysis-surface.c
index 0ba667d4ae4..a61514903d4 100644
--- a/gfx/cairo/cairo/src/cairo-analysis-surface.c
+++ b/gfx/cairo/cairo/src/cairo-analysis-surface.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,8 +37,10 @@
 #include "cairoint.h"
 
 #include "cairo-analysis-surface-private.h"
+#include "cairo-error-private.h"
 #include "cairo-paginated-private.h"
 #include "cairo-recording-surface-private.h"
+#include "cairo-surface-subsurface-private.h"
 #include "cairo-region-private.h"
 
 typedef struct {
@@ -99,10 +101,11 @@ _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface,
     cairo_bool_t old_has_ctm;
     cairo_matrix_t old_ctm, p2d;
     cairo_status_t status;
+    cairo_surface_t *source;
 
     assert (pattern->type == CAIRO_PATTERN_TYPE_SURFACE);
     surface_pattern = (const cairo_surface_pattern_t *) pattern;
-    assert (_cairo_surface_is_recording (surface_pattern->surface));
+    assert (surface_pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING);
 
     old_ctm = surface->ctm;
     old_has_ctm = surface->has_ctm;
@@ -114,8 +117,13 @@ _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface,
     cairo_matrix_multiply (&surface->ctm, &p2d, &surface->ctm);
     surface->has_ctm = ! _cairo_matrix_is_identity (&surface->ctm);
 
-    status = _cairo_recording_surface_replay_and_create_regions (surface_pattern->surface,
-							    &surface->base);
+    source = surface_pattern->surface;
+    if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source;
+	source = sub->target;
+    }
+
+    status = _cairo_recording_surface_replay_and_create_regions (source, &surface->base);
 
     surface->ctm = old_ctm;
     surface->has_ctm = old_has_ctm;
@@ -396,9 +404,9 @@ _cairo_analysis_surface_stroke (void			*abstract_surface,
 				cairo_operator_t	 op,
 				const cairo_pattern_t	*source,
 				cairo_path_fixed_t	*path,
-				cairo_stroke_style_t	*style,
-				cairo_matrix_t		*ctm,
-				cairo_matrix_t		*ctm_inverse,
+				const cairo_stroke_style_t	*style,
+				const cairo_matrix_t		*ctm,
+				const cairo_matrix_t		*ctm_inverse,
 				double			 tolerance,
 				cairo_antialias_t	 antialias,
 				cairo_clip_t		*clip)
@@ -716,7 +724,9 @@ _cairo_analysis_surface_create (cairo_surface_t		*target)
 
     /* I believe the content type here is truly arbitrary. I'm quite
      * sure nothing will ever use this value. */
-    _cairo_surface_init (&surface->base, &cairo_analysis_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_analysis_surface_backend,
+			 NULL, /* device */
 			 CAIRO_CONTENT_COLOR_ALPHA);
 
     cairo_matrix_init_identity (&surface->ctm);
@@ -831,9 +841,9 @@ typedef cairo_int_status_t
 			         cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 cairo_path_fixed_t	*path,
-				 cairo_stroke_style_t	*style,
-				 cairo_matrix_t		*ctm,
-				 cairo_matrix_t		*ctm_inverse,
+				 const cairo_stroke_style_t	*style,
+				 const cairo_matrix_t		*ctm,
+				 const cairo_matrix_t		*ctm_inverse,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
 				 cairo_clip_t		*clip);
@@ -906,7 +916,10 @@ _cairo_null_surface_create (cairo_content_t content)
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
     }
 
-    _cairo_surface_init (surface, &cairo_null_surface_backend, content);
+    _cairo_surface_init (surface,
+			 &cairo_null_surface_backend,
+			 NULL, /* device */
+			 content);
 
     return surface;
 }
diff --git a/gfx/cairo/cairo/src/cairo-arc-private.h b/gfx/cairo/cairo/src/cairo-arc-private.h
index 633fbfa5a3a..018a14b4a71 100644
--- a/gfx/cairo/cairo/src/cairo-arc-private.h
+++ b/gfx/cairo/cairo/src/cairo-arc-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-arc.c b/gfx/cairo/cairo/src/cairo-arc.c
index e99c79b2da8..56d42f19eb7 100644
--- a/gfx/cairo/cairo/src/cairo-arc.c
+++ b/gfx/cairo/cairo/src/cairo-arc.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-array.c b/gfx/cairo/cairo/src/cairo-array.c
index fcd1246dc53..942c9b98ecd 100644
--- a/gfx/cairo/cairo/src/cairo-array.c
+++ b/gfx/cairo/cairo/src/cairo-array.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -36,6 +36,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 /**
  * _cairo_array_init:
@@ -260,7 +261,7 @@ _cairo_array_append (cairo_array_t	*array,
 }
 
 /**
- * _cairo_array_append:
+ * _cairo_array_append_multiple:
  * @array: a #cairo_array_t
  *
  * Append one or more items onto the array by growing the array by
diff --git a/gfx/cairo/cairo/src/cairo-atomic-private.h b/gfx/cairo/cairo/src/cairo-atomic-private.h
index 8532f6212b4..8d02ec948cb 100644
--- a/gfx/cairo/cairo/src/cairo-atomic-private.h
+++ b/gfx/cairo/cairo/src/cairo-atomic-private.h
@@ -1,6 +1,7 @@
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2007 Chris Wilson
+ * Copyright © 2010 Andrea Canciani
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -12,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -32,6 +33,7 @@
  *
  * Contributor(s):
  *	Chris Wilson <chris@chris-wilson.co.uk>
+ *	Andrea Canciani <ranma42@gmail.com>
  */
 
 #ifndef CAIRO_ATOMIC_PRIVATE_H
@@ -57,12 +59,29 @@ CAIRO_BEGIN_DECLS
 
 typedef int cairo_atomic_int_t;
 
+#ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
+static cairo_always_inline cairo_atomic_int_t
+_cairo_atomic_int_get (cairo_atomic_int_t *x)
+{
+    __sync_synchronize ();
+    return *x;
+}
+
+static cairo_always_inline void *
+_cairo_atomic_ptr_get (void **x)
+{
+    __sync_synchronize ();
+    return *x;
+}
+#else
 # define _cairo_atomic_int_get(x) (*x)
-# define _cairo_atomic_int_set(x, value) ((*x) = value)
+# define _cairo_atomic_ptr_get(x) (*x)
+#endif
 
 # define _cairo_atomic_int_inc(x) ((void) __sync_fetch_and_add(x, 1))
 # define _cairo_atomic_int_dec_and_test(x) (__sync_fetch_and_add(x, -1) == 1)
-# define _cairo_atomic_int_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
+# define _cairo_atomic_int_cmpxchg(x, oldv, newv) __sync_bool_compare_and_swap (x, oldv, newv)
+# define _cairo_atomic_int_cmpxchg_return_old(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
 
 #if SIZEOF_VOID_P==SIZEOF_INT
 typedef int cairo_atomic_intptr_t;
@@ -75,7 +94,10 @@ typedef long long cairo_atomic_intptr_t;
 #endif
 
 # define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
-    (void*)__sync_val_compare_and_swap ((cairo_atomic_intptr_t*)x, (cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv)
+    __sync_bool_compare_and_swap ((cairo_atomic_intptr_t*)x, (cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv)
+
+# define _cairo_atomic_ptr_cmpxchg_return_old(x, oldv, newv) \
+    _cairo_atomic_intptr_to_voidptr (__sync_val_compare_and_swap ((cairo_atomic_intptr_t*)x, (cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv))
 
 #endif
 
@@ -87,11 +109,10 @@ typedef long long cairo_atomic_intptr_t;
 typedef  AO_t cairo_atomic_int_t;
 
 # define _cairo_atomic_int_get(x) (AO_load_full (x))
-# define _cairo_atomic_int_set(x, value) (AO_store_full (x))
 
 # define _cairo_atomic_int_inc(x) ((void) AO_fetch_and_add1_full(x))
 # define _cairo_atomic_int_dec_and_test(x) (AO_fetch_and_sub1_full(x) == 1)
-# define _cairo_atomic_int_cmpxchg(x, oldv, newv) ((cairo_atomic_int_t) AO_compare_and_swap_full(x, oldv, newv) ? oldv : *x)
+# define _cairo_atomic_int_cmpxchg(x, oldv, newv) AO_compare_and_swap_full(x, oldv, newv)
 
 #if SIZEOF_VOID_P==SIZEOF_INT
 typedef unsigned int cairo_atomic_intptr_t;
@@ -103,45 +124,129 @@ typedef unsigned long long cairo_atomic_intptr_t;
 #error No matching integer pointer type
 #endif
 
+# define _cairo_atomic_ptr_get(x) _cairo_atomic_intptr_to_voidptr (AO_load_full (x))
 # define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
-    (void*) (cairo_atomic_intptr_t) _cairo_atomic_int_cmpxchg ((cairo_atomic_intptr_t*)(x), (cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv)
+    _cairo_atomic_int_cmpxchg ((cairo_atomic_intptr_t*)(x), (cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv)
 
 #endif
 
+#if HAVE_OS_ATOMIC_OPS
+#include <libkern/OSAtomic.h>
+
+#define HAS_ATOMIC_OPS 1
+
+typedef int32_t cairo_atomic_int_t;
+
+# define _cairo_atomic_int_get(x) (OSMemoryBarrier(), *(x))
+
+# define _cairo_atomic_int_inc(x) ((void) OSAtomicIncrement32Barrier (x))
+# define _cairo_atomic_int_dec_and_test(x) (OSAtomicDecrement32Barrier (x) == 0)
+# define _cairo_atomic_int_cmpxchg(x, oldv, newv) OSAtomicCompareAndSwap32Barrier(oldv, newv, x)
+
+#if SIZEOF_VOID_P==4
+typedef int32_t cairo_atomic_intptr_t;
+# define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
+    OSAtomicCompareAndSwap32Barrier((cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv, (cairo_atomic_intptr_t *)x)
+
+#elif SIZEOF_VOID_P==8
+typedef int64_t cairo_atomic_intptr_t;
+# define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
+    OSAtomicCompareAndSwap64Barrier((cairo_atomic_intptr_t)oldv, (cairo_atomic_intptr_t)newv, (cairo_atomic_intptr_t *)x)
+
+#else
+#error No matching integer pointer type
+#endif
+
+# define _cairo_atomic_ptr_get(x) (OSMemoryBarrier(), *(x))
+
+#endif
 
 #ifndef HAS_ATOMIC_OPS
 
-typedef int cairo_atomic_int_t;
+#if SIZEOF_VOID_P==SIZEOF_INT
+typedef unsigned int cairo_atomic_intptr_t;
+#elif SIZEOF_VOID_P==SIZEOF_LONG
+typedef unsigned long cairo_atomic_intptr_t;
+#elif SIZEOF_VOID_P==SIZEOF_LONG_LONG
+typedef unsigned long long cairo_atomic_intptr_t;
+#else
+#error No matching integer pointer type
+#endif
+
+typedef cairo_atomic_intptr_t cairo_atomic_int_t;
 
 cairo_private void
-_cairo_atomic_int_inc (int *x);
+_cairo_atomic_int_inc (cairo_atomic_int_t *x);
 
 cairo_private cairo_bool_t
-_cairo_atomic_int_dec_and_test (int *x);
+_cairo_atomic_int_dec_and_test (cairo_atomic_int_t *x);
 
-cairo_private int
-_cairo_atomic_int_cmpxchg (int *x, int oldv, int newv);
+cairo_private cairo_atomic_int_t
+_cairo_atomic_int_cmpxchg_return_old_impl (cairo_atomic_int_t *x, cairo_atomic_int_t oldv, cairo_atomic_int_t newv);
 
 cairo_private void *
-_cairo_atomic_ptr_cmpxchg (void **x, void *oldv, void *newv);
+_cairo_atomic_ptr_cmpxchg_return_old_impl (void **x, void *oldv, void *newv);
+
+#define _cairo_atomic_int_cmpxchg_return_old(x, oldv, newv) _cairo_atomic_int_cmpxchg_return_old_impl (x, oldv, newv)
+#define _cairo_atomic_ptr_cmpxchg_return_old(x, oldv, newv) _cairo_atomic_ptr_cmpxchg_return_old_impl (x, oldv, newv)
 
 #ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
-
-# include "cairo-compiler-private.h"
-
-cairo_private int
-_cairo_atomic_int_get (int *x);
-
-cairo_private void
-_cairo_atomic_int_set (int *x, int value);
+cairo_private cairo_atomic_int_t
+_cairo_atomic_int_get (cairo_atomic_int_t *x);
+# define _cairo_atomic_ptr_get(x) (void *) _cairo_atomic_int_get((cairo_atomic_int_t *) x)
+#else
+# define _cairo_atomic_int_get(x) (*x)
+# define _cairo_atomic_ptr_get(x) (*x)
+#endif
 
 #else
 
-# define _cairo_atomic_int_get(x) (*x)
-# define _cairo_atomic_int_set(x, value) ((*x) = value)
+/* Workaround GCC complaining about casts */
+static cairo_always_inline void *
+_cairo_atomic_intptr_to_voidptr (cairo_atomic_intptr_t x)
+{
+  return (void *) x;
+}
 
+static cairo_always_inline cairo_atomic_int_t
+_cairo_atomic_int_cmpxchg_return_old_fallback(cairo_atomic_int_t *x, cairo_atomic_int_t oldv, cairo_atomic_int_t newv)
+{
+    cairo_atomic_int_t curr;
+
+    do {
+        curr = _cairo_atomic_int_get (x);
+    } while (curr == oldv && !_cairo_atomic_int_cmpxchg (x, oldv, newv));
+
+    return curr;
+}
+
+static cairo_always_inline void *
+_cairo_atomic_ptr_cmpxchg_return_old_fallback(void **x, void *oldv, void *newv)
+{
+    void *curr;
+
+    do {
+        curr = _cairo_atomic_ptr_get (x);
+    } while (curr == oldv && !_cairo_atomic_ptr_cmpxchg (x, oldv, newv));
+
+    return curr;
+}
 #endif
 
+#ifndef _cairo_atomic_int_cmpxchg_return_old
+#define _cairo_atomic_int_cmpxchg_return_old(x, oldv, newv) _cairo_atomic_int_cmpxchg_return_old_fallback (x, oldv, newv)
+#endif
+
+#ifndef _cairo_atomic_ptr_cmpxchg_return_old
+#define _cairo_atomic_ptr_cmpxchg_return_old(x, oldv, newv) _cairo_atomic_ptr_cmpxchg_return_old_fallback (x, oldv, newv)
+#endif
+
+#ifndef _cairo_atomic_int_cmpxchg
+#define _cairo_atomic_int_cmpxchg(x, oldv, newv) (_cairo_atomic_int_cmpxchg_return_old (x, oldv, newv) == oldv)
+#endif
+
+#ifndef _cairo_atomic_ptr_cmpxchg
+#define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) (_cairo_atomic_ptr_cmpxchg_return_old (x, oldv, newv) == oldv)
 #endif
 
 #define _cairo_atomic_uint_get(x) _cairo_atomic_int_get(x)
diff --git a/gfx/cairo/cairo/src/cairo-atomic.c b/gfx/cairo/cairo/src/cairo-atomic.c
index 146ad857d80..909cfea4925 100644
--- a/gfx/cairo/cairo/src/cairo-atomic.c
+++ b/gfx/cairo/cairo/src/cairo-atomic.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,7 +42,7 @@ COMPILE_TIME_ASSERT(sizeof(void*) == sizeof(int) ||
 		    sizeof(void*) == sizeof(long long));
 #else
 void
-_cairo_atomic_int_inc (int *x)
+_cairo_atomic_int_inc (cairo_atomic_intptr_t *x)
 {
     CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
     *x += 1;
@@ -50,7 +50,7 @@ _cairo_atomic_int_inc (int *x)
 }
 
 cairo_bool_t
-_cairo_atomic_int_dec_and_test (int *x)
+_cairo_atomic_int_dec_and_test (cairo_atomic_intptr_t *x)
 {
     cairo_bool_t ret;
 
@@ -61,10 +61,10 @@ _cairo_atomic_int_dec_and_test (int *x)
     return ret;
 }
 
-int
-_cairo_atomic_int_cmpxchg (int *x, int oldv, int newv)
+cairo_atomic_intptr_t
+_cairo_atomic_int_cmpxchg_return_old_impl (cairo_atomic_intptr_t *x, cairo_atomic_intptr_t oldv, cairo_atomic_intptr_t newv)
 {
-    int ret;
+    cairo_atomic_intptr_t ret;
 
     CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
     ret = *x;
@@ -76,7 +76,7 @@ _cairo_atomic_int_cmpxchg (int *x, int oldv, int newv)
 }
 
 void *
-_cairo_atomic_ptr_cmpxchg (void **x, void *oldv, void *newv)
+_cairo_atomic_ptr_cmpxchg_return_old_impl (void **x, void *oldv, void *newv)
 {
     void *ret;
 
@@ -88,13 +88,12 @@ _cairo_atomic_ptr_cmpxchg (void **x, void *oldv, void *newv)
 
     return ret;
 }
-#endif
 
 #ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
-int
-_cairo_atomic_int_get (int *x)
+cairo_atomic_intptr_t
+_cairo_atomic_int_get (cairo_atomic_intptr_t *x)
 {
-    int ret;
+    cairo_atomic_intptr_t ret;
 
     CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
     ret = *x;
@@ -102,12 +101,6 @@ _cairo_atomic_int_get (int *x)
 
     return ret;
 }
-
-void
-_cairo_atomic_int_set (int *x, int value)
-{
-    CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
-    *x = value;
-    CAIRO_MUTEX_UNLOCK (_cairo_atomic_mutex);
-}
+#endif
+
 #endif
diff --git a/gfx/cairo/cairo/src/cairo-base64-stream.c b/gfx/cairo/cairo/src/cairo-base64-stream.c
index 2b211ff0ce3..636431372b5 100644
--- a/gfx/cairo/cairo/src/cairo-base64-stream.c
+++ b/gfx/cairo/cairo/src/cairo-base64-stream.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 
 typedef struct _cairo_base64_stream {
diff --git a/gfx/cairo/cairo/src/cairo-base85-stream.c b/gfx/cairo/cairo/src/cairo-base85-stream.c
index 791e8013403..f81affb49ea 100644
--- a/gfx/cairo/cairo/src/cairo-base85-stream.c
+++ b/gfx/cairo/cairo/src/cairo-base85-stream.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 
 typedef struct _cairo_base85_stream {
diff --git a/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectangular.c b/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectangular.c
index 9887b8242f2..f2f790e53be 100644
--- a/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectangular.c
+++ b/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectangular.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,30 +38,30 @@
 /* Provide definitions for standalone compilation */
 #include "cairoint.h"
 
+#include "cairo-boxes-private.h"
+#include "cairo-error-private.h"
 #include "cairo-combsort-private.h"
 #include "cairo-list-private.h"
 
-typedef struct _cairo_bo_rectangle cairo_bo_rectangle_t;
-typedef struct _cairo_bo_edge cairo_bo_edge_t;
+#include <setjmp.h>
 
-/* A deferred trapezoid of an edge */
-typedef struct _cairo_bo_trap {
-    cairo_bo_edge_t *right;
-    int32_t top;
-} cairo_bo_trap_t;
+typedef struct _rectangle rectangle_t;
+typedef struct _edge edge_t;
 
-struct _cairo_bo_edge {
-    int x;
+struct _edge {
+    edge_t *next, *prev;
+    edge_t *right;
+    cairo_fixed_t x, top;
     int dir;
-    cairo_bo_trap_t deferred_trap;
-    cairo_list_t link;
 };
 
-struct _cairo_bo_rectangle {
-    cairo_bo_edge_t left, right;
-    int top, bottom;
+struct _rectangle {
+    edge_t left, right;
+    int32_t top, bottom;
 };
 
+#define UNROLL3(x) x x x
+
 /* the parent is always given by index/2 */
 #define PQ_PARENT_INDEX(i) ((i) >> 1)
 #define PQ_FIRST_ENTRY 1
@@ -72,18 +72,22 @@ struct _cairo_bo_rectangle {
 typedef struct _pqueue {
     int size, max_size;
 
-    cairo_bo_rectangle_t **elements;
-    cairo_bo_rectangle_t *elements_embedded[1024];
+    rectangle_t **elements;
+    rectangle_t *elements_embedded[1024];
 } pqueue_t;
 
-typedef struct _cairo_bo_sweep_line {
-    cairo_bo_rectangle_t **rectangles;
-    pqueue_t stop;
-    cairo_list_t sweep;
-    cairo_list_t *current_left, *current_right;
+typedef struct _sweep_line {
+    rectangle_t **rectangles;
+    pqueue_t pq;
+    edge_t head, tail;
+    edge_t *insert_left, *insert_right;
     int32_t current_y;
     int32_t last_y;
-} cairo_bo_sweep_line_t;
+
+    cairo_fill_rule_t fill_rule;
+
+    jmp_buf unwind;
+} sweep_line_t;
 
 #define DEBUG_TRAPS 0
 
@@ -121,21 +125,21 @@ dump_traps (cairo_traps_t *traps, const char *filename)
 #endif
 
 static inline int
-cairo_bo_rectangle_compare_start (const cairo_bo_rectangle_t *a,
-				  const cairo_bo_rectangle_t *b)
+rectangle_compare_start (const rectangle_t *a,
+			 const rectangle_t *b)
 {
     return a->top - b->top;
 }
 
 static inline int
-_cairo_bo_rectangle_compare_stop (const cairo_bo_rectangle_t *a,
-				  const cairo_bo_rectangle_t *b)
+rectangle_compare_stop (const rectangle_t *a,
+			 const rectangle_t *b)
 {
     return a->bottom - b->bottom;
 }
 
 static inline void
-_pqueue_init (pqueue_t *pq)
+pqueue_init (pqueue_t *pq)
 {
     pq->max_size = ARRAY_LENGTH (pq->elements_embedded);
     pq->size = 0;
@@ -145,73 +149,69 @@ _pqueue_init (pqueue_t *pq)
 }
 
 static inline void
-_pqueue_fini (pqueue_t *pq)
+pqueue_fini (pqueue_t *pq)
 {
     if (pq->elements != pq->elements_embedded)
 	free (pq->elements);
 }
 
-static cairo_status_t
-_pqueue_grow (pqueue_t *pq)
+static cairo_bool_t
+pqueue_grow (pqueue_t *pq)
 {
-    cairo_bo_rectangle_t **new_elements;
+    rectangle_t **new_elements;
     pq->max_size *= 2;
 
     if (pq->elements == pq->elements_embedded) {
 	new_elements = _cairo_malloc_ab (pq->max_size,
-					 sizeof (cairo_bo_rectangle_t *));
+					 sizeof (rectangle_t *));
 	if (unlikely (new_elements == NULL))
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return FALSE;
 
 	memcpy (new_elements, pq->elements_embedded,
 		sizeof (pq->elements_embedded));
     } else {
 	new_elements = _cairo_realloc_ab (pq->elements,
 					  pq->max_size,
-					  sizeof (cairo_bo_rectangle_t *));
+					  sizeof (rectangle_t *));
 	if (unlikely (new_elements == NULL))
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return FALSE;
     }
 
     pq->elements = new_elements;
-    return CAIRO_STATUS_SUCCESS;
+    return TRUE;
 }
 
-static inline cairo_status_t
-_pqueue_push (pqueue_t *pq, cairo_bo_rectangle_t *rectangle)
+static inline void
+pqueue_push (sweep_line_t *sweep, rectangle_t *rectangle)
 {
-    cairo_bo_rectangle_t **elements;
+    rectangle_t **elements;
     int i, parent;
 
-    if (unlikely (pq->size + 1 == pq->max_size)) {
-	cairo_status_t status;
-
-	status = _pqueue_grow (pq);
-	if (unlikely (status))
-	    return status;
+    if (unlikely (sweep->pq.size + 1 == sweep->pq.max_size)) {
+	if (unlikely (! pqueue_grow (&sweep->pq))) {
+	    longjmp (sweep->unwind,
+		     _cairo_error (CAIRO_STATUS_NO_MEMORY));
+	}
     }
 
-    elements = pq->elements;
-
-    for (i = ++pq->size;
+    elements = sweep->pq.elements;
+    for (i = ++sweep->pq.size;
 	 i != PQ_FIRST_ENTRY &&
-	 _cairo_bo_rectangle_compare_stop (rectangle,
-					   elements[parent = PQ_PARENT_INDEX (i)]) < 0;
+	 rectangle_compare_stop (rectangle,
+				 elements[parent = PQ_PARENT_INDEX (i)]) < 0;
 	 i = parent)
     {
 	elements[i] = elements[parent];
     }
 
     elements[i] = rectangle;
-
-    return CAIRO_STATUS_SUCCESS;
 }
 
 static inline void
-_pqueue_pop (pqueue_t *pq)
+pqueue_pop (pqueue_t *pq)
 {
-    cairo_bo_rectangle_t **elements = pq->elements;
-    cairo_bo_rectangle_t *tail;
+    rectangle_t **elements = pq->elements;
+    rectangle_t *tail;
     int child, i;
 
     tail = elements[pq->size--];
@@ -225,13 +225,13 @@ _pqueue_pop (pqueue_t *pq)
 	 i = child)
     {
 	if (child != pq->size &&
-	    _cairo_bo_rectangle_compare_stop (elements[child+1],
-					      elements[child]) < 0)
+	    rectangle_compare_stop (elements[child+1],
+				    elements[child]) < 0)
 	{
 	    child++;
 	}
 
-	if (_cairo_bo_rectangle_compare_stop (elements[child], tail) >= 0)
+	if (rectangle_compare_stop (elements[child], tail) >= 0)
 	    break;
 
 	elements[i] = elements[child];
@@ -239,74 +239,94 @@ _pqueue_pop (pqueue_t *pq)
     elements[i] = tail;
 }
 
-static inline cairo_bo_rectangle_t *
-_cairo_bo_rectangle_pop_start (cairo_bo_sweep_line_t *sweep_line)
+static inline rectangle_t *
+rectangle_pop_start (sweep_line_t *sweep_line)
 {
     return *sweep_line->rectangles++;
 }
 
-static inline cairo_bo_rectangle_t *
-_cairo_bo_rectangle_peek_stop (cairo_bo_sweep_line_t *sweep_line)
+static inline rectangle_t *
+rectangle_peek_stop (sweep_line_t *sweep_line)
 {
-    return sweep_line->stop.elements[PQ_FIRST_ENTRY];
+    return sweep_line->pq.elements[PQ_FIRST_ENTRY];
 }
 
-CAIRO_COMBSORT_DECLARE (_cairo_bo_rectangle_sort,
-			cairo_bo_rectangle_t *,
-			cairo_bo_rectangle_compare_start)
+CAIRO_COMBSORT_DECLARE (_rectangle_sort,
+			rectangle_t *,
+			rectangle_compare_start)
 
 static void
-_cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line,
-			   cairo_bo_rectangle_t	**rectangles,
-			   int			  num_rectangles)
+sweep_line_init (sweep_line_t	 *sweep_line,
+		 rectangle_t	**rectangles,
+		 int		  num_rectangles,
+		 cairo_fill_rule_t fill_rule)
 {
-    _cairo_bo_rectangle_sort (rectangles, num_rectangles);
+    _rectangle_sort (rectangles, num_rectangles);
     rectangles[num_rectangles] = NULL;
     sweep_line->rectangles = rectangles;
 
-    cairo_list_init (&sweep_line->sweep);
-    sweep_line->current_left = &sweep_line->sweep;
-    sweep_line->current_right = &sweep_line->sweep;
+    sweep_line->head.x = INT32_MIN;
+    sweep_line->head.right = NULL;
+    sweep_line->head.dir = 0;
+    sweep_line->head.next = &sweep_line->tail;
+    sweep_line->tail.x = INT32_MAX;
+    sweep_line->tail.right = NULL;
+    sweep_line->tail.dir = 0;
+    sweep_line->tail.prev = &sweep_line->head;
+
+    sweep_line->insert_left = &sweep_line->tail;
+    sweep_line->insert_right = &sweep_line->tail;
+
     sweep_line->current_y = INT32_MIN;
     sweep_line->last_y = INT32_MIN;
 
-    _pqueue_init (&sweep_line->stop);
+    sweep_line->fill_rule = fill_rule;
+
+    pqueue_init (&sweep_line->pq);
 }
 
 static void
-_cairo_bo_sweep_line_fini (cairo_bo_sweep_line_t *sweep_line)
+sweep_line_fini (sweep_line_t *sweep_line)
 {
-    _pqueue_fini (&sweep_line->stop);
+    pqueue_fini (&sweep_line->pq);
 }
 
-static inline cairo_bo_edge_t *
-link_to_edge (cairo_list_t *elt)
+static void
+edge_end_box (sweep_line_t *sweep_line,
+	      edge_t	*left,
+	      int32_t		 bot,
+	      cairo_bool_t	 do_traps,
+	      void	        *container)
 {
-    return cairo_container_of (elt, cairo_bo_edge_t, link);
-}
-
-static cairo_status_t
-_cairo_bo_edge_end_trap (cairo_bo_edge_t	*left,
-			 int32_t		 bot,
-			 cairo_traps_t	        *traps)
-{
-    cairo_bo_trap_t *trap = &left->deferred_trap;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
     /* Only emit (trivial) non-degenerate trapezoids with positive height. */
-    if (likely (trap->top < bot)) {
-	cairo_line_t _left = {
-	    { left->x, trap->top },
-	    { left->x, bot },
-	}, _right = {
-	    { trap->right->x, trap->top },
-	    { trap->right->x, bot },
-	};
-	_cairo_traps_add_trap (traps, trap->top, bot, &_left, &_right);
+    if (likely (left->top < bot)) {
+	if (do_traps) {
+	    cairo_line_t _left = {
+		{ left->x, left->top },
+		{ left->x, bot },
+	    }, _right = {
+		{ left->right->x, left->top },
+		{ left->right->x, bot },
+	    };
+	    _cairo_traps_add_trap (container, left->top, bot, &_left, &_right);
+	    status = _cairo_traps_status ((cairo_traps_t *) container);
+	} else {
+	    cairo_box_t box;
+
+	    box.p1.x = left->x;
+	    box.p1.y = left->top;
+	    box.p2.x = left->right->x;
+	    box.p2.y = bot;
+
+	    status = _cairo_boxes_add (container, &box);
+	}
     }
+    if (unlikely (status))
+	longjmp (sweep_line->unwind, status);
 
-    trap->right = NULL;
-
-    return _cairo_traps_status (traps);
+    left->right = NULL;
 }
 
 /* Start a new trapezoid at the given top y coordinate, whose edges
@@ -314,75 +334,78 @@ _cairo_bo_edge_end_trap (cairo_bo_edge_t	*left,
  * then either add it to the traps in `traps', if the trapezoid's
  * right edge differs from `edge->next', or do nothing if the new
  * trapezoid would be a continuation of the existing one. */
-static inline cairo_status_t
-_cairo_bo_edge_start_or_continue_trap (cairo_bo_edge_t	    *left,
-				       cairo_bo_edge_t	    *right,
-				       int		     top,
-				       cairo_traps_t	    *traps)
+static inline void
+edge_start_or_continue_box (sweep_line_t *sweep_line,
+			    edge_t	*left,
+			    edge_t	*right,
+			    int		 top,
+			    cairo_bool_t	 do_traps,
+			    void		*container)
 {
-    cairo_status_t status;
+    if (left->right == right)
+	return;
 
-    if (left->deferred_trap.right == right)
-	return CAIRO_STATUS_SUCCESS;
-
-    if (left->deferred_trap.right != NULL) {
-	if (right != NULL && left->deferred_trap.right->x == right->x) {
+    if (left->right != NULL) {
+	if (right != NULL && left->right->x == right->x) {
 	    /* continuation on right, so just swap edges */
-	    left->deferred_trap.right = right;
-	    return CAIRO_STATUS_SUCCESS;
+	    left->right = right;
+	    return;
 	}
 
-	status = _cairo_bo_edge_end_trap (left, top, traps);
-	if (unlikely (status))
-	    return status;
+	edge_end_box (sweep_line,
+		      left, top, do_traps, container);
     }
 
     if (right != NULL && left->x != right->x) {
-	left->deferred_trap.top = top;
-	left->deferred_trap.right = right;
+	left->top = top;
+	left->right = right;
     }
-
-    return CAIRO_STATUS_SUCCESS;
 }
 
-static inline cairo_status_t
-_active_edges_to_traps (cairo_bo_sweep_line_t	*sweep,
-			cairo_fill_rule_t	 fill_rule,
-			cairo_traps_t	        *traps)
+static inline void
+active_edges_to_traps (sweep_line_t	*sweep,
+		       cairo_bool_t	 do_traps,
+		       void		*container)
 {
     int top = sweep->current_y;
-    cairo_list_t *pos = &sweep->sweep;
-    cairo_status_t status;
+    edge_t *pos;
 
     if (sweep->last_y == sweep->current_y)
-	return CAIRO_STATUS_SUCCESS;
+	return;
 
-    if (fill_rule == CAIRO_FILL_RULE_WINDING) {
+    pos = sweep->head.next;
+    if (pos == &sweep->tail)
+	return;
+
+    if (sweep->fill_rule == CAIRO_FILL_RULE_WINDING) {
 	do {
-	    cairo_bo_edge_t *left, *right;
-	    int in_out;
+	    edge_t *left, *right;
+	    int winding;
 
-	    pos = pos->next;
-	    if (pos == &sweep->sweep)
-		break;
+	    left = pos;
+	    winding = left->dir;
 
-	    left = link_to_edge (pos);
-	    in_out = left->dir;
+	    right = left->next;
 
 	    /* Check if there is a co-linear edge with an existing trap */
-	    if (left->deferred_trap.right == NULL) {
-		right = link_to_edge (pos->next);
+	    if (left->right == NULL) {
 		while (unlikely (right->x == left->x)) {
-		    if (right->deferred_trap.right != NULL) {
+		    winding += right->dir;
+		    if (right->right != NULL) {
 			/* continuation on left */
-			left->deferred_trap = right->deferred_trap;
-			right->deferred_trap.right = NULL;
+			left->top = right->top;
+			left->right = right->right;
+			right->right = NULL;
+			winding -= right->dir;
 			break;
 		    }
 
-		    if (right->link.next == &sweep->sweep)
-			break;
-		    right = link_to_edge (right->link.next);
+		    right = right->next;
+		}
+
+		if (winding == 0) {
+		    pos = right;
+		    continue;
 		}
 	    }
 
@@ -390,277 +413,238 @@ _active_edges_to_traps (cairo_bo_sweep_line_t	*sweep,
 	     * maximal span width with the minimal number of trapezoids.
 	     */
 
-	    right = link_to_edge (left->link.next);
 	    do {
 		/* End all subsumed traps */
-		if (right->deferred_trap.right != NULL) {
-		    status = _cairo_bo_edge_end_trap (right, top, traps);
-		    if (unlikely (status))
-			return status;
+		if (unlikely (right->right != NULL)) {
+		    edge_end_box (sweep,
+				  right, top, do_traps, container);
 		}
 
-		in_out += right->dir;
-		if (in_out == 0) {
+		winding += right->dir;
+		if (winding == 0) {
 		    /* skip co-linear edges */
-		    if (likely (right->link.next == &sweep->sweep ||
-				right->x != link_to_edge (right->link.next)->x))
-		    {
+		    if (likely (right->x != right->next->x))
 			break;
-		    }
 		}
 
-		right = link_to_edge (right->link.next);
+		right = right->next;
 	    } while (TRUE);
 
-	    status = _cairo_bo_edge_start_or_continue_trap (left, right,
-							    top, traps);
-	    if (unlikely (status))
-		return status;
+	    edge_start_or_continue_box (sweep,
+					left, right, top,
+					do_traps, container);
 
-	    pos = &right->link;
-	} while (TRUE);
+	    pos = right->next;
+	} while (pos != &sweep->tail);
     } else {
-	cairo_bo_edge_t *left, *right;
 	do {
-	    int in_out = 0;
+	    edge_t *right = pos->next;
+	    int count = 0;
 
-	    pos = pos->next;
-	    if (pos == &sweep->sweep)
-		break;
-
-	    left = link_to_edge (pos);
-
-	    pos = pos->next;
 	    do {
-		right = link_to_edge (pos);
-		if (right->deferred_trap.right != NULL) {
-		    status = _cairo_bo_edge_end_trap (right, top, traps);
-		    if (unlikely (status))
-			return status;
+		/* End all subsumed traps */
+		if (unlikely (right->right != NULL)) {
+		    edge_end_box (sweep,
+				  right, top, do_traps, container);
 		}
 
-		if ((in_out++ & 1) == 0) {
-		    cairo_list_t *next;
-		    cairo_bool_t skip = FALSE;
-
+		if (++count & 1) {
 		    /* skip co-linear edges */
-		    next = pos->next;
-		    if (next != &sweep->sweep)
-			skip = right->x == link_to_edge (next)->x;
-
-		    if (! skip)
+		    if (likely (right->x != right->next->x))
 			break;
 		}
-		pos = pos->next;
+
+		right = right->next;
 	    } while (TRUE);
 
-	    right = pos == &sweep->sweep ? NULL : link_to_edge (pos);
-	    status = _cairo_bo_edge_start_or_continue_trap (left, right,
-							    top, traps);
-	    if (unlikely (status))
-		return status;
-	} while (right != NULL);
+	    edge_start_or_continue_box (sweep,
+					pos, right, top,
+					do_traps, container);
+
+	    pos = right->next;
+	} while (pos != &sweep->tail);
     }
 
     sweep->last_y = sweep->current_y;
-    return CAIRO_STATUS_SUCCESS;
 }
 
-static inline cairo_status_t
-_cairo_bo_sweep_line_delete_edge (cairo_bo_sweep_line_t *sweep_line,
-	                          cairo_bo_edge_t *edge,
-				  cairo_traps_t *traps)
+static inline void
+sweep_line_delete_edge (sweep_line_t *sweep_line,
+			edge_t *edge,
+			cairo_bool_t do_traps,
+			void *container)
 {
-    if (edge->deferred_trap.right != NULL) {
-	cairo_bo_edge_t *next = link_to_edge (edge->link.next);
-	if (&next->link != &sweep_line->sweep && next->x == edge->x) {
-	    next->deferred_trap = edge->deferred_trap;
+    if (edge->right != NULL) {
+	edge_t *next = edge->next;
+	if (next->x == edge->x) {
+	    next->top = edge->top;
+	    next->right = edge->right;
 	} else {
-	    cairo_status_t status;
-
-	    status = _cairo_bo_edge_end_trap (edge,
-		                              sweep_line->current_y,
-					      traps);
-	    if (unlikely (status))
-		return status;
+	    edge_end_box (sweep_line,
+			  edge,
+			  sweep_line->current_y,
+			  do_traps, container);
 	}
     }
 
-    if (sweep_line->current_left == &edge->link)
-	sweep_line->current_left = edge->link.prev;
+    if (sweep_line->insert_left == edge)
+	sweep_line->insert_left = edge->next;
+    if (sweep_line->insert_right == edge)
+	sweep_line->insert_right = edge->next;
 
-    if (sweep_line->current_right == &edge->link)
-	sweep_line->current_right = edge->link.next;
-
-    cairo_list_del (&edge->link);
-
-    return CAIRO_STATUS_SUCCESS;
+    edge->prev->next = edge->next;
+    edge->next->prev = edge->prev;
 }
 
-static inline cairo_status_t
-_cairo_bo_sweep_line_delete (cairo_bo_sweep_line_t	*sweep_line,
-			     cairo_bo_rectangle_t	*rectangle,
-			     cairo_fill_rule_t		 fill_rule,
-			     cairo_traps_t		*traps)
+static inline cairo_bool_t
+sweep_line_delete (sweep_line_t	*sweep,
+		   rectangle_t	*rectangle,
+		   cairo_bool_t		 do_traps,
+		   void			*container)
 {
-    cairo_status_t status;
+    cairo_bool_t update;
 
-    if (rectangle->bottom != sweep_line->current_y) {
-	status = _active_edges_to_traps (sweep_line, fill_rule, traps);
-	if (unlikely (status))
-	    return status;
-
-	sweep_line->current_y = rectangle->bottom;
+    update = TRUE;
+    if (sweep->fill_rule == CAIRO_FILL_RULE_WINDING &&
+	rectangle->left.prev->dir == rectangle->left.dir)
+    {
+	update = rectangle->left.next != &rectangle->right;
     }
 
-    status = _cairo_bo_sweep_line_delete_edge (sweep_line,
-	                                       &rectangle->left,
-					       traps);
-    if (unlikely (status))
-	return status;
+    sweep_line_delete_edge (sweep,
+			    &rectangle->left,
+			    do_traps, container);
 
-    status = _cairo_bo_sweep_line_delete_edge (sweep_line,
-	                                       &rectangle->right,
-					       traps);
-    if (unlikely (status))
-	return status;
+    sweep_line_delete_edge (sweep,
+			    &rectangle->right,
+			    do_traps, container);
 
-    _pqueue_pop (&sweep_line->stop);
-    return CAIRO_STATUS_SUCCESS;
+    pqueue_pop (&sweep->pq);
+    return update;
 }
 
-static cairo_bool_t
-validate_sweep_line (cairo_bo_sweep_line_t *sweep_line)
+static inline void
+insert_edge (edge_t *edge, edge_t *pos)
 {
-    int32_t last_x = INT32_MIN;
-    cairo_bo_edge_t *edge;
-    cairo_list_foreach_entry (edge, cairo_bo_edge_t, &sweep_line->sweep, link) {
-	if (edge->x < last_x)
-	    return FALSE;
-	last_x = edge->x;
-    }
-    return TRUE;
-}
-static inline cairo_status_t
-_cairo_bo_sweep_line_insert (cairo_bo_sweep_line_t	*sweep_line,
-			     cairo_bo_rectangle_t	*rectangle,
-			     cairo_fill_rule_t		 fill_rule,
-			     cairo_traps_t		*traps)
-{
-    cairo_list_t *pos;
-    cairo_status_t status;
-
-    if (rectangle->top != sweep_line->current_y) {
-	cairo_bo_rectangle_t *stop;
-
-	stop = _cairo_bo_rectangle_peek_stop (sweep_line);
-	while (stop != NULL && stop->bottom < rectangle->top) {
-	    status = _cairo_bo_sweep_line_delete (sweep_line, stop,
-						  fill_rule, traps);
-	    if (unlikely (status))
-		return status;
-
-	    stop = _cairo_bo_rectangle_peek_stop (sweep_line);
+    if (pos->x != edge->x) {
+	if (pos->x > edge->x) {
+	    do {
+		UNROLL3({
+		    if (pos->prev->x <= edge->x)
+			break;
+		    pos = pos->prev;
+		})
+	    } while (TRUE);
+	} else {
+	    do {
+		UNROLL3({
+		    pos = pos->next;
+		    if (pos->x >= edge->x)
+			break;
+		})
+	    } while (TRUE);
 	}
-
-	status = _active_edges_to_traps (sweep_line, fill_rule, traps);
-	if (unlikely (status))
-	    return status;
-
-	sweep_line->current_y = rectangle->top;
     }
 
+    pos->prev->next = edge;
+    edge->prev = pos->prev;
+    edge->next = pos;
+    pos->prev = edge;
+}
+
+static inline cairo_bool_t
+sweep_line_insert (sweep_line_t	*sweep,
+		   rectangle_t	*rectangle)
+{
+    edge_t *pos;
+
     /* right edge */
-    pos = sweep_line->current_right;
-    if (pos == &sweep_line->sweep)
-	pos = sweep_line->sweep.prev;
-    if (pos != &sweep_line->sweep) {
-	int cmp;
-
-	cmp = link_to_edge (pos)->x - rectangle->right.x;
-	if (cmp < 0) {
-	    while (pos->next != &sweep_line->sweep &&
-		   link_to_edge (pos->next)->x - rectangle->right.x < 0)
-	    {
-		pos = pos->next;
-	    }
-	} else if (cmp > 0) {
-	    do {
-		pos = pos->prev;
-	    } while (pos != &sweep_line->sweep &&
-		     link_to_edge (pos)->x - rectangle->right.x > 0);
-	}
-
-	cairo_list_add (&rectangle->right.link, pos);
-    } else {
-	cairo_list_add_tail (&rectangle->right.link, pos);
-    }
-    sweep_line->current_right = &rectangle->right.link;
-    assert (validate_sweep_line (sweep_line));
+    pos = sweep->insert_right;
+    insert_edge (&rectangle->right, pos);
+    sweep->insert_right = &rectangle->right;
 
     /* left edge */
-    pos = sweep_line->current_left;
-    if (pos == &sweep_line->sweep)
-	pos = sweep_line->sweep.next;
-    if (pos != &sweep_line->sweep) {
-	int cmp;
+    pos = sweep->insert_left;
+    if (pos->x > sweep->insert_right->x)
+	pos = sweep->insert_right->prev;
+    insert_edge (&rectangle->left, pos);
+    sweep->insert_left = &rectangle->left;
 
-	if (link_to_edge (pos)->x >= rectangle->right.x) {
-	    pos = rectangle->right.link.prev;
-	    if (pos == &sweep_line->sweep)
-		goto left_done;
-	}
+    pqueue_push (sweep, rectangle);
 
-	cmp = link_to_edge (pos)->x - rectangle->left.x;
-	if (cmp < 0) {
-	    while (pos->next != &sweep_line->sweep &&
-		   link_to_edge (pos->next)->x - rectangle->left.x < 0)
-	    {
-		pos = pos->next;
-	    }
-	} else if (cmp > 0) {
-	    do {
-		pos = pos->prev;
-	    } while (pos != &sweep_line->sweep &&
-		    link_to_edge (pos)->x - rectangle->left.x > 0);
-	}
+    if (sweep->fill_rule == CAIRO_FILL_RULE_WINDING &&
+	rectangle->left.prev->dir == rectangle->left.dir)
+    {
+	return rectangle->left.next != &rectangle->right;
     }
-  left_done:
-    cairo_list_add (&rectangle->left.link, pos);
-    sweep_line->current_left = &rectangle->left.link;
-    assert (validate_sweep_line (sweep_line));
 
-    return _pqueue_push (&sweep_line->stop, rectangle);
+    return TRUE;
 }
 
 static cairo_status_t
-_cairo_bentley_ottmann_tessellate_rectangular (cairo_bo_rectangle_t	**rectangles,
+_cairo_bentley_ottmann_tessellate_rectangular (rectangle_t	**rectangles,
 					       int			  num_rectangles,
 					       cairo_fill_rule_t	  fill_rule,
-					       cairo_traps_t		 *traps)
+					       cairo_bool_t		 do_traps,
+					       void			*container)
 {
-    cairo_bo_sweep_line_t sweep_line;
-    cairo_bo_rectangle_t *rectangle;
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    sweep_line_t sweep_line;
+    rectangle_t *rectangle;
+    cairo_status_t status;
+    cairo_bool_t update = FALSE;
 
-    _cairo_bo_sweep_line_init (&sweep_line, rectangles, num_rectangles);
+    sweep_line_init (&sweep_line, rectangles, num_rectangles, fill_rule);
+    if ((status = setjmp (sweep_line.unwind)))
+	goto unwind;
 
-    while ((rectangle = _cairo_bo_rectangle_pop_start (&sweep_line)) != NULL) {
-	status = _cairo_bo_sweep_line_insert (&sweep_line, rectangle,
-					      fill_rule, traps);
-	if (unlikely (status))
-	    goto BAIL;
+    rectangle = rectangle_pop_start (&sweep_line);
+    do {
+	if (rectangle->top != sweep_line.current_y) {
+	    rectangle_t *stop;
+
+	    stop = rectangle_peek_stop (&sweep_line);
+	    while (stop != NULL && stop->bottom < rectangle->top) {
+		if (stop->bottom != sweep_line.current_y) {
+		    if (update) {
+			active_edges_to_traps (&sweep_line,
+					       do_traps, container);
+			update = FALSE;
+		    }
+
+		    sweep_line.current_y = stop->bottom;
+		}
+
+		update |= sweep_line_delete (&sweep_line, stop, do_traps, container);
+
+		stop = rectangle_peek_stop (&sweep_line);
+	    }
+
+	    if (update) {
+		active_edges_to_traps (&sweep_line, do_traps, container);
+		update = FALSE;
+	    }
+
+	    sweep_line.current_y = rectangle->top;
+	}
+
+	update |= sweep_line_insert (&sweep_line, rectangle);
+    } while ((rectangle = rectangle_pop_start (&sweep_line)) != NULL);
+
+    while ((rectangle = rectangle_peek_stop (&sweep_line)) != NULL) {
+	if (rectangle->bottom != sweep_line.current_y) {
+	    if (update) {
+		active_edges_to_traps (&sweep_line, do_traps, container);
+		update = FALSE;
+	    }
+
+	    sweep_line.current_y = rectangle->bottom;
+	}
+
+	update |= sweep_line_delete (&sweep_line, rectangle, do_traps, container);
     }
 
-    while ((rectangle = _cairo_bo_rectangle_peek_stop (&sweep_line)) != NULL) {
-	status = _cairo_bo_sweep_line_delete (&sweep_line, rectangle,
-					      fill_rule, traps);
-	if (unlikely (status))
-	    goto BAIL;
-    }
-
-BAIL:
-    _cairo_bo_sweep_line_fini (&sweep_line);
+unwind:
+    sweep_line_fini (&sweep_line);
     return status;
 }
 
@@ -668,14 +652,14 @@ cairo_status_t
 _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
 						     cairo_fill_rule_t fill_rule)
 {
-    cairo_bo_rectangle_t stack_rectangles[CAIRO_STACK_ARRAY_LENGTH (cairo_bo_rectangle_t)];
-    cairo_bo_rectangle_t *rectangles;
-    cairo_bo_rectangle_t *stack_rectangles_ptrs[ARRAY_LENGTH (stack_rectangles) + 1];
-    cairo_bo_rectangle_t **rectangles_ptrs;
+    rectangle_t stack_rectangles[CAIRO_STACK_ARRAY_LENGTH (rectangle_t)];
+    rectangle_t *rectangles;
+    rectangle_t *stack_rectangles_ptrs[ARRAY_LENGTH (stack_rectangles) + 1];
+    rectangle_t **rectangles_ptrs;
     cairo_status_t status;
     int i;
 
-    if (unlikely (traps->num_traps == 0))
+    if (unlikely (traps->num_traps <= 1))
 	return CAIRO_STATUS_SUCCESS;
 
     assert (traps->is_rectangular);
@@ -686,13 +670,13 @@ _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
     rectangles_ptrs = stack_rectangles_ptrs;
     if (traps->num_traps > ARRAY_LENGTH (stack_rectangles)) {
 	rectangles = _cairo_malloc_ab_plus_c (traps->num_traps,
-					  sizeof (cairo_bo_rectangle_t) +
-					  sizeof (cairo_bo_rectangle_t *),
-					  sizeof (cairo_bo_rectangle_t *));
+					  sizeof (rectangle_t) +
+					  sizeof (rectangle_t *),
+					  sizeof (rectangle_t *));
 	if (unlikely (rectangles == NULL))
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	rectangles_ptrs = (cairo_bo_rectangle_t **) (rectangles + traps->num_traps);
+	rectangles_ptrs = (rectangle_t **) (rectangles + traps->num_traps);
     }
 
     for (i = 0; i < traps->num_traps; i++) {
@@ -710,11 +694,8 @@ _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
 	    rectangles[i].left.dir = -1;
 	}
 
-	rectangles[i].left.deferred_trap.right = NULL;
-	cairo_list_init (&rectangles[i].left.link);
-
-	rectangles[i].right.deferred_trap.right = NULL;
-	cairo_list_init (&rectangles[i].right.link);
+	rectangles[i].left.right = NULL;
+	rectangles[i].right.right = NULL;
 
 	rectangles[i].top = traps->traps[i].top;
 	rectangles[i].bottom = traps->traps[i].bottom;
@@ -725,7 +706,7 @@ _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
     _cairo_traps_clear (traps);
     status = _cairo_bentley_ottmann_tessellate_rectangular (rectangles_ptrs, i,
 							    fill_rule,
-							    traps);
+							    TRUE, traps);
     traps->is_rectilinear = TRUE;
     traps->is_rectangular = TRUE;
 
@@ -734,6 +715,73 @@ _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
 
     dump_traps (traps, "bo-rects-traps-out.txt");
 
+    return status;
+}
+
+cairo_status_t
+_cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in,
+					 cairo_fill_rule_t fill_rule,
+					 cairo_boxes_t *out)
+{
+    rectangle_t stack_rectangles[CAIRO_STACK_ARRAY_LENGTH (rectangle_t)];
+    rectangle_t *rectangles;
+    rectangle_t *stack_rectangles_ptrs[ARRAY_LENGTH (stack_rectangles) + 1];
+    rectangle_t **rectangles_ptrs;
+    const struct _cairo_boxes_chunk *chunk;
+    cairo_status_t status;
+    int i, j;
+
+    if (unlikely (in->num_boxes <= 1))
+	return CAIRO_STATUS_SUCCESS;
+
+    rectangles = stack_rectangles;
+    rectangles_ptrs = stack_rectangles_ptrs;
+    if (in->num_boxes > ARRAY_LENGTH (stack_rectangles)) {
+	rectangles = _cairo_malloc_ab_plus_c (in->num_boxes,
+					  sizeof (rectangle_t) +
+					  sizeof (rectangle_t *),
+					  sizeof (rectangle_t *));
+	if (unlikely (rectangles == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+	rectangles_ptrs = (rectangle_t **) (rectangles + in->num_boxes);
+    }
+
+    j = 0;
+    for (chunk = &in->chunks; chunk != NULL; chunk = chunk->next) {
+	const cairo_box_t *box = chunk->base;
+	for (i = 0; i < chunk->count; i++) {
+	    if (box[i].p1.x < box[i].p2.x) {
+		rectangles[j].left.x = box[i].p1.x;
+		rectangles[j].left.dir = 1;
+
+		rectangles[j].right.x = box[i].p2.x;
+		rectangles[j].right.dir = -1;
+	    } else {
+		rectangles[j].right.x = box[i].p1.x;
+		rectangles[j].right.dir = 1;
+
+		rectangles[j].left.x = box[i].p2.x;
+		rectangles[j].left.dir = -1;
+	    }
+
+	    rectangles[j].left.right = NULL;
+	    rectangles[j].right.right = NULL;
+
+	    rectangles[j].top = box[i].p1.y;
+	    rectangles[j].bottom = box[i].p2.y;
+
+	    rectangles_ptrs[j] = &rectangles[j];
+	    j++;
+	}
+    }
+
+    _cairo_boxes_clear (out);
+    status = _cairo_bentley_ottmann_tessellate_rectangular (rectangles_ptrs, j,
+							    fill_rule,
+							    FALSE, out);
+    if (rectangles != stack_rectangles)
+	free (rectangles);
 
     return status;
 }
diff --git a/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectilinear.c b/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectilinear.c
index c7e738b6f6a..1696d9367b6 100644
--- a/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectilinear.c
+++ b/gfx/cairo/cairo/src/cairo-bentley-ottmann-rectilinear.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,7 +38,9 @@
 /* Provide definitions for standalone compilation */
 #include "cairoint.h"
 
+#include "cairo-boxes-private.h"
 #include "cairo-combsort-private.h"
+#include "cairo-error-private.h"
 
 typedef struct _cairo_bo_edge cairo_bo_edge_t;
 typedef struct _cairo_bo_trap cairo_bo_trap_t;
@@ -215,20 +217,33 @@ edges_collinear (const cairo_bo_edge_t *a, const cairo_bo_edge_t *b)
 static cairo_status_t
 _cairo_bo_edge_end_trap (cairo_bo_edge_t	*left,
 			 int32_t		 bot,
-			 cairo_traps_t	        *traps)
+			 cairo_bool_t		 do_traps,
+			 void			*container)
 {
     cairo_bo_trap_t *trap = &left->deferred_trap;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
     /* Only emit (trivial) non-degenerate trapezoids with positive height. */
     if (likely (trap->top < bot)) {
-	_cairo_traps_add_trap (traps,
-			       trap->top, bot,
-			       &left->edge.line, &trap->right->edge.line);
+	if (do_traps) {
+	    _cairo_traps_add_trap (container,
+				   trap->top, bot,
+				   &left->edge.line, &trap->right->edge.line);
+	    status =  _cairo_traps_status ((cairo_traps_t *) container);
+	} else {
+	    cairo_box_t box;
+
+	    box.p1.x = left->edge.line.p1.x;
+	    box.p1.y = trap->top;
+	    box.p2.x = trap->right->edge.line.p1.x;
+	    box.p2.y = bot;
+	    status = _cairo_boxes_add (container, &box);
+	}
     }
 
     trap->right = NULL;
 
-    return _cairo_traps_status (traps);
+    return status;
 }
 
 /* Start a new trapezoid at the given top y coordinate, whose edges
@@ -240,7 +255,8 @@ static inline cairo_status_t
 _cairo_bo_edge_start_or_continue_trap (cairo_bo_edge_t	*left,
 				       cairo_bo_edge_t  *right,
 				       int               top,
-				       cairo_traps_t	*traps)
+				       cairo_bool_t	 do_traps,
+				       void		*container)
 {
     cairo_status_t status;
 
@@ -255,7 +271,7 @@ _cairo_bo_edge_start_or_continue_trap (cairo_bo_edge_t	*left,
 	    return CAIRO_STATUS_SUCCESS;
 	}
 
-	status = _cairo_bo_edge_end_trap (left, top, traps);
+	status = _cairo_bo_edge_end_trap (left, top, do_traps, container);
 	if (unlikely (status))
 	    return status;
     }
@@ -272,7 +288,8 @@ static inline cairo_status_t
 _active_edges_to_traps (cairo_bo_edge_t		*left,
 			int32_t			 top,
 			cairo_fill_rule_t	 fill_rule,
-			cairo_traps_t	        *traps)
+			cairo_bool_t		 do_traps,
+			void			*container)
 {
     cairo_bo_edge_t *right;
     cairo_status_t status;
@@ -303,7 +320,7 @@ _active_edges_to_traps (cairo_bo_edge_t		*left,
 	    right = left->next;
 	    while (right != NULL) {
 		if (right->deferred_trap.right != NULL) {
-		    status = _cairo_bo_edge_end_trap (right, top, traps);
+		    status = _cairo_bo_edge_end_trap (right, top, do_traps, container);
 		    if (unlikely (status))
 			return status;
 		}
@@ -321,8 +338,8 @@ _active_edges_to_traps (cairo_bo_edge_t		*left,
 		right = right->next;
 	    }
 
-	    status = _cairo_bo_edge_start_or_continue_trap (left, right,
-							    top, traps);
+	    status = _cairo_bo_edge_start_or_continue_trap (left, right, top,
+							    do_traps, container);
 	    if (unlikely (status))
 		return status;
 
@@ -337,7 +354,7 @@ _active_edges_to_traps (cairo_bo_edge_t		*left,
 	    right = left->next;
 	    while (right != NULL) {
 		if (right->deferred_trap.right != NULL) {
-		    status = _cairo_bo_edge_end_trap (right, top, traps);
+		    status = _cairo_bo_edge_end_trap (right, top, do_traps, container);
 		    if (unlikely (status))
 			return status;
 		}
@@ -358,8 +375,8 @@ _active_edges_to_traps (cairo_bo_edge_t		*left,
 		right = right->next;
 	    }
 
-	    status = _cairo_bo_edge_start_or_continue_trap (left, right,
-							    top, traps);
+	    status = _cairo_bo_edge_start_or_continue_trap (left, right, top,
+							    do_traps, container);
 	    if (unlikely (status))
 		return status;
 
@@ -376,7 +393,8 @@ static cairo_status_t
 _cairo_bentley_ottmann_tessellate_rectilinear (cairo_bo_event_t   **start_events,
 					       int			 num_events,
 					       cairo_fill_rule_t	 fill_rule,
-					       cairo_traps_t	*traps)
+					       cairo_bool_t		 do_traps,
+					       void			*container)
 {
     cairo_bo_sweep_line_t sweep_line;
     cairo_bo_event_t *event;
@@ -388,7 +406,7 @@ _cairo_bentley_ottmann_tessellate_rectilinear (cairo_bo_event_t   **start_events
 	if (event->point.y != sweep_line.current_y) {
 	    status = _active_edges_to_traps (sweep_line.head,
 					     sweep_line.current_y,
-					     fill_rule, traps);
+					     fill_rule, do_traps, container);
 	    if (unlikely (status))
 		return status;
 
@@ -406,7 +424,7 @@ _cairo_bentley_ottmann_tessellate_rectilinear (cairo_bo_event_t   **start_events
 	    if (event->edge->deferred_trap.right != NULL) {
 		status = _cairo_bo_edge_end_trap (event->edge,
 						  sweep_line.current_y,
-						  traps);
+						  do_traps, container);
 		if (unlikely (status))
 		    return status;
 	    }
@@ -476,7 +494,8 @@ _cairo_bentley_ottmann_tessellate_rectilinear_polygon (cairo_traps_t	 *traps,
     }
 
     status = _cairo_bentley_ottmann_tessellate_rectilinear (event_ptrs, j,
-							    fill_rule, traps);
+							    fill_rule,
+							    TRUE, traps);
     if (events != stack_events)
 	free (events);
 
@@ -485,6 +504,72 @@ _cairo_bentley_ottmann_tessellate_rectilinear_polygon (cairo_traps_t	 *traps,
     return status;
 }
 
+cairo_status_t
+_cairo_bentley_ottmann_tessellate_rectilinear_polygon_to_boxes (const cairo_polygon_t *polygon,
+								cairo_fill_rule_t	  fill_rule,
+								cairo_boxes_t *boxes)
+{
+    cairo_status_t status;
+    cairo_bo_event_t stack_events[CAIRO_STACK_ARRAY_LENGTH (cairo_bo_event_t)];
+    cairo_bo_event_t *events;
+    cairo_bo_event_t *stack_event_ptrs[ARRAY_LENGTH (stack_events) + 1];
+    cairo_bo_event_t **event_ptrs;
+    cairo_bo_edge_t stack_edges[ARRAY_LENGTH (stack_events)];
+    cairo_bo_edge_t *edges;
+    int num_events;
+    int i, j;
+
+    if (unlikely (polygon->num_edges == 0))
+	return CAIRO_STATUS_SUCCESS;
+
+    num_events = 2 * polygon->num_edges;
+
+    events = stack_events;
+    event_ptrs = stack_event_ptrs;
+    edges = stack_edges;
+    if (num_events > ARRAY_LENGTH (stack_events)) {
+	events = _cairo_malloc_ab_plus_c (num_events,
+					  sizeof (cairo_bo_event_t) +
+					  sizeof (cairo_bo_edge_t) +
+					  sizeof (cairo_bo_event_t *),
+					  sizeof (cairo_bo_event_t *));
+	if (unlikely (events == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+	event_ptrs = (cairo_bo_event_t **) (events + num_events);
+	edges = (cairo_bo_edge_t *) (event_ptrs + num_events + 1);
+    }
+
+    for (i = j = 0; i < polygon->num_edges; i++) {
+	edges[i].edge = polygon->edges[i];
+	edges[i].deferred_trap.right = NULL;
+	edges[i].prev = NULL;
+	edges[i].next = NULL;
+
+	event_ptrs[j] = &events[j];
+	events[j].type = CAIRO_BO_EVENT_TYPE_START;
+	events[j].point.y = polygon->edges[i].top;
+	events[j].point.x = polygon->edges[i].line.p1.x;
+	events[j].edge = &edges[i];
+	j++;
+
+	event_ptrs[j] = &events[j];
+	events[j].type = CAIRO_BO_EVENT_TYPE_STOP;
+	events[j].point.y = polygon->edges[i].bottom;
+	events[j].point.x = polygon->edges[i].line.p1.x;
+	events[j].edge = &edges[i];
+	j++;
+    }
+
+    status = _cairo_bentley_ottmann_tessellate_rectilinear (event_ptrs, j,
+							    fill_rule,
+							    FALSE, boxes);
+    if (events != stack_events)
+	free (events);
+
+    return status;
+}
+
 cairo_status_t
 _cairo_bentley_ottmann_tessellate_rectilinear_traps (cairo_traps_t *traps,
 						     cairo_fill_rule_t fill_rule)
@@ -572,7 +657,7 @@ _cairo_bentley_ottmann_tessellate_rectilinear_traps (cairo_traps_t *traps,
     _cairo_traps_clear (traps);
     status = _cairo_bentley_ottmann_tessellate_rectilinear (event_ptrs, j,
 							    fill_rule,
-							    traps);
+							    TRUE, traps);
     traps->is_rectilinear = TRUE;
 
     if (events != stack_events)
diff --git a/gfx/cairo/cairo/src/cairo-bentley-ottmann.c b/gfx/cairo/cairo/src/cairo-bentley-ottmann.c
index cb508f518fe..b3819f2f7fa 100644
--- a/gfx/cairo/cairo/src/cairo-bentley-ottmann.c
+++ b/gfx/cairo/cairo/src/cairo-bentley-ottmann.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,7 @@
 /* Provide definitions for standalone compilation */
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
 #include "cairo-combsort-private.h"
 
@@ -129,21 +130,25 @@ static void
 dump_traps (cairo_traps_t *traps, const char *filename)
 {
     FILE *file;
+    cairo_box_t extents;
     int n;
 
     if (getenv ("CAIRO_DEBUG_TRAPS") == NULL)
 	return;
 
+#if 0
     if (traps->has_limits) {
 	printf ("%s: limits=(%d, %d, %d, %d)\n",
 		filename,
 		traps->limits.p1.x, traps->limits.p1.y,
 		traps->limits.p2.x, traps->limits.p2.y);
     }
+#endif
+    _cairo_traps_extents (traps, &extents);
     printf ("%s: extents=(%d, %d, %d, %d)\n",
 	    filename,
-	    traps->extents.p1.x, traps->extents.p1.y,
-	    traps->extents.p2.x, traps->extents.p2.y);
+	    extents.p1.x, extents.p1.y,
+	    extents.p2.x, extents.p2.y);
 
     file = fopen (filename, "a");
     if (file != NULL) {
diff --git a/gfx/cairo/cairo/src/cairo-beos.h b/gfx/cairo/cairo/src/cairo-beos.h
index f53be5a7ef6..fdb89a6c4dc 100644
--- a/gfx/cairo/cairo/src/cairo-beos.h
+++ b/gfx/cairo/cairo/src/cairo-beos.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-botor-scan-converter.c b/gfx/cairo/cairo/src/cairo-botor-scan-converter.c
new file mode 100644
index 00000000000..0778a5dcd9d
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-botor-scan-converter.c
@@ -0,0 +1,2199 @@
+/*
+ * Copyright © 2004 Carl Worth
+ * Copyright © 2006 Red Hat, Inc.
+ * Copyright © 2007 David Turner
+ * Copyright © 2008 M Joonas Pihlaja
+ * Copyright © 2008 Chris Wilson
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Carl Worth
+ *
+ * Contributor(s):
+ *	Carl D. Worth <cworth@cworth.org>
+ *      M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+/* Provide definitions for standalone compilation */
+#include "cairoint.h"
+
+#include "cairo-error-private.h"
+#include "cairo-list-private.h"
+#include "cairo-freelist-private.h"
+#include "cairo-combsort-private.h"
+
+#include <setjmp.h>
+
+#define STEP_X CAIRO_FIXED_ONE
+#define STEP_Y CAIRO_FIXED_ONE
+#define UNROLL3(x) x x x
+
+#define STEP_XY (2*STEP_X*STEP_Y) /* Unit area in the step. */
+#define AREA_TO_ALPHA(c)  (((c)*255 + STEP_XY/2) / STEP_XY)
+
+typedef struct _cairo_bo_intersect_ordinate {
+    int32_t ordinate;
+    enum { EXACT, INEXACT } exactness;
+} cairo_bo_intersect_ordinate_t;
+
+typedef struct _cairo_bo_intersect_point {
+    cairo_bo_intersect_ordinate_t x;
+    cairo_bo_intersect_ordinate_t y;
+} cairo_bo_intersect_point_t;
+
+struct quorem {
+    cairo_fixed_t quo;
+    cairo_fixed_t rem;
+};
+
+struct run {
+    struct run *next;
+    int sign;
+    cairo_fixed_t y;
+};
+
+typedef struct edge {
+    cairo_list_t link;
+
+    cairo_edge_t edge;
+
+    /* Current x coordinate and advancement.
+     * Initialised to the x coordinate of the top of the
+     * edge. The quotient is in cairo_fixed_t units and the
+     * remainder is mod dy in cairo_fixed_t units.
+     */
+    cairo_fixed_t dy;
+    struct quorem x;
+    struct quorem dxdy;
+    struct quorem dxdy_full;
+
+    cairo_bool_t vertical;
+    unsigned int flags;
+
+    int current_sign;
+    struct run *runs;
+} edge_t;
+
+enum {
+    START = 0x1,
+    STOP = 0x2,
+};
+
+/* the parent is always given by index/2 */
+#define PQ_PARENT_INDEX(i) ((i) >> 1)
+#define PQ_FIRST_ENTRY 1
+
+/* left and right children are index * 2 and (index * 2) +1 respectively */
+#define PQ_LEFT_CHILD_INDEX(i) ((i) << 1)
+
+typedef enum {
+    EVENT_TYPE_STOP,
+    EVENT_TYPE_INTERSECTION,
+    EVENT_TYPE_START
+} event_type_t;
+
+typedef struct _event {
+    cairo_fixed_t y;
+    event_type_t type;
+} event_t;
+
+typedef struct _start_event {
+    cairo_fixed_t y;
+    event_type_t type;
+    edge_t *edge;
+} start_event_t;
+
+typedef struct _queue_event {
+    cairo_fixed_t y;
+    event_type_t type;
+    edge_t *e1;
+    edge_t *e2;
+} queue_event_t;
+
+typedef struct _pqueue {
+    int size, max_size;
+
+    event_t **elements;
+    event_t *elements_embedded[1024];
+} pqueue_t;
+
+struct cell {
+    struct cell	*prev;
+    struct cell	*next;
+    int		 x;
+    int		 uncovered_area;
+    int		 covered_height;
+};
+
+typedef struct _sweep_line {
+    cairo_list_t active;
+    cairo_list_t stopped;
+    cairo_list_t *insert_cursor;
+    cairo_bool_t is_vertical;
+
+    cairo_fixed_t current_row;
+    cairo_fixed_t current_subrow;
+
+    struct coverage {
+	struct cell head;
+	struct cell tail;
+
+	struct cell *cursor;
+	int count;
+
+	cairo_freepool_t pool;
+    } coverage;
+
+    struct event_queue {
+	pqueue_t pq;
+	event_t **start_events;
+
+	cairo_freepool_t pool;
+    } queue;
+
+    cairo_freepool_t runs;
+
+    jmp_buf unwind;
+} sweep_line_t;
+
+cairo_always_inline static struct quorem
+floored_divrem (int a, int b)
+{
+    struct quorem qr;
+    qr.quo = a/b;
+    qr.rem = a%b;
+    if ((a^b)<0 && qr.rem) {
+	qr.quo--;
+	qr.rem += b;
+    }
+    return qr;
+}
+
+static struct quorem
+floored_muldivrem(int x, int a, int b)
+{
+    struct quorem qr;
+    long long xa = (long long)x*a;
+    qr.quo = xa/b;
+    qr.rem = xa%b;
+    if ((xa>=0) != (b>=0) && qr.rem) {
+	qr.quo--;
+	qr.rem += b;
+    }
+    return qr;
+}
+
+static cairo_fixed_t
+line_compute_intersection_x_for_y (const cairo_line_t *line,
+				   cairo_fixed_t y)
+{
+    cairo_fixed_t x, dy;
+
+    if (y == line->p1.y)
+	return line->p1.x;
+    if (y == line->p2.y)
+	return line->p2.x;
+
+    x = line->p1.x;
+    dy = line->p2.y - line->p1.y;
+    if (dy != 0) {
+	x += _cairo_fixed_mul_div_floor (y - line->p1.y,
+					 line->p2.x - line->p1.x,
+					 dy);
+    }
+
+    return x;
+}
+
+/*
+ * We need to compare the x-coordinates of a pair of lines for a particular y,
+ * without loss of precision.
+ *
+ * The x-coordinate along an edge for a given y is:
+ *   X = A_x + (Y - A_y) * A_dx / A_dy
+ *
+ * So the inequality we wish to test is:
+ *   A_x + (Y - A_y) * A_dx / A_dy ∘ B_x + (Y - B_y) * B_dx / B_dy,
+ * where ∘ is our inequality operator.
+ *
+ * By construction, we know that A_dy and B_dy (and (Y - A_y), (Y - B_y)) are
+ * all positive, so we can rearrange it thus without causing a sign change:
+ *   A_dy * B_dy * (A_x - B_x) ∘ (Y - B_y) * B_dx * A_dy
+ *                                 - (Y - A_y) * A_dx * B_dy
+ *
+ * Given the assumption that all the deltas fit within 32 bits, we can compute
+ * this comparison directly using 128 bit arithmetic. For certain, but common,
+ * input we can reduce this down to a single 32 bit compare by inspecting the
+ * deltas.
+ *
+ * (And put the burden of the work on developing fast 128 bit ops, which are
+ * required throughout the tessellator.)
+ *
+ * See the similar discussion for _slope_compare().
+ */
+static int
+edges_compare_x_for_y_general (const cairo_edge_t *a,
+			       const cairo_edge_t *b,
+			       int32_t y)
+{
+    /* XXX: We're assuming here that dx and dy will still fit in 32
+     * bits. That's not true in general as there could be overflow. We
+     * should prevent that before the tessellation algorithm
+     * begins.
+     */
+    int32_t dx;
+    int32_t adx, ady;
+    int32_t bdx, bdy;
+    enum {
+       HAVE_NONE    = 0x0,
+       HAVE_DX      = 0x1,
+       HAVE_ADX     = 0x2,
+       HAVE_DX_ADX  = HAVE_DX | HAVE_ADX,
+       HAVE_BDX     = 0x4,
+       HAVE_DX_BDX  = HAVE_DX | HAVE_BDX,
+       HAVE_ADX_BDX = HAVE_ADX | HAVE_BDX,
+       HAVE_ALL     = HAVE_DX | HAVE_ADX | HAVE_BDX
+    } have_dx_adx_bdx = HAVE_ALL;
+
+    /* don't bother solving for abscissa if the edges' bounding boxes
+     * can be used to order them. */
+    {
+           int32_t amin, amax;
+           int32_t bmin, bmax;
+           if (a->line.p1.x < a->line.p2.x) {
+                   amin = a->line.p1.x;
+                   amax = a->line.p2.x;
+           } else {
+                   amin = a->line.p2.x;
+                   amax = a->line.p1.x;
+           }
+           if (b->line.p1.x < b->line.p2.x) {
+                   bmin = b->line.p1.x;
+                   bmax = b->line.p2.x;
+           } else {
+                   bmin = b->line.p2.x;
+                   bmax = b->line.p1.x;
+           }
+           if (amax < bmin) return -1;
+           if (amin > bmax) return +1;
+    }
+
+    ady = a->line.p2.y - a->line.p1.y;
+    adx = a->line.p2.x - a->line.p1.x;
+    if (adx == 0)
+	have_dx_adx_bdx &= ~HAVE_ADX;
+
+    bdy = b->line.p2.y - b->line.p1.y;
+    bdx = b->line.p2.x - b->line.p1.x;
+    if (bdx == 0)
+	have_dx_adx_bdx &= ~HAVE_BDX;
+
+    dx = a->line.p1.x - b->line.p1.x;
+    if (dx == 0)
+	have_dx_adx_bdx &= ~HAVE_DX;
+
+#define L _cairo_int64x32_128_mul (_cairo_int32x32_64_mul (ady, bdy), dx)
+#define A _cairo_int64x32_128_mul (_cairo_int32x32_64_mul (adx, bdy), y - a->line.p1.y)
+#define B _cairo_int64x32_128_mul (_cairo_int32x32_64_mul (bdx, ady), y - b->line.p1.y)
+    switch (have_dx_adx_bdx) {
+    default:
+    case HAVE_NONE:
+	return 0;
+    case HAVE_DX:
+	/* A_dy * B_dy * (A_x - B_x) ∘ 0 */
+	return dx; /* ady * bdy is positive definite */
+    case HAVE_ADX:
+	/* 0 ∘  - (Y - A_y) * A_dx * B_dy */
+	return adx; /* bdy * (y - a->top.y) is positive definite */
+    case HAVE_BDX:
+	/* 0 ∘ (Y - B_y) * B_dx * A_dy */
+	return -bdx; /* ady * (y - b->top.y) is positive definite */
+    case HAVE_ADX_BDX:
+	/*  0 ∘ (Y - B_y) * B_dx * A_dy - (Y - A_y) * A_dx * B_dy */
+	if ((adx ^ bdx) < 0) {
+	    return adx;
+	} else if (a->line.p1.y == b->line.p1.y) { /* common origin */
+	    cairo_int64_t adx_bdy, bdx_ady;
+
+	    /* ∴ A_dx * B_dy ∘ B_dx * A_dy */
+
+	    adx_bdy = _cairo_int32x32_64_mul (adx, bdy);
+	    bdx_ady = _cairo_int32x32_64_mul (bdx, ady);
+
+	    return _cairo_int64_cmp (adx_bdy, bdx_ady);
+	} else
+	    return _cairo_int128_cmp (A, B);
+    case HAVE_DX_ADX:
+	/* A_dy * (A_x - B_x) ∘ - (Y - A_y) * A_dx */
+	if ((-adx ^ dx) < 0) {
+	    return dx;
+	} else {
+	    cairo_int64_t ady_dx, dy_adx;
+
+	    ady_dx = _cairo_int32x32_64_mul (ady, dx);
+	    dy_adx = _cairo_int32x32_64_mul (a->line.p1.y - y, adx);
+
+	    return _cairo_int64_cmp (ady_dx, dy_adx);
+	}
+    case HAVE_DX_BDX:
+	/* B_dy * (A_x - B_x) ∘ (Y - B_y) * B_dx */
+	if ((bdx ^ dx) < 0) {
+	    return dx;
+	} else {
+	    cairo_int64_t bdy_dx, dy_bdx;
+
+	    bdy_dx = _cairo_int32x32_64_mul (bdy, dx);
+	    dy_bdx = _cairo_int32x32_64_mul (y - b->line.p1.y, bdx);
+
+	    return _cairo_int64_cmp (bdy_dx, dy_bdx);
+	}
+    case HAVE_ALL:
+	/* XXX try comparing (a->line.p2.x - b->line.p2.x) et al */
+	return _cairo_int128_cmp (L, _cairo_int128_sub (B, A));
+    }
+#undef B
+#undef A
+#undef L
+}
+
+/*
+ * We need to compare the x-coordinate of a line for a particular y wrt to a
+ * given x, without loss of precision.
+ *
+ * The x-coordinate along an edge for a given y is:
+ *   X = A_x + (Y - A_y) * A_dx / A_dy
+ *
+ * So the inequality we wish to test is:
+ *   A_x + (Y - A_y) * A_dx / A_dy ∘ X
+ * where ∘ is our inequality operator.
+ *
+ * By construction, we know that A_dy (and (Y - A_y)) are
+ * all positive, so we can rearrange it thus without causing a sign change:
+ *   (Y - A_y) * A_dx ∘ (X - A_x) * A_dy
+ *
+ * Given the assumption that all the deltas fit within 32 bits, we can compute
+ * this comparison directly using 64 bit arithmetic.
+ *
+ * See the similar discussion for _slope_compare() and
+ * edges_compare_x_for_y_general().
+ */
+static int
+edge_compare_for_y_against_x (const cairo_edge_t *a,
+			      int32_t y,
+			      int32_t x)
+{
+    int32_t adx, ady;
+    int32_t dx, dy;
+    cairo_int64_t L, R;
+
+    if (a->line.p1.x <= a->line.p2.x) {
+	if (x < a->line.p1.x)
+	    return 1;
+	if (x > a->line.p2.x)
+	    return -1;
+    } else {
+	if (x < a->line.p2.x)
+	    return 1;
+	if (x > a->line.p1.x)
+	    return -1;
+    }
+
+    adx = a->line.p2.x - a->line.p1.x;
+    dx = x - a->line.p1.x;
+
+    if (adx == 0)
+	return -dx;
+    if (dx == 0 || (adx ^ dx) < 0)
+	return adx;
+
+    dy = y - a->line.p1.y;
+    ady = a->line.p2.y - a->line.p1.y;
+
+    L = _cairo_int32x32_64_mul (dy, adx);
+    R = _cairo_int32x32_64_mul (dx, ady);
+
+    return _cairo_int64_cmp (L, R);
+}
+
+static int
+edges_compare_x_for_y (const cairo_edge_t *a,
+		       const cairo_edge_t *b,
+		       int32_t y)
+{
+    /* If the sweep-line is currently on an end-point of a line,
+     * then we know its precise x value (and considering that we often need to
+     * compare events at end-points, this happens frequently enough to warrant
+     * special casing).
+     */
+    enum {
+       HAVE_NEITHER = 0x0,
+       HAVE_AX      = 0x1,
+       HAVE_BX      = 0x2,
+       HAVE_BOTH    = HAVE_AX | HAVE_BX
+    } have_ax_bx = HAVE_BOTH;
+    int32_t ax, bx;
+
+    /* XXX given we have x and dx? */
+
+    if (y == a->line.p1.y)
+	ax = a->line.p1.x;
+    else if (y == a->line.p2.y)
+	ax = a->line.p2.x;
+    else
+	have_ax_bx &= ~HAVE_AX;
+
+    if (y == b->line.p1.y)
+	bx = b->line.p1.x;
+    else if (y == b->line.p2.y)
+	bx = b->line.p2.x;
+    else
+	have_ax_bx &= ~HAVE_BX;
+
+    switch (have_ax_bx) {
+    default:
+    case HAVE_NEITHER:
+	return edges_compare_x_for_y_general (a, b, y);
+    case HAVE_AX:
+	return -edge_compare_for_y_against_x (b, y, ax);
+    case HAVE_BX:
+	return edge_compare_for_y_against_x (a, y, bx);
+    case HAVE_BOTH:
+	return ax - bx;
+    }
+}
+
+static inline int
+slope_compare (const edge_t *a,
+	       const edge_t *b)
+{
+    cairo_int64_t L, R;
+    int cmp;
+
+    cmp = a->dxdy.quo - b->dxdy.quo;
+    if (cmp)
+	return cmp;
+
+    if (a->dxdy.rem == 0)
+	return -b->dxdy.rem;
+    if (b->dxdy.rem == 0)
+	return a->dxdy.rem;
+
+    L = _cairo_int32x32_64_mul (b->dy, a->dxdy.rem);
+    R = _cairo_int32x32_64_mul (a->dy, b->dxdy.rem);
+    return _cairo_int64_cmp (L, R);
+}
+
+static inline int
+line_equal (const cairo_line_t *a, const cairo_line_t *b)
+{
+    return a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
+           a->p2.x == b->p2.x && a->p2.y == b->p2.y;
+}
+
+static inline int
+sweep_line_compare_edges (const edge_t	*a,
+			  const edge_t	*b,
+			  cairo_fixed_t y)
+{
+    int cmp;
+
+    if (line_equal (&a->edge.line, &b->edge.line))
+	return 0;
+
+    cmp = edges_compare_x_for_y (&a->edge, &b->edge, y);
+    if (cmp)
+	return cmp;
+
+    return slope_compare (a, b);
+}
+
+static inline cairo_int64_t
+det32_64 (int32_t a, int32_t b,
+	  int32_t c, int32_t d)
+{
+    /* det = a * d - b * c */
+    return _cairo_int64_sub (_cairo_int32x32_64_mul (a, d),
+			     _cairo_int32x32_64_mul (b, c));
+}
+
+static inline cairo_int128_t
+det64x32_128 (cairo_int64_t a, int32_t       b,
+	      cairo_int64_t c, int32_t       d)
+{
+    /* det = a * d - b * c */
+    return _cairo_int128_sub (_cairo_int64x32_128_mul (a, d),
+			      _cairo_int64x32_128_mul (c, b));
+}
+
+/* Compute the intersection of two lines as defined by two edges. The
+ * result is provided as a coordinate pair of 128-bit integers.
+ *
+ * Returns %CAIRO_BO_STATUS_INTERSECTION if there is an intersection or
+ * %CAIRO_BO_STATUS_PARALLEL if the two lines are exactly parallel.
+ */
+static cairo_bool_t
+intersect_lines (const edge_t *a, const edge_t *b,
+		 cairo_bo_intersect_point_t	*intersection)
+{
+    cairo_int64_t a_det, b_det;
+
+    /* XXX: We're assuming here that dx and dy will still fit in 32
+     * bits. That's not true in general as there could be overflow. We
+     * should prevent that before the tessellation algorithm begins.
+     * What we're doing to mitigate this is to perform clamping in
+     * cairo_bo_tessellate_polygon().
+     */
+    int32_t dx1 = a->edge.line.p1.x - a->edge.line.p2.x;
+    int32_t dy1 = a->edge.line.p1.y - a->edge.line.p2.y;
+
+    int32_t dx2 = b->edge.line.p1.x - b->edge.line.p2.x;
+    int32_t dy2 = b->edge.line.p1.y - b->edge.line.p2.y;
+
+    cairo_int64_t den_det;
+    cairo_int64_t R;
+    cairo_quorem64_t qr;
+
+    den_det = det32_64 (dx1, dy1, dx2, dy2);
+
+     /* Q: Can we determine that the lines do not intersect (within range)
+      * much more cheaply than computing the intersection point i.e. by
+      * avoiding the division?
+      *
+      *   X = ax + t * adx = bx + s * bdx;
+      *   Y = ay + t * ady = by + s * bdy;
+      *   ∴ t * (ady*bdx - bdy*adx) = bdx * (by - ay) + bdy * (ax - bx)
+      *   => t * L = R
+      *
+      * Therefore we can reject any intersection (under the criteria for
+      * valid intersection events) if:
+      *   L^R < 0 => t < 0, or
+      *   L<R => t > 1
+      *
+      * (where top/bottom must at least extend to the line endpoints).
+      *
+      * A similar substitution can be performed for s, yielding:
+      *   s * (ady*bdx - bdy*adx) = ady * (ax - bx) - adx * (ay - by)
+      */
+    R = det32_64 (dx2, dy2,
+		  b->edge.line.p1.x - a->edge.line.p1.x,
+		  b->edge.line.p1.y - a->edge.line.p1.y);
+    if (_cairo_int64_negative (den_det)) {
+	if (_cairo_int64_ge (den_det, R))
+	    return FALSE;
+    } else {
+	if (_cairo_int64_le (den_det, R))
+	    return FALSE;
+    }
+
+    R = det32_64 (dy1, dx1,
+		  a->edge.line.p1.y - b->edge.line.p1.y,
+		  a->edge.line.p1.x - b->edge.line.p1.x);
+    if (_cairo_int64_negative (den_det)) {
+	if (_cairo_int64_ge (den_det, R))
+	    return FALSE;
+    } else {
+	if (_cairo_int64_le (den_det, R))
+	    return FALSE;
+    }
+
+    /* We now know that the two lines should intersect within range. */
+
+    a_det = det32_64 (a->edge.line.p1.x, a->edge.line.p1.y,
+		      a->edge.line.p2.x, a->edge.line.p2.y);
+    b_det = det32_64 (b->edge.line.p1.x, b->edge.line.p1.y,
+		      b->edge.line.p2.x, b->edge.line.p2.y);
+
+    /* x = det (a_det, dx1, b_det, dx2) / den_det */
+    qr = _cairo_int_96by64_32x64_divrem (det64x32_128 (a_det, dx1,
+						       b_det, dx2),
+					 den_det);
+    if (_cairo_int64_eq (qr.rem, den_det))
+	return FALSE;
+#if 0
+    intersection->x.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
+#else
+    intersection->x.exactness = EXACT;
+    if (! _cairo_int64_is_zero (qr.rem)) {
+	if (_cairo_int64_negative (den_det) ^ _cairo_int64_negative (qr.rem))
+	    qr.rem = _cairo_int64_negate (qr.rem);
+	qr.rem = _cairo_int64_mul (qr.rem, _cairo_int32_to_int64 (2));
+	if (_cairo_int64_ge (qr.rem, den_det)) {
+	    qr.quo = _cairo_int64_add (qr.quo,
+				       _cairo_int32_to_int64 (_cairo_int64_negative (qr.quo) ? -1 : 1));
+	} else
+	    intersection->x.exactness = INEXACT;
+    }
+#endif
+    intersection->x.ordinate = _cairo_int64_to_int32 (qr.quo);
+
+    /* y = det (a_det, dy1, b_det, dy2) / den_det */
+    qr = _cairo_int_96by64_32x64_divrem (det64x32_128 (a_det, dy1,
+						       b_det, dy2),
+					 den_det);
+    if (_cairo_int64_eq (qr.rem, den_det))
+	return FALSE;
+#if 0
+    intersection->y.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
+#else
+    intersection->y.exactness = EXACT;
+    if (! _cairo_int64_is_zero (qr.rem)) {
+	/* compute ceiling away from zero */
+	qr.quo = _cairo_int64_add (qr.quo,
+				   _cairo_int32_to_int64 (_cairo_int64_negative (qr.quo) ? -1 : 1));
+	intersection->y.exactness = INEXACT;
+    }
+#endif
+    intersection->y.ordinate = _cairo_int64_to_int32 (qr.quo);
+
+    return TRUE;
+}
+
+static int
+bo_intersect_ordinate_32_compare (int32_t a, int32_t b, int exactness)
+{
+    int cmp;
+
+    /* First compare the quotient */
+    cmp = a - b;
+    if (cmp)
+	return cmp;
+
+    /* With quotient identical, if remainder is 0 then compare equal */
+    /* Otherwise, the non-zero remainder makes a > b */
+    return -(INEXACT == exactness);
+}
+
+/* Does the given edge contain the given point. The point must already
+ * be known to be contained within the line determined by the edge,
+ * (most likely the point results from an intersection of this edge
+ * with another).
+ *
+ * If we had exact arithmetic, then this function would simply be a
+ * matter of examining whether the y value of the point lies within
+ * the range of y values of the edge. But since intersection points
+ * are not exact due to being rounded to the nearest integer within
+ * the available precision, we must also examine the x value of the
+ * point.
+ *
+ * The definition of "contains" here is that the given intersection
+ * point will be seen by the sweep line after the start event for the
+ * given edge and before the stop event for the edge. See the comments
+ * in the implementation for more details.
+ */
+static cairo_bool_t
+bo_edge_contains_intersect_point (const edge_t			*edge,
+				  cairo_bo_intersect_point_t	*point)
+{
+    int cmp_top, cmp_bottom;
+
+    /* XXX: When running the actual algorithm, we don't actually need to
+     * compare against edge->top at all here, since any intersection above
+     * top is eliminated early via a slope comparison. We're leaving these
+     * here for now only for the sake of the quadratic-time intersection
+     * finder which needs them.
+     */
+
+    cmp_top = bo_intersect_ordinate_32_compare (point->y.ordinate,
+						edge->edge.top,
+						point->y.exactness);
+    if (cmp_top < 0)
+	return FALSE;
+
+    cmp_bottom = bo_intersect_ordinate_32_compare (point->y.ordinate,
+						   edge->edge.bottom,
+						   point->y.exactness);
+    if (cmp_bottom > 0)
+	return FALSE;
+
+    if (cmp_top > 0 && cmp_bottom < 0)
+	return TRUE;
+
+    /* At this stage, the point lies on the same y value as either
+     * edge->top or edge->bottom, so we have to examine the x value in
+     * order to properly determine containment. */
+
+    /* If the y value of the point is the same as the y value of the
+     * top of the edge, then the x value of the point must be greater
+     * to be considered as inside the edge. Similarly, if the y value
+     * of the point is the same as the y value of the bottom of the
+     * edge, then the x value of the point must be less to be
+     * considered as inside. */
+
+    if (cmp_top == 0) {
+	cairo_fixed_t top_x;
+
+	top_x = line_compute_intersection_x_for_y (&edge->edge.line,
+						   edge->edge.top);
+	return bo_intersect_ordinate_32_compare (top_x, point->x.ordinate, point->x.exactness) < 0;
+    } else { /* cmp_bottom == 0 */
+	cairo_fixed_t bot_x;
+
+	bot_x = line_compute_intersection_x_for_y (&edge->edge.line,
+						   edge->edge.bottom);
+	return bo_intersect_ordinate_32_compare (point->x.ordinate, bot_x, point->x.exactness) < 0;
+    }
+}
+
+static cairo_bool_t
+edge_intersect (const edge_t		*a,
+		const edge_t		*b,
+		cairo_point_t	*intersection)
+{
+    cairo_bo_intersect_point_t quorem;
+
+    if (! intersect_lines (a, b, &quorem))
+	return FALSE;
+
+    if (a->edge.top != a->edge.line.p1.y || a->edge.bottom != a->edge.line.p2.y) {
+	if (! bo_edge_contains_intersect_point (a, &quorem))
+	    return FALSE;
+    }
+
+    if (b->edge.top != b->edge.line.p1.y || b->edge.bottom != b->edge.line.p2.y) {
+	if (! bo_edge_contains_intersect_point (b, &quorem))
+	    return FALSE;
+    }
+
+    /* Now that we've correctly compared the intersection point and
+     * determined that it lies within the edge, then we know that we
+     * no longer need any more bits of storage for the intersection
+     * than we do for our edge coordinates. We also no longer need the
+     * remainder from the division. */
+    intersection->x = quorem.x.ordinate;
+    intersection->y = quorem.y.ordinate;
+
+    return TRUE;
+}
+
+static inline int
+event_compare (const event_t *a, const event_t *b)
+{
+    return a->y - b->y;
+}
+
+static void
+pqueue_init (pqueue_t *pq)
+{
+    pq->max_size = ARRAY_LENGTH (pq->elements_embedded);
+    pq->size = 0;
+
+    pq->elements = pq->elements_embedded;
+}
+
+static void
+pqueue_fini (pqueue_t *pq)
+{
+    if (pq->elements != pq->elements_embedded)
+	free (pq->elements);
+}
+
+static cairo_bool_t
+pqueue_grow (pqueue_t *pq)
+{
+    event_t **new_elements;
+    pq->max_size *= 2;
+
+    if (pq->elements == pq->elements_embedded) {
+	new_elements = _cairo_malloc_ab (pq->max_size,
+					 sizeof (event_t *));
+	if (unlikely (new_elements == NULL))
+	    return FALSE;
+
+	memcpy (new_elements, pq->elements_embedded,
+		sizeof (pq->elements_embedded));
+    } else {
+	new_elements = _cairo_realloc_ab (pq->elements,
+					  pq->max_size,
+					  sizeof (event_t *));
+	if (unlikely (new_elements == NULL))
+	    return FALSE;
+    }
+
+    pq->elements = new_elements;
+    return TRUE;
+}
+
+static inline void
+pqueue_push (sweep_line_t *sweep_line, event_t *event)
+{
+    event_t **elements;
+    int i, parent;
+
+    if (unlikely (sweep_line->queue.pq.size + 1 == sweep_line->queue.pq.max_size)) {
+	if (unlikely (! pqueue_grow (&sweep_line->queue.pq))) {
+	    longjmp (sweep_line->unwind,
+		     _cairo_error (CAIRO_STATUS_NO_MEMORY));
+	}
+    }
+
+    elements = sweep_line->queue.pq.elements;
+    for (i = ++sweep_line->queue.pq.size;
+	 i != PQ_FIRST_ENTRY &&
+	 event_compare (event,
+			elements[parent = PQ_PARENT_INDEX (i)]) < 0;
+	 i = parent)
+    {
+	elements[i] = elements[parent];
+    }
+
+    elements[i] = event;
+}
+
+static inline void
+pqueue_pop (pqueue_t *pq)
+{
+    event_t **elements = pq->elements;
+    event_t *tail;
+    int child, i;
+
+    tail = elements[pq->size--];
+    if (pq->size == 0) {
+	elements[PQ_FIRST_ENTRY] = NULL;
+	return;
+    }
+
+    for (i = PQ_FIRST_ENTRY;
+	 (child = PQ_LEFT_CHILD_INDEX (i)) <= pq->size;
+	 i = child)
+    {
+	if (child != pq->size &&
+	    event_compare (elements[child+1],
+			   elements[child]) < 0)
+	{
+	    child++;
+	}
+
+	if (event_compare (elements[child], tail) >= 0)
+	    break;
+
+	elements[i] = elements[child];
+    }
+    elements[i] = tail;
+}
+
+static inline void
+event_insert (sweep_line_t	*sweep_line,
+	      event_type_t	 type,
+	      edge_t		*e1,
+	      edge_t		*e2,
+	      cairo_fixed_t	 y)
+{
+    queue_event_t *event;
+
+    event = _cairo_freepool_alloc (&sweep_line->queue.pool);
+    if (unlikely (event == NULL)) {
+	longjmp (sweep_line->unwind,
+		 _cairo_error (CAIRO_STATUS_NO_MEMORY));
+    }
+
+    event->y = y;
+    event->type = type;
+    event->e1 = e1;
+    event->e2 = e2;
+
+    pqueue_push (sweep_line, (event_t *) event);
+}
+
+static void
+event_delete (sweep_line_t	*sweep_line,
+	      event_t		*event)
+{
+    _cairo_freepool_free (&sweep_line->queue.pool, event);
+}
+
+static inline event_t *
+event_next (sweep_line_t *sweep_line)
+{
+    event_t *event, *cmp;
+
+    event = sweep_line->queue.pq.elements[PQ_FIRST_ENTRY];
+    cmp = *sweep_line->queue.start_events;
+    if (event == NULL ||
+	(cmp != NULL && event_compare (cmp, event) < 0))
+    {
+	event = cmp;
+	sweep_line->queue.start_events++;
+    }
+    else
+    {
+	pqueue_pop (&sweep_line->queue.pq);
+    }
+
+    return event;
+}
+
+CAIRO_COMBSORT_DECLARE (start_event_sort, event_t *, event_compare)
+
+static inline void
+event_insert_stop (sweep_line_t	*sweep_line,
+		   edge_t	*edge)
+{
+    event_insert (sweep_line,
+		  EVENT_TYPE_STOP,
+		  edge, NULL,
+		  edge->edge.bottom);
+}
+
+static inline void
+event_insert_if_intersect_below_current_y (sweep_line_t	*sweep_line,
+					   edge_t	*left,
+					   edge_t	*right)
+{
+    cairo_point_t intersection;
+
+    /* start points intersect */
+    if (left->edge.line.p1.x == right->edge.line.p1.x &&
+	left->edge.line.p1.y == right->edge.line.p1.y)
+    {
+	return;
+    }
+
+    /* end points intersect, process DELETE events first */
+    if (left->edge.line.p2.x == right->edge.line.p2.x &&
+	left->edge.line.p2.y == right->edge.line.p2.y)
+    {
+	return;
+    }
+
+    if (slope_compare (left, right) <= 0)
+	return;
+
+    if (! edge_intersect (left, right, &intersection))
+	return;
+
+    event_insert (sweep_line,
+		  EVENT_TYPE_INTERSECTION,
+		  left, right,
+		  intersection.y);
+}
+
+static inline edge_t *
+link_to_edge (cairo_list_t *link)
+{
+    return (edge_t *) link;
+}
+
+static void
+sweep_line_insert (sweep_line_t	*sweep_line,
+		   edge_t	*edge)
+{
+    cairo_list_t *pos;
+    cairo_fixed_t y = sweep_line->current_subrow;
+
+    pos = sweep_line->insert_cursor;
+    if (pos == &sweep_line->active)
+	pos = sweep_line->active.next;
+    if (pos != &sweep_line->active) {
+	int cmp;
+
+	cmp = sweep_line_compare_edges (link_to_edge (pos),
+					edge,
+					y);
+	if (cmp < 0) {
+	    while (pos->next != &sweep_line->active &&
+		   sweep_line_compare_edges (link_to_edge (pos->next),
+					     edge,
+					     y) < 0)
+	    {
+		pos = pos->next;
+	    }
+	} else if (cmp > 0) {
+	    do {
+		pos = pos->prev;
+	    } while (pos != &sweep_line->active &&
+		     sweep_line_compare_edges (link_to_edge (pos),
+					       edge,
+					       y) > 0);
+	}
+    }
+    cairo_list_add (&edge->link, pos);
+    sweep_line->insert_cursor = &edge->link;
+}
+
+inline static void
+coverage_rewind (struct coverage *cells)
+{
+    cells->cursor = &cells->head;
+}
+
+static void
+coverage_init (struct coverage *cells)
+{
+    _cairo_freepool_init (&cells->pool,
+			  sizeof (struct cell));
+    cells->head.prev = NULL;
+    cells->head.next = &cells->tail;
+    cells->head.x = INT_MIN;
+    cells->tail.prev = &cells->head;
+    cells->tail.next = NULL;
+    cells->tail.x = INT_MAX;
+    cells->count = 0;
+    coverage_rewind (cells);
+}
+
+static void
+coverage_fini (struct coverage *cells)
+{
+    _cairo_freepool_fini (&cells->pool);
+}
+
+inline static void
+coverage_reset (struct coverage *cells)
+{
+    cells->head.next = &cells->tail;
+    cells->tail.prev = &cells->head;
+    cells->count = 0;
+    _cairo_freepool_reset (&cells->pool);
+    coverage_rewind (cells);
+}
+
+inline static struct cell *
+coverage_alloc (sweep_line_t *sweep_line,
+		struct cell *tail,
+		int x)
+{
+    struct cell *cell;
+
+    cell = _cairo_freepool_alloc (&sweep_line->coverage.pool);
+    if (unlikely (NULL == cell)) {
+	longjmp (sweep_line->unwind,
+		 _cairo_error (CAIRO_STATUS_NO_MEMORY));
+    }
+
+    tail->prev->next = cell;
+    cell->prev = tail->prev;
+    cell->next = tail;
+    tail->prev = cell;
+    cell->x = x;
+    cell->uncovered_area = 0;
+    cell->covered_height = 0;
+    sweep_line->coverage.count++;
+    return cell;
+}
+
+inline static struct cell *
+coverage_find (sweep_line_t *sweep_line, int x)
+{
+    struct cell *cell;
+
+    cell = sweep_line->coverage.cursor;
+    if (unlikely (cell->x > x)) {
+	do {
+	    if (cell->prev->x < x)
+		break;
+	    cell = cell->prev;
+	} while (TRUE);
+    } else {
+	if (cell->x == x)
+	    return cell;
+
+	do {
+	    UNROLL3({
+		    cell = cell->next;
+		    if (cell->x >= x)
+			break;
+		    });
+	} while (TRUE);
+    }
+
+    if (cell->x != x)
+	cell = coverage_alloc (sweep_line, cell, x);
+
+    return sweep_line->coverage.cursor = cell;
+}
+
+static void
+coverage_render_cells (sweep_line_t *sweep_line,
+		       cairo_fixed_t left, cairo_fixed_t right,
+		       cairo_fixed_t y1, cairo_fixed_t y2,
+		       int sign)
+{
+    int fx1, fx2;
+    int ix1, ix2;
+    int dx, dy;
+
+    /* Orient the edge left-to-right. */
+    dx = right - left;
+    if (dx >= 0) {
+	ix1 = _cairo_fixed_integer_part (left);
+	fx1 = _cairo_fixed_fractional_part (left);
+
+	ix2 = _cairo_fixed_integer_part (right);
+	fx2 = _cairo_fixed_fractional_part (right);
+
+	dy = y2 - y1;
+    } else {
+	ix1 = _cairo_fixed_integer_part (right);
+	fx1 = _cairo_fixed_fractional_part (right);
+
+	ix2 = _cairo_fixed_integer_part (left);
+	fx2 = _cairo_fixed_fractional_part (left);
+
+	dx = -dx;
+	sign = -sign;
+	dy = y1 - y2;
+	y1 = y2 - dy;
+	y2 = y1 + dy;
+    }
+
+    /* Add coverage for all pixels [ix1,ix2] on this row crossed
+     * by the edge. */
+    {
+	struct quorem y = floored_divrem ((STEP_X - fx1)*dy, dx);
+	struct cell *cell;
+
+	cell = sweep_line->coverage.cursor;
+	if (cell->x != ix1) {
+	    if (unlikely (cell->x > ix1)) {
+		do {
+		    if (cell->prev->x < ix1)
+			break;
+		    cell = cell->prev;
+		} while (TRUE);
+	    } else do {
+		UNROLL3({
+			if (cell->x >= ix1)
+			    break;
+			cell = cell->next;
+			});
+	    } while (TRUE);
+
+	    if (cell->x != ix1)
+		cell = coverage_alloc (sweep_line, cell, ix1);
+	}
+
+	cell->uncovered_area += sign * y.quo * (STEP_X + fx1);
+	cell->covered_height += sign * y.quo;
+	y.quo += y1;
+
+	cell = cell->next;
+	if (cell->x != ++ix1)
+	    cell = coverage_alloc (sweep_line, cell, ix1);
+	if (ix1 < ix2) {
+	    struct quorem dydx_full = floored_divrem (STEP_X*dy, dx);
+
+	    do {
+		cairo_fixed_t y_skip = dydx_full.quo;
+		y.rem += dydx_full.rem;
+		if (y.rem >= dx) {
+		    ++y_skip;
+		    y.rem -= dx;
+		}
+
+		y.quo += y_skip;
+
+		y_skip *= sign;
+		cell->covered_height += y_skip;
+		cell->uncovered_area += y_skip*STEP_X;
+
+		cell = cell->next;
+		if (cell->x != ++ix1)
+		    cell = coverage_alloc (sweep_line, cell, ix1);
+	    } while (ix1 != ix2);
+	}
+	cell->uncovered_area += sign*(y2 - y.quo)*fx2;
+	cell->covered_height += sign*(y2 - y.quo);
+	sweep_line->coverage.cursor = cell;
+    }
+}
+
+inline static void
+full_inc_edge (edge_t *edge)
+{
+    edge->x.quo += edge->dxdy_full.quo;
+    edge->x.rem += edge->dxdy_full.rem;
+    if (edge->x.rem >= 0) {
+	++edge->x.quo;
+	edge->x.rem -= edge->dy;
+    }
+}
+
+static void
+full_add_edge (sweep_line_t *sweep_line, edge_t *edge, int sign)
+{
+    struct cell *cell;
+    cairo_fixed_t x1, x2;
+    int ix1, ix2;
+    int frac;
+
+    edge->current_sign = sign;
+
+    ix1 = _cairo_fixed_integer_part (edge->x.quo);
+
+    if (edge->vertical) {
+	frac = _cairo_fixed_fractional_part (edge->x.quo);
+	cell = coverage_find (sweep_line, ix1);
+	cell->covered_height += sign * STEP_Y;
+	cell->uncovered_area += sign * 2 * frac * STEP_Y;
+	return;
+    }
+
+    x1 = edge->x.quo;
+    full_inc_edge (edge);
+    x2 = edge->x.quo;
+
+    ix2 = _cairo_fixed_integer_part (edge->x.quo);
+
+    /* Edge is entirely within a column? */
+    if (likely (ix1 == ix2)) {
+	frac = _cairo_fixed_fractional_part (x1) +
+	       _cairo_fixed_fractional_part (x2);
+	cell = coverage_find (sweep_line, ix1);
+	cell->covered_height += sign * STEP_Y;
+	cell->uncovered_area += sign * frac * STEP_Y;
+	return;
+    }
+
+    coverage_render_cells (sweep_line, x1, x2, 0, STEP_Y, sign);
+}
+
+static void
+full_nonzero (sweep_line_t *sweep_line)
+{
+    cairo_list_t *pos;
+
+    sweep_line->is_vertical = TRUE;
+    pos = sweep_line->active.next;
+    do {
+	edge_t *left = link_to_edge (pos), *right;
+	int winding = left->edge.dir;
+
+	sweep_line->is_vertical &= left->vertical;
+
+	pos = left->link.next;
+	do {
+	    if (unlikely (pos == &sweep_line->active)) {
+		full_add_edge (sweep_line, left, +1);
+		return;
+	    }
+
+	    right = link_to_edge (pos);
+	    pos = pos->next;
+	    sweep_line->is_vertical &= right->vertical;
+
+	    winding += right->edge.dir;
+	    if (0 == winding) {
+		if (pos == &sweep_line->active ||
+		    link_to_edge (pos)->x.quo != right->x.quo)
+		{
+		    break;
+		}
+	    }
+
+	    if (! right->vertical)
+		full_inc_edge (right);
+	} while (TRUE);
+
+	full_add_edge (sweep_line, left,  +1);
+	full_add_edge (sweep_line, right, -1);
+    } while (pos != &sweep_line->active);
+}
+
+static void
+full_evenodd (sweep_line_t *sweep_line)
+{
+    cairo_list_t *pos;
+
+    sweep_line->is_vertical = TRUE;
+    pos = sweep_line->active.next;
+    do {
+	edge_t *left = link_to_edge (pos), *right;
+	int winding = 0;
+
+	sweep_line->is_vertical &= left->vertical;
+
+	pos = left->link.next;
+	do {
+	    if (pos == &sweep_line->active) {
+		full_add_edge (sweep_line, left, +1);
+		return;
+	    }
+
+	    right = link_to_edge (pos);
+	    pos = pos->next;
+	    sweep_line->is_vertical &= right->vertical;
+
+	    if (++winding & 1) {
+		if (pos == &sweep_line->active ||
+		    link_to_edge (pos)->x.quo != right->x.quo)
+		{
+		    break;
+		}
+	    }
+
+	    if (! right->vertical)
+		full_inc_edge (right);
+	} while (TRUE);
+
+	full_add_edge (sweep_line, left,  +1);
+	full_add_edge (sweep_line, right, -1);
+    } while (pos != &sweep_line->active);
+}
+
+static void
+render_rows (cairo_botor_scan_converter_t *self,
+	     sweep_line_t *sweep_line,
+	     int y, int height,
+	     cairo_span_renderer_t *renderer)
+{
+    cairo_half_open_span_t spans_stack[CAIRO_STACK_ARRAY_LENGTH (cairo_half_open_span_t)];
+    cairo_half_open_span_t *spans = spans_stack;
+    struct cell *cell;
+    int prev_x, cover;
+    int num_spans;
+    cairo_status_t status;
+
+    if (unlikely (sweep_line->coverage.count == 0)) {
+	status = renderer->render_rows (renderer, y, height, NULL, 0);
+	if (unlikely (status))
+	    longjmp (sweep_line->unwind, status);
+	return;
+    }
+
+    /* Allocate enough spans for the row. */
+
+    num_spans = 2*sweep_line->coverage.count+2;
+    if (unlikely (num_spans > ARRAY_LENGTH (spans_stack))) {
+	spans = _cairo_malloc_ab (num_spans, sizeof (cairo_half_open_span_t));
+	if (unlikely (spans == NULL)) {
+	    longjmp (sweep_line->unwind,
+		     _cairo_error (CAIRO_STATUS_NO_MEMORY));
+	}
+    }
+
+    /* Form the spans from the coverage and areas. */
+    num_spans = 0;
+    prev_x = self->xmin;
+    cover = 0;
+    cell = sweep_line->coverage.head.next;
+    do {
+	int x = cell->x;
+	int area;
+
+	if (x > prev_x) {
+	    spans[num_spans].x = prev_x;
+	    spans[num_spans].coverage = AREA_TO_ALPHA (cover);
+	    ++num_spans;
+	}
+
+	cover += cell->covered_height*STEP_X*2;
+	area = cover - cell->uncovered_area;
+
+	spans[num_spans].x = x;
+	spans[num_spans].coverage = AREA_TO_ALPHA (area);
+	++num_spans;
+
+	prev_x = x + 1;
+    } while ((cell = cell->next) != &sweep_line->coverage.tail);
+
+    if (prev_x <= self->xmax) {
+	spans[num_spans].x = prev_x;
+	spans[num_spans].coverage = AREA_TO_ALPHA (cover);
+	++num_spans;
+    }
+
+    if (cover && prev_x < self->xmax) {
+	spans[num_spans].x = self->xmax;
+	spans[num_spans].coverage = 0;
+	++num_spans;
+    }
+
+    status = renderer->render_rows (renderer, y, height, spans, num_spans);
+
+    if (unlikely (spans != spans_stack))
+	free (spans);
+
+    coverage_reset (&sweep_line->coverage);
+
+    if (unlikely (status))
+	longjmp (sweep_line->unwind, status);
+}
+
+static void
+full_repeat (sweep_line_t *sweep)
+{
+    edge_t *edge;
+
+    cairo_list_foreach_entry (edge, edge_t, &sweep->active, link) {
+	if (edge->current_sign)
+	    full_add_edge (sweep, edge, edge->current_sign);
+	else if (! edge->vertical)
+	    full_inc_edge (edge);
+    }
+}
+
+static void
+full_reset (sweep_line_t *sweep)
+{
+    edge_t *edge;
+
+    cairo_list_foreach_entry (edge, edge_t, &sweep->active, link)
+	edge->current_sign = 0;
+}
+
+static void
+full_step (cairo_botor_scan_converter_t *self,
+	   sweep_line_t *sweep_line,
+	   cairo_fixed_t row,
+	   cairo_span_renderer_t *renderer)
+{
+    int top, bottom;
+
+    top = _cairo_fixed_integer_part (sweep_line->current_row);
+    bottom = _cairo_fixed_integer_part (row);
+    if (cairo_list_is_empty (&sweep_line->active)) {
+	cairo_status_t  status;
+
+	status = renderer->render_rows (renderer, top, bottom - top, NULL, 0);
+	if (unlikely (status))
+	    longjmp (sweep_line->unwind, status);
+
+	return;
+    }
+
+    if (self->fill_rule == CAIRO_FILL_RULE_WINDING)
+	full_nonzero (sweep_line);
+    else
+	full_evenodd (sweep_line);
+
+    if (sweep_line->is_vertical || bottom == top + 1) {
+	render_rows (self, sweep_line, top, bottom - top, renderer);
+	full_reset (sweep_line);
+	return;
+    }
+
+    render_rows (self, sweep_line, top++, 1, renderer);
+    do {
+	full_repeat (sweep_line);
+	render_rows (self, sweep_line, top, 1, renderer);
+    } while (++top != bottom);
+
+    full_reset (sweep_line);
+}
+
+cairo_always_inline static void
+sub_inc_edge (edge_t *edge,
+	      cairo_fixed_t height)
+{
+    if (height == 1) {
+	edge->x.quo += edge->dxdy.quo;
+	edge->x.rem += edge->dxdy.rem;
+	if (edge->x.rem >= 0) {
+	    ++edge->x.quo;
+	    edge->x.rem -= edge->dy;
+	}
+    } else {
+	edge->x.quo += height * edge->dxdy.quo;
+	edge->x.rem += height * edge->dxdy.rem;
+	if (edge->x.rem >= 0) {
+	    int carry = edge->x.rem / edge->dy + 1;
+	    edge->x.quo += carry;
+	    edge->x.rem -= carry * edge->dy;
+	}
+    }
+}
+
+static void
+sub_add_run (sweep_line_t *sweep_line, edge_t *edge, int y, int sign)
+{
+    struct run *run;
+
+    run = _cairo_freepool_alloc (&sweep_line->runs);
+    if (unlikely (run == NULL))
+	longjmp (sweep_line->unwind, _cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    run->y = y;
+    run->sign = sign;
+    run->next = edge->runs;
+    edge->runs = run;
+
+    edge->current_sign = sign;
+}
+
+inline static cairo_bool_t
+edges_coincident (edge_t *left, edge_t *right, cairo_fixed_t y)
+{
+    /* XXX is compare_x_for_y() worth executing during sub steps? */
+    return line_equal (&left->edge.line, &right->edge.line);
+    //edges_compare_x_for_y (&left->edge, &right->edge, y) >= 0;
+}
+
+static void
+sub_nonzero (sweep_line_t *sweep_line)
+{
+    cairo_fixed_t y = sweep_line->current_subrow;
+    cairo_fixed_t fy = _cairo_fixed_fractional_part (y);
+    cairo_list_t *pos;
+
+    pos = sweep_line->active.next;
+    do {
+	edge_t *left = link_to_edge (pos), *right;
+	int winding = left->edge.dir;
+
+	pos = left->link.next;
+	do {
+	    if (unlikely (pos == &sweep_line->active)) {
+		if (left->current_sign != +1)
+		    sub_add_run (sweep_line, left, fy, +1);
+		return;
+	    }
+
+	    right = link_to_edge (pos);
+	    pos = pos->next;
+
+	    winding += right->edge.dir;
+	    if (0 == winding) {
+		if (pos == &sweep_line->active ||
+		    ! edges_coincident (right, link_to_edge (pos), y))
+		{
+		    break;
+		}
+	    }
+
+	    if (right->current_sign)
+		sub_add_run (sweep_line, right, fy, 0);
+	} while (TRUE);
+
+	if (left->current_sign != +1)
+	    sub_add_run (sweep_line, left, fy, +1);
+	if (right->current_sign != -1)
+	    sub_add_run (sweep_line, right, fy, -1);
+    } while (pos != &sweep_line->active);
+}
+
+static void
+sub_evenodd (sweep_line_t *sweep_line)
+{
+    cairo_fixed_t y = sweep_line->current_subrow;
+    cairo_fixed_t fy = _cairo_fixed_fractional_part (y);
+    cairo_list_t *pos;
+
+    pos = sweep_line->active.next;
+    do {
+	edge_t *left = link_to_edge (pos), *right;
+	int winding = 0;
+
+	pos = left->link.next;
+	do {
+	    if (unlikely (pos == &sweep_line->active)) {
+		if (left->current_sign != +1)
+		    sub_add_run (sweep_line, left, fy, +1);
+		return;
+	    }
+
+	    right = link_to_edge (pos);
+	    pos = pos->next;
+
+	    if (++winding & 1) {
+		if (pos == &sweep_line->active ||
+		    ! edges_coincident (right, link_to_edge (pos), y))
+		{
+		    break;
+		}
+	    }
+
+	    if (right->current_sign)
+		sub_add_run (sweep_line, right, fy, 0);
+	} while (TRUE);
+
+	if (left->current_sign != +1)
+	    sub_add_run (sweep_line, left, fy, +1);
+	if (right->current_sign != -1)
+	    sub_add_run (sweep_line, right, fy, -1);
+    } while (pos != &sweep_line->active);
+}
+
+cairo_always_inline static void
+sub_step (cairo_botor_scan_converter_t *self,
+	  sweep_line_t *sweep_line)
+{
+    if (cairo_list_is_empty (&sweep_line->active))
+	return;
+
+    if (self->fill_rule == CAIRO_FILL_RULE_WINDING)
+	sub_nonzero (sweep_line);
+    else
+	sub_evenodd (sweep_line);
+}
+
+static void
+coverage_render_runs (sweep_line_t *sweep, edge_t *edge,
+		      cairo_fixed_t y1, cairo_fixed_t y2)
+{
+    struct run tail;
+    struct run *run = &tail;
+
+    tail.next = NULL;
+    tail.y = y2;
+
+    /* Order the runs top->bottom */
+    while (edge->runs) {
+	struct run *r;
+
+	r = edge->runs;
+	edge->runs = r->next;
+	r->next = run;
+	run = r;
+    }
+
+    if (run->y > y1)
+	sub_inc_edge (edge, run->y - y1);
+
+    do {
+	cairo_fixed_t x1, x2;
+
+	y1 = run->y;
+	y2 = run->next->y;
+
+	x1 = edge->x.quo;
+	if (y2 - y1 == STEP_Y)
+	    full_inc_edge (edge);
+	else
+	    sub_inc_edge (edge, y2 - y1);
+	x2 = edge->x.quo;
+
+	if (run->sign) {
+	    int ix1, ix2;
+
+	    ix1 = _cairo_fixed_integer_part (x1);
+	    ix2 = _cairo_fixed_integer_part (x2);
+
+	    /* Edge is entirely within a column? */
+	    if (likely (ix1 == ix2)) {
+		struct cell *cell;
+		int frac;
+
+		frac = _cairo_fixed_fractional_part (x1) +
+		       _cairo_fixed_fractional_part (x2);
+		cell = coverage_find (sweep, ix1);
+		cell->covered_height += run->sign * (y2 - y1);
+		cell->uncovered_area += run->sign * (y2 - y1) * frac;
+	    } else {
+		coverage_render_cells (sweep, x1, x2, y1, y2, run->sign);
+	    }
+	}
+
+	run = run->next;
+    } while (run->next != NULL);
+}
+
+static void
+coverage_render_vertical_runs (sweep_line_t *sweep, edge_t *edge, cairo_fixed_t y2)
+{
+    struct cell *cell;
+    struct run *run;
+    int height = 0;
+
+    for (run = edge->runs; run != NULL; run = run->next) {
+	if (run->sign)
+	    height += run->sign * (y2 - run->y);
+	y2 = run->y;
+    }
+
+    cell = coverage_find (sweep, _cairo_fixed_integer_part (edge->x.quo));
+    cell->covered_height += height;
+    cell->uncovered_area += 2 * _cairo_fixed_fractional_part (edge->x.quo) * height;
+}
+
+cairo_always_inline static void
+sub_emit (cairo_botor_scan_converter_t *self,
+	  sweep_line_t *sweep,
+	  cairo_span_renderer_t *renderer)
+{
+    edge_t *edge;
+
+    sub_step (self, sweep);
+
+    /* convert the runs into coverages */
+
+    cairo_list_foreach_entry (edge, edge_t, &sweep->active, link) {
+	if (edge->runs == NULL) {
+	    if (! edge->vertical) {
+		if (edge->flags & START) {
+		    sub_inc_edge (edge,
+				  STEP_Y - _cairo_fixed_fractional_part (edge->edge.top));
+		    edge->flags &= ~START;
+		} else
+		    full_inc_edge (edge);
+	    }
+	} else {
+	    if (edge->vertical) {
+		coverage_render_vertical_runs (sweep, edge, STEP_Y);
+	    } else {
+		int y1 = 0;
+		if (edge->flags & START) {
+		    y1 = _cairo_fixed_fractional_part (edge->edge.top);
+		    edge->flags &= ~START;
+		}
+		coverage_render_runs (sweep, edge, y1, STEP_Y);
+	    }
+	}
+	edge->current_sign = 0;
+	edge->runs = NULL;
+    }
+
+    cairo_list_foreach_entry (edge, edge_t, &sweep->stopped, link) {
+	int y2 = _cairo_fixed_fractional_part (edge->edge.bottom);
+	if (edge->vertical) {
+	    coverage_render_vertical_runs (sweep, edge, y2);
+	} else {
+	    int y1 = 0;
+	    if (edge->flags & START)
+		y1 = _cairo_fixed_fractional_part (edge->edge.top);
+	    coverage_render_runs (sweep, edge, y1, y2);
+	}
+    }
+    cairo_list_init (&sweep->stopped);
+
+    _cairo_freepool_reset (&sweep->runs);
+
+    render_rows (self, sweep,
+		 _cairo_fixed_integer_part (sweep->current_row), 1,
+		 renderer);
+}
+
+static void
+sweep_line_init (sweep_line_t	 *sweep_line,
+		 event_t	**start_events,
+		 int		  num_events)
+{
+    cairo_list_init (&sweep_line->active);
+    cairo_list_init (&sweep_line->stopped);
+    sweep_line->insert_cursor = &sweep_line->active;
+
+    sweep_line->current_row = INT32_MIN;
+    sweep_line->current_subrow = INT32_MIN;
+
+    coverage_init (&sweep_line->coverage);
+    _cairo_freepool_init (&sweep_line->runs, sizeof (struct run));
+
+    start_event_sort (start_events, num_events);
+    start_events[num_events] = NULL;
+
+    sweep_line->queue.start_events = start_events;
+
+    _cairo_freepool_init (&sweep_line->queue.pool,
+			  sizeof (queue_event_t));
+    pqueue_init (&sweep_line->queue.pq);
+    sweep_line->queue.pq.elements[PQ_FIRST_ENTRY] = NULL;
+}
+
+static void
+sweep_line_delete (sweep_line_t	*sweep_line,
+		   edge_t	*edge)
+{
+    if (sweep_line->insert_cursor == &edge->link)
+	sweep_line->insert_cursor = edge->link.prev;
+
+    cairo_list_del (&edge->link);
+    if (edge->runs)
+	cairo_list_add_tail (&edge->link, &sweep_line->stopped);
+    edge->flags |= STOP;
+}
+
+static void
+sweep_line_swap (sweep_line_t	*sweep_line,
+		 edge_t	*left,
+		 edge_t	*right)
+{
+    right->link.prev = left->link.prev;
+    left->link.next = right->link.next;
+    right->link.next = &left->link;
+    left->link.prev = &right->link;
+    left->link.next->prev = &left->link;
+    right->link.prev->next = &right->link;
+}
+
+static void
+sweep_line_fini (sweep_line_t *sweep_line)
+{
+    pqueue_fini (&sweep_line->queue.pq);
+    _cairo_freepool_fini (&sweep_line->queue.pool);
+    coverage_fini (&sweep_line->coverage);
+    _cairo_freepool_fini (&sweep_line->runs);
+}
+
+static cairo_status_t
+botor_generate (cairo_botor_scan_converter_t	 *self,
+		event_t				**start_events,
+		cairo_span_renderer_t		 *renderer)
+{
+    cairo_status_t status;
+    sweep_line_t sweep_line;
+    cairo_fixed_t ybot;
+    event_t *event;
+    cairo_list_t *left, *right;
+    edge_t *e1, *e2;
+    int bottom;
+
+    sweep_line_init (&sweep_line, start_events, self->num_edges);
+    if ((status = setjmp (sweep_line.unwind)))
+	goto unwind;
+
+    ybot = self->extents.p2.y;
+    sweep_line.current_subrow = self->extents.p1.y;
+    sweep_line.current_row = _cairo_fixed_floor (self->extents.p1.y);
+    event = *sweep_line.queue.start_events++;
+    do {
+	/* Can we process a full step in one go? */
+	if (event->y >= sweep_line.current_row + STEP_Y) {
+	    bottom = _cairo_fixed_floor (event->y);
+	    full_step (self, &sweep_line, bottom, renderer);
+	    sweep_line.current_row = bottom;
+	    sweep_line.current_subrow = bottom;
+	}
+
+	do {
+	    if (event->y > sweep_line.current_subrow) {
+		sub_step (self, &sweep_line);
+		sweep_line.current_subrow = event->y;
+	    }
+
+	    do {
+		/* Update the active list using Bentley-Ottmann */
+		switch (event->type) {
+		case EVENT_TYPE_START:
+		    e1 = ((start_event_t *) event)->edge;
+
+		    sweep_line_insert (&sweep_line, e1);
+		    event_insert_stop (&sweep_line, e1);
+
+		    left = e1->link.prev;
+		    right = e1->link.next;
+
+		    if (left != &sweep_line.active) {
+			event_insert_if_intersect_below_current_y (&sweep_line,
+								   link_to_edge (left), e1);
+		    }
+
+		    if (right != &sweep_line.active) {
+			event_insert_if_intersect_below_current_y (&sweep_line,
+								   e1, link_to_edge (right));
+		    }
+
+		    break;
+
+		case EVENT_TYPE_STOP:
+		    e1 = ((queue_event_t *) event)->e1;
+		    event_delete (&sweep_line, event);
+
+		    left = e1->link.prev;
+		    right = e1->link.next;
+
+		    sweep_line_delete (&sweep_line, e1);
+
+		    if (left != &sweep_line.active &&
+			right != &sweep_line.active)
+		    {
+			 event_insert_if_intersect_below_current_y (&sweep_line,
+								    link_to_edge (left),
+								    link_to_edge (right));
+		    }
+
+		    break;
+
+		case EVENT_TYPE_INTERSECTION:
+		    e1 = ((queue_event_t *) event)->e1;
+		    e2 = ((queue_event_t *) event)->e2;
+
+		    event_delete (&sweep_line, event);
+		    if (e1->flags & STOP)
+			break;
+		    if (e2->flags & STOP)
+			break;
+
+		    /* skip this intersection if its edges are not adjacent */
+		    if (&e2->link != e1->link.next)
+			break;
+
+		    left = e1->link.prev;
+		    right = e2->link.next;
+
+		    sweep_line_swap (&sweep_line, e1, e2);
+
+		    /* after the swap e2 is left of e1 */
+		    if (left != &sweep_line.active) {
+			event_insert_if_intersect_below_current_y (&sweep_line,
+								   link_to_edge (left), e2);
+		    }
+
+		    if (right != &sweep_line.active) {
+			event_insert_if_intersect_below_current_y (&sweep_line,
+								   e1, link_to_edge (right));
+		    }
+
+		    break;
+		}
+
+		event = event_next (&sweep_line);
+		if (event == NULL)
+		    goto end;
+	    } while (event->y == sweep_line.current_subrow);
+	} while (event->y < sweep_line.current_row + STEP_Y);
+
+	bottom = sweep_line.current_row + STEP_Y;
+	sub_emit (self, &sweep_line, renderer);
+	sweep_line.current_subrow = bottom;
+	sweep_line.current_row = sweep_line.current_subrow;
+    } while (TRUE);
+
+  end:
+    /* flush any partial spans */
+    if (sweep_line.current_subrow != sweep_line.current_row) {
+	sub_emit (self, &sweep_line, renderer);
+	sweep_line.current_row += STEP_Y;
+	sweep_line.current_subrow = sweep_line.current_row;
+    }
+    /* clear the rest */
+    if (sweep_line.current_subrow < ybot) {
+	bottom = _cairo_fixed_integer_part (sweep_line.current_row);
+	status = renderer->render_rows (renderer,
+					bottom, _cairo_fixed_integer_ceil (ybot) - bottom,
+					NULL, 0);
+    }
+
+ unwind:
+    sweep_line_fini (&sweep_line);
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_botor_scan_converter_generate (void			*converter,
+				      cairo_span_renderer_t	*renderer)
+{
+    cairo_botor_scan_converter_t *self = converter;
+    start_event_t stack_events[CAIRO_STACK_ARRAY_LENGTH (start_event_t)];
+    start_event_t *events;
+    event_t *stack_event_ptrs[ARRAY_LENGTH (stack_events) + 1];
+    event_t **event_ptrs;
+    struct _cairo_botor_scan_converter_chunk *chunk;
+    cairo_status_t status;
+    int num_events;
+    int i, j;
+
+    num_events = self->num_edges;
+    if (unlikely (0 == num_events)) {
+	return renderer->render_rows (renderer,
+				      _cairo_fixed_integer_floor (self->extents.p1.y),
+				      _cairo_fixed_integer_ceil (self->extents.p2.y) -
+				      _cairo_fixed_integer_floor (self->extents.p1.y),
+				      NULL, 0);
+    }
+
+    events = stack_events;
+    event_ptrs = stack_event_ptrs;
+    if (unlikely (num_events >= ARRAY_LENGTH (stack_events))) {
+	events = _cairo_malloc_ab_plus_c (num_events,
+					  sizeof (start_event_t) + sizeof (event_t *),
+					  sizeof (event_t *));
+	if (unlikely (events == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+	event_ptrs = (event_t **) (events + num_events);
+    }
+
+    j = 0;
+    for (chunk = &self->chunks; chunk != NULL; chunk = chunk->next) {
+	edge_t *edge;
+
+	edge = chunk->base;
+	for (i = 0; i < chunk->count; i++) {
+	    event_ptrs[j] = (event_t *) &events[j];
+
+	    events[j].y = edge->edge.top;
+	    events[j].type = EVENT_TYPE_START;
+	    events[j].edge = edge;
+
+	    edge++, j++;
+	}
+    }
+
+    status = botor_generate (self, event_ptrs, renderer);
+
+    if (events != stack_events)
+	free (events);
+
+    return status;
+}
+
+static edge_t *
+botor_allocate_edge (cairo_botor_scan_converter_t *self)
+{
+    struct _cairo_botor_scan_converter_chunk *chunk;
+
+    chunk = self->tail;
+    if (chunk->count == chunk->size) {
+	int size;
+
+	size = chunk->size * 2;
+	chunk->next = _cairo_malloc_ab_plus_c (size,
+					       sizeof (edge_t),
+					       sizeof (struct _cairo_botor_scan_converter_chunk));
+	if (unlikely (chunk->next == NULL))
+	    return NULL;
+
+	chunk = chunk->next;
+	chunk->next = NULL;
+	chunk->count = 0;
+	chunk->size = size;
+	chunk->base = chunk + 1;
+	self->tail = chunk;
+    }
+
+    return (edge_t *) chunk->base + chunk->count++;
+}
+
+static cairo_status_t
+botor_add_edge (cairo_botor_scan_converter_t *self,
+		const cairo_edge_t *edge)
+{
+    edge_t *e;
+    cairo_fixed_t dx, dy;
+
+    e = botor_allocate_edge (self);
+    if (unlikely (e == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    cairo_list_init (&e->link);
+    e->edge = *edge;
+
+    dx = edge->line.p2.x - edge->line.p1.x;
+    dy = edge->line.p2.y - edge->line.p1.y;
+    e->dy = dy;
+
+    if (dx == 0) {
+	e->vertical = TRUE;
+	e->x.quo = edge->line.p1.x;
+	e->x.rem = 0;
+	e->dxdy.quo = 0;
+	e->dxdy.rem = 0;
+	e->dxdy_full.quo = 0;
+	e->dxdy_full.rem = 0;
+    } else {
+	e->vertical = FALSE;
+	e->dxdy = floored_divrem (dx, dy);
+	if (edge->top == edge->line.p1.y) {
+	    e->x.quo = edge->line.p1.x;
+	    e->x.rem = 0;
+	} else {
+	    e->x = floored_muldivrem (edge->top - edge->line.p1.y,
+				      dx, dy);
+	    e->x.quo += edge->line.p1.x;
+	}
+
+	if (_cairo_fixed_integer_part (edge->bottom) - _cairo_fixed_integer_part (edge->top) > 1) {
+	    e->dxdy_full = floored_muldivrem (STEP_Y, dx, dy);
+	} else {
+	    e->dxdy_full.quo = 0;
+	    e->dxdy_full.rem = 0;
+	}
+    }
+
+    e->x.rem = -e->dy;
+    e->current_sign = 0;
+    e->runs = NULL;
+    e->flags = START;
+
+    self->num_edges++;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_cairo_botor_scan_converter_add_edge (void		*converter,
+				      const cairo_point_t *p1,
+				      const cairo_point_t *p2,
+				      int top, int bottom,
+				      int dir)
+{
+    cairo_botor_scan_converter_t *self = converter;
+    cairo_edge_t edge;
+
+    edge.line.p1 = *p1;
+    edge.line.p2 = *p2;
+    edge.top = top;
+    edge.bottom = bottom;
+    edge.dir = dir;
+
+    return botor_add_edge (self, &edge);
+}
+
+static cairo_status_t
+_cairo_botor_scan_converter_add_polygon (void		*converter,
+					 const cairo_polygon_t *polygon)
+{
+    cairo_botor_scan_converter_t *self = converter;
+    cairo_status_t status;
+    int i;
+
+    for (i = 0; i < polygon->num_edges; i++) {
+	status = botor_add_edge (self, &polygon->edges[i]);
+	if (unlikely (status))
+	    return status;
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_cairo_botor_scan_converter_destroy (void *converter)
+{
+    cairo_botor_scan_converter_t *self = converter;
+    struct _cairo_botor_scan_converter_chunk *chunk, *next;
+
+    for (chunk = self->chunks.next; chunk != NULL; chunk = next) {
+	next = chunk->next;
+	free (chunk);
+    }
+}
+
+void
+_cairo_botor_scan_converter_init (cairo_botor_scan_converter_t *self,
+				  const cairo_box_t *extents,
+				  cairo_fill_rule_t fill_rule)
+{
+    self->base.destroy     = _cairo_botor_scan_converter_destroy;
+    self->base.add_edge    = _cairo_botor_scan_converter_add_edge;
+    self->base.add_polygon = _cairo_botor_scan_converter_add_polygon;
+    self->base.generate    = _cairo_botor_scan_converter_generate;
+
+    self->extents   = *extents;
+    self->fill_rule = fill_rule;
+
+    self->xmin = _cairo_fixed_integer_floor (extents->p1.x);
+    self->xmax = _cairo_fixed_integer_ceil (extents->p2.x);
+
+    self->chunks.base = self->buf;
+    self->chunks.next = NULL;
+    self->chunks.count = 0;
+    self->chunks.size = sizeof (self->buf) / sizeof (edge_t);
+    self->tail = &self->chunks;
+
+    self->num_edges = 0;
+}
diff --git a/gfx/cairo/cairo/src/cairo-boxes-private.h b/gfx/cairo/cairo/src/cairo-boxes-private.h
new file mode 100644
index 00000000000..3af0fbdefe7
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-boxes-private.h
@@ -0,0 +1,84 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef CAIRO_BOXES_H
+#define CAIRO_BOXES_H
+
+#include "cairo-types-private.h"
+#include "cairo-compiler-private.h"
+
+struct _cairo_boxes_t {
+    cairo_status_t status;
+    cairo_box_t limit;
+    const cairo_box_t *limits;
+    int num_limits;
+    int num_boxes;
+    unsigned int is_pixel_aligned : 1;
+
+    struct _cairo_boxes_chunk {
+	struct _cairo_boxes_chunk *next;
+	cairo_box_t *base;
+	int count;
+	int size;
+    } chunks, *tail;
+    cairo_box_t boxes_embedded[32];
+};
+
+cairo_private void
+_cairo_boxes_init (cairo_boxes_t *boxes);
+
+cairo_private void
+_cairo_boxes_init_for_array (cairo_boxes_t *boxes,
+			     cairo_box_t *array,
+			     int num_boxes);
+
+cairo_private void
+_cairo_boxes_limit (cairo_boxes_t	*boxes,
+		    const cairo_box_t	*limits,
+		    int			 num_limits);
+
+cairo_private cairo_status_t
+_cairo_boxes_add (cairo_boxes_t *boxes,
+		  const cairo_box_t *box);
+
+cairo_private void
+_cairo_boxes_extents (const cairo_boxes_t *boxes,
+		      cairo_rectangle_int_t *extents);
+
+cairo_private void
+_cairo_boxes_clear (cairo_boxes_t *boxes);
+
+cairo_private void
+_cairo_boxes_fini (cairo_boxes_t *boxes);
+
+#endif /* CAIRO_BOXES_H */
diff --git a/gfx/cairo/cairo/src/cairo-boxes.c b/gfx/cairo/cairo/src/cairo-boxes.c
new file mode 100644
index 00000000000..31bfc0e4ebb
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-boxes.c
@@ -0,0 +1,300 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-boxes-private.h"
+#include "cairo-error-private.h"
+
+void
+_cairo_boxes_init (cairo_boxes_t *boxes)
+{
+    boxes->status = CAIRO_STATUS_SUCCESS;
+    boxes->num_limits = 0;
+    boxes->num_boxes = 0;
+
+    boxes->tail = &boxes->chunks;
+    boxes->chunks.next = NULL;
+    boxes->chunks.base = boxes->boxes_embedded;
+    boxes->chunks.size = ARRAY_LENGTH (boxes->boxes_embedded);
+    boxes->chunks.count = 0;
+
+    boxes->is_pixel_aligned = TRUE;
+}
+
+void
+_cairo_boxes_init_for_array (cairo_boxes_t *boxes,
+			     cairo_box_t *array,
+			     int num_boxes)
+{
+    int n;
+
+    boxes->status = CAIRO_STATUS_SUCCESS;
+    boxes->num_limits = 0;
+    boxes->num_boxes = num_boxes;
+
+    boxes->tail = &boxes->chunks;
+    boxes->chunks.next = NULL;
+    boxes->chunks.base = array;
+    boxes->chunks.size = num_boxes;
+    boxes->chunks.count = num_boxes;
+
+    for (n = 0; n < num_boxes; n++) {
+	if (! _cairo_fixed_is_integer (array[n].p1.x) ||
+	    ! _cairo_fixed_is_integer (array[n].p1.y) ||
+	    ! _cairo_fixed_is_integer (array[n].p2.x) ||
+	    ! _cairo_fixed_is_integer (array[n].p2.y))
+	{
+	    break;
+	}
+    }
+
+    boxes->is_pixel_aligned = n == num_boxes;
+}
+
+void
+_cairo_boxes_limit (cairo_boxes_t	*boxes,
+		    const cairo_box_t	*limits,
+		    int			 num_limits)
+{
+    int n;
+
+    boxes->limits = limits;
+    boxes->num_limits = num_limits;
+
+    if (boxes->num_limits) {
+	boxes->limit = limits[0];
+	for (n = 1; n < num_limits; n++) {
+	    if (limits[n].p1.x < boxes->limit.p1.x)
+		boxes->limit.p1.x = limits[n].p1.x;
+
+	    if (limits[n].p1.y < boxes->limit.p1.y)
+		boxes->limit.p1.y = limits[n].p1.y;
+
+	    if (limits[n].p2.x > boxes->limit.p2.x)
+		boxes->limit.p2.x = limits[n].p2.x;
+
+	    if (limits[n].p2.y > boxes->limit.p2.y)
+		boxes->limit.p2.y = limits[n].p2.y;
+	}
+    }
+}
+
+static void
+_cairo_boxes_add_internal (cairo_boxes_t *boxes,
+			   const cairo_box_t *box)
+{
+    struct _cairo_boxes_chunk *chunk;
+
+    if (unlikely (boxes->status))
+	return;
+
+    chunk = boxes->tail;
+    if (unlikely (chunk->count == chunk->size)) {
+	int size;
+
+	size = chunk->size * 2;
+	chunk->next = _cairo_malloc_ab_plus_c (size,
+					       sizeof (cairo_box_t),
+					       sizeof (struct _cairo_boxes_chunk));
+
+	if (unlikely (chunk->next == NULL)) {
+	    boxes->status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    return;
+	}
+
+	chunk = chunk->next;
+	boxes->tail = chunk;
+
+	chunk->next = NULL;
+	chunk->count = 0;
+	chunk->size = size;
+	chunk->base = (cairo_box_t *) (chunk + 1);
+    }
+
+    chunk->base[chunk->count++] = *box;
+    boxes->num_boxes++;
+
+    if (boxes->is_pixel_aligned) {
+	boxes->is_pixel_aligned =
+	    _cairo_fixed_is_integer (box->p1.x) &&
+	    _cairo_fixed_is_integer (box->p1.y) &&
+	    _cairo_fixed_is_integer (box->p2.x) &&
+	    _cairo_fixed_is_integer (box->p2.y);
+    }
+}
+
+cairo_status_t
+_cairo_boxes_add (cairo_boxes_t *boxes,
+		  const cairo_box_t *box)
+{
+    if (box->p1.y == box->p2.y)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (box->p1.x == box->p2.x)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (boxes->num_limits) {
+	cairo_point_t p1, p2;
+	cairo_bool_t reversed = FALSE;
+	int n;
+
+	/* support counter-clockwise winding for rectangular tessellation */
+	if (box->p1.x < box->p2.x) {
+	    p1.x = box->p1.x;
+	    p2.x = box->p2.x;
+	} else {
+	    p2.x = box->p1.x;
+	    p1.x = box->p2.x;
+	    reversed = ! reversed;
+	}
+
+	if (p1.x >= boxes->limit.p2.x || p2.x <= boxes->limit.p1.x)
+	    return CAIRO_STATUS_SUCCESS;
+
+	if (box->p1.y < box->p2.y) {
+	    p1.y = box->p1.y;
+	    p2.y = box->p2.y;
+	} else {
+	    p2.y = box->p1.y;
+	    p1.y = box->p2.y;
+	    reversed = ! reversed;
+	}
+
+	if (p1.y >= boxes->limit.p2.y || p2.y <= boxes->limit.p1.y)
+	    return CAIRO_STATUS_SUCCESS;
+
+	for (n = 0; n < boxes->num_limits; n++) {
+	    const cairo_box_t *limits = &boxes->limits[n];
+	    cairo_box_t _box;
+	    cairo_point_t _p1, _p2;
+
+	    if (p1.x >= limits->p2.x || p2.x <= limits->p1.x)
+		continue;
+	    if (p1.y >= limits->p2.y || p2.y <= limits->p1.y)
+		continue;
+
+	    /* Otherwise, clip the box to the limits. */
+	    _p1 = p1;
+	    if (_p1.x < limits->p1.x)
+		_p1.x = limits->p1.x;
+	    if (_p1.y < limits->p1.y)
+		_p1.y = limits->p1.y;
+
+	    _p2 = p2;
+	    if (_p2.x > limits->p2.x)
+		_p2.x = limits->p2.x;
+	    if (_p2.y > limits->p2.y)
+		_p2.y = limits->p2.y;
+
+	    if (_p2.y <= _p1.y || _p2.x <= _p1.x)
+		continue;
+
+	    _box.p1.y = _p1.y;
+	    _box.p2.y = _p2.y;
+	    if (reversed) {
+		_box.p1.x = _p2.x;
+		_box.p2.x = _p1.x;
+	    } else {
+		_box.p1.x = _p1.x;
+		_box.p2.x = _p2.x;
+	    }
+
+	    _cairo_boxes_add_internal (boxes, &_box);
+	}
+    } else {
+	_cairo_boxes_add_internal (boxes, box);
+    }
+
+    return boxes->status;
+}
+
+void
+_cairo_boxes_extents (const cairo_boxes_t *boxes,
+		      cairo_rectangle_int_t *extents)
+{
+    const struct _cairo_boxes_chunk *chunk;
+    cairo_box_t box;
+    int i;
+
+    box.p1.y = box.p1.x = INT_MAX;
+    box.p2.y = box.p2.x = INT_MIN;
+
+    for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	const cairo_box_t *b = chunk->base;
+	for (i = 0; i < chunk->count; i++) {
+	    if (b[i].p1.x < box.p1.x)
+		box.p1.x = b[i].p1.x;
+
+	    if (b[i].p1.y < box.p1.y)
+		box.p1.y = b[i].p1.y;
+
+	    if (b[i].p2.x > box.p2.x)
+		box.p2.x = b[i].p2.x;
+
+	    if (b[i].p2.y > box.p2.y)
+		box.p2.y = b[i].p2.y;
+	}
+    }
+
+    _cairo_box_round_to_rectangle (&box, extents);
+}
+
+void
+_cairo_boxes_clear (cairo_boxes_t *boxes)
+{
+    struct _cairo_boxes_chunk *chunk, *next;
+
+    for (chunk = boxes->chunks.next; chunk != NULL; chunk = next) {
+	next = chunk->next;
+	free (chunk);
+    }
+
+    boxes->tail = &boxes->chunks;
+    boxes->chunks.next = 0;
+    boxes->chunks.count = 0;
+    boxes->num_boxes = 0;
+
+    boxes->is_pixel_aligned = TRUE;
+}
+
+void
+_cairo_boxes_fini (cairo_boxes_t *boxes)
+{
+    struct _cairo_boxes_chunk *chunk, *next;
+
+    for (chunk = boxes->chunks.next; chunk != NULL; chunk = next) {
+	next = chunk->next;
+	free (chunk);
+    }
+}
diff --git a/gfx/cairo/cairo/src/cairo-cache-private.h b/gfx/cairo/cairo/src/cairo-cache-private.h
index 49ff69cc097..76b556194d5 100644
--- a/gfx/cairo/cairo/src/cairo-cache-private.h
+++ b/gfx/cairo/cairo/src/cairo-cache-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-cache.c b/gfx/cairo/cairo/src/cairo-cache.c
index 025dd9ff96c..5c4e4caa3d0 100644
--- a/gfx/cairo/cairo/src/cairo-cache.c
+++ b/gfx/cairo/cairo/src/cairo-cache.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 static void
 _cairo_cache_shrink_to_accommodate (cairo_cache_t *cache,
@@ -174,9 +175,7 @@ _cairo_cache_thaw (cairo_cache_t *cache)
 {
     assert (cache->freeze_count > 0);
 
-    cache->freeze_count--;
-
-    if (cache->freeze_count == 0)
+    if (--cache->freeze_count == 0)
 	_cairo_cache_shrink_to_accommodate (cache, 0);
 }
 
@@ -240,9 +239,6 @@ static void
 _cairo_cache_shrink_to_accommodate (cairo_cache_t *cache,
 				    unsigned long  additional)
 {
-    if (cache->freeze_count)
-	return;
-
     while (cache->size + additional > cache->max_size) {
 	if (! _cairo_cache_remove_random (cache))
 	    return;
@@ -267,7 +263,8 @@ _cairo_cache_insert (cairo_cache_t	 *cache,
 {
     cairo_status_t status;
 
-    _cairo_cache_shrink_to_accommodate (cache, entry->size);
+    if (entry->size && ! cache->freeze_count)
+	_cairo_cache_shrink_to_accommodate (cache, entry->size);
 
     status = _cairo_hash_table_insert (cache->hash_table,
 				       (cairo_hash_entry_t *) entry);
diff --git a/gfx/cairo/cairo/src/cairo-cff-subset.c b/gfx/cairo/cairo/src/cairo-cff-subset.c
index 1f4cb9228ba..a4a434f77cd 100644
--- a/gfx/cairo/cairo/src/cairo-cff-subset.c
+++ b/gfx/cairo/cairo/src/cairo-cff-subset.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
 
 #define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FONT_SUBSET
 
@@ -117,6 +118,7 @@ typedef struct _cairo_cff_font {
     cairo_array_t        local_sub_index;
     int                  num_glyphs;
     cairo_bool_t         is_cid;
+    int  		 units_per_em;
 
     /* CID Font Data */
     int                 *fdselect;
@@ -1772,6 +1774,9 @@ _cairo_cff_font_create (cairo_scaled_font_subset_t  *scaled_font_subset,
     font->y_max = (int16_t) be16_to_cpu (head.y_max);
     font->ascent = (int16_t) be16_to_cpu (hhea.ascender);
     font->descent = (int16_t) be16_to_cpu (hhea.descender);
+    font->units_per_em = (int16_t) be16_to_cpu (head.units_per_em);
+    if (font->units_per_em == 0)
+        font->units_per_em = 1000;
 
     font->font_name = NULL;
     status = _cairo_truetype_read_font_name (scaled_font_subset->scaled_font,
@@ -1955,20 +1960,20 @@ _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
 	cff_subset->font_name = NULL;
     }
 
-    cff_subset->widths = calloc (sizeof (int), font->scaled_font_subset->num_glyphs);
+    cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     if (unlikely (cff_subset->widths == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail3;
     }
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++)
-        cff_subset->widths[i] = font->widths[i];
+        cff_subset->widths[i] = (double)font->widths[i]/font->units_per_em;
 
-    cff_subset->x_min = font->x_min;
-    cff_subset->y_min = font->y_min;
-    cff_subset->x_max = font->x_max;
-    cff_subset->y_max = font->y_max;
-    cff_subset->ascent = font->ascent;
-    cff_subset->descent = font->descent;
+    cff_subset->x_min = (double)font->x_min/font->units_per_em;
+    cff_subset->y_min = (double)font->y_min/font->units_per_em;
+    cff_subset->x_max = (double)font->x_max/font->units_per_em;
+    cff_subset->y_max = (double)font->y_max/font->units_per_em;
+    cff_subset->ascent = (double)font->ascent/font->units_per_em;
+    cff_subset->descent = (double)font->descent/font->units_per_em;
 
     cff_subset->data = malloc (length);
     if (unlikely (cff_subset->data == NULL)) {
@@ -2212,21 +2217,21 @@ _cairo_cff_fallback_init (cairo_cff_subset_t          *cff_subset,
 	goto fail2;
     }
 
-    cff_subset->widths = calloc (sizeof (int), font->scaled_font_subset->num_glyphs);
+    cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     if (unlikely (cff_subset->widths == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail3;
     }
 
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++)
-        cff_subset->widths[i] = type2_subset.widths[i];
+        cff_subset->widths[i] = (double)type2_subset.widths[i]/1000;
 
-    cff_subset->x_min = type2_subset.x_min;
-    cff_subset->y_min = type2_subset.y_min;
-    cff_subset->x_max = type2_subset.x_max;
-    cff_subset->y_max = type2_subset.y_max;
-    cff_subset->ascent = type2_subset.y_max;
-    cff_subset->descent = type2_subset.y_min;
+    cff_subset->x_min = (double)type2_subset.x_min/1000;
+    cff_subset->y_min = (double)type2_subset.y_min/1000;
+    cff_subset->x_max = (double)type2_subset.x_max/1000;
+    cff_subset->y_max = (double)type2_subset.y_max/1000;
+    cff_subset->ascent = (double)type2_subset.y_max/1000;
+    cff_subset->descent = (double)type2_subset.y_min/1000;
 
     cff_subset->data = malloc (length);
     if (unlikely (cff_subset->data == NULL)) {
diff --git a/gfx/cairo/cairo/src/cairo-clip-private.h b/gfx/cairo/cairo/src/cairo-clip-private.h
index 6128243502b..faf48640995 100644
--- a/gfx/cairo/cairo/src/cairo-clip-private.h
+++ b/gfx/cairo/cairo/src/cairo-clip-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -76,10 +76,6 @@ struct _cairo_clip {
 cairo_private void
 _cairo_clip_init (cairo_clip_t *clip);
 
-cairo_private cairo_status_t
-_cairo_clip_init_rectangle (cairo_clip_t *clip,
-			    const cairo_rectangle_int_t *rect);
-
 cairo_private_no_warn cairo_clip_t *
 _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other);
 
@@ -91,6 +87,10 @@ _cairo_clip_init_copy_transformed (cairo_clip_t    *clip,
 cairo_private void
 _cairo_clip_reset (cairo_clip_t *clip);
 
+cairo_private cairo_bool_t
+_cairo_clip_equal (const cairo_clip_t *clip_a,
+		   const cairo_clip_t *clip_b);
+
 #define _cairo_clip_fini(clip) _cairo_clip_reset (clip)
 
 cairo_private cairo_status_t
@@ -112,12 +112,12 @@ cairo_private const cairo_rectangle_int_t *
 _cairo_clip_get_extents (const cairo_clip_t *clip);
 
 cairo_private cairo_surface_t *
-_cairo_clip_get_surface (cairo_clip_t *clip, cairo_surface_t *dst);
+_cairo_clip_get_surface (cairo_clip_t *clip, cairo_surface_t *dst, int *tx, int *ty);
 
 cairo_private cairo_status_t
 _cairo_clip_combine_with_surface (cairo_clip_t *clip,
 				  cairo_surface_t *dst,
-				  const cairo_rectangle_int_t *extents);
+				  int dst_x, int dst_y);
 
 cairo_private cairo_int_status_t
 _cairo_clip_get_region (cairo_clip_t *clip,
@@ -128,6 +128,20 @@ _cairo_clip_get_boxes (cairo_clip_t *clip,
 		       cairo_box_t **boxes,
 		       int *count);
 
+cairo_private cairo_status_t
+_cairo_clip_to_boxes (cairo_clip_t **clip,
+		      cairo_composite_rectangles_t *extents,
+		      cairo_box_t **boxes,
+		      int *num_boxes);
+
+cairo_private cairo_bool_t
+_cairo_clip_contains_rectangle (cairo_clip_t *clip,
+				const cairo_rectangle_int_t *rect);
+
+cairo_private cairo_bool_t
+_cairo_clip_contains_extents (cairo_clip_t *clip,
+				const cairo_composite_rectangles_t *extents);
+
 cairo_private void
 _cairo_clip_drop_cache (cairo_clip_t  *clip);
 
diff --git a/gfx/cairo/cairo/src/cairo-clip.c b/gfx/cairo/cairo/src/cairo-clip.c
index 4d4aaa7703e..d5a2fab7e7e 100644
--- a/gfx/cairo/cairo/src/cairo-clip.c
+++ b/gfx/cairo/cairo/src/cairo-clip.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,95 +41,16 @@
 
 #include "cairoint.h"
 #include "cairo-clip-private.h"
+#include "cairo-error-private.h"
+#include "cairo-freed-pool-private.h"
+#include "cairo-gstate-private.h"
 #include "cairo-path-fixed-private.h"
+#include "cairo-composite-rectangles-private.h"
 #include "cairo-region-private.h"
 
-/* Keep a stash of recently freed clip_paths, since we need to
- * reallocate them frequently.
- */
-#define MAX_FREED_POOL_SIZE 4
-typedef struct {
-    void *pool[MAX_FREED_POOL_SIZE];
-    int top;
-} freed_pool_t;
-
+#if HAS_FREED_POOL
 static freed_pool_t clip_path_pool;
-
-static void *
-_atomic_fetch (void **slot)
-{
-    return _cairo_atomic_ptr_cmpxchg (slot, *slot, NULL);
-}
-
-static cairo_bool_t
-_atomic_store (void **slot, void *ptr)
-{
-    return _cairo_atomic_ptr_cmpxchg (slot, NULL, ptr) == NULL;
-}
-
-static void *
-_freed_pool_get (freed_pool_t *pool)
-{
-    void *ptr;
-    int i;
-
-    i = pool->top - 1;
-    if (i < 0)
-	i = 0;
-
-    ptr = _atomic_fetch (&pool->pool[i]);
-    if (ptr != NULL) {
-	pool->top = i;
-	return ptr;
-    }
-
-    /* either empty or contended */
-    for (i = ARRAY_LENGTH (pool->pool); i--;) {
-	ptr = _atomic_fetch (&pool->pool[i]);
-	if (ptr != NULL) {
-	    pool->top = i;
-	    return ptr;
-	}
-    }
-
-    /* empty */
-    pool->top = 0;
-    return NULL;
-}
-
-static void
-_freed_pool_put (freed_pool_t *pool, void *ptr)
-{
-    int i = pool->top;
-
-    if (_atomic_store (&pool->pool[i], ptr)) {
-	pool->top = i + 1;
-	return;
-    }
-
-    /* either full or contended */
-    for (i = 0; i < ARRAY_LENGTH (pool->pool); i++) {
-	if (_atomic_store (&pool->pool[i], ptr)) {
-	    pool->top = i + 1;
-	    return;
-	}
-    }
-
-    /* full */
-    pool->top = ARRAY_LENGTH (pool->pool);
-    free (ptr);
-}
-
-static void
-_freed_pool_reset (freed_pool_t *pool)
-{
-    int i;
-
-    for (i = 0; i < ARRAY_LENGTH (pool->pool); i++) {
-	free (pool->pool[i]);
-	pool->pool[i] = NULL;
-    }
-}
+#endif
 
 static cairo_clip_path_t *
 _cairo_clip_path_create (cairo_clip_t *clip)
@@ -158,9 +79,6 @@ _cairo_clip_path_create (cairo_clip_t *clip)
 static cairo_clip_path_t *
 _cairo_clip_path_reference (cairo_clip_path_t *clip_path)
 {
-    if (clip_path == NULL)
-	return NULL;
-
     assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&clip_path->ref_count));
 
     _cairo_reference_count_inc (&clip_path->ref_count);
@@ -247,47 +165,40 @@ _cairo_clip_intersect_rectangle (cairo_clip_t *clip,
     status = _cairo_path_fixed_close_path (&clip_path->path);
     assert (status == CAIRO_STATUS_SUCCESS);
 
-    clip_path->extents = *rect;
     clip_path->fill_rule = CAIRO_FILL_RULE_WINDING;
     clip_path->tolerance = 1;
-    clip_path->antialias = CAIRO_ANTIALIAS_NONE;
+    clip_path->antialias = CAIRO_ANTIALIAS_DEFAULT;
     clip_path->flags |= CAIRO_CLIP_PATH_IS_BOX;
 
+    clip_path->extents = *rect;
+    if (clip_path->prev != NULL) {
+	if (! _cairo_rectangle_intersect (&clip_path->extents,
+					  &clip_path->prev->extents))
+	{
+	    _cairo_clip_set_all_clipped (clip);
+	}
+    }
+
     /* could preallocate the region if it proves worthwhile */
 
     return CAIRO_STATUS_SUCCESS;
 }
 
-/* XXX consider accepting a matrix, no users yet. */
-cairo_status_t
-_cairo_clip_init_rectangle (cairo_clip_t *clip,
-			    const cairo_rectangle_int_t *rect)
-{
-    _cairo_clip_init (clip);
-
-    if (rect == NULL)
-	return CAIRO_STATUS_SUCCESS;
-
-    if (rect->width == 0 || rect->height == 0) {
-	_cairo_clip_set_all_clipped (clip);
-	return CAIRO_STATUS_SUCCESS;
-    }
-
-    return _cairo_clip_intersect_rectangle (clip, rect);
-}
-
 cairo_clip_t *
 _cairo_clip_init_copy (cairo_clip_t *clip, cairo_clip_t *other)
 {
     if (other != NULL) {
 	clip->all_clipped = other->all_clipped;
-	clip->path = _cairo_clip_path_reference (other->path);
-
-	/* this guy is here because of the weird return semantics of _cairo_clip_init_copy */
-	if (!other->path)
-	    return NULL;
+	if (other->path == NULL) {
+	    clip->path = NULL;
+	    if (! clip->all_clipped)
+		clip = NULL;
+	} else {
+	    clip->path = _cairo_clip_path_reference (other->path);
+	}
     } else {
 	_cairo_clip_init (clip);
+	clip = NULL;
     }
 
     return clip;
@@ -318,9 +229,8 @@ _cairo_clip_intersect_path (cairo_clip_t       *clip,
 
     if (clip->path != NULL) {
 	if (clip->path->fill_rule == fill_rule &&
-	    (path->is_rectilinear ||
-	     (tolerance == clip->path->tolerance &&
-	      antialias == clip->path->antialias)) &&
+	    (path->is_rectilinear || tolerance == clip->path->tolerance) &&
+	    antialias == clip->path->antialias &&
 	    _cairo_path_fixed_equal (&clip->path->path, path))
 	{
 	    return CAIRO_STATUS_SUCCESS;
@@ -372,6 +282,38 @@ _cairo_clip_intersect_path (cairo_clip_t       *clip,
     return CAIRO_STATUS_SUCCESS;
 }
 
+cairo_bool_t
+_cairo_clip_equal (const cairo_clip_t *clip_a,
+		   const cairo_clip_t *clip_b)
+{
+    const cairo_clip_path_t *clip_path_a, *clip_path_b;
+
+    clip_path_a = clip_a->path;
+    clip_path_b = clip_b->path;
+
+    while (clip_path_a && clip_path_b) {
+	if (clip_path_a == clip_path_b)
+	    return TRUE;
+
+	if (clip_path_a->fill_rule != clip_path_b->fill_rule)
+	    return FALSE;
+
+	if (clip_path_a->tolerance != clip_path_b->tolerance)
+	    return FALSE;
+
+	if (clip_path_a->antialias != clip_path_b->antialias)
+	    return FALSE;
+
+	if (! _cairo_path_fixed_equal (&clip_path_a->path, &clip_path_b->path))
+	    return FALSE;
+
+	clip_path_a = clip_path_a->prev;
+	clip_path_b = clip_path_b->prev;
+    }
+
+    return clip_path_a == clip_path_b; /* ie both NULL */
+}
+
 cairo_status_t
 _cairo_clip_clip (cairo_clip_t       *clip,
 		  const cairo_path_fixed_t *path,
@@ -409,7 +351,7 @@ _cairo_clip_rectangle (cairo_clip_t       *clip,
     if (clip->path != NULL) {
 	if (rectangle->x <= clip->path->extents.x &&
 	    rectangle->y <= clip->path->extents.y &&
-	    rectangle->x + rectangle->width >= clip->path->extents.x + clip->path->extents.width &&
+	    rectangle->x + rectangle->width  >= clip->path->extents.x + clip->path->extents.width &&
 	    rectangle->y + rectangle->height >= clip->path->extents.y + clip->path->extents.height)
 	{
 	    return CAIRO_STATUS_SUCCESS;
@@ -443,6 +385,7 @@ _cairo_clip_path_reapply_clip_path_transform (cairo_clip_t      *clip,
     status = _cairo_path_fixed_init_copy (&clip_path->path,
 					  &other_path->path);
     if (unlikely (status)) {
+	clip->path = clip->path->prev;
 	_cairo_clip_path_destroy (clip_path);
 	return status;
     }
@@ -485,6 +428,7 @@ _cairo_clip_path_reapply_clip_path_translate (cairo_clip_t      *clip,
     status = _cairo_path_fixed_init_copy (&clip_path->path,
 					  &other_path->path);
     if (unlikely (status)) {
+	clip->path = clip->path->prev;
 	_cairo_clip_path_destroy (clip_path);
 	return status;
     }
@@ -500,6 +444,13 @@ _cairo_clip_path_reapply_clip_path_translate (cairo_clip_t      *clip,
     clip_path->flags = other_path->flags;
     if (other_path->region != NULL) {
 	clip_path->region = cairo_region_copy (other_path->region);
+	status = clip_path->region->status;
+	if (unlikely (status)) {
+	    clip->path = clip->path->prev;
+	    _cairo_clip_path_destroy (clip_path);
+	    return status;
+	}
+
 	cairo_region_translate (clip_path->region, tx, ty);
     }
     clip_path->surface = cairo_surface_reference (other_path->surface);
@@ -997,104 +948,73 @@ _cairo_clip_path_to_boxes (cairo_clip_path_t *clip_path,
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_status_t
-_combine_region (cairo_surface_t *surface,
-		 const cairo_region_t *region,
-		 const cairo_rectangle_int_t *extents)
-{
-    cairo_region_t clear_region;
-    cairo_status_t status;
-
-    _cairo_region_init_rectangle (&clear_region, extents);
-    status = cairo_region_subtract (&clear_region, region);
-    if (unlikely (status))
-	return status;
-
-    if (! cairo_region_is_empty (&clear_region)) {
-	cairo_region_translate (&clear_region, -extents->x, -extents->y);
-	status = _cairo_surface_fill_region (surface,
-					     CAIRO_OPERATOR_CLEAR,
-					     CAIRO_COLOR_TRANSPARENT,
-					     &clear_region);
-    }
-    _cairo_region_fini (&clear_region);
-
-    return status;
-}
-
 static cairo_surface_t *
 _cairo_clip_path_get_surface (cairo_clip_path_t *clip_path,
-			      cairo_surface_t *target)
+			      cairo_surface_t *target,
+			      int *tx, int *ty)
 {
-    cairo_surface_t *surface;
-    cairo_pattern_union_t pattern;
-    cairo_status_t status;
     const cairo_rectangle_int_t *clip_extents = &clip_path->extents;
-    cairo_clip_path_t *prev;
     cairo_bool_t need_translate;
+    cairo_surface_t *surface;
+    cairo_clip_path_t *prev;
+    cairo_status_t status;
 
+    while (clip_path->prev != NULL &&
+	   clip_path->flags & CAIRO_CLIP_PATH_IS_BOX &&
+	   clip_path->path.maybe_fill_region)
+    {
+	clip_path = clip_path->prev;
+    }
+
+    clip_extents = &clip_path->extents;
     if (clip_path->surface != NULL &&
 	clip_path->surface->backend == target->backend)
     {
-	return cairo_surface_reference (clip_path->surface);
+	*tx = clip_extents->x;
+	*ty = clip_extents->y;
+	return clip_path->surface;
     }
 
-    surface = _cairo_surface_create_similar_solid (target,
-						   CAIRO_CONTENT_ALPHA,
-						   clip_extents->width,
-						   clip_extents->height,
-						   CAIRO_COLOR_TRANSPARENT,
-						   FALSE);
+    surface = _cairo_surface_create_similar_scratch (target,
+						     CAIRO_CONTENT_ALPHA,
+						     clip_extents->width,
+						     clip_extents->height);
     if (surface == NULL) {
-	if (clip_path->surface != NULL &&
-	    clip_path->surface->backend == &_cairo_image_surface_backend)
-	{
-	    return cairo_surface_reference (clip_path->surface);
-	}
-
-	surface =
-	    _cairo_image_surface_create_with_content (CAIRO_CONTENT_ALPHA,
-						      clip_extents->width,
-						      clip_extents->height);
+	surface = cairo_image_surface_create (CAIRO_FORMAT_A8,
+					      clip_extents->width,
+					      clip_extents->height);
     }
     if (unlikely (surface->status))
 	return surface;
 
-    _cairo_pattern_init_solid (&pattern.solid,
-			       CAIRO_COLOR_WHITE,
-			       CAIRO_CONTENT_COLOR);
-
-    status = _cairo_clip_path_to_region (clip_path);
-    if (unlikely (_cairo_status_is_error (status)))
-	goto BAIL;
-
     need_translate = clip_extents->x | clip_extents->y;
-    if (status == CAIRO_STATUS_SUCCESS) {
-	if (need_translate) {
-	    cairo_region_translate (clip_path->region,
-				    -clip_extents->x, -clip_extents->y);
-	}
-	status = _cairo_surface_fill_region (surface,
-					     CAIRO_OPERATOR_SOURCE,
-					     CAIRO_COLOR_WHITE,
-					     clip_path->region);
-	if (need_translate) {
-	    cairo_region_translate (clip_path->region,
-				    clip_extents->x, clip_extents->y);
-	}
+    if (clip_path->flags & CAIRO_CLIP_PATH_IS_BOX &&
+	clip_path->path.maybe_fill_region)
+    {
+	status = _cairo_surface_paint (surface,
+				       CAIRO_OPERATOR_SOURCE,
+				       &_cairo_pattern_white.base,
+				       NULL);
+	if (unlikely (status))
+	    goto BAIL;
+    }
+    else
+    {
+	status = _cairo_surface_paint (surface,
+				       CAIRO_OPERATOR_CLEAR,
+				       &_cairo_pattern_clear.base,
+				       NULL);
 	if (unlikely (status))
 	    goto BAIL;
 
-	goto DONE;
-    } else {
 	if (need_translate) {
 	    _cairo_path_fixed_translate (&clip_path->path,
 					 _cairo_fixed_from_int (-clip_extents->x),
 					 _cairo_fixed_from_int (-clip_extents->y));
 	}
 	status = _cairo_surface_fill (surface,
-				      CAIRO_OPERATOR_OVER,
-				      &pattern.base,
+				      CAIRO_OPERATOR_ADD,
+				      &_cairo_pattern_white.base,
 				      &clip_path->path,
 				      clip_path->fill_rule,
 				      clip_path->tolerance,
@@ -1111,19 +1031,16 @@ _cairo_clip_path_get_surface (cairo_clip_path_t *clip_path,
     }
 
     prev = clip_path->prev;
-  NEXT_PATH:
-    if (prev != NULL) {
-	status = _cairo_clip_path_to_region (prev);
-	if (unlikely (_cairo_status_is_error (status)))
-	    goto BAIL;
-
-	if (status == CAIRO_STATUS_SUCCESS) {
-	    status = _combine_region (surface, prev->region, clip_extents);
-	    if (unlikely (status))
-		goto BAIL;
-	} else if (prev->flags & CAIRO_CLIP_PATH_IS_BOX) {
+    while (prev != NULL) {
+	if (prev->flags & CAIRO_CLIP_PATH_IS_BOX &&
+	    prev->path.maybe_fill_region)
+	{
 	    /* a simple box only affects the extents */
-	} else if (prev->path.is_rectilinear) {
+	}
+	else if (prev->path.is_rectilinear ||
+		prev->surface == NULL ||
+		prev->surface->backend != target->backend)
+	{
 	    if (need_translate) {
 		_cairo_path_fixed_translate (&prev->path,
 					     _cairo_fixed_from_int (-clip_extents->x),
@@ -1131,7 +1048,7 @@ _cairo_clip_path_get_surface (cairo_clip_path_t *clip_path,
 	    }
 	    status = _cairo_surface_fill (surface,
 					  CAIRO_OPERATOR_IN,
-					  &pattern.base,
+					  &_cairo_pattern_white.base,
 					  &prev->path,
 					  prev->fill_rule,
 					  prev->tolerance,
@@ -1145,19 +1062,23 @@ _cairo_clip_path_get_surface (cairo_clip_path_t *clip_path,
 
 	    if (unlikely (status))
 		goto BAIL;
-
-	    prev = prev->prev;
-	    goto NEXT_PATH;
-	} else {
+	}
+	else
+	{
+	    cairo_surface_pattern_t pattern;
 	    cairo_surface_t *prev_surface;
+	    int prev_tx, prev_ty;
 
-	    prev_surface = _cairo_clip_path_get_surface (prev, target);
-	    _cairo_pattern_init_for_surface (&pattern.surface, prev_surface);
-	    cairo_surface_destroy (prev_surface);
+	    prev_surface = _cairo_clip_path_get_surface (prev, target, &prev_tx, &prev_ty);
+	    status = prev_surface->status;
+	    if (unlikely (status))
+		goto BAIL;
 
+	    _cairo_pattern_init_for_surface (&pattern, prev_surface);
+	    pattern.base.filter = CAIRO_FILTER_NEAREST;
 	    cairo_matrix_init_translate (&pattern.base.matrix,
-					 -prev->extents.x + clip_extents->x,
-					 -prev->extents.y + clip_extents->y);
+					 clip_extents->x - prev_tx,
+					 clip_extents->y - prev_ty);
 	    status = _cairo_surface_paint (surface,
 					   CAIRO_OPERATOR_IN,
 					   &pattern.base,
@@ -1166,18 +1087,75 @@ _cairo_clip_path_get_surface (cairo_clip_path_t *clip_path,
 
 	    if (unlikely (status))
 		goto BAIL;
+
+	    break;
 	}
+
+	prev = prev->prev;
     }
 
-  DONE:
+    *tx = clip_extents->x;
+    *ty = clip_extents->y;
     cairo_surface_destroy (clip_path->surface);
-    return clip_path->surface = cairo_surface_reference (surface);
+    return clip_path->surface = surface;
 
   BAIL:
     cairo_surface_destroy (surface);
     return _cairo_surface_create_in_error (status);
 }
 
+cairo_bool_t
+_cairo_clip_contains_rectangle (cairo_clip_t *clip,
+				const cairo_rectangle_int_t *rect)
+{
+    cairo_clip_path_t *clip_path;
+
+    if (clip == NULL)
+	return FALSE;
+
+    clip_path = clip->path;
+    if (clip_path->extents.x > rect->x ||
+	clip_path->extents.y > rect->y ||
+	clip_path->extents.x + clip_path->extents.width  < rect->x + rect->width ||
+	clip_path->extents.y + clip_path->extents.height < rect->y + rect->height)
+    {
+	return FALSE;
+    }
+
+    do {
+	cairo_box_t box;
+
+	if ((clip_path->flags & CAIRO_CLIP_PATH_IS_BOX) == 0)
+	    return FALSE;
+
+	if (! _cairo_path_fixed_is_box (&clip_path->path, &box))
+	    return FALSE;
+
+	if (box.p1.x > _cairo_fixed_from_int (rect->x) ||
+	    box.p1.y > _cairo_fixed_from_int (rect->y) ||
+	    box.p2.x < _cairo_fixed_from_int (rect->x + rect->width) ||
+	    box.p2.y < _cairo_fixed_from_int (rect->y + rect->height))
+	{
+	    return FALSE;
+	}
+    } while ((clip_path = clip_path->prev) != NULL);
+
+    return TRUE;
+}
+
+cairo_bool_t
+_cairo_clip_contains_extents (cairo_clip_t *clip,
+			      const cairo_composite_rectangles_t *extents)
+{
+    const cairo_rectangle_int_t *rect;
+
+    if (clip == NULL)
+	return FALSE;
+
+    rect = extents->is_bounded ? &extents->bounded : &extents->unbounded;
+    return _cairo_clip_contains_rectangle (clip, rect);
+}
+
 void
 _cairo_debug_print_clip (FILE *stream, cairo_clip_t *clip)
 {
@@ -1202,72 +1180,48 @@ _cairo_debug_print_clip (FILE *stream, cairo_clip_t *clip)
 
     clip_path = clip->path;
     do {
-	fprintf (stream, "path: has region? %s, has surface? %s: ",
+	fprintf (stream, "path: has region? %s, has surface? %s, aa=%d, tolerance=%f, rule=%d: ",
 		 clip_path->region == NULL ? "no" : "yes",
-		 clip_path->surface == NULL ? "no" : "yes");
+		 clip_path->surface == NULL ? "no" : "yes",
+		 clip_path->antialias,
+		 clip_path->tolerance,
+		 clip_path->fill_rule);
 	_cairo_debug_print_path (stream, &clip_path->path);
 	fprintf (stream, "\n");
     } while ((clip_path = clip_path->prev) != NULL);
 }
 
 cairo_surface_t *
-_cairo_clip_get_surface (cairo_clip_t *clip, cairo_surface_t *target)
+_cairo_clip_get_surface (cairo_clip_t *clip, cairo_surface_t *target, int *tx, int *ty)
 {
+    /* XXX is_clear -> all_clipped */
     assert (clip->path != NULL);
-    return _cairo_clip_path_get_surface (clip->path, target);
+    return _cairo_clip_path_get_surface (clip->path, target, tx, ty);
 }
 
 cairo_status_t
 _cairo_clip_combine_with_surface (cairo_clip_t *clip,
 				  cairo_surface_t *dst,
-				  const cairo_rectangle_int_t *extents)
+				  int dst_x, int dst_y)
 {
-    cairo_pattern_union_t pattern;
     cairo_clip_path_t *clip_path = clip->path;
     cairo_bool_t need_translate;
     cairo_status_t status;
 
     assert (clip_path != NULL);
 
-    if (clip_path->surface != NULL &&
-	clip_path->surface->backend == dst->backend)
-    {
-	_cairo_pattern_init_for_surface (&pattern.surface,
-					 clip_path->surface);
-	cairo_matrix_init_translate (&pattern.base.matrix,
-				     extents->x - clip_path->extents.x,
-				     extents->y - clip_path->extents.y);
-	status = _cairo_surface_paint (dst,
-				       CAIRO_OPERATOR_IN,
-				       &pattern.base,
-				       NULL);
-
-	_cairo_pattern_fini (&pattern.base);
-
-	return status;
-    }
-
-    _cairo_pattern_init_solid (&pattern.solid,
-			       CAIRO_COLOR_WHITE,
-			       CAIRO_CONTENT_COLOR);
-
-    need_translate = extents->x | extents->y;
+    need_translate = dst_x | dst_y;
     do {
-	status = _cairo_clip_path_to_region (clip_path);
-	if (unlikely (_cairo_status_is_error (status)))
-	    return status;
-
-	if (status == CAIRO_STATUS_SUCCESS)
-	    return _combine_region (dst, clip_path->region, extents);
-
 	if (clip_path->surface != NULL &&
 	    clip_path->surface->backend == dst->backend)
 	{
-	    _cairo_pattern_init_for_surface (&pattern.surface,
-					     clip_path->surface);
+	    cairo_surface_pattern_t pattern;
+
+	    _cairo_pattern_init_for_surface (&pattern, clip_path->surface);
 	    cairo_matrix_init_translate (&pattern.base.matrix,
-					 extents->x - clip_path->extents.x,
-					 extents->y - clip_path->extents.y);
+					 dst_x - clip_path->extents.x,
+					 dst_y - clip_path->extents.y);
+	    pattern.base.filter = CAIRO_FILTER_NEAREST;
 	    status = _cairo_surface_paint (dst,
 					   CAIRO_OPERATOR_IN,
 					   &pattern.base,
@@ -1278,30 +1232,29 @@ _cairo_clip_combine_with_surface (cairo_clip_t *clip,
 	    return status;
 	}
 
-	if (clip_path->flags & CAIRO_CLIP_PATH_IS_BOX) {
-	    cairo_region_t clip_region;
+	if (clip_path->flags & CAIRO_CLIP_PATH_IS_BOX &&
+	    clip_path->path.maybe_fill_region)
+	{
+	    continue;
+	}
 
-	    _cairo_region_init_rectangle (&clip_region, &clip_path->extents);
-	    status = _combine_region (dst, &clip_region, extents);
-	} else {
-	    if (need_translate) {
-		_cairo_path_fixed_translate (&clip_path->path,
-					     _cairo_fixed_from_int (-extents->x),
-					     _cairo_fixed_from_int (-extents->y));
-	    }
-	    status = _cairo_surface_fill (dst,
-					  CAIRO_OPERATOR_IN,
-					  &pattern.base,
-					  &clip_path->path,
-					  clip_path->fill_rule,
-					  clip_path->tolerance,
-					  clip_path->antialias,
-					  NULL);
-	    if (need_translate) {
-		_cairo_path_fixed_translate (&clip_path->path,
-					     _cairo_fixed_from_int (extents->x),
-					     _cairo_fixed_from_int (extents->y));
-	    }
+	if (need_translate) {
+	    _cairo_path_fixed_translate (&clip_path->path,
+					 _cairo_fixed_from_int (-dst_x),
+					 _cairo_fixed_from_int (-dst_y));
+	}
+	status = _cairo_surface_fill (dst,
+				      CAIRO_OPERATOR_IN,
+				      &_cairo_pattern_white.base,
+				      &clip_path->path,
+				      clip_path->fill_rule,
+				      clip_path->tolerance,
+				      clip_path->antialias,
+				      NULL);
+	if (need_translate) {
+	    _cairo_path_fixed_translate (&clip_path->path,
+					 _cairo_fixed_from_int (dst_x),
+					 _cairo_fixed_from_int (dst_y));
 	}
 
 	if (unlikely (status))
@@ -1432,6 +1385,90 @@ _cairo_clip_get_boxes (cairo_clip_t *clip,
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_bool_t
+box_is_aligned (const cairo_box_t *box)
+{
+    return
+	_cairo_fixed_is_integer (box->p1.x) &&
+	_cairo_fixed_is_integer (box->p1.y) &&
+	_cairo_fixed_is_integer (box->p2.x) &&
+	_cairo_fixed_is_integer (box->p2.y);
+}
+
+static void
+intersect_with_boxes (cairo_composite_rectangles_t *extents,
+		      cairo_box_t *boxes,
+		      int num_boxes)
+{
+    cairo_rectangle_int_t rect;
+    cairo_box_t box;
+    cairo_bool_t is_empty;
+
+    box.p1.x = box.p1.y = INT_MIN;
+    box.p2.x = box.p2.y = INT_MAX;
+    while (num_boxes--) {
+	if (boxes->p1.x < box.p1.x)
+	    box.p1.x = boxes->p1.x;
+	if (boxes->p1.y < box.p1.y)
+	    box.p1.y = boxes->p1.y;
+
+	if (boxes->p2.x > box.p2.x)
+	    box.p2.x = boxes->p2.x;
+	if (boxes->p2.y > box.p2.y)
+	    box.p2.y = boxes->p2.y;
+    }
+
+    _cairo_box_round_to_rectangle (&box, &rect);
+    is_empty = _cairo_rectangle_intersect (&extents->bounded, &rect);
+    is_empty = _cairo_rectangle_intersect (&extents->unbounded, &rect);
+}
+
+cairo_status_t
+_cairo_clip_to_boxes (cairo_clip_t **clip,
+		      cairo_composite_rectangles_t *extents,
+		      cairo_box_t **boxes,
+		      int *num_boxes)
+{
+    cairo_status_t status;
+    const cairo_rectangle_int_t *rect;
+
+    rect = extents->is_bounded ? &extents->bounded : &extents->unbounded;
+
+    if (*clip == NULL)
+	goto EXTENTS;
+
+    status = _cairo_clip_rectangle (*clip, rect);
+    if (unlikely (status))
+	return status;
+
+    status = _cairo_clip_get_boxes (*clip, boxes, num_boxes);
+    switch ((int) status) {
+    case CAIRO_STATUS_SUCCESS:
+	intersect_with_boxes (extents, *boxes, *num_boxes);
+	if (rect->width == 0 || rect->height == 0 ||
+	    extents->is_bounded ||
+	    (*num_boxes == 1 && box_is_aligned (*boxes)))
+	{
+	    *clip = NULL;
+	}
+	goto DONE;
+
+    case CAIRO_INT_STATUS_UNSUPPORTED:
+	goto EXTENTS;
+
+    default:
+	return status;
+    }
+
+  EXTENTS:
+    status = CAIRO_STATUS_SUCCESS;
+    _cairo_box_from_rectangle (&(*boxes)[0], rect);
+    *num_boxes = 1;
+  DONE:
+    return status;
+}
+
+
 static cairo_rectangle_list_t *
 _cairo_rectangle_list_create_in_error (cairo_status_t status)
 {
diff --git a/gfx/cairo/cairo/src/cairo-color.c b/gfx/cairo/cairo/src/cairo-color.c
index 7640bf43621..d20fea4d2f3 100644
--- a/gfx/cairo/cairo/src/cairo-color.c
+++ b/gfx/cairo/cairo/src/cairo-color.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -67,13 +67,14 @@ _cairo_stock_color (cairo_stock_t stock)
 	return &cairo_color_black;
     case CAIRO_STOCK_TRANSPARENT:
 	return &cairo_color_transparent;
+
+    case CAIRO_STOCK_NUM_COLORS:
+    default:
+	ASSERT_NOT_REACHED;
+	/* If the user can get here somehow, give a color that indicates a
+	 * problem. */
+	return &cairo_color_magenta;
     }
-
-    ASSERT_NOT_REACHED;
-
-    /* If the user can get here somehow, give a color that indicates a
-     * problem. */
-    return &cairo_color_magenta;
 }
 
 void
@@ -161,6 +162,7 @@ _cairo_color_get_rgba_premultiplied (cairo_color_t *color,
     *alpha = color->alpha;
 }
 
+/* NB: This function works both for unmultiplied and premultiplied colors */
 cairo_bool_t
 _cairo_color_equal (const cairo_color_t *color_a,
 	            const cairo_color_t *color_b)
@@ -168,8 +170,42 @@ _cairo_color_equal (const cairo_color_t *color_a,
     if (color_a == color_b)
 	return TRUE;
 
+    if (color_a->alpha_short != color_b->alpha_short)
+        return FALSE;
+
+    if (color_a->alpha_short == 0)
+        return TRUE;
+
     return color_a->red_short   == color_b->red_short   &&
            color_a->green_short == color_b->green_short &&
-           color_a->blue_short  == color_b->blue_short  &&
-           color_a->alpha_short == color_b->alpha_short;
+           color_a->blue_short  == color_b->blue_short;
+}
+
+cairo_bool_t
+_cairo_color_stop_equal (const cairo_color_stop_t *color_a,
+			 const cairo_color_stop_t *color_b)
+{
+    if (color_a == color_b)
+	return TRUE;
+
+    return color_a->alpha_short == color_b->alpha_short &&
+           color_a->red_short   == color_b->red_short   &&
+           color_a->green_short == color_b->green_short &&
+           color_a->blue_short  == color_b->blue_short;
+}
+
+cairo_content_t
+_cairo_color_get_content (const cairo_color_t *color)
+{
+    if (CAIRO_COLOR_IS_OPAQUE (color))
+        return CAIRO_CONTENT_COLOR;
+
+    if (color->red_short == 0 &&
+	color->green_short == 0 &&
+	color->blue_short == 0)
+    {
+        return CAIRO_CONTENT_ALPHA;
+    }
+
+    return CAIRO_CONTENT_COLOR_ALPHA;
 }
diff --git a/gfx/cairo/cairo/src/cairo-combsort-private.h b/gfx/cairo/cairo/src/cairo-combsort-private.h
index ce31257ecec..bb7abb47769 100644
--- a/gfx/cairo/cairo/src/cairo-combsort-private.h
+++ b/gfx/cairo/cairo/src/cairo-combsort-private.h
@@ -11,7 +11,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-compiler-private.h b/gfx/cairo/cairo/src/cairo-compiler-private.h
index 403c3f7a136..bc6a8802853 100644
--- a/gfx/cairo/cairo/src/cairo-compiler-private.h
+++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,6 +44,45 @@
 #include "config.h"
 #endif
 
+/* Size in bytes of buffer to use off the stack per functions.
+ * Mostly used by text functions.  For larger allocations, they'll
+ * malloc(). */
+#ifndef CAIRO_STACK_BUFFER_SIZE
+#define CAIRO_STACK_BUFFER_SIZE (512 * sizeof (int))
+#endif
+
+#define CAIRO_STACK_ARRAY_LENGTH(T) (CAIRO_STACK_BUFFER_SIZE / sizeof(T))
+
+/*
+ * The goal of this block is to define the following macros for
+ * providing faster linkage to functions in the public API for calls
+ * from within cairo.
+ *
+ * slim_hidden_proto(f)
+ * slim_hidden_proto_no_warn(f)
+ *
+ *   Declares `f' as a library internal function and hides the
+ *   function from the global symbol table.  This macro must be
+ *   expanded after `f' has been declared with a prototype but before
+ *   any calls to the function are seen by the compiler.  The no_warn
+ *   variant inhibits warnings about the return value being unused at
+ *   call sites.  The macro works by renaming `f' to an internal name
+ *   in the symbol table and hiding that.  As far as cairo internal
+ *   calls are concerned they're calling a library internal function
+ *   and thus don't need to bounce via the PLT.
+ *
+ * slim_hidden_def(f)
+ *
+ *   Exports `f' back to the global symbol table.  This macro must be
+ *   expanded right after the function definition and only for symbols
+ *   hidden previously with slim_hidden_proto().  The macro works by
+ *   adding a global entry to the symbol table which points at the
+ *   internal name of `f' created by slim_hidden_proto().
+ *
+ * Functions in the public API which aren't called by the library
+ * don't need to be hidden and re-exported using the slim hidden
+ * macros.
+ */
 #if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
 # define slim_hidden_proto(name)		slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private
 # define slim_hidden_proto_no_warn(name)	slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private_no_warn
@@ -134,9 +173,11 @@
 #if __GNUC__ >= 3
 #define cairo_pure __attribute__((pure))
 #define cairo_const __attribute__((const))
+#define cairo_always_inline inline __attribute__((always_inline))
 #else
 #define cairo_pure
 #define cairo_const
+#define cairo_always_inline inline
 #endif
 
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
@@ -171,6 +212,26 @@
 #ifdef _MSC_VER
 #undef inline
 #define inline __inline
+
+/* there are currently linkage problems that arise when trying to include intrin.h in c++:
+ * D:\sdks\v7.0\include\winnt.h(3674) : error C2733: second C linkage of overloaded function '_interlockedbittestandset' not allowed
+ * so avoid defining ffs in c++ code for now */
+#ifndef  __cplusplus
+/* Add a definition of ffs */
+#include <intrin.h>
+#pragma intrinsic(_BitScanForward)
+static __forceinline int
+ffs (int x)
+{
+    unsigned long i;
+
+    if (_BitScanForward(&i, x) != 0)
+	return i + 1;
+
+    return 0;
+}
+#endif
+
 #endif
 
 #if defined(_MSC_VER) && defined(_M_IX86)
diff --git a/gfx/cairo/cairo/src/cairo-composite-rectangles-private.h b/gfx/cairo/cairo/src/cairo-composite-rectangles-private.h
new file mode 100644
index 00000000000..8c3c5abcc7a
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-composite-rectangles-private.h
@@ -0,0 +1,105 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.u>
+ */
+
+#ifndef CAIRO_COMPOSITE_RECTANGLES_PRIVATE_H
+#define CAIRO_COMPOSITE_RECTANGLES_PRIVATE_H
+
+#include "cairo-types-private.h"
+
+CAIRO_BEGIN_DECLS
+
+/* Rectangles that take part in a composite operation.
+ *
+ * The source and mask track the extents of the respective patterns in device
+ * space. The unbounded rectangle is essentially the clip rectangle. And the
+ * intersection of all is the bounded rectangle, which is the minimum extents
+ * the operation may require. Whether or not the operation is actually bounded
+ * is tracked in the is_bounded boolean.
+ *
+ */
+struct _cairo_composite_rectangles {
+    cairo_rectangle_int_t source;
+    cairo_rectangle_int_t mask;
+    cairo_rectangle_int_t bounded; /* dst */
+    cairo_rectangle_int_t unbounded; /* clip */
+    uint32_t is_bounded;
+};
+
+cairo_private cairo_int_status_t
+_cairo_composite_rectangles_init_for_paint (cairo_composite_rectangles_t *extents,
+					 const cairo_rectangle_int_t *surface_extents,
+					 cairo_operator_t	 op,
+					 const cairo_pattern_t	*source,
+					 cairo_clip_t		*clip);
+
+cairo_private cairo_int_status_t
+_cairo_composite_rectangles_init_for_mask (cairo_composite_rectangles_t *extents,
+					const cairo_rectangle_int_t *surface_extents,
+					cairo_operator_t	 op,
+					const cairo_pattern_t	*source,
+					const cairo_pattern_t	*mask,
+					cairo_clip_t		*clip);
+
+cairo_private cairo_int_status_t
+_cairo_composite_rectangles_init_for_stroke (cairo_composite_rectangles_t *extents,
+					     const cairo_rectangle_int_t *surface_extents,
+					     cairo_operator_t	 op,
+					     const cairo_pattern_t	*source,
+					     cairo_path_fixed_t	*path,
+					     const cairo_stroke_style_t	*style,
+					     const cairo_matrix_t	*ctm,
+					     cairo_clip_t		*clip);
+
+cairo_private cairo_int_status_t
+_cairo_composite_rectangles_init_for_fill (cairo_composite_rectangles_t *extents,
+					   const cairo_rectangle_int_t *surface_extents,
+					   cairo_operator_t	 op,
+					   const cairo_pattern_t	*source,
+					   cairo_path_fixed_t	*path,
+					   cairo_clip_t		*clip);
+
+cairo_private cairo_int_status_t
+_cairo_composite_rectangles_init_for_glyphs (cairo_composite_rectangles_t *extents,
+					     const cairo_rectangle_int_t *surface_extents,
+					     cairo_operator_t		 op,
+					     const cairo_pattern_t	*source,
+					     cairo_scaled_font_t	*scaled_font,
+					     cairo_glyph_t		*glyphs,
+					     int			 num_glyphs,
+					     cairo_clip_t		*clip,
+					     cairo_bool_t		*overlap);
+
+#endif /* CAIRO_COMPOSITE_RECTANGLES_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-composite-rectangles.c b/gfx/cairo/cairo/src/cairo-composite-rectangles.c
new file mode 100644
index 00000000000..7f6484339d5
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-composite-rectangles.c
@@ -0,0 +1,195 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Red Hat, Inc.
+ *
+ * Contributor(s):
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-error-private.h"
+#include "cairo-composite-rectangles-private.h"
+
+/* A collection of routines to facilitate writing compositors. */
+
+static inline cairo_bool_t
+_cairo_composite_rectangles_init (cairo_composite_rectangles_t *extents,
+				  const cairo_rectangle_int_t *surface_extents,
+				  cairo_operator_t op,
+				  const cairo_pattern_t *source,
+				  cairo_clip_t *clip)
+{
+    extents->unbounded = *surface_extents;
+
+    if (clip != NULL) {
+	const cairo_rectangle_int_t *clip_extents;
+
+	clip_extents = _cairo_clip_get_extents (clip);
+	if (clip_extents == NULL)
+	    return FALSE;
+
+	if (! _cairo_rectangle_intersect (&extents->unbounded, clip_extents))
+	    return FALSE;
+    }
+
+    extents->bounded = extents->unbounded;
+    extents->is_bounded = _cairo_operator_bounded_by_either (op);
+
+    _cairo_pattern_get_extents (source, &extents->source);
+    if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_SOURCE) {
+	if (! _cairo_rectangle_intersect (&extents->bounded, &extents->source))
+	    return FALSE;
+    }
+
+    return TRUE;
+}
+
+cairo_int_status_t
+_cairo_composite_rectangles_init_for_paint (cairo_composite_rectangles_t *extents,
+					    const cairo_rectangle_int_t *surface_extents,
+					    cairo_operator_t		 op,
+					    const cairo_pattern_t	*source,
+					    cairo_clip_t		*clip)
+{
+    if (! _cairo_composite_rectangles_init (extents,
+					    surface_extents,
+					    op, source, clip))
+    {
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+    }
+
+    extents->mask = extents->bounded;
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_int_status_t
+_cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents)
+{
+    cairo_bool_t ret;
+
+    ret = _cairo_rectangle_intersect (&extents->bounded, &extents->mask);
+    if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+cairo_int_status_t
+_cairo_composite_rectangles_init_for_mask (cairo_composite_rectangles_t *extents,
+					   const cairo_rectangle_int_t *surface_extents,
+					   cairo_operator_t		 op,
+					   const cairo_pattern_t	*source,
+					   const cairo_pattern_t	*mask,
+					   cairo_clip_t			*clip)
+{
+    if (! _cairo_composite_rectangles_init (extents,
+					    surface_extents,
+					    op, source, clip))
+    {
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+    }
+
+    _cairo_pattern_get_extents (mask, &extents->mask);
+
+    return _cairo_composite_rectangles_intersect (extents);
+}
+
+cairo_int_status_t
+_cairo_composite_rectangles_init_for_stroke (cairo_composite_rectangles_t *extents,
+					     const cairo_rectangle_int_t *surface_extents,
+					     cairo_operator_t		 op,
+					     const cairo_pattern_t	*source,
+					     cairo_path_fixed_t		*path,
+					     const cairo_stroke_style_t	*style,
+					     const cairo_matrix_t	*ctm,
+					     cairo_clip_t		*clip)
+{
+    if (! _cairo_composite_rectangles_init (extents,
+					    surface_extents,
+					    op, source, clip))
+    {
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+    }
+
+    _cairo_path_fixed_approximate_stroke_extents (path, style, ctm, &extents->mask);
+
+    return _cairo_composite_rectangles_intersect (extents);
+}
+
+cairo_int_status_t
+_cairo_composite_rectangles_init_for_fill (cairo_composite_rectangles_t *extents,
+					   const cairo_rectangle_int_t *surface_extents,
+					   cairo_operator_t		 op,
+					   const cairo_pattern_t	*source,
+					   cairo_path_fixed_t		*path,
+					   cairo_clip_t			*clip)
+{
+    if (! _cairo_composite_rectangles_init (extents,
+					    surface_extents,
+					    op, source, clip))
+    {
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+    }
+
+    _cairo_path_fixed_approximate_fill_extents (path, &extents->mask);
+
+    return _cairo_composite_rectangles_intersect (extents);
+}
+
+cairo_int_status_t
+_cairo_composite_rectangles_init_for_glyphs (cairo_composite_rectangles_t *extents,
+					     const cairo_rectangle_int_t *surface_extents,
+					     cairo_operator_t		 op,
+					     const cairo_pattern_t	*source,
+					     cairo_scaled_font_t	*scaled_font,
+					     cairo_glyph_t		*glyphs,
+					     int			 num_glyphs,
+					     cairo_clip_t		*clip,
+					     cairo_bool_t		*overlap)
+{
+    cairo_status_t status;
+
+    if (! _cairo_composite_rectangles_init (extents,
+					    surface_extents,
+					    op, source, clip))
+    {
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
+    }
+
+    status = _cairo_scaled_font_glyph_device_extents (scaled_font,
+						      glyphs, num_glyphs,
+						      &extents->mask,
+						      overlap);
+    if (unlikely (status))
+	return status;
+
+    return _cairo_composite_rectangles_intersect (extents);
+}
diff --git a/gfx/cairo/cairo/src/cairo-d2d-private.h b/gfx/cairo/cairo/src/cairo-d2d-private.h
index 80e480ff0f2..4fc2f60d4ac 100644
--- a/gfx/cairo/cairo/src/cairo-d2d-private.h
+++ b/gfx/cairo/cairo/src/cairo-d2d-private.h
@@ -43,10 +43,8 @@
 #include <d3d10.h>
 #include <dxgi.h>
 
-extern "C" {
 #include "cairoint.h"
 #include "cairo-surface-clipper-private.h"
-}
 
 #include "cairo-win32-refptr.h"
 #include "cairo-d2d-private-fx.h"
diff --git a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
index 43ae796c451..6df6dd8c411 100644
--- a/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-d2d-surface.cpp
@@ -39,10 +39,9 @@
 #include "cairo-d2d-private.h"
 #include "cairo-dwrite-private.h"
 
-extern "C" {
 #include "cairo-win32.h"
 #include "cairo-analysis-surface-private.h"
-}
+#include "cairo-error-private.h"
 
 // Required for using placement new.
 #include <new>
@@ -649,9 +648,9 @@ _cairo_d2d_stroke(void			*surface,
 		  cairo_operator_t	 op,
 		  const cairo_pattern_t	*source,
 		  cairo_path_fixed_t	*path,
-		  cairo_stroke_style_t	*style,
-		  cairo_matrix_t	*ctm,
-		  cairo_matrix_t	*ctm_inverse,
+		  const cairo_stroke_style_t	*style,
+		  const cairo_matrix_t	*ctm,
+		  const cairo_matrix_t	*ctm_inverse,
 		  double		 tolerance,
 		  cairo_antialias_t	 antialias,
 		  cairo_clip_t		*clip);
@@ -763,6 +762,16 @@ _cairo_d2d_compute_surface_mem_size(cairo_d2d_surface_t *surface)
     return size;
 }
 
+static D2D1_COLOR_F
+_cairo_d2d_color_from_cairo_color_stop(const cairo_color_stop_t &color)
+{
+    return D2D1::ColorF((FLOAT)color.red, 
+			(FLOAT)color.green, 
+			(FLOAT)color.blue,
+			(FLOAT)color.alpha);
+}
+
+
 /**
  * Gets the surface buffer texture for window surfaces whose backbuffer
  * is not directly usable as a bitmap.
@@ -1435,7 +1444,7 @@ _cairo_d2d_create_radial_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 		    stops[i].position = (FLOAT)((repeat + source_pattern->base.stops[stop].offset) * stop_scale);
 		}
 		stops[i].color =
-		    _cairo_d2d_color_from_cairo_color(source_pattern->base.stops[stop].color);
+		    _cairo_d2d_color_from_cairo_color_stop(source_pattern->base.stops[stop].color);
 	    }
 	} else {
 	    // Simple case, we don't need to reflect.
@@ -1445,7 +1454,7 @@ _cairo_d2d_create_radial_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 		// Calculate which stop this would be in the original pattern
 		cairo_gradient_stop_t *stop = &source_pattern->base.stops[i % source_pattern->base.n_stops];
 		stops[i].position = (FLOAT)((repeat + stop->offset) * stop_scale);
-		stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+		stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	    }
 	}
     } else if (source_pattern->base.base.extend == CAIRO_EXTEND_PAD) {
@@ -1458,7 +1467,7 @@ _cairo_d2d_create_radial_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 	for (unsigned int i = 0; i < source_pattern->base.n_stops; i++) {
 	    cairo_gradient_stop_t *stop = &source_pattern->base.stops[i];
 	    stops[i].position = (FLOAT)(global_offset + stop->offset * offset_factor);
-	    stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+	    stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	}
     } else if (source_pattern->base.base.extend == CAIRO_EXTEND_NONE) {
 	float offset_factor = (outer_radius - inner_radius) / outer_radius;
@@ -1482,7 +1491,7 @@ _cairo_d2d_create_radial_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 	for (unsigned int j = 0; j < source_pattern->base.n_stops; j++, i++) {
 	    cairo_gradient_stop_t *stop = &source_pattern->base.stops[j];
 	    stops[i].position = (FLOAT)(global_offset + stop->offset * offset_factor);
-	    stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+	    stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	}
 	stops[i].position = 1.0f;
 	stops[i].color = D2D1::ColorF(0, 0);
@@ -1514,7 +1523,7 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 	// Cairo behavior in this situation is to draw a solid color the size of the last stop.
 	RefPtr<ID2D1SolidColorBrush> brush;
 	d2dsurf->rt->CreateSolidColorBrush(
-	    _cairo_d2d_color_from_cairo_color(source_pattern->base.stops[source_pattern->base.n_stops - 1].color),
+	    _cairo_d2d_color_from_cairo_color_stop(source_pattern->base.stops[source_pattern->base.n_stops - 1].color),
 	    &brush);
 	return brush;
     }
@@ -1619,7 +1628,7 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 		    stops[i].position = (FLOAT)((repeat + source_pattern->base.stops[stop].offset) * stop_scale);
 		}
 		stops[i].color =
-		    _cairo_d2d_color_from_cairo_color(source_pattern->base.stops[stop].color);
+		    _cairo_d2d_color_from_cairo_color_stop(source_pattern->base.stops[stop].color);
 	    }
 	} else {
 	    // Simple case, we don't need to reflect.
@@ -1629,7 +1638,7 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 		// Calculate which stop this would be in the original pattern
 		cairo_gradient_stop_t *stop = &source_pattern->base.stops[i % source_pattern->base.n_stops];
 		stops[i].position = (FLOAT)((repeat + stop->offset) * stop_scale);
-		stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+		stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	    }
 	}
     } else if (source_pattern->base.base.extend == CAIRO_EXTEND_PAD) {
@@ -1637,7 +1646,7 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 	for (unsigned int i = 0; i < source_pattern->base.n_stops; i++) {
 	    cairo_gradient_stop_t *stop = &source_pattern->base.stops[i];
 	    stops[i].position = (FLOAT)stop->offset;
-	    stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+	    stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	}
     } else if (source_pattern->base.base.extend == CAIRO_EXTEND_NONE) {
 	num_stops += 2;
@@ -1647,7 +1656,7 @@ _cairo_d2d_create_linear_gradient_brush(cairo_d2d_surface_t *d2dsurf,
 	for (unsigned int i = 1; i < source_pattern->base.n_stops + 1; i++) {
 	    cairo_gradient_stop_t *stop = &source_pattern->base.stops[i - 1];
 	    stops[i].position = (FLOAT)stop->offset;
-	    stops[i].color = _cairo_d2d_color_from_cairo_color(stop->color);
+	    stops[i].color = _cairo_d2d_color_from_cairo_color_stop(stop->color);
 	}
 	stops[source_pattern->base.n_stops + 1].position = 1.0f;
 	stops[source_pattern->base.n_stops + 1].color = D2D1::ColorF(0, 0);
@@ -2309,6 +2318,16 @@ static cairo_operator_t _cairo_d2d_simplify_operator(cairo_operator_t op,
     return op;
 }
 
+void
+_cairo_d2d_surface_init(cairo_d2d_surface_t *newSurf, cairo_d2d_device_t *d2d_device, cairo_format_t format)
+{
+    newSurf->format = format;
+
+    newSurf->device = d2d_device;
+    cairo_addref_device(&d2d_device->base);
+    d2d_device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+}
+
 // Implementation
 static cairo_surface_t*
 _cairo_d2d_create_similar(void			*surface,
@@ -2320,7 +2339,7 @@ _cairo_d2d_create_similar(void			*surface,
     cairo_d2d_surface_t *newSurf = static_cast<cairo_d2d_surface_t*>(malloc(sizeof(cairo_d2d_surface_t)));
     
     new (newSurf) cairo_d2d_surface_t();
-    _cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, content);
+    _cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, content);
 
 
     D2D1_SIZE_U sizePixels;
@@ -2425,9 +2444,7 @@ _cairo_d2d_create_similar(void			*surface,
 
     _d2d_clear_surface(newSurf);
 
-    newSurf->device = d2dsurf->device;
-    cairo_addref_device(&newSurf->device->base);
-    newSurf->device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+    _cairo_d2d_surface_init(newSurf, d2dsurf->device, _cairo_format_from_content(content));
 
     return reinterpret_cast<cairo_surface_t*>(newSurf);
 
@@ -2501,8 +2518,8 @@ _cairo_d2d_acquire_source_image(void                    *abstract_surface,
 	return _cairo_error(CAIRO_STATUS_NO_DEVICE);
     }
     *image_out = 
-	(cairo_image_surface_t*)_cairo_image_surface_create_for_data_with_content((unsigned char*)data.pData,
-										  d2dsurf->base.content,
+	(cairo_image_surface_t*)cairo_image_surface_create_for_data((unsigned char*)data.pData,
+										  d2dsurf->format,
 										  size.width,
 										  size.height,
 										  data.RowPitch);
@@ -2573,8 +2590,8 @@ _cairo_d2d_acquire_dest_image(void                    *abstract_surface,
 	return _cairo_error(CAIRO_STATUS_NO_DEVICE);
     }
     *image_out = 
-	(cairo_image_surface_t*)_cairo_image_surface_create_for_data_with_content((unsigned char*)data.pData,
-										  d2dsurf->base.content,
+	(cairo_image_surface_t*)cairo_image_surface_create_for_data((unsigned char*)data.pData,
+										  _cairo_format_from_content(d2dsurf->base.content),
 										  size.width,
 										  size.height,
 										  data.RowPitch);
@@ -3178,7 +3195,7 @@ _cairo_d2d_mask(void			*surface,
     if (mask->type == CAIRO_PATTERN_TYPE_SOLID) {
 	cairo_solid_pattern_t *solidPattern =
 	    (cairo_solid_pattern_t*)mask;
-	if (solidPattern->content = CAIRO_CONTENT_ALPHA) {
+	if (_cairo_color_get_content (&solidPattern->color) == CAIRO_CONTENT_ALPHA) {
 	    isSolidAlphaMask = true;
 	    solidAlphaValue = solidPattern->color.alpha;
 	}
@@ -3321,9 +3338,9 @@ _cairo_d2d_stroke(void			*surface,
 		  cairo_operator_t	 op,
 		  const cairo_pattern_t	*source,
 		  cairo_path_fixed_t	*path,
-		  cairo_stroke_style_t	*style,
-		  cairo_matrix_t	*ctm,
-		  cairo_matrix_t	*ctm_inverse,
+		  const cairo_stroke_style_t	*style,
+		  const cairo_matrix_t	*ctm,
+		  const cairo_matrix_t	*ctm_inverse,
 		  double		 tolerance,
 		  cairo_antialias_t	 antialias,
 		  cairo_clip_t		*clip)
@@ -3526,7 +3543,12 @@ _cairo_d2d_fill(void			*surface,
 
     if (target_rt.get() != d2dsurf->rt.get()) {
 	double x1, y1, x2, y2;
-	_cairo_path_fixed_bounds(path, &x1, &y1, &x2, &y2);
+        cairo_box_t box;
+        _cairo_path_fixed_extents (path, &box);
+        x1 = _cairo_fixed_to_double (box.p1.x);
+        y1 = _cairo_fixed_to_double (box.p1.y);
+        x2 = _cairo_fixed_to_double (box.p2.x);
+        y2 = _cairo_fixed_to_double (box.p2.y);
 	cairo_rectangle_int_t bounds;
 	_cairo_d2d_round_out_to_int_rect(&bounds, x1, y1, x2, y2);
 	return _cairo_d2d_blend_temp_surface(d2dsurf, op, target_rt, clip, &bounds);
@@ -4118,6 +4140,8 @@ _cairo_d2d_getextents(void		       *surface,
 
 /** Helper functions. */
 
+
+
 cairo_surface_t*
 cairo_d2d_surface_create_for_hwnd(cairo_device_t *cairo_device,
 				  HWND wnd,
@@ -4127,7 +4151,7 @@ cairo_d2d_surface_create_for_hwnd(cairo_device_t *cairo_device,
     cairo_d2d_surface_t *newSurf = static_cast<cairo_d2d_surface_t*>(malloc(sizeof(cairo_d2d_surface_t)));
     new (newSurf) cairo_d2d_surface_t();
 
-    _cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, content);
+    _cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, content);
 
     RECT rc;
     HRESULT hr;
@@ -4229,9 +4253,7 @@ cairo_d2d_surface_create_for_hwnd(cairo_device_t *cairo_device,
 
     _d2d_clear_surface(newSurf);
 
-    newSurf->device = d2d_device;
-    cairo_addref_device(cairo_device);
-    d2d_device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+    _cairo_d2d_surface_init(newSurf, d2d_device, _cairo_format_from_content(content));
 
     return reinterpret_cast<cairo_surface_t*>(newSurf);
 
@@ -4241,6 +4263,8 @@ FAIL_HWND:
     return _cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_NO_MEMORY));
 }
 
+
+
 cairo_surface_t *
 cairo_d2d_surface_create(cairo_device_t *device,
 			 cairo_format_t format,
@@ -4258,12 +4282,12 @@ cairo_d2d_surface_create(cairo_device_t *device,
     DXGI_FORMAT dxgiformat = DXGI_FORMAT_B8G8R8A8_UNORM;
     D2D1_ALPHA_MODE alpha = D2D1_ALPHA_MODE_PREMULTIPLIED;
     if (format == CAIRO_FORMAT_ARGB32) {
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, CAIRO_CONTENT_COLOR_ALPHA);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, CAIRO_CONTENT_COLOR_ALPHA);
     } else if (format == CAIRO_FORMAT_RGB24) {
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, CAIRO_CONTENT_COLOR);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, CAIRO_CONTENT_COLOR);
 	alpha = D2D1_ALPHA_MODE_IGNORE;
     } else {
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, CAIRO_CONTENT_ALPHA);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, CAIRO_CONTENT_ALPHA);
 	dxgiformat = DXGI_FORMAT_A8_UNORM;
     }
 
@@ -4343,9 +4367,7 @@ cairo_d2d_surface_create(cairo_device_t *device,
 
     _d2d_clear_surface(newSurf);
 
-    newSurf->device = d2d_device;
-    cairo_addref_device(device);
-    d2d_device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+    _cairo_d2d_surface_init(newSurf, d2d_device, format);
 
     return reinterpret_cast<cairo_surface_t*>(newSurf);
 
@@ -4398,7 +4420,7 @@ cairo_d2d_surface_create_for_handle(cairo_device_t *device, HANDLE handle, cairo
 	    status = CAIRO_STATUS_INVALID_CONTENT;
 	    goto FAIL_CREATEHANDLE;
 	}
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, content);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, content);
 	if (content == CAIRO_CONTENT_COLOR) {
 	    alpha = D2D1_ALPHA_MODE_IGNORE;
 	}
@@ -4407,7 +4429,7 @@ cairo_d2d_surface_create_for_handle(cairo_device_t *device, HANDLE handle, cairo
 	    status = CAIRO_STATUS_INVALID_CONTENT;
 	    goto FAIL_CREATEHANDLE;
 	}
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, CAIRO_CONTENT_ALPHA);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, CAIRO_CONTENT_ALPHA);
     } else {
 	status = CAIRO_STATUS_INVALID_FORMAT;
 	// We don't know how to support this format!
@@ -4444,9 +4466,7 @@ cairo_d2d_surface_create_for_handle(cairo_device_t *device, HANDLE handle, cairo
 
     newSurf->rt->CreateSolidColorBrush(D2D1::ColorF(0, 1.0), &newSurf->solidColorBrush);
 
-    newSurf->device = d2d_device;
-    cairo_addref_device(device);
-    d2d_device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+    _cairo_d2d_surface_init(newSurf, d2d_device, _cairo_format_from_content(content));
 
     return &newSurf->base;
    
@@ -4467,10 +4487,10 @@ cairo_d2d_surface_create_for_texture(cairo_device_t *device,
 
     D2D1_ALPHA_MODE alpha = D2D1_ALPHA_MODE_PREMULTIPLIED;
     if (content == CAIRO_CONTENT_COLOR) {
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, CAIRO_CONTENT_COLOR);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, CAIRO_CONTENT_COLOR);
 	alpha = D2D1_ALPHA_MODE_IGNORE;
     } else {
-	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, content);
+	_cairo_surface_init(&newSurf->base, &cairo_d2d_surface_backend, NULL, content);
     }
 
     D2D1_SIZE_U sizePixels;
@@ -4527,9 +4547,7 @@ cairo_d2d_surface_create_for_texture(cairo_device_t *device,
 
     newSurf->rt->CreateSolidColorBrush(D2D1::ColorF(0, 1.0), &newSurf->solidColorBrush);
 
-    newSurf->device = d2d_device;
-    cairo_addref_device(device);
-    d2d_device->mVRAMUsage += _cairo_d2d_compute_surface_mem_size(newSurf);
+    _cairo_d2d_surface_init(newSurf, d2d_device, _cairo_format_from_content(content));
 
     return reinterpret_cast<cairo_surface_t*>(newSurf);
 
diff --git a/gfx/cairo/cairo/src/cairo-debug.c b/gfx/cairo/cairo/src/cairo-debug.c
index 9160728e0ff..c9567531839 100644
--- a/gfx/cairo/cairo/src/cairo-debug.c
+++ b/gfx/cairo/cairo/src/cairo-debug.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -77,10 +77,14 @@ cairo_debug_reset_static_data (void)
 
     _cairo_clip_reset_static_data ();
 
+    _cairo_image_reset_static_data ();
+
 #if CAIRO_HAS_DRM_SURFACE
     _cairo_drm_device_reset_static_data ();
 #endif
 
+    _cairo_reset_static_data ();
+
     CAIRO_MUTEX_FINALIZE ();
 }
 
@@ -106,10 +110,14 @@ _cairo_debug_check_image_surface_is_defined (const cairo_surface_t *surface)
     case CAIRO_FORMAT_A8:
 	width = image->width;
 	break;
+    case CAIRO_FORMAT_RGB16_565:
+	width = image->width*2;
+	break;
     case CAIRO_FORMAT_RGB24:
     case CAIRO_FORMAT_ARGB32:
 	width = image->width*4;
 	break;
+    case CAIRO_FORMAT_INVALID:
     default:
 	/* XXX compute width from pixman bpp */
 	return;
@@ -221,6 +229,12 @@ _cairo_debug_print_path (FILE *stream, cairo_path_fixed_t *path)
 {
     cairo_status_t status;
 
+    printf ("path: extents=(%f, %f), (%f, %f)\n",
+	    _cairo_fixed_to_double (path->extents.p1.x),
+	    _cairo_fixed_to_double (path->extents.p1.y),
+	    _cairo_fixed_to_double (path->extents.p2.x),
+	    _cairo_fixed_to_double (path->extents.p2.y));
+
     status = _cairo_path_fixed_interpret (path,
 					  CAIRO_DIRECTION_FORWARD,
 					  _print_move_to,
diff --git a/gfx/cairo/cairo/src/cairo-deflate-stream.c b/gfx/cairo/cairo/src/cairo-deflate-stream.c
index 863189f4565..ba5f18392b4 100644
--- a/gfx/cairo/cairo/src/cairo-deflate-stream.c
+++ b/gfx/cairo/cairo/src/cairo-deflate-stream.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 #include <zlib.h>
 
diff --git a/gfx/cairo/cairo/src/cairo-deprecated.h b/gfx/cairo/cairo/src/cairo-deprecated.h
index 438e1d89858..7a56aadbfe1 100644
--- a/gfx/cairo/cairo/src/cairo-deprecated.h
+++ b/gfx/cairo/cairo/src/cairo-deprecated.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -36,20 +36,6 @@
 #ifndef CAIRO_DEPRECATED_H
 #define CAIRO_DEPRECATED_H
 
-/* The %CAIRO_FORMAT_RGB16_565 value was added in cairo 1.2.0 as part
- * of fixing cairo's xlib backend to work with X servers advertising a
- * 16-bit, 565 visual. But as it turned out, adding this format to
- * #cairo_format_t was not necessary, and was a mistake, (cairo's xlib
- * backend can work fine with 16-bit visuals in the same way it works
- * with BGR visuals without any BGR formats in
- * #cairo_format_t).
- *
- * Additionally, the support for the RGB16_565 format was never
- * completely implemented. So while this format value is currently
- * deprecated, it may eventually acquire complete support in the future.
- */
-/* #define CAIRO_FORMAT_RGB16_565 4 */
-
 #define CAIRO_FONT_TYPE_ATSUI CAIRO_FONT_TYPE_QUARTZ
 
 /* Obsolete functions. These definitions exist to coerce the compiler
@@ -123,7 +109,6 @@
 #define cairo_matrix_copy		cairo_matrix_copy_DEPRECATED_BY_cairo_matrix_t
 #define cairo_matrix_get_affine		cairo_matrix_get_affine_DEPRECATED_BY_cairo_matrix_t
 #define cairo_set_target_surface	cairo_set_target_surface_DEPRECATED_BY_cairo_create
-#define cairo_set_target_glitz		cairo_set_target_glitz_DEPRECATED_BY_cairo_glitz_surface_create
 #define cairo_set_target_image		cairo_set_target_image_DEPRECATED_BY_cairo_image_surface_create_for_data
 #define cairo_set_target_pdf		cairo_set_target_pdf_DEPRECATED_BY_cairo_pdf_surface_create
 #define cairo_set_target_png		cairo_set_target_png_DEPRECATED_BY_cairo_surface_write_to_png
diff --git a/gfx/cairo/cairo/src/cairo-device-private.h b/gfx/cairo/cairo/src/cairo-device-private.h
new file mode 100644
index 00000000000..6eb44f3b634
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-device-private.h
@@ -0,0 +1,86 @@
+/* Cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation.
+ *
+ * Contributors(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef _CAIRO_DEVICE_PRIVATE_H_
+#define _CAIRO_DEVICE_PRIVATE_H_
+
+#include "cairo-compiler-private.h"
+#include "cairo-mutex-private.h"
+#include "cairo-reference-count-private.h"
+#include "cairo-types-private.h"
+
+struct _cairo_device {
+    cairo_reference_count_t ref_count;
+    cairo_status_t status;
+    cairo_user_data_array_t user_data;
+
+    const cairo_device_backend_t *backend;
+
+    cairo_recursive_mutex_t mutex;
+    unsigned mutex_depth;
+
+    cairo_bool_t finished;
+};
+
+struct _cairo_device_backend {
+    cairo_device_type_t type;
+
+    void (*lock) (void *device);
+    void (*unlock) (void *device);
+
+    cairo_warn cairo_status_t (*flush) (void *device);
+    void (*finish) (void *device);
+    void (*destroy) (void *device);
+};
+
+cairo_private cairo_device_t *
+_cairo_device_create_in_error (cairo_status_t status);
+
+cairo_private void
+_cairo_device_init (cairo_device_t *device,
+		    const cairo_device_backend_t *backend);
+
+cairo_private cairo_status_t
+_cairo_device_set_error (cairo_device_t *device,
+		         cairo_status_t error);
+
+slim_hidden_proto_no_warn (cairo_device_reference);
+slim_hidden_proto (cairo_device_acquire);
+slim_hidden_proto (cairo_device_release);
+slim_hidden_proto (cairo_device_flush);
+slim_hidden_proto (cairo_device_finish);
+slim_hidden_proto (cairo_device_destroy);
+
+#endif /* _CAIRO_DEVICE_PRIVATE_H_ */
diff --git a/gfx/cairo/cairo/src/cairo-device.c b/gfx/cairo/cairo/src/cairo-device.c
new file mode 100644
index 00000000000..15b04847759
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-device.c
@@ -0,0 +1,533 @@
+/* Cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation.
+ *
+ * Contributors(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+#include "cairo-device-private.h"
+#include "cairo-error-private.h"
+
+/**
+ * SECTION:cairo-device
+ * @Title: cairo_device_t
+ * @Short_Description: interface to underlying rendering system
+ * @See_Also: #cairo_surface_t
+ *
+ * Devices are the abstraction Cairo employs for the rendering system
+ * used by a #cairo_surface_t. You can get the device of a surface using
+ * cairo_surface_get_device().
+ *
+ * Devices are created using custom functions specific to the rendering
+ * system you want to use. See the documentation for the surface types
+ * for those functions.
+ *
+ * An important function that devices fulfill is sharing access to the
+ * rendering system between Cairo and your application. If you want to
+ * access a device directly that you used to draw to with Cairo, you must
+ * first call cairo_device_flush() to ensure that Cairo finishes all
+ * operations on the device and resets it to a clean state.
+ *
+ * Cairo also provides the functions cairo_device_acquire() and
+ * cairo_device_release() to synchronize access to the rendering system
+ * in a multithreaded environment. This is done internally, but can also
+ * be used by applications.
+ *
+ * Putting this all together, a function that works with devices should
+ * look something like this:
+ * <informalexample><programlisting>
+ * void
+ * my_device_modifying_function (cairo_device_t *device)
+ * {
+ *   cairo_status_t status;
+ *
+ *   // Ensure the device is properly reset
+ *   cairo_device_flush (device);
+ *   // Try to acquire the device
+ *   status = cairo_device_acquire (device);
+ *   if (status != CAIRO_STATUS_SUCCESS) {
+ *     printf ("Failed to acquire the device: %s\n", cairo_status_to_string (status));
+ *     return;
+ *   }
+ *
+ *   // Do the custom operations on the device here.
+ *   // But do not call any Cairo functions that might acquire devices.
+ *   
+ *   // Release the device when done.
+ *   cairo_device_release (device);
+ * }
+ * </programlisting></informalexample>
+ *
+ * <note><para>Please refer to the documentation of each backend for
+ * additional usage requirements, guarantees provided, and
+ * interactions with existing surface API of the device functions for
+ * surfaces of that type.
+ * </para></note>
+ */
+
+static const cairo_device_t _nil_device = {
+    CAIRO_REFERENCE_COUNT_INVALID,
+    CAIRO_STATUS_NO_MEMORY,
+};
+
+static const cairo_device_t _mismatch_device = {
+    CAIRO_REFERENCE_COUNT_INVALID,
+    CAIRO_STATUS_DEVICE_TYPE_MISMATCH,
+};
+
+static const cairo_device_t _invalid_device = {
+    CAIRO_REFERENCE_COUNT_INVALID,
+    CAIRO_STATUS_DEVICE_ERROR,
+};
+
+cairo_device_t *
+_cairo_device_create_in_error (cairo_status_t status)
+{
+    switch (status) {
+    case CAIRO_STATUS_NO_MEMORY:
+	return (cairo_device_t *) &_nil_device;
+    case CAIRO_STATUS_DEVICE_ERROR:
+	return (cairo_device_t *) &_invalid_device;
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH:
+	return (cairo_device_t *) &_mismatch_device;
+
+    case CAIRO_STATUS_SUCCESS:
+    case CAIRO_STATUS_LAST_STATUS:
+	ASSERT_NOT_REACHED;
+	/* fall-through */
+    case CAIRO_STATUS_SURFACE_TYPE_MISMATCH:
+    case CAIRO_STATUS_INVALID_STATUS:
+    case CAIRO_STATUS_INVALID_FORMAT:
+    case CAIRO_STATUS_INVALID_VISUAL:
+    case CAIRO_STATUS_READ_ERROR:
+    case CAIRO_STATUS_WRITE_ERROR:
+    case CAIRO_STATUS_FILE_NOT_FOUND:
+    case CAIRO_STATUS_TEMP_FILE_ERROR:
+    case CAIRO_STATUS_INVALID_STRIDE:
+    case CAIRO_STATUS_INVALID_SIZE:
+    case CAIRO_STATUS_INVALID_RESTORE:
+    case CAIRO_STATUS_INVALID_POP_GROUP:
+    case CAIRO_STATUS_NO_CURRENT_POINT:
+    case CAIRO_STATUS_INVALID_MATRIX:
+    case CAIRO_STATUS_NULL_POINTER:
+    case CAIRO_STATUS_INVALID_STRING:
+    case CAIRO_STATUS_INVALID_PATH_DATA:
+    case CAIRO_STATUS_SURFACE_FINISHED:
+    case CAIRO_STATUS_PATTERN_TYPE_MISMATCH:
+    case CAIRO_STATUS_INVALID_DASH:
+    case CAIRO_STATUS_INVALID_DSC_COMMENT:
+    case CAIRO_STATUS_INVALID_INDEX:
+    case CAIRO_STATUS_CLIP_NOT_REPRESENTABLE:
+    case CAIRO_STATUS_FONT_TYPE_MISMATCH:
+    case CAIRO_STATUS_USER_FONT_IMMUTABLE:
+    case CAIRO_STATUS_USER_FONT_ERROR:
+    case CAIRO_STATUS_NEGATIVE_COUNT:
+    case CAIRO_STATUS_INVALID_CLUSTERS:
+    case CAIRO_STATUS_INVALID_SLANT:
+    case CAIRO_STATUS_INVALID_WEIGHT:
+    case CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED:
+    case CAIRO_STATUS_INVALID_CONTENT:
+    default:
+	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
+	return (cairo_device_t *) &_nil_device;
+    }
+}
+
+void
+_cairo_device_init (cairo_device_t *device,
+		    const cairo_device_backend_t *backend)
+{
+    CAIRO_REFERENCE_COUNT_INIT (&device->ref_count, 1);
+    device->status = CAIRO_STATUS_SUCCESS;
+
+    device->backend = backend;
+
+    CAIRO_RECURSIVE_MUTEX_INIT (device->mutex);
+    device->mutex_depth = 0;
+
+    device->finished = FALSE;
+
+    _cairo_user_data_array_init (&device->user_data);
+}
+
+/**
+ * cairo_device_reference:
+ * @device: a #cairo_device_t
+ *
+ * Increases the reference count on @device by one. This prevents
+ * @device from being destroyed until a matching call to
+ * cairo_device_destroy() is made.
+ *
+ * The number of references to a #cairo_device_t can be get using
+ * cairo_device_get_reference_count().
+ *
+ * Return value: the referenced #cairo_device_t.
+ *
+ * Since: 1.10
+ **/
+cairo_device_t *
+cairo_device_reference (cairo_device_t *device)
+{
+    if (device == NULL ||
+	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+    {
+	return device;
+    }
+
+    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&device->ref_count));
+    _cairo_reference_count_inc (&device->ref_count);
+
+    return device;
+}
+slim_hidden_def (cairo_device_reference);
+
+/**
+ * cairo_device_status:
+ * @device: a #cairo_device_t
+ *
+ * Checks whether an error has previously occurred for this
+ * device.
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS on success or an error code if
+ *               the device is in an error state.
+ *
+ * Since: 1.10
+ **/
+cairo_status_t
+cairo_device_status (cairo_device_t *device)
+{
+    if (device == NULL)
+	return CAIRO_STATUS_NULL_POINTER;
+
+    return device->status;
+}
+
+/**
+ * cairo_device_flush:
+ * @device: a #cairo_device_t
+ *
+ * Finish any pending operations for the device and also restore any
+ * temporary modifications cairo has made to the device's state.
+ * This function must be called before switching from using the 
+ * device with Cairo to operating on it directly with native APIs.
+ * If the device doesn't support direct access, then this function
+ * does nothing.
+ *
+ * This function may acquire devices.
+ *
+ * Since: 1.10
+ **/
+void
+cairo_device_flush (cairo_device_t *device)
+{
+    cairo_status_t status;
+
+    if (device == NULL || device->status)
+	return;
+
+    if (device->backend->flush != NULL) {
+	status = device->backend->flush (device);
+	if (unlikely (status))
+	    status = _cairo_device_set_error (device, status);
+    }
+}
+slim_hidden_def (cairo_device_flush);
+
+/**
+ * cairo_device_finish:
+ * @device: the #cairo_device_t to finish
+ *
+ * This function finishes the device and drops all references to
+ * external resources. All surfaces, fonts and other objects created
+ * for this @device will be finished, too.
+ * Further operations on the @device will not affect the @device but
+ * will instead trigger a %CAIRO_STATUS_DEVICE_FINISHED error.
+ *
+ * When the last call to cairo_device_destroy() decreases the
+ * reference count to zero, cairo will call cairo_device_finish() if
+ * it hasn't been called already, before freeing the resources
+ * associated with the device.
+ *
+ * This function may acquire devices.
+ *
+ * Since: 1.10
+ **/
+void
+cairo_device_finish (cairo_device_t *device)
+{
+    if (device == NULL ||
+	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+    {
+	return;
+    }
+
+    if (device->finished)
+	return;
+
+    cairo_device_flush (device);
+
+    device->finished = TRUE;
+
+    if (device->backend->finish != NULL)
+	device->backend->finish (device);
+}
+slim_hidden_def (cairo_device_finish);
+
+/**
+ * cairo_device_destroy:
+ * @device: a #cairo_device_t
+ *
+ * Decreases the reference count on @device by one. If the result is
+ * zero, then @device and all associated resources are freed.  See
+ * cairo_device_reference().
+ *
+ * This function may acquire devices if the last reference was dropped.
+ *
+ * Since: 1.10
+ **/
+void
+cairo_device_destroy (cairo_device_t *device)
+{
+    cairo_user_data_array_t user_data;
+
+    if (device == NULL ||
+	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+    {
+	return;
+    }
+
+    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&device->ref_count));
+    if (! _cairo_reference_count_dec_and_test (&device->ref_count))
+	return;
+
+    cairo_device_finish (device);
+
+    assert (device->mutex_depth == 0);
+    CAIRO_MUTEX_FINI (device->mutex);
+
+    user_data = device->user_data;
+
+    device->backend->destroy (device);
+
+    _cairo_user_data_array_fini (&user_data);
+
+}
+slim_hidden_def (cairo_device_destroy);
+
+/**
+ * cairo_device_get_type:
+ * @device: a #cairo_device_t
+ *
+ * This function returns the type of the device. See #cairo_device_type_t
+ * for available types.
+ *
+ * Return value: The type of @device.
+ *
+ * Since: 1.10
+ **/
+cairo_device_type_t
+cairo_device_get_type (cairo_device_t *device)
+{
+    if (device == NULL ||
+	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+    {
+	return (cairo_device_type_t) -1;
+    }
+
+    return device->backend->type;
+}
+
+/**
+ * cairo_device_acquire:
+ * @device: a #cairo_device_t
+ *
+ * Acquires the @device for the current thread. This function will block
+ * until no other thread has acquired the device.
+ *
+ * If the return value is %CAIRO_STATUS_SUCCESS, you successfully acquired the
+ * device. From now on your thread owns the device and no other thread will be
+ * able to acquire it until a matching call to cairo_device_release(). It is
+ * allowed to recursively acquire the device multiple times from the same
+ * thread.
+ *
+ * <note><para>You must never acquire two different devices at the same time
+ * unless this is explicitly allowed. Otherwise the possibility of deadlocks
+ * exist.
+ *
+ * As various Cairo functions can acquire devices when called, these functions
+ * may also cause deadlocks when you call them with an acquired device. So you
+ * must not have a device acquired when calling them. These functions are
+ * marked in the documentation.
+ * </para></note>
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS on success or an error code if
+ *               the device is in an error state and could not be
+ *               acquired. After a successful call to cairo_device_acquire(),
+ *               a matching call to cairo_device_release() is required.
+ *
+ * Since: 1.10
+ **/
+cairo_status_t
+cairo_device_acquire (cairo_device_t *device)
+{
+    if (device == NULL)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (unlikely (device->status))
+	return device->status;
+
+    if (unlikely (device->finished))
+	return _cairo_device_set_error (device, CAIRO_STATUS_SURFACE_FINISHED); /* XXX */
+
+    CAIRO_MUTEX_LOCK (device->mutex);
+    if (device->mutex_depth++ == 0) {
+	if (device->backend->lock != NULL)
+	    device->backend->lock (device);
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+slim_hidden_def (cairo_device_acquire);
+
+/**
+ * cairo_device_release:
+ * @device: a #cairo_device_t
+ *
+ * Releases a @device previously acquired using cairo_device_acquire(). See
+ * that function for details.
+ *
+ * Since: 1.10
+ **/
+void
+cairo_device_release (cairo_device_t *device)
+{
+    if (device == NULL)
+	return;
+
+    assert (device->mutex_depth > 0);
+
+    if (--device->mutex_depth == 0) {
+	if (device->backend->unlock != NULL)
+	    device->backend->unlock (device);
+    }
+
+    CAIRO_MUTEX_UNLOCK (device->mutex);
+}
+slim_hidden_def (cairo_device_release);
+
+cairo_status_t
+_cairo_device_set_error (cairo_device_t *device,
+			 cairo_status_t  status)
+{
+    if (status == CAIRO_STATUS_SUCCESS || status >= CAIRO_INT_STATUS_UNSUPPORTED)
+	return status;
+
+    /* Don't overwrite an existing error. This preserves the first
+     * error, which is the most significant. */
+    _cairo_status_set_error (&device->status, status);
+
+    return _cairo_error (status);
+}
+
+/**
+ * cairo_device_get_reference_count:
+ * @device: a #cairo_device_t
+ *
+ * Returns the current reference count of @device.
+ *
+ * Return value: the current reference count of @device.  If the
+ * object is a nil object, 0 will be returned.
+ *
+ * Since: 1.10
+ **/
+unsigned int
+cairo_device_get_reference_count (cairo_device_t *device)
+{
+    if (device == NULL ||
+	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+	return 0;
+
+    return CAIRO_REFERENCE_COUNT_GET_VALUE (&device->ref_count);
+}
+
+/**
+ * cairo_device_get_user_data:
+ * @device: a #cairo_device_t
+ * @key: the address of the #cairo_user_data_key_t the user data was
+ * attached to
+ *
+ * Return user data previously attached to @device using the
+ * specified key.  If no user data has been attached with the given
+ * key this function returns %NULL.
+ *
+ * Return value: the user data previously attached or %NULL.
+ *
+ * Since: 1.10
+ **/
+void *
+cairo_device_get_user_data (cairo_device_t		 *device,
+			    const cairo_user_data_key_t *key)
+{
+    return _cairo_user_data_array_get_data (&device->user_data,
+					    key);
+}
+
+/**
+ * cairo_device_set_user_data:
+ * @device: a #cairo_device_t
+ * @key: the address of a #cairo_user_data_key_t to attach the user data to
+ * @user_data: the user data to attach to the #cairo_device_t
+ * @destroy: a #cairo_destroy_func_t which will be called when the
+ * #cairo_t is destroyed or when new user data is attached using the
+ * same key.
+ *
+ * Attach user data to @device.  To remove user data from a surface,
+ * call this function with the key that was used to set it and %NULL
+ * for @data.
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY if a
+ * slot could not be allocated for the user data.
+ *
+ * Since: 1.10
+ **/
+cairo_status_t
+cairo_device_set_user_data (cairo_device_t		 *device,
+			    const cairo_user_data_key_t *key,
+			    void			 *user_data,
+			    cairo_destroy_func_t	  destroy)
+{
+    if (CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
+	return device->status;
+
+    return _cairo_user_data_array_set_data (&device->user_data,
+					    key, user_data, destroy);
+}
diff --git a/gfx/cairo/cairo/src/cairo-directfb-surface.c b/gfx/cairo/cairo/src/cairo-directfb-surface.c
index afad2705268..fc7509c1a49 100644
--- a/gfx/cairo/cairo/src/cairo-directfb-surface.c
+++ b/gfx/cairo/cairo/src/cairo-directfb-surface.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,7 @@
 #include "cairo-directfb.h"
 
 #include "cairo-clip-private.h"
+#include "cairo-error-private.h"
 
 #include <pixman.h>
 
@@ -564,6 +565,7 @@ _cairo_directfb_surface_create_internal (IDirectFB *dfb,
 
     _cairo_surface_init (&surface->base,
 			 &_cairo_directfb_surface_backend,
+			 NULL, /* device */
 			 content);
     surface->pixman_format = _directfb_to_pixman_format (format);
     surface->supported_destination = pixman_format_supported_destination (surface->pixman_format);
@@ -762,14 +764,14 @@ _cairo_directfb_surface_clone_similar (void             *abstract_surface,
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	}
 
-	pixman_image_composite (PIXMAN_OP_SRC,
-				image_src->pixman_image,
-				NULL,
-				pixman_image,
-				src_x, src_y,
-				0, 0,
-				0, 0,
-				width, height);
+	pixman_image_composite32 (PIXMAN_OP_SRC,
+                                  image_src->pixman_image,
+                                  NULL,
+                                  pixman_image,
+                                  src_x, src_y,
+                                  0, 0,
+                                  0, 0,
+                                  width, height);
 
 	pixman_image_unref (pixman_image);
 
@@ -1814,7 +1816,7 @@ _cairo_directfb_surface_show_glyphs (void		    *abstract_dst,
 
 
 static cairo_bool_t
-_cairo_directfb_surface_is_similar (void *surface_a, void *surface_b, cairo_content_t content)
+_cairo_directfb_surface_is_similar (void *surface_a, void *surface_b)
 {
     cairo_directfb_surface_t *a = (cairo_directfb_surface_t *) surface_a;
     cairo_directfb_surface_t *b = (cairo_directfb_surface_t *) surface_b;
@@ -1955,6 +1957,7 @@ cairo_directfb_surface_create (IDirectFB *dfb, IDirectFBSurface *dfbsurface)
 
     _cairo_surface_init (&surface->base,
                          &_cairo_directfb_surface_backend,
+			 NULL, /* device */
 			 _directfb_format_to_content (format));
 
     return &surface->base;
diff --git a/gfx/cairo/cairo/src/cairo-directfb.h b/gfx/cairo/cairo/src/cairo-directfb.h
index 0396cb13a21..e3d818c6687 100644
--- a/gfx/cairo/cairo/src/cairo-directfb.h
+++ b/gfx/cairo/cairo/src/cairo-directfb.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-drm.h b/gfx/cairo/cairo/src/cairo-drm.h
index 1b50b1bd4eb..907610dcde8 100644
--- a/gfx/cairo/cairo/src/cairo-drm.h
+++ b/gfx/cairo/cairo/src/cairo-drm.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,56 +39,41 @@
 
 CAIRO_BEGIN_DECLS
 
-typedef struct _cairo_drm_device cairo_drm_device_t;
-
 struct udev_device;
 
-cairo_public cairo_drm_device_t *
+cairo_public cairo_device_t *
 cairo_drm_device_get (struct udev_device *device);
 
-cairo_public cairo_drm_device_t *
+cairo_public cairo_device_t *
 cairo_drm_device_get_for_fd (int fd);
 
-cairo_public cairo_drm_device_t *
+cairo_public cairo_device_t *
 cairo_drm_device_default (void);
 
-cairo_public cairo_drm_device_t *
-cairo_drm_device_reference (cairo_drm_device_t *device);
-
-cairo_public cairo_status_t
-cairo_drm_device_status (cairo_drm_device_t *device);
-
 cairo_public int
-cairo_drm_device_get_fd (cairo_drm_device_t *device);
+cairo_drm_device_get_fd (cairo_device_t *device);
 
 cairo_public void
-cairo_drm_device_throttle (cairo_drm_device_t *device);
-
-cairo_public void
-cairo_drm_device_destroy (cairo_drm_device_t *device);
-
+cairo_drm_device_throttle (cairo_device_t *device);
 
 cairo_public cairo_surface_t *
-cairo_drm_surface_create (cairo_drm_device_t *device,
-			  cairo_content_t content,
+cairo_drm_surface_create (cairo_device_t *device,
+			  cairo_format_t format,
 			  int width, int height);
 
 cairo_public cairo_surface_t *
-cairo_drm_surface_create_for_name (cairo_drm_device_t *device,
+cairo_drm_surface_create_for_name (cairo_device_t *device,
 				   unsigned int name,
 	                           cairo_format_t format,
 				   int width, int height, int stride);
 
 cairo_public cairo_surface_t *
-cairo_drm_surface_create_from_cacheable_image (cairo_drm_device_t *device,
+cairo_drm_surface_create_from_cacheable_image (cairo_device_t *device,
 	                                       cairo_surface_t *surface);
 
 cairo_public cairo_status_t
 cairo_drm_surface_enable_scan_out (cairo_surface_t *surface);
 
-cairo_public cairo_drm_device_t *
-cairo_drm_surface_get_device (cairo_surface_t *abstract_surface);
-
 cairo_public unsigned int
 cairo_drm_surface_get_handle (cairo_surface_t *surface);
 
@@ -120,7 +105,7 @@ cairo_drm_surface_get_stride (cairo_surface_t *surface);
  *  will also disassociate the mapping.)
 */
 cairo_public cairo_surface_t *
-cairo_drm_surface_map (cairo_surface_t *surface);
+cairo_drm_surface_map_to_image (cairo_surface_t *surface);
 
 cairo_public void
 cairo_drm_surface_unmap (cairo_surface_t *drm_surface,
diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
index f53f7fa502e..0c937d07228 100644
--- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
+++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
@@ -34,13 +34,12 @@
  *	Bas Schouten <bschouten@mozilla.com>
  */
 
-extern "C" {
 #include "cairoint.h"
 
 #include "cairo-win32-private.h"
 #include "cairo-surface-private.h"
 #include "cairo-clip-private.h"
-}
+
 #include "cairo-d2d-private.h"
 #include "cairo-dwrite-private.h"
 #include <float.h>
diff --git a/gfx/cairo/cairo/src/cairo-error-private.h b/gfx/cairo/cairo/src/cairo-error-private.h
new file mode 100644
index 00000000000..fc0c5643884
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-error-private.h
@@ -0,0 +1,60 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2002 University of Southern California
+ * Copyright © 2005 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Carl D. Worth <cworth@cworth.org>
+ */
+
+#ifndef _CAIRO_ERROR_PRIVATE_H_
+#define _CAIRO_ERROR_PRIVATE_H_
+
+#include "cairo.h"
+#include "cairo-compiler-private.h"
+
+CAIRO_BEGIN_DECLS
+
+#define _cairo_status_is_error(status) \
+    (status != CAIRO_STATUS_SUCCESS && status <= CAIRO_STATUS_LAST_STATUS)
+
+cairo_private cairo_status_t
+_cairo_error (cairo_status_t status);
+
+/* hide compiler warnings when discarding the return value */
+#define _cairo_error_throw(status) do { \
+    cairo_status_t status__ = _cairo_error (status); \
+    (void) status__; \
+} while (0)
+
+CAIRO_END_DECLS
+
+#endif /* _CAIRO_ERROR_PRIVATE_H_ */
diff --git a/gfx/cairo/cairo/src/cairo-features.h.in b/gfx/cairo/cairo/src/cairo-features.h.in
index 97fca33c94e..c83e91a20ab 100644
--- a/gfx/cairo/cairo/src/cairo-features.h.in
+++ b/gfx/cairo/cairo/src/cairo-features.h.in
@@ -89,6 +89,8 @@
 
 @QUARTZ_FONT_FEATURE@
 
+@TEE_SURFACE_FEATURE@
+
 @PNG_FUNCTIONS_FEATURE@
 
 @FC_FONT_FEATURE@
diff --git a/gfx/cairo/cairo/src/cairo-fixed-private.h b/gfx/cairo/cairo/src/cairo-fixed-private.h
index a37ca6a70a5..9478d7d4fbc 100644
--- a/gfx/cairo/cairo/src/cairo-fixed-private.h
+++ b/gfx/cairo/cairo/src/cairo-fixed-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -53,7 +53,7 @@
 #define CAIRO_FIXED_ONE_FLOAT  ((float)(1 << CAIRO_FIXED_FRAC_BITS))
 #define CAIRO_FIXED_EPSILON    ((cairo_fixed_t)(1))
 
-#define CAIRO_FIXED_FRAC_MASK  (((cairo_fixed_unsigned_t)(-1)) >> (CAIRO_FIXED_BITS - CAIRO_FIXED_FRAC_BITS))
+#define CAIRO_FIXED_FRAC_MASK  ((cairo_fixed_t)(((cairo_fixed_unsigned_t)(-1)) >> (CAIRO_FIXED_BITS - CAIRO_FIXED_FRAC_BITS)))
 #define CAIRO_FIXED_WHOLE_MASK (~CAIRO_FIXED_FRAC_MASK)
 
 static inline cairo_fixed_t
@@ -136,6 +136,16 @@ _cairo_fixed_from_26_6 (uint32_t i)
 #endif
 }
 
+static inline cairo_fixed_t
+_cairo_fixed_from_16_16 (uint32_t i)
+{
+#if CAIRO_FIXED_FRAC_BITS > 16
+    return i << (CAIRO_FIXED_FRAC_BITS - 16);
+#else
+    return i >> (16 - CAIRO_FIXED_FRAC_BITS);
+#endif
+}
+
 static inline double
 _cairo_fixed_to_double (cairo_fixed_t f)
 {
@@ -154,12 +164,48 @@ _cairo_fixed_is_integer (cairo_fixed_t f)
     return (f & CAIRO_FIXED_FRAC_MASK) == 0;
 }
 
+static inline cairo_fixed_t
+_cairo_fixed_floor (cairo_fixed_t f)
+{
+    return f & ~CAIRO_FIXED_FRAC_MASK;
+}
+
+static inline cairo_fixed_t
+_cairo_fixed_round (cairo_fixed_t f)
+{
+    return _cairo_fixed_floor (f + (CAIRO_FIXED_FRAC_MASK+1)/2);
+}
+
+static inline cairo_fixed_t
+_cairo_fixed_round_down (cairo_fixed_t f)
+{
+    return _cairo_fixed_floor (f + CAIRO_FIXED_FRAC_MASK/2);
+}
+
 static inline int
 _cairo_fixed_integer_part (cairo_fixed_t f)
 {
     return f >> CAIRO_FIXED_FRAC_BITS;
 }
 
+static inline int
+_cairo_fixed_integer_round (cairo_fixed_t f)
+{
+    return _cairo_fixed_integer_part (f + (CAIRO_FIXED_FRAC_MASK+1)/2);
+}
+
+static inline int
+_cairo_fixed_integer_round_down (cairo_fixed_t f)
+{
+    return _cairo_fixed_integer_part (f + CAIRO_FIXED_FRAC_MASK/2);
+}
+
+static inline int
+_cairo_fixed_fractional_part (cairo_fixed_t f)
+{
+    return f & CAIRO_FIXED_FRAC_MASK;
+}
+
 static inline int
 _cairo_fixed_integer_floor (cairo_fixed_t f)
 {
@@ -225,12 +271,18 @@ _cairo_fixed_16_16_from_double (double d)
 }
 
 static inline int
-_cairo_fixed_16_16_floor (cairo_fixed_t f)
+_cairo_fixed_16_16_floor (cairo_fixed_16_16_t f)
 {
     if (f >= 0)
-        return f >> 16;
+	return f >> 16;
     else
-        return -((-f - 1) >> 16) - 1;
+	return -((-f - 1) >> 16) - 1;
+}
+
+static inline double
+_cairo_fixed_16_16_to_double (cairo_fixed_16_16_t f)
+{
+    return ((double) f) / (double) (1 << 16);
 }
 
 #if CAIRO_FIXED_BITS == 32
diff --git a/gfx/cairo/cairo/src/cairo-fixed-type-private.h b/gfx/cairo/cairo/src/cairo-fixed-type-private.h
index ce3c007f585..2bbd5f78621 100644
--- a/gfx/cairo/cairo/src/cairo-fixed-type-private.h
+++ b/gfx/cairo/cairo/src/cairo-fixed-type-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-fixed.c b/gfx/cairo/cairo/src/cairo-fixed.c
index 2bb0dfe1767..03e05592354 100644
--- a/gfx/cairo/cairo/src/cairo-fixed.c
+++ b/gfx/cairo/cairo/src/cairo-fixed.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-font-face-twin.c b/gfx/cairo/cairo/src/cairo-font-face-twin.c
index 56ebaeaa6a4..98c6dd8a90a 100644
--- a/gfx/cairo/cairo/src/cairo-font-face-twin.c
+++ b/gfx/cairo/cairo/src/cairo-font-face-twin.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #include <math.h>
 
diff --git a/gfx/cairo/cairo/src/cairo-font-face.c b/gfx/cairo/cairo/src/cairo-font-face.c
index 6744899b69e..a66054ead83 100644
--- a/gfx/cairo/cairo/src/cairo-font-face.c
+++ b/gfx/cairo/cairo/src/cairo-font-face.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,24 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
+
+/**
+ * SECTION:cairo-font-face
+ * @Title: cairo_font_face_t
+ * @Short_Description: Base class for font faces
+ * @See_Also: #cairo_scaled_font_t
+ *
+ * #cairo_font_face_t represents a particular font at a particular weight,
+ * slant, and other characteristic but no size, transformation, or size.
+ * 
+ * Font faces are created using <firstterm>font-backend</firstterm>-specific
+ * constructors, typically of the form
+ * cairo_<emphasis>backend</emphasis>_font_face_create(), or implicitly
+ * using the <firstterm>toy</firstterm> text API by way of 
+ * cairo_select_font_face().  The resulting face can be accessed using
+ * cairo_get_font_face().
+ */
 
 /* #cairo_font_face_t */
 
diff --git a/gfx/cairo/cairo/src/cairo-font-options.c b/gfx/cairo/cairo/src/cairo-font-options.c
index b2cb230ba65..5d59fb0f242 100644
--- a/gfx/cairo/cairo/src/cairo-font-options.c
+++ b/gfx/cairo/cairo/src/cairo-font-options.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,12 +35,27 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
+
+/**
+ * SECTION:cairo-font-options
+ * @Title: cairo_font_options_t
+ * @Short_Description: How a font should be rendered
+ * @See_Also: #cairo_scaled_font_t
+ *
+ * The font options specify how fonts should be rendered.  Most of the 
+ * time the font options implied by a surface are just right and do not 
+ * need any changes, but for pixel-based targets tweaking font options 
+ * may result in superior output on a particular display.
+ */
 
 static const cairo_font_options_t _cairo_font_options_nil = {
     CAIRO_ANTIALIAS_DEFAULT,
     CAIRO_SUBPIXEL_ORDER_DEFAULT,
+    CAIRO_LCD_FILTER_DEFAULT,
     CAIRO_HINT_STYLE_DEFAULT,
-    CAIRO_HINT_METRICS_DEFAULT
+    CAIRO_HINT_METRICS_DEFAULT,
+    CAIRO_ROUND_GLYPH_POS_DEFAULT
 };
 
 /**
@@ -54,8 +69,10 @@ _cairo_font_options_init_default (cairo_font_options_t *options)
 {
     options->antialias = CAIRO_ANTIALIAS_DEFAULT;
     options->subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
+    options->lcd_filter = CAIRO_LCD_FILTER_DEFAULT;
     options->hint_style = CAIRO_HINT_STYLE_DEFAULT;
     options->hint_metrics = CAIRO_HINT_METRICS_DEFAULT;
+    options->round_glyph_positions = CAIRO_ROUND_GLYPH_POS_DEFAULT;
 }
 
 void
@@ -64,8 +81,10 @@ _cairo_font_options_init_copy (cairo_font_options_t		*options,
 {
     options->antialias = other->antialias;
     options->subpixel_order = other->subpixel_order;
+    options->lcd_filter = other->lcd_filter;
     options->hint_style = other->hint_style;
     options->hint_metrics = other->hint_metrics;
+    options->round_glyph_positions = other->round_glyph_positions;
 }
 
 /**
@@ -189,10 +208,14 @@ cairo_font_options_merge (cairo_font_options_t       *options,
 	options->antialias = other->antialias;
     if (other->subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT)
 	options->subpixel_order = other->subpixel_order;
+    if (other->lcd_filter != CAIRO_LCD_FILTER_DEFAULT)
+	options->lcd_filter = other->lcd_filter;
     if (other->hint_style != CAIRO_HINT_STYLE_DEFAULT)
 	options->hint_style = other->hint_style;
     if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT)
 	options->hint_metrics = other->hint_metrics;
+    if (other->round_glyph_positions != CAIRO_ROUND_GLYPH_POS_DEFAULT)
+	options->round_glyph_positions = other->round_glyph_positions;
 }
 slim_hidden_def (cairo_font_options_merge);
 
@@ -221,8 +244,10 @@ cairo_font_options_equal (const cairo_font_options_t *options,
 
     return (options->antialias == other->antialias &&
 	    options->subpixel_order == other->subpixel_order &&
+	    options->lcd_filter == other->lcd_filter &&
 	    options->hint_style == other->hint_style &&
-	    options->hint_metrics == other->hint_metrics);
+	    options->hint_metrics == other->hint_metrics &&
+	    options->round_glyph_positions == other->round_glyph_positions);
 }
 slim_hidden_def (cairo_font_options_equal);
 
@@ -246,7 +271,8 @@ cairo_font_options_hash (const cairo_font_options_t *options)
 
     return ((options->antialias) |
 	    (options->subpixel_order << 4) |
-	    (options->hint_style << 8) |
+	    (options->lcd_filter << 8) |
+	    (options->hint_style << 12) |
 	    (options->hint_metrics << 16));
 }
 slim_hidden_def (cairo_font_options_hash);
@@ -327,6 +353,87 @@ cairo_font_options_get_subpixel_order (const cairo_font_options_t *options)
     return options->subpixel_order;
 }
 
+/**
+ * _cairo_font_options_set_lcd_filter:
+ * @options: a #cairo_font_options_t
+ * @lcd_filter: the new LCD filter
+ *
+ * Sets the LCD filter for the font options object. The LCD filter
+ * specifies how pixels are filtered when rendered with an antialiasing
+ * mode of %CAIRO_ANTIALIAS_SUBPIXEL. See the documentation for
+ * #cairo_lcd_filter_t for full details.
+ *
+ * Since: 1.8
+ **/
+void
+_cairo_font_options_set_lcd_filter (cairo_font_options_t *options,
+				    cairo_lcd_filter_t    lcd_filter)
+{
+    if (cairo_font_options_status (options))
+	return;
+
+    options->lcd_filter = lcd_filter;
+}
+
+/**
+ * _cairo_font_options_get_lcd_filter:
+ * @options: a #cairo_font_options_t
+ *
+ * Gets the LCD filter for the font options object.
+ * See the documentation for #cairo_lcd_filter_t for full details.
+ *
+ * Return value: the LCD filter for the font options object
+ *
+ * Since: 1.8
+ **/
+cairo_lcd_filter_t
+_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options)
+{
+    if (cairo_font_options_status ((cairo_font_options_t *) options))
+	return CAIRO_LCD_FILTER_DEFAULT;
+
+    return options->lcd_filter;
+}
+
+/**
+ * _cairo_font_options_set_round_glyph_positions:
+ * @options: a #cairo_font_options_t
+ * @round: the new rounding value
+ *
+ * Sets the rounding options for the font options object. If rounding is set, a
+ * glyph's position will be rounded to integer values.
+ *
+ * Since: 1.12
+ **/
+void
+_cairo_font_options_set_round_glyph_positions (cairo_font_options_t *options,
+					       cairo_round_glyph_positions_t  round)
+{
+    if (cairo_font_options_status (options))
+	return;
+
+    options->round_glyph_positions = round;
+}
+
+/**
+ * _cairo_font_options_get_round_glyph_positions:
+ * @options: a #cairo_font_options_t
+ *
+ * Gets the glyph position rounding option for the font options object.
+ *
+ * Return value: The round glyph posistions flag for the font options object.
+ *
+ * Since: 1.12
+ **/
+cairo_round_glyph_positions_t
+_cairo_font_options_get_round_glyph_positions (const cairo_font_options_t *options)
+{
+    if (cairo_font_options_status ((cairo_font_options_t *) options))
+	return CAIRO_ROUND_GLYPH_POS_DEFAULT;
+
+    return options->round_glyph_positions;
+}
+
 /**
  * cairo_font_options_set_hint_style:
  * @options: a #cairo_font_options_t
diff --git a/gfx/cairo/cairo/src/cairo-fontconfig-private.h b/gfx/cairo/cairo/src/cairo-fontconfig-private.h
new file mode 100644
index 00000000000..ea873abe7e4
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-fontconfig-private.h
@@ -0,0 +1,78 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2000 Keith Packard
+ * Copyright © 2005 Red Hat, Inc
+ * Copyright © 2010 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Red Hat, Inc.
+ *
+ * Contributor(s):
+ *      Graydon Hoare <graydon@redhat.com>
+ *	Owen Taylor <otaylor@redhat.com>
+ *      Keith Packard <keithp@keithp.com>
+ *      Carl Worth <cworth@cworth.org>
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef _CAIRO_FONTCONFIG_PRIVATE_H
+#define _CAIRO_FONTCONFIG_PRIVATE_H
+
+#include "cairo.h"
+
+#if CAIRO_HAS_FC_FONT
+#include <fontconfig/fontconfig.h>
+#include <fontconfig/fcfreetype.h>
+#endif
+
+/* sub-pixel order */
+#ifndef FC_RGBA_UNKNOWN
+#define FC_RGBA_UNKNOWN	    0
+#define FC_RGBA_RGB	    1
+#define FC_RGBA_BGR	    2
+#define FC_RGBA_VRGB	    3
+#define FC_RGBA_VBGR	    4
+#define FC_RGBA_NONE	    5
+#endif
+
+/* hinting style */
+#ifndef FC_HINT_NONE
+#define FC_HINT_NONE        0
+#define FC_HINT_SLIGHT      1
+#define FC_HINT_MEDIUM      2
+#define FC_HINT_FULL        3
+#endif
+
+/* LCD filter */
+#ifndef FC_LCD_NONE
+#define FC_LCD_NONE	    0
+#define FC_LCD_DEFAULT	    1
+#define FC_LCD_LIGHT	    2
+#define FC_LCD_LEGACY	    3
+#endif
+
+#endif /* _CAIRO_FONTCONFIG_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-freed-pool-private.h b/gfx/cairo/cairo/src/cairo-freed-pool-private.h
new file mode 100644
index 00000000000..0a4ab0eee5a
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-freed-pool-private.h
@@ -0,0 +1,129 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef CAIRO_FREED_POOL_H
+#define CAIRO_FREED_POOL_H
+
+#include "cairoint.h"
+#include "cairo-atomic-private.h"
+
+#if HAS_ATOMIC_OPS
+/* Keep a stash of recently freed clip_paths, since we need to
+ * reallocate them frequently.
+ */
+#define MAX_FREED_POOL_SIZE 4
+typedef struct {
+    void *pool[MAX_FREED_POOL_SIZE];
+    int top;
+} freed_pool_t;
+
+static cairo_always_inline void *
+_atomic_fetch (void **slot)
+{
+    void *ptr;
+
+    do {
+        ptr = _cairo_atomic_ptr_get (slot);
+    } while (! _cairo_atomic_ptr_cmpxchg (slot, ptr, NULL));
+
+    return ptr;
+}
+
+static cairo_always_inline cairo_bool_t
+_atomic_store (void **slot, void *ptr)
+{
+    return _cairo_atomic_ptr_cmpxchg (slot, NULL, ptr);
+}
+
+cairo_private void *
+_freed_pool_get_search (freed_pool_t *pool);
+
+static inline void *
+_freed_pool_get (freed_pool_t *pool)
+{
+    void *ptr;
+    int i;
+
+    i = pool->top - 1;
+    if (i < 0)
+	i = 0;
+
+    ptr = _atomic_fetch (&pool->pool[i]);
+    if (likely (ptr != NULL)) {
+	pool->top = i;
+	return ptr;
+    }
+
+    /* either empty or contended */
+    return _freed_pool_get_search (pool);
+}
+
+cairo_private void
+_freed_pool_put_search (freed_pool_t *pool, void *ptr);
+
+static inline void
+_freed_pool_put (freed_pool_t *pool, void *ptr)
+{
+    int i;
+
+    i = pool->top;
+    if (likely (i < ARRAY_LENGTH (pool->pool) &&
+		_atomic_store (&pool->pool[i], ptr)))
+    {
+	pool->top = i + 1;
+	return;
+    }
+
+    /* either full or contended */
+    _freed_pool_put_search (pool, ptr);
+}
+
+cairo_private void
+_freed_pool_reset (freed_pool_t *pool);
+
+#define HAS_FREED_POOL 1
+
+#else
+
+typedef int freed_pool_t;
+
+#define _freed_pool_get(pool) NULL
+#define _freed_pool_put(pool, ptr) free(ptr)
+#define _freed_pool_reset(ptr)
+
+#endif
+
+#endif /* CAIRO_FREED_POOL_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-freed-pool.c b/gfx/cairo/cairo/src/cairo-freed-pool.c
new file mode 100644
index 00000000000..cfdc8e96b05
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-freed-pool.c
@@ -0,0 +1,93 @@
+/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-freed-pool-private.h"
+
+#if HAS_FREED_POOL
+
+void *
+_freed_pool_get_search (freed_pool_t *pool)
+{
+    void *ptr;
+    int i;
+
+    for (i = ARRAY_LENGTH (pool->pool); i--;) {
+	ptr = _atomic_fetch (&pool->pool[i]);
+	if (ptr != NULL) {
+	    pool->top = i;
+	    return ptr;
+	}
+    }
+
+    /* empty */
+    pool->top = 0;
+    return NULL;
+}
+
+void
+_freed_pool_put_search (freed_pool_t *pool, void *ptr)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_LENGTH (pool->pool); i++) {
+	if (_atomic_store (&pool->pool[i], ptr)) {
+	    pool->top = i + 1;
+	    return;
+	}
+    }
+
+    /* full */
+    pool->top = i;
+    free (ptr);
+}
+
+void
+_freed_pool_reset (freed_pool_t *pool)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_LENGTH (pool->pool); i++) {
+	free (pool->pool[i]);
+	pool->pool[i] = NULL;
+    }
+
+    pool->top = 0;
+}
+
+#endif
diff --git a/gfx/cairo/cairo/src/cairo-freelist-private.h b/gfx/cairo/cairo/src/cairo-freelist-private.h
index 5be22b1f964..703181b567c 100644
--- a/gfx/cairo/cairo/src/cairo-freelist-private.h
+++ b/gfx/cairo/cairo/src/cairo-freelist-private.h
@@ -24,6 +24,7 @@
 
 #include "cairo-types-private.h"
 #include "cairo-compiler-private.h"
+#include "cairo-freelist-type-private.h"
 
 /* for stand-alone compilation*/
 #ifndef VG
@@ -34,32 +35,6 @@
 #define NULL (void *) 0
 #endif
 
-typedef struct _cairo_freelist_node cairo_freelist_node_t;
-struct _cairo_freelist_node {
-    cairo_freelist_node_t *next;
-};
-
-typedef struct _cairo_freelist {
-    cairo_freelist_node_t *first_free_node;
-    unsigned nodesize;
-} cairo_freelist_t;
-
-typedef struct _cairo_freelist_pool cairo_freelist_pool_t;
-struct _cairo_freelist_pool {
-    cairo_freelist_pool_t *next;
-    unsigned size, rem;
-    uint8_t *data;
-};
-
-typedef struct _cairo_freepool {
-    cairo_freelist_node_t *first_free_node;
-    cairo_freelist_pool_t *pools;
-    unsigned nodesize;
-    cairo_freelist_pool_t embedded_pool;
-    uint8_t embedded_data[1000];
-} cairo_freepool_t;
-
-
 /* Initialise a freelist that will be responsible for allocating
  * nodes of size nodesize. */
 cairo_private void
@@ -96,6 +71,20 @@ _cairo_freepool_init (cairo_freepool_t *freepool, unsigned nodesize);
 cairo_private void
 _cairo_freepool_fini (cairo_freepool_t *freepool);
 
+static inline void
+_cairo_freepool_reset (cairo_freepool_t *freepool)
+{
+    while (freepool->pools != &freepool->embedded_pool) {
+	cairo_freelist_pool_t *pool = freepool->pools;
+	freepool->pools = pool->next;
+	pool->next = freepool->freepools;
+	freepool->freepools = pool;
+    }
+
+    freepool->embedded_pool.rem = sizeof (freepool->embedded_data);
+    freepool->embedded_pool.data = freepool->embedded_data;
+}
+
 cairo_private void *
 _cairo_freepool_alloc_from_new_pool (cairo_freepool_t *freepool);
 
diff --git a/gfx/cairo/cairo/src/cairo-freelist-type-private.h b/gfx/cairo/cairo/src/cairo-freelist-type-private.h
new file mode 100644
index 00000000000..4dd05646107
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-freelist-type-private.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2010 Joonas Pihlaja
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+#ifndef CAIRO_FREELIST_TYPE_H
+#define CAIRO_FREELIST_TYPE_H
+
+#include "cairo-types-private.h"
+#include "cairo-compiler-private.h"
+
+typedef struct _cairo_freelist_node cairo_freelist_node_t;
+struct _cairo_freelist_node {
+    cairo_freelist_node_t *next;
+};
+
+typedef struct _cairo_freelist {
+    cairo_freelist_node_t *first_free_node;
+    unsigned nodesize;
+} cairo_freelist_t;
+
+typedef struct _cairo_freelist_pool cairo_freelist_pool_t;
+struct _cairo_freelist_pool {
+    cairo_freelist_pool_t *next;
+    unsigned size, rem;
+    uint8_t *data;
+};
+
+typedef struct _cairo_freepool {
+    cairo_freelist_node_t *first_free_node;
+    cairo_freelist_pool_t *pools;
+    cairo_freelist_pool_t *freepools;
+    unsigned nodesize;
+    cairo_freelist_pool_t embedded_pool;
+    uint8_t embedded_data[1000];
+} cairo_freepool_t;
+
+#endif /* CAIRO_FREELIST_TYPE_H */
diff --git a/gfx/cairo/cairo/src/cairo-freelist.c b/gfx/cairo/cairo/src/cairo-freelist.c
index acf31573f04..d596eab81dc 100644
--- a/gfx/cairo/cairo/src/cairo-freelist.c
+++ b/gfx/cairo/cairo/src/cairo-freelist.c
@@ -22,6 +22,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-freelist-private.h"
 
 void
@@ -83,12 +84,12 @@ _cairo_freelist_free (cairo_freelist_t *freelist, void *voidnode)
     }
 }
 
-
 void
 _cairo_freepool_init (cairo_freepool_t *freepool, unsigned nodesize)
 {
     freepool->first_free_node = NULL;
     freepool->pools = &freepool->embedded_pool;
+    freepool->freepools = NULL;
     freepool->nodesize = nodesize;
 
     freepool->embedded_pool.next = NULL;
@@ -96,19 +97,28 @@ _cairo_freepool_init (cairo_freepool_t *freepool, unsigned nodesize)
     freepool->embedded_pool.rem = sizeof (freepool->embedded_data);
     freepool->embedded_pool.data = freepool->embedded_data;
 
-    VG (VALGRIND_MAKE_MEM_NOACCESS (freepool->embedded_data,
-				    sizeof (freepool->embedded_data)));
+    VG (VALGRIND_MAKE_MEM_NOACCESS (freepool->embedded_data, sizeof (freepool->embedded_data)));
 }
 
 void
 _cairo_freepool_fini (cairo_freepool_t *freepool)
 {
-    cairo_freelist_pool_t *pool = freepool->pools;
+    cairo_freelist_pool_t *pool;
+
+    pool = freepool->pools;
     while (pool != &freepool->embedded_pool) {
 	cairo_freelist_pool_t *next = pool->next;
 	free (pool);
 	pool = next;
     }
+
+    pool = freepool->freepools;
+    while (pool != NULL) {
+	cairo_freelist_pool_t *next = pool->next;
+	free (pool);
+	pool = next;
+    }
+
     VG (VALGRIND_MAKE_MEM_NOACCESS (freepool, sizeof (freepool)));
 }
 
@@ -118,23 +128,31 @@ _cairo_freepool_alloc_from_new_pool (cairo_freepool_t *freepool)
     cairo_freelist_pool_t *pool;
     int poolsize;
 
-    if (freepool->pools != &freepool->embedded_pool)
-	poolsize = 2 * freepool->pools->size;
-    else
-	poolsize = (128 * freepool->nodesize + 8191) & -8192;
-    pool = malloc (sizeof (cairo_freelist_pool_t) + poolsize);
-    if (unlikely (pool == NULL))
-	return pool;
+    if (freepool->freepools != NULL) {
+	pool = freepool->freepools;
+	freepool->freepools = pool->next;
+
+	poolsize = pool->size;
+    } else {
+	if (freepool->pools != &freepool->embedded_pool)
+	    poolsize = 2 * freepool->pools->size;
+	else
+	    poolsize = (128 * freepool->nodesize + 8191) & -8192;
+
+	pool = malloc (sizeof (cairo_freelist_pool_t) + poolsize);
+	if (unlikely (pool == NULL))
+	    return pool;
+
+	pool->size = poolsize;
+    }
 
     pool->next = freepool->pools;
     freepool->pools = pool;
 
-    pool->size = poolsize;
     pool->rem = poolsize - freepool->nodesize;
     pool->data = (uint8_t *) (pool + 1) + freepool->nodesize;
 
-    VG (VALGRIND_MAKE_MEM_NOACCESS (pool->data, poolsize));
-    VG (VALGRIND_MAKE_MEM_UNDEFINED (pool->data, freepool->nodesize));
+    VG (VALGRIND_MAKE_MEM_NOACCESS (pool->data, pool->rem));
 
     return pool + 1;
 }
diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c
index e94cdb73aec..986036e7087 100644
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,14 +41,12 @@
 #define _BSD_SOURCE /* for strdup() */
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-ft-private.h"
 
 #include <float.h>
 
-#if CAIRO_HAS_FC_FONT
-#include <fontconfig/fontconfig.h>
-#include <fontconfig/fcfreetype.h>
-#endif
+#include "cairo-fontconfig-private.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -59,6 +57,30 @@
 #include FT_SYNTHESIS_H
 #endif
 
+#if HAVE_FT_LIBRARY_SETLCDFILTER
+#include FT_LCD_FILTER_H
+#endif
+
+/* Fontconfig version older than 2.6 didn't have these options */
+#ifndef FC_LCD_FILTER
+#define FC_LCD_FILTER	"lcdfilter"
+#endif
+/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */
+#ifndef FC_LCD_NONE
+#define FC_LCD_NONE	0
+#define FC_LCD_DEFAULT	1
+#define FC_LCD_LIGHT	2
+#define FC_LCD_LEGACY	3
+#endif
+
+/* FreeType version older than 2.3.5(?) didn't have these options */
+#ifndef FT_LCD_FILTER_NONE
+#define FT_LCD_FILTER_NONE	0
+#define FT_LCD_FILTER_DEFAULT	1
+#define FT_LCD_FILTER_LIGHT	2
+#define FT_LCD_FILTER_LEGACY	16
+#endif
+
 #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0))
 #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0)
 #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0))
@@ -67,11 +89,35 @@
 /* This is the max number of FT_face objects we keep open at once
  */
 #define MAX_OPEN_FACES 10
-
 /* This is the maximum font size we allow to be passed to FT_Set_Char_Size
  */
 #define MAX_FONT_SIZE 1000
 
+/**
+ * SECTION:cairo-ft
+ * @Title: FreeType Fonts
+ * @Short_Description: Font support for FreeType
+ * @See_Also: #cairo_font_face_t
+ *
+ * The FreeType font backend is primarily used to render text on GNU/Linux
+ * systems, but can be used on other platforms too.
+ */
+
+/**
+ * CAIRO_HAS_FT_FONT:
+ *
+ * Defined if the FreeType font backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
+/**
+ * CAIRO_HAS_FC_FONT:
+ *
+ * Defined if the Fontconfig-specific functions of the FreeType font backend
+ * are available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 /*
  * The simple 2x2 matrix is converted into separate scale and shape
  * factors so that hinting works right
@@ -180,6 +226,7 @@ typedef struct _cairo_ft_unscaled_font_map {
 
 static cairo_ft_unscaled_font_map_t *cairo_ft_unscaled_font_map = NULL;
 
+
 static void
 _font_map_release_face_lock_held (cairo_ft_unscaled_font_map_t *font_map,
 				  cairo_ft_unscaled_font_t *unscaled)
@@ -779,23 +826,279 @@ _cairo_ft_unscaled_font_set_scale (cairo_ft_unscaled_font_t *unscaled,
     return CAIRO_STATUS_SUCCESS;
 }
 
-/* Empirically-derived subpixel filtering values thanks to Keith
- * Packard and libXft. */
-static const int    filters[3][3] = {
-    /* red */
-#if 0
-    {    65538*4/7,65538*2/7,65538*1/7 },
-    /* green */
-    {    65536*1/4, 65536*2/4, 65537*1/4 },
-    /* blue */
-    {    65538*1/7,65538*2/7,65538*4/7 },
-#endif
-    {    65538*9/13,65538*3/13,65538*1/13 },
-    /* green */
-    {    65538*1/6, 65538*4/6, 65538*1/6 },
-    /* blue */
-    {    65538*1/13,65538*3/13,65538*9/13 },
-};
+/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot
+ * into a different format. For example, we want to convert a
+ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit
+ * ARGB or ABGR bitmap.
+ *
+ * this function prepares a target descriptor for this operation.
+ *
+ * input :: target bitmap descriptor. The function will set its
+ *          'width', 'rows' and 'pitch' fields, and only these
+ *
+ * slot  :: the glyph slot containing the source bitmap. this
+ *          function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP
+ *
+ * mode  :: the requested final rendering mode. supported values are
+ *          MONO, NORMAL (i.e. gray), LCD and LCD_V
+ *
+ * the function returns the size in bytes of the corresponding buffer,
+ * it's up to the caller to allocate the corresponding memory block
+ * before calling _fill_xrender_bitmap
+ *
+ * it also returns -1 in case of error (e.g. incompatible arguments,
+ * like trying to convert a gray bitmap into a monochrome one)
+ */
+static int
+_compute_xrender_bitmap_size(FT_Bitmap      *target,
+			     FT_GlyphSlot    slot,
+			     FT_Render_Mode  mode)
+{
+    FT_Bitmap *ftbit;
+    int width, height, pitch;
+
+    if (slot->format != FT_GLYPH_FORMAT_BITMAP)
+	return -1;
+
+    /* compute the size of the final bitmap */
+    ftbit = &slot->bitmap;
+
+    width = ftbit->width;
+    height = ftbit->rows;
+    pitch = (width + 3) & ~3;
+
+    switch (ftbit->pixel_mode) {
+    case FT_PIXEL_MODE_MONO:
+	if (mode == FT_RENDER_MODE_MONO) {
+	    pitch = (((width + 31) & ~31) >> 3);
+	    break;
+	}
+	/* fall-through */
+
+    case FT_PIXEL_MODE_GRAY:
+	if (mode == FT_RENDER_MODE_LCD ||
+	    mode == FT_RENDER_MODE_LCD_V)
+	{
+	    /* each pixel is replicated into a 32-bit ARGB value */
+	    pitch = width * 4;
+	}
+	break;
+
+    case FT_PIXEL_MODE_LCD:
+	if (mode != FT_RENDER_MODE_LCD)
+	    return -1;
+
+	/* horz pixel triplets are packed into 32-bit ARGB values */
+	width /= 3;
+	pitch = width * 4;
+	break;
+
+    case FT_PIXEL_MODE_LCD_V:
+	if (mode != FT_RENDER_MODE_LCD_V)
+	    return -1;
+
+	/* vert pixel triplets are packed into 32-bit ARGB values */
+	height /= 3;
+	pitch = width * 4;
+	break;
+
+    default:  /* unsupported source format */
+	return -1;
+    }
+
+    target->width = width;
+    target->rows = height;
+    target->pitch = pitch;
+    target->buffer = NULL;
+
+    return pitch * height;
+}
+
+/* this functions converts the glyph bitmap found in a FT_GlyphSlot
+ * into a different format (see _compute_xrender_bitmap_size)
+ *
+ * you should call this function after _compute_xrender_bitmap_size
+ *
+ * target :: target bitmap descriptor. Note that its 'buffer' pointer
+ *           must point to memory allocated by the caller
+ *
+ * slot   :: the glyph slot containing the source bitmap
+ *
+ * mode   :: the requested final rendering mode
+ *
+ * bgr    :: boolean, set if BGR or VBGR pixel ordering is needed
+ */
+static void
+_fill_xrender_bitmap(FT_Bitmap      *target,
+		     FT_GlyphSlot    slot,
+		     FT_Render_Mode  mode,
+		     int             bgr)
+{
+    FT_Bitmap *ftbit = &slot->bitmap;
+    unsigned char *srcLine = ftbit->buffer;
+    unsigned char *dstLine = target->buffer;
+    int src_pitch = ftbit->pitch;
+    int width = target->width;
+    int height = target->rows;
+    int pitch = target->pitch;
+    int subpixel;
+    int h;
+
+    subpixel = (mode == FT_RENDER_MODE_LCD ||
+		mode == FT_RENDER_MODE_LCD_V);
+
+    if (src_pitch < 0)
+	srcLine -= src_pitch * (ftbit->rows - 1);
+
+    target->pixel_mode = ftbit->pixel_mode;
+
+    switch (ftbit->pixel_mode) {
+    case FT_PIXEL_MODE_MONO:
+	if (subpixel) {
+	    /* convert mono to ARGB32 values */
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
+		int x;
+
+		for (x = 0; x < width; x++) {
+		    if (srcLine[(x >> 3)] & (0x80 >> (x & 7)))
+			((unsigned int *) dstLine)[x] = 0xffffffffU;
+		}
+	    }
+	    target->pixel_mode = FT_PIXEL_MODE_LCD;
+
+	} else if (mode == FT_RENDER_MODE_NORMAL) {
+	    /* convert mono to 8-bit gray */
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
+		int x;
+
+		for (x = 0; x < width; x++) {
+		    if (srcLine[(x >> 3)] & (0x80 >> (x & 7)))
+			dstLine[x] = 0xff;
+		}
+	    }
+	    target->pixel_mode = FT_PIXEL_MODE_GRAY;
+
+	} else {
+	    /* copy mono to mono */
+
+	    int  bytes = (width + 7) >> 3;
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
+		memcpy (dstLine, srcLine, bytes);
+	}
+	break;
+
+    case FT_PIXEL_MODE_GRAY:
+	if (subpixel) {
+	    /* convert gray to ARGB32 values */
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
+		int x;
+		unsigned int *dst = (unsigned int *) dstLine;
+
+		for (x = 0; x < width; x++) {
+		    unsigned int pix = srcLine[x];
+
+		    pix |= (pix << 8);
+		    pix |= (pix << 16);
+
+		    dst[x] = pix;
+		}
+	    }
+	    target->pixel_mode = FT_PIXEL_MODE_LCD;
+        } else {
+            /* copy gray into gray */
+
+            for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch)
+                memcpy (dstLine, srcLine, width);
+        }
+        break;
+
+    case FT_PIXEL_MODE_LCD:
+	if (!bgr) {
+	    /* convert horizontal RGB into ARGB32 */
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
+		int x;
+		unsigned char *src = srcLine;
+		unsigned int *dst = (unsigned int *) dstLine;
+
+		for (x = 0; x < width; x++, src += 3) {
+		    unsigned int  pix;
+
+		    pix = ((unsigned int)src[0] << 16) |
+			  ((unsigned int)src[1] <<  8) |
+			  ((unsigned int)src[2]      ) |
+			  ((unsigned int)src[1] << 24) ;
+
+		    dst[x] = pix;
+		}
+	    }
+	} else {
+	    /* convert horizontal BGR into ARGB32 */
+
+	    for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) {
+
+		int x;
+		unsigned char *src = srcLine;
+		unsigned int *dst = (unsigned int *) dstLine;
+
+		for (x = 0; x < width; x++, src += 3) {
+		    unsigned int  pix;
+
+		    pix = ((unsigned int)src[2] << 16) |
+			  ((unsigned int)src[1] <<  8) |
+			  ((unsigned int)src[0]      ) |
+			  ((unsigned int)src[1] << 24) ;
+
+		    dst[x] = pix;
+		}
+	    }
+	}
+	break;
+
+    default:  /* FT_PIXEL_MODE_LCD_V */
+	/* convert vertical RGB into ARGB32 */
+	if (!bgr) {
+
+	    for (h = height; h > 0; h--, srcLine += 3 * src_pitch, dstLine += pitch) {
+		int x;
+		unsigned char* src = srcLine;
+		unsigned int*  dst = (unsigned int *) dstLine;
+
+		for (x = 0; x < width; x++, src += 1) {
+		    unsigned int pix;
+		    pix = ((unsigned int)src[0]           << 16) |
+			  ((unsigned int)src[src_pitch]   <<  8) |
+			  ((unsigned int)src[src_pitch*2]      ) |
+			  ((unsigned int)src[src_pitch]   << 24) ;
+		    dst[x] = pix;
+		}
+	    }
+	} else {
+
+	    for (h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch) {
+		int x;
+		unsigned char *src = srcLine;
+		unsigned int *dst = (unsigned int *) dstLine;
+
+		for (x = 0; x < width; x++, src += 1) {
+		    unsigned int  pix;
+
+		    pix = ((unsigned int)src[src_pitch * 2] << 16) |
+			  ((unsigned int)src[src_pitch]     <<  8) |
+			  ((unsigned int)src[0]                  ) |
+			  ((unsigned int)src[src_pitch]     << 24) ;
+
+		    dst[x] = pix;
+		}
+	    }
+	}
+    }
+}
+
 
 /* Fills in val->image with an image surface created from @bitmap
  */
@@ -808,6 +1111,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
     int width, height, stride;
     unsigned char *data;
     int format = CAIRO_FORMAT_A8;
+    cairo_image_surface_t *image;
 
     width = bitmap->width;
     height = bitmap->rows;
@@ -864,11 +1168,7 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
     case FT_PIXEL_MODE_LCD:
     case FT_PIXEL_MODE_LCD_V:
     case FT_PIXEL_MODE_GRAY:
-	switch (font_options->antialias) {
-	case CAIRO_ANTIALIAS_DEFAULT:
-	case CAIRO_ANTIALIAS_GRAY:
-	case CAIRO_ANTIALIAS_NONE:
-	default:
+        if (font_options->antialias != CAIRO_ANTIALIAS_SUBPIXEL) {
 	    stride = bitmap->pitch;
 	    if (own_buffer) {
 		data = bitmap->buffer;
@@ -879,104 +1179,18 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
 
 		memcpy (data, bitmap->buffer, stride * height);
 	    }
-	    format = CAIRO_FORMAT_A8;
-	    break;
-	case CAIRO_ANTIALIAS_SUBPIXEL: {
-	    int		    x, y;
-	    unsigned char   *in_line, *out_line, *in;
-	    unsigned int    *out;
-	    unsigned int    red, green, blue;
-	    int		    rf, gf, bf;
-	    int		    s;
-	    int		    o, os;
-	    unsigned char   *data_rgba;
-	    unsigned int    width_rgba, stride_rgba;
-	    int		    vmul = 1;
-	    int		    hmul = 1;
 
-	    switch (font_options->subpixel_order) {
-	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-	    case CAIRO_SUBPIXEL_ORDER_RGB:
-	    case CAIRO_SUBPIXEL_ORDER_BGR:
-	    default:
-		width /= 3;
-		hmul = 3;
-		break;
-	    case CAIRO_SUBPIXEL_ORDER_VRGB:
-	    case CAIRO_SUBPIXEL_ORDER_VBGR:
-		vmul = 3;
-		height /= 3;
-		break;
-	    }
-	    /*
-	     * Filter the glyph to soften the color fringes
-	     */
-	    width_rgba = width;
-	    stride = bitmap->pitch;
-	    stride_rgba = (width_rgba * 4 + 3) & ~3;
-	    data_rgba = calloc (stride_rgba, height);
-	    if (unlikely (data_rgba == NULL)) {
-		if (own_buffer)
-		    free (bitmap->buffer);
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	    }
+	format = CAIRO_FORMAT_A8;
+	} else {
+	    /* if we get there, the  data from the source bitmap
+	     * really comes from _fill_xrender_bitmap, and is
+	     * made of 32-bit ARGB or ABGR values */
+	    assert (own_buffer != 0);
+	    assert (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY);
 
-	    os = 1;
-	    switch (font_options->subpixel_order) {
-	    case CAIRO_SUBPIXEL_ORDER_VRGB:
-		os = stride;
-	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-	    case CAIRO_SUBPIXEL_ORDER_RGB:
-	    default:
-		rf = 0;
-		gf = 1;
-		bf = 2;
-		break;
-	    case CAIRO_SUBPIXEL_ORDER_VBGR:
-		os = stride;
-	    case CAIRO_SUBPIXEL_ORDER_BGR:
-		bf = 0;
-		gf = 1;
-		rf = 2;
-		break;
-	    }
-	    in_line = bitmap->buffer;
-	    out_line = data_rgba;
-	    for (y = 0; y < height; y++)
-	    {
-		in = in_line;
-		out = (unsigned int *) out_line;
-		in_line += stride * vmul;
-		out_line += stride_rgba;
-		for (x = 0; x < width * hmul; x += hmul)
-		{
-		    red = green = blue = 0;
-		    o = 0;
-		    for (s = 0; s < 3; s++)
-		    {
-			red += filters[rf][s]*in[x+o];
-			green += filters[gf][s]*in[x+o];
-			blue += filters[bf][s]*in[x+o];
-			o += os;
-		    }
-		    red = red / 65536;
-		    green = green / 65536;
-		    blue = blue / 65536;
-		    *out++ = (green << 24) | (red << 16) | (green << 8) | blue;
-		}
-	    }
-
-	    /* Images here are stored in native format. The
-	     * backend must convert to its own format as needed
-	     */
-
-	    if (own_buffer)
-		free (bitmap->buffer);
-	    data = data_rgba;
-	    stride = stride_rgba;
-	    format = CAIRO_FORMAT_ARGB32;
-	    break;
-	}
+		data = bitmap->buffer;
+		stride = bitmap->pitch;
+		format = CAIRO_FORMAT_ARGB32;
 	}
 	break;
     case FT_PIXEL_MODE_GRAY2:
@@ -988,18 +1202,22 @@ _get_bitmap_surface (FT_Bitmap		     *bitmap,
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
-    *surface = (cairo_image_surface_t *)
+    /* XXX */
+    *surface = image = (cairo_image_surface_t *)
 	cairo_image_surface_create_for_data (data,
 					     format,
 					     width, height, stride);
-    if ((*surface)->base.status) {
+    if (image->base.status) {
 	free (data);
 	return (*surface)->base.status;
     }
 
-    _cairo_image_surface_assume_ownership_of_data ((*surface));
+    if (format == CAIRO_FORMAT_ARGB32)
+	pixman_image_set_component_alpha (image->pixman_image, TRUE);
 
-    _cairo_debug_check_image_surface_is_defined (&(*surface)->base);
+    _cairo_image_surface_assume_ownership_of_data (image);
+
+    _cairo_debug_check_image_surface_is_defined (&image->base);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1024,16 +1242,59 @@ _render_glyph_outline (FT_Face                    face,
 		       cairo_font_options_t	 *font_options,
 		       cairo_image_surface_t	**surface)
 {
+    int rgba = FC_RGBA_UNKNOWN;
+    int lcd_filter = FT_LCD_FILTER_LEGACY;
     FT_GlyphSlot glyphslot = face->glyph;
     FT_Outline *outline = &glyphslot->outline;
     FT_Bitmap bitmap;
     FT_BBox cbox;
-    FT_Matrix matrix;
-    int hmul = 1;
-    int vmul = 1;
-    unsigned int width, height, stride;
-    cairo_bool_t subpixel = FALSE;
+    unsigned int width, height;
     cairo_status_t status;
+    FT_Error fterror;
+    FT_Library library = glyphslot->library;
+    FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL;
+
+    switch (font_options->antialias) {
+    case CAIRO_ANTIALIAS_NONE:
+	render_mode = FT_RENDER_MODE_MONO;
+	break;
+
+    case CAIRO_ANTIALIAS_SUBPIXEL:
+	switch (font_options->subpixel_order) {
+	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
+	    case CAIRO_SUBPIXEL_ORDER_RGB:
+	    case CAIRO_SUBPIXEL_ORDER_BGR:
+		render_mode = FT_RENDER_MODE_LCD;
+		break;
+
+	    case CAIRO_SUBPIXEL_ORDER_VRGB:
+	    case CAIRO_SUBPIXEL_ORDER_VBGR:
+		render_mode = FT_RENDER_MODE_LCD_V;
+		break;
+	}
+
+	switch (font_options->lcd_filter) {
+	case CAIRO_LCD_FILTER_NONE:
+	    lcd_filter = FT_LCD_FILTER_NONE;
+	    break;
+	case CAIRO_LCD_FILTER_DEFAULT:
+	case CAIRO_LCD_FILTER_INTRA_PIXEL:
+	    lcd_filter = FT_LCD_FILTER_LEGACY;
+	    break;
+	case CAIRO_LCD_FILTER_FIR3:
+	    lcd_filter = FT_LCD_FILTER_LIGHT;
+	    break;
+	case CAIRO_LCD_FILTER_FIR5:
+	    lcd_filter = FT_LCD_FILTER_DEFAULT;
+	    break;
+	}
+
+	break;
+
+    case CAIRO_ANTIALIAS_DEFAULT:
+    case CAIRO_ANTIALIAS_GRAY:
+	render_mode = FT_RENDER_MODE_NORMAL;
+    }
 
     FT_Outline_Get_CBox (outline, &cbox);
 
@@ -1044,20 +1305,21 @@ _render_glyph_outline (FT_Face                    face,
 
     width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6);
     height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6);
-    stride = (width * hmul + 3) & ~3;
 
     if (width * height == 0) {
 	cairo_format_t format;
 	/* Looks like fb handles zero-sized images just fine */
-	switch (font_options->antialias) {
-	case CAIRO_ANTIALIAS_NONE:
+	switch (render_mode) {
+	case FT_RENDER_MODE_MONO:
 	    format = CAIRO_FORMAT_A1;
 	    break;
-	case CAIRO_ANTIALIAS_SUBPIXEL:
+	case FT_RENDER_MODE_LCD:
+	case FT_RENDER_MODE_LCD_V:
 	    format= CAIRO_FORMAT_ARGB32;
 	    break;
-	case CAIRO_ANTIALIAS_DEFAULT:
-	case CAIRO_ANTIALIAS_GRAY:
+	case FT_RENDER_MODE_LIGHT:
+	case FT_RENDER_MODE_NORMAL:
+	case FT_RENDER_MODE_MAX:
 	default:
 	    format = CAIRO_FORMAT_A8;
 	    break;
@@ -1067,75 +1329,74 @@ _render_glyph_outline (FT_Face                    face,
 	    cairo_image_surface_create_for_data (NULL, format, 0, 0, 0);
 	if ((*surface)->base.status)
 	    return (*surface)->base.status;
-    } else  {
+    } else {
 
-	matrix.xx = matrix.yy = 0x10000L;
-	matrix.xy = matrix.yx = 0;
+	int bitmap_size;
 
-	switch (font_options->antialias) {
-	case CAIRO_ANTIALIAS_NONE:
-	    bitmap.pixel_mode = FT_PIXEL_MODE_MONO;
-	    bitmap.num_grays  = 1;
-	    stride = ((width + 31) & -32) >> 3;
-	    break;
-	case CAIRO_ANTIALIAS_DEFAULT:
-	case CAIRO_ANTIALIAS_GRAY:
-	    bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
-	    bitmap.num_grays  = 256;
-	    stride = (width + 3) & -4;
-	    break;
-	case CAIRO_ANTIALIAS_SUBPIXEL:
-	    switch (font_options->subpixel_order) {
-	    case CAIRO_SUBPIXEL_ORDER_RGB:
-	    case CAIRO_SUBPIXEL_ORDER_BGR:
-	    case CAIRO_SUBPIXEL_ORDER_DEFAULT:
-	    default:
-		matrix.xx *= 3;
-		hmul = 3;
-		subpixel = TRUE;
-		break;
-	    case CAIRO_SUBPIXEL_ORDER_VRGB:
-	    case CAIRO_SUBPIXEL_ORDER_VBGR:
-		matrix.yy *= 3;
-		vmul = 3;
-		subpixel = TRUE;
-		break;
+	switch (render_mode) {
+	case FT_RENDER_MODE_LCD:
+	    if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR) {
+		rgba = FC_RGBA_BGR;
+	    } else {
+		rgba = FC_RGBA_RGB;
+	    }
+	case FT_RENDER_MODE_LCD_V:
+	    if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR) {
+		rgba = FC_RGBA_VBGR;
+	    } else {
+		rgba = FC_RGBA_VRGB;
+		}
+	    break;
+	case FT_RENDER_MODE_MONO:
+	case FT_RENDER_MODE_LIGHT:
+	case FT_RENDER_MODE_NORMAL:
+	case FT_RENDER_MODE_MAX:
+	default:
+	    break;
 	    }
-	    FT_Outline_Transform (outline, &matrix);
 
-	    bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
-	    bitmap.num_grays  = 256;
-	    stride = (width * hmul + 3) & -4;
-	}
+#if HAVE_FT_LIBRARY_SETLCDFILTER
+	FT_Library_SetLcdFilter (library, lcd_filter);
+#endif
 
-	bitmap.pitch = stride;
-	bitmap.width = width * hmul;
-	bitmap.rows = height * vmul;
-	bitmap.buffer = calloc (stride, bitmap.rows);
-	if (unlikely (bitmap.buffer == NULL))
+	fterror = FT_Render_Glyph (face->glyph, render_mode);
+
+#if HAVE_FT_LIBRARY_SETLCDFILTER
+	FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
+#endif
+
+	if (fterror != 0)
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+	bitmap_size = _compute_xrender_bitmap_size (&bitmap,
+						    face->glyph,
+						    render_mode);
+	if (bitmap_size < 0)
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul);
+	bitmap.buffer = calloc (1, bitmap_size);
+	if (bitmap.buffer == NULL)
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) {
-	    free (bitmap.buffer);
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	}
+	_fill_xrender_bitmap (&bitmap, face->glyph, render_mode,
+			      (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR));
 
+	/* Note:
+	 * _get_bitmap_surface will free bitmap.buffer if there is an error
+	 */
 	status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface);
 	if (unlikely (status))
 	    return status;
-    }
 
-    /*
-     * Note: the font's coordinate system is upside down from ours, so the
-     * Y coordinate of the control box needs to be negated.  Moreover, device
-     * offsets are position of glyph origin relative to top left while xMin
-     * and yMax are offsets of top left relative to origin.  Another negation.
-     */
-    cairo_surface_set_device_offset (&(*surface)->base,
-				     floor (-(double) cbox.xMin / 64.0),
-				     floor (+(double) cbox.yMax / 64.0));
+	/* Note: the font's coordinate system is upside down from ours, so the
+	 * Y coordinate of the control box needs to be negated.  Moreover, device
+	 * offsets are position of glyph origin relative to top left while xMin
+	 * and yMax are offsets of top left relative to origin.  Another negation.
+	 */
+	cairo_surface_set_device_offset (&(*surface)->base,
+					 (double)-glyphslot->bitmap_left,
+					 (double)+glyphslot->bitmap_top);
+    }
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1207,8 +1468,8 @@ _transform_glyph_bitmap (cairo_matrix_t         * shape,
     original_to_transformed = *shape;
     
     cairo_surface_get_device_offset (&(*surface)->base, &origin_x, &origin_y);
-    orig_width = cairo_image_surface_get_width (&(*surface)->base);
-    orig_height = cairo_image_surface_get_height (&(*surface)->base);
+    orig_width = (*surface)->width;
+    orig_height = (*surface)->height;
 
     cairo_matrix_translate (&original_to_transformed,
 			    -origin_x, -origin_y);
@@ -1246,9 +1507,8 @@ _transform_glyph_bitmap (cairo_matrix_t         * shape,
     original_to_transformed.x0 -= x_min;
     original_to_transformed.y0 -= y_min;
 
-    /* Create the transformed bitmap
-     */
-    width = x_max - x_min;
+    /* Create the transformed bitmap */
+    width  = x_max - x_min;
     height = y_max - y_min;
 
     transformed_to_original = original_to_transformed;
@@ -1256,30 +1516,19 @@ _transform_glyph_bitmap (cairo_matrix_t         * shape,
     if (unlikely (status))
 	return status;
 
-    /* We need to pad out the width to 32-bit intervals for cairo-xlib-surface.c */
-    width = (width + 3) & ~3;
     image = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
     if (unlikely (image->status))
 	return image->status;
 
-    /* Initialize it to empty
-     */
-    status = _cairo_surface_fill_rectangle (image, CAIRO_OPERATOR_CLEAR,
-				            CAIRO_COLOR_TRANSPARENT,
-					    0, 0,
-					    width, height);
-    if (unlikely (status)) {
-	cairo_surface_destroy (image);
-	return status;
-    }
-
     /* Draw the original bitmap transformed into the new bitmap
      */
     _cairo_pattern_init_for_surface (&pattern, &(*surface)->base);
     cairo_pattern_set_matrix (&pattern.base, &transformed_to_original);
 
-    status = _cairo_surface_paint (image, CAIRO_OPERATOR_OVER,
-				   &pattern.base, NULL);
+    status = _cairo_surface_paint (image,
+				   CAIRO_OPERATOR_SOURCE,
+				   &pattern.base,
+				   NULL);
 
     _cairo_pattern_fini (&pattern.base);
 
@@ -1355,6 +1604,7 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret)
     
     if (antialias) {
 	cairo_subpixel_order_t subpixel_order;
+	int lcd_filter;
 
 	/* disable hinting if requested */
 	if (FcPatternGetBool (pattern,
@@ -1390,6 +1640,25 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret)
 	    ft_options.base.antialias = CAIRO_ANTIALIAS_SUBPIXEL;
 	}
 
+	if (FcPatternGetInteger (pattern,
+				 FC_LCD_FILTER, 0, &lcd_filter) == FcResultMatch)
+	{
+	    switch (lcd_filter) {
+	    case FC_LCD_NONE:
+		ft_options.base.lcd_filter = CAIRO_LCD_FILTER_NONE;
+		break;
+	    case FC_LCD_DEFAULT:
+		ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR5;
+		break;
+	    case FC_LCD_LIGHT:
+		ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR3;
+		break;
+	    case FC_LCD_LEGACY:
+		ft_options.base.lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL;
+		break;
+	    }
+	}
+
 #ifdef FC_HINT_STYLE
 	if (FcPatternGetInteger (pattern,
 				 FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
@@ -1491,6 +1760,12 @@ _cairo_ft_options_merge (cairo_ft_options_t *options,
     if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
 	options->base.hint_style = CAIRO_HINT_STYLE_NONE;
 
+    if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT)
+	options->base.lcd_filter = other->base.lcd_filter;
+
+    if (other->base.lcd_filter == CAIRO_LCD_FILTER_NONE)
+	options->base.lcd_filter = CAIRO_LCD_FILTER_NONE;
+
     if (options->base.antialias == CAIRO_ANTIALIAS_NONE) {
 	if (options->base.hint_style == CAIRO_HINT_STYLE_NONE)
 	    load_flags |= FT_LOAD_NO_HINTING;
@@ -1514,11 +1789,11 @@ _cairo_ft_options_merge (cairo_ft_options_t *options,
 		case CAIRO_SUBPIXEL_ORDER_DEFAULT:
 		case CAIRO_SUBPIXEL_ORDER_RGB:
 		case CAIRO_SUBPIXEL_ORDER_BGR:
-		    load_target |= FT_LOAD_TARGET_LCD;
+		    load_target = FT_LOAD_TARGET_LCD;
 		    break;
 		case CAIRO_SUBPIXEL_ORDER_VRGB:
 		case CAIRO_SUBPIXEL_ORDER_VBGR:
-		    load_target |= FT_LOAD_TARGET_LCD_V;
+		    load_target = FT_LOAD_TARGET_LCD_V;
 		break;
 		}
 	    }
@@ -2517,6 +2792,34 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 	}
     }
 
+    if (options->lcd_filter != CAIRO_LCD_FILTER_DEFAULT)
+    {
+	if (FcPatternGet (pattern, FC_LCD_FILTER, 0, &v) == FcResultNoMatch)
+	{
+	    int lcd_filter;
+
+	    switch (options->lcd_filter) {
+	    case CAIRO_LCD_FILTER_NONE:
+		lcd_filter = FT_LCD_FILTER_NONE;
+		break;
+	    case CAIRO_LCD_FILTER_DEFAULT:
+	    case CAIRO_LCD_FILTER_INTRA_PIXEL:
+		lcd_filter = FT_LCD_FILTER_LEGACY;
+		break;
+	    case CAIRO_LCD_FILTER_FIR3:
+		lcd_filter = FT_LCD_FILTER_LIGHT;
+		break;
+	    default:
+	    case CAIRO_LCD_FILTER_FIR5:
+		lcd_filter = FT_LCD_FILTER_DEFAULT;
+		break;
+	    }
+
+	    if (! FcPatternAddInteger (pattern, FC_LCD_FILTER, lcd_filter))
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+    }
+
     if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT)
     {
 	if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)
@@ -2638,13 +2941,11 @@ _cairo_ft_resolve_pattern (FcPattern		      *pattern,
     }
 
     status = _cairo_ft_unscaled_font_create_for_pattern (resolved, &unscaled);
-    if (unlikely (status)) {
+    if (unlikely (status || unscaled == NULL)) {
 	font_face = (cairo_font_face_t *)&_cairo_font_face_nil;
 	goto FREE_RESOLVED;
     }
 
-    assert (unscaled != NULL);
-
     _get_pattern_ft_options (resolved, &ft_options);
     font_face = _cairo_ft_font_face_create (unscaled, &ft_options);
     _cairo_unscaled_font_destroy (&unscaled->base);
diff --git a/gfx/cairo/cairo/src/cairo-ft-private.h b/gfx/cairo/cairo/src/cairo-ft-private.h
index 00f7f77cb50..ff6ad4e655f 100644
--- a/gfx/cairo/cairo/src/cairo-ft-private.h
+++ b/gfx/cairo/cairo/src/cairo-ft-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-ft.h b/gfx/cairo/cairo/src/cairo-ft.h
index b7178d35f5a..56d48c3280a 100644
--- a/gfx/cairo/cairo/src/cairo-ft.h
+++ b/gfx/cairo/cairo/src/cairo-ft.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-gl-glyphs.c b/gfx/cairo/cairo/src/cairo-gl-glyphs.c
index dbc71003355..4736e190e0d 100644
--- a/gfx/cairo/cairo/src/cairo-gl-glyphs.c
+++ b/gfx/cairo/cairo/src/cairo-gl-glyphs.c
@@ -1,6 +1,8 @@
 /* Cairo - a vector graphics library with display and print output
  *
  * Copyright © 2009 Chris Wilson
+ * Copyright © 2010 Intel Corporation
+ * Copyright © 2010 Red Hat, Inc
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -12,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -28,11 +30,17 @@
  * The Original Code is the cairo graphics library.
  *
  * The Initial Developer of the Original Code is Chris Wilson.
+ *
+ * Contributors:
+ *      Benjamin Otte <otte@gnome.org>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #include "cairoint.h"
 
 #include "cairo-gl-private.h"
+
+#include "cairo-error-private.h"
 #include "cairo-rtree-private.h"
 
 #define GLYPH_CACHE_WIDTH 1024
@@ -47,40 +55,16 @@ typedef struct _cairo_gl_glyph_private {
 } cairo_gl_glyph_private_t;
 
 static cairo_status_t
-_cairo_gl_glyph_cache_add_glyph (cairo_gl_glyph_cache_t *cache,
+_cairo_gl_glyph_cache_add_glyph (cairo_gl_context_t *ctx,
+				 cairo_gl_glyph_cache_t *cache,
 				 cairo_scaled_glyph_t  *scaled_glyph)
 {
     cairo_image_surface_t *glyph_surface = scaled_glyph->surface;
+    cairo_gl_surface_t *cache_surface;
     cairo_gl_glyph_private_t *glyph_private;
     cairo_rtree_node_t *node = NULL;
-    cairo_image_surface_t *clone = NULL;
     cairo_status_t status;
     int width, height;
-    GLenum internal_format, format, type;
-    cairo_bool_t has_alpha;
-
-    if (! _cairo_gl_get_image_format_and_type (glyph_surface->pixman_format,
-					       &internal_format,
-					       &format,
-					       &type,
-					       &has_alpha))
-    {
-	cairo_bool_t is_supported;
-
-	clone = _cairo_image_surface_coerce (glyph_surface,
-		                             _cairo_format_from_content (glyph_surface->base.content));
-	if (unlikely (clone->base.status))
-	    return clone->base.status;
-
-	is_supported =
-	    _cairo_gl_get_image_format_and_type (clone->pixman_format,
-					         &internal_format,
-						 &format,
-						 &type,
-						 &has_alpha);
-	assert (is_supported);
-	glyph_surface = clone;
-    }
 
     width = glyph_surface->width;
     if (width < GLYPH_CACHE_MIN_SIZE)
@@ -103,16 +87,17 @@ _cairo_gl_glyph_cache_add_glyph (cairo_gl_glyph_cache_t *cache,
     if (status)
 	return status;
 
-    glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-    glPixelStorei (GL_UNPACK_ROW_LENGTH,
-		   glyph_surface->stride /
-		   (PIXMAN_FORMAT_BPP (glyph_surface->pixman_format) / 8));
-    glTexSubImage2D (GL_TEXTURE_2D, 0,
-		     node->x, node->y,
-		     glyph_surface->width, glyph_surface->height,
-		     format, type,
-		     glyph_surface->data);
-    glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+    cache_surface = (cairo_gl_surface_t *) cache->pattern.surface;
+
+    /* XXX: Make sure we use the mask texture. This should work automagically somehow */
+    glActiveTexture (GL_TEXTURE1);
+    status = _cairo_gl_surface_draw_image (cache_surface,
+                                           glyph_surface,
+                                           0, 0,
+                                           glyph_surface->width, glyph_surface->height,
+                                           node->x, node->y);
+    if (unlikely (status))
+	return status;
 
     scaled_glyph->surface_private = node;
     node->owner = &scaled_glyph->surface_private;
@@ -121,14 +106,16 @@ _cairo_gl_glyph_cache_add_glyph (cairo_gl_glyph_cache_t *cache,
     glyph_private->cache = cache;
 
     /* compute tex coords */
-    glyph_private->p1.x = node->x / (double) cache->width;
-    glyph_private->p1.y = node->y / (double) cache->height;
-    glyph_private->p2.x =
-	(node->x + glyph_surface->width) / (double) cache->width;
-    glyph_private->p2.y =
-	(node->y + glyph_surface->height) / (double) cache->height;
-
-    cairo_surface_destroy (&clone->base);
+    glyph_private->p1.x = node->x;
+    glyph_private->p1.y = node->y;
+    glyph_private->p2.x = node->x + glyph_surface->width;
+    glyph_private->p2.y = node->y + glyph_surface->height;
+    if (! _cairo_gl_device_requires_power_of_two_textures (&ctx->base)) {
+	glyph_private->p1.x /= cache_surface->width;
+	glyph_private->p1.y /= cache_surface->height;
+	glyph_private->p2.x /= cache_surface->width;
+	glyph_private->p2.y /= cache_surface->height;
+    }
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -140,53 +127,50 @@ _cairo_gl_glyph_cache_lock (cairo_gl_glyph_cache_t *cache,
     return _cairo_rtree_pin (&cache->rtree, scaled_glyph->surface_private);
 }
 
-static cairo_gl_glyph_cache_t *
+static cairo_status_t
 cairo_gl_context_get_glyph_cache (cairo_gl_context_t *ctx,
-				  cairo_format_t format)
+				  cairo_format_t format,
+                                  cairo_gl_glyph_cache_t **cache_out)
 {
     cairo_gl_glyph_cache_t *cache;
+    cairo_content_t content;
 
     switch (format) {
+    case CAIRO_FORMAT_RGB16_565:
     case CAIRO_FORMAT_ARGB32:
     case CAIRO_FORMAT_RGB24:
 	cache = &ctx->glyph_cache[0];
-	format = CAIRO_FORMAT_ARGB32;
+        content = CAIRO_CONTENT_COLOR_ALPHA;
 	break;
     case CAIRO_FORMAT_A8:
     case CAIRO_FORMAT_A1:
 	cache = &ctx->glyph_cache[1];
-	format = CAIRO_FORMAT_A8;
+        content = CAIRO_CONTENT_ALPHA;
 	break;
+    case CAIRO_FORMAT_INVALID:
+	ASSERT_NOT_REACHED;
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     }
 
-    if (unlikely (cache->tex == 0)) {
-	GLenum internal_format;
-
-	cache->width = GLYPH_CACHE_WIDTH;
-	cache->height = GLYPH_CACHE_HEIGHT;
-
-	switch (format) {
-	    case CAIRO_FORMAT_A1:
-	    case CAIRO_FORMAT_RGB24:
-		ASSERT_NOT_REACHED;
-	    case CAIRO_FORMAT_ARGB32:
-		internal_format = GL_RGBA;
-		break;
-	    case CAIRO_FORMAT_A8:
-		internal_format = GL_ALPHA;
-		break;
-	}
-
-	glGenTextures (1, &cache->tex);
-	glBindTexture (GL_TEXTURE_2D, cache->tex);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexImage2D (GL_TEXTURE_2D, 0, internal_format,
-		      GLYPH_CACHE_WIDTH, GLYPH_CACHE_HEIGHT, 0,
-		      internal_format, GL_FLOAT, NULL);
+    if (unlikely (cache->pattern.surface == NULL)) {
+        cairo_surface_t *surface;
+        surface = cairo_gl_surface_create (&ctx->base,
+                                           content,
+                                           GLYPH_CACHE_WIDTH,
+                                           GLYPH_CACHE_HEIGHT);
+        if (unlikely (surface->status)) {
+            cairo_status_t status = surface->status;
+            cairo_surface_destroy (surface);
+            return status;
+        }
+        _cairo_surface_release_device_reference (surface);
+        _cairo_pattern_init_for_surface (&cache->pattern, surface);
+        cairo_surface_destroy (surface);
+        cache->pattern.base.has_component_alpha = (content == CAIRO_CONTENT_COLOR_ALPHA);
     }
 
-    return cache;
+    *cache_out = cache;
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static void
@@ -199,12 +183,12 @@ static cairo_bool_t
 _cairo_gl_surface_owns_font (cairo_gl_surface_t *surface,
 			     cairo_scaled_font_t *scaled_font)
 {
-    cairo_gl_context_t *font_private;
+    cairo_device_t *font_private;
 
     font_private = scaled_font->surface_private;
     if ((scaled_font->surface_backend != NULL &&
 	 scaled_font->surface_backend != &_cairo_gl_surface_backend) ||
-	(font_private != NULL && font_private != surface->ctx))
+	(font_private != NULL && font_private != surface->base.device))
     {
 	return FALSE;
     }
@@ -212,6 +196,12 @@ _cairo_gl_surface_owns_font (cairo_gl_surface_t *surface,
     return TRUE;
 }
 
+void
+_cairo_gl_surface_scaled_font_fini (cairo_scaled_font_t  *scaled_font)
+{
+    cairo_list_del (&scaled_font->link);
+}
+
 void
 _cairo_gl_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 				     cairo_scaled_font_t  *scaled_font)
@@ -229,109 +219,6 @@ _cairo_gl_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
     }
 }
 
-typedef struct _cairo_gl_glyphs_setup
-{
-    unsigned int vbo_size; /* units of floats */
-    unsigned int vb_offset; /* units of floats */
-    unsigned int vertex_size; /* units of floats */
-    unsigned int num_prims;
-    float *vb;
-    cairo_gl_composite_setup_t *composite;
-    cairo_region_t *clip;
-    cairo_gl_surface_t *dst;
-} cairo_gl_glyphs_setup_t;
-
-static void
-_cairo_gl_flush_glyphs (cairo_gl_context_t *ctx,
-			cairo_gl_glyphs_setup_t *setup)
-{
-    int i;
-
-    if (setup->vb != NULL) {
-	glUnmapBufferARB (GL_ARRAY_BUFFER_ARB);
-	setup->vb = NULL;
-
-	if (setup->num_prims != 0) {
-	    if (setup->clip) {
-		int num_rectangles = cairo_region_num_rectangles (setup->clip);
-
-		glEnable (GL_SCISSOR_TEST);
-		for (i = 0; i < num_rectangles; i++) {
-		    cairo_rectangle_int_t rect;
-
-		    cairo_region_get_rectangle (setup->clip, i, &rect);
-
-		    glScissor (rect.x,
-			       _cairo_gl_y_flip (setup->dst, rect.y),
-			       rect.x + rect.width,
-			       _cairo_gl_y_flip (setup->dst,
-						 rect.y + rect.height));
-		    glDrawArrays (GL_QUADS, 0, 4 * setup->num_prims);
-		}
-		glDisable (GL_SCISSOR_TEST);
-	    } else {
-		glDrawArrays (GL_QUADS, 0, 4 * setup->num_prims);
-	    }
-	    setup->num_prims = 0;
-	}
-    }
-}
-
-static void
-_cairo_gl_glyphs_emit_vertex (cairo_gl_glyphs_setup_t *setup,
-			      int x, int y, float glyph_x, float glyph_y)
-{
-    int i = 0;
-    float *vb = &setup->vb[setup->vb_offset];
-    cairo_surface_attributes_t *src_attributes;
-
-    src_attributes = &setup->composite->src.operand.texture.attributes;
-
-    vb[i++] = x;
-    vb[i++] = y;
-
-    vb[i++] = glyph_x;
-    vb[i++] = glyph_y;
-
-    if (setup->composite->src.type == OPERAND_TEXTURE) {
-	double s = x;
-	double t = y;
-	cairo_matrix_transform_point (&src_attributes->matrix, &s, &t);
-	vb[i++] = s;
-	vb[i++] = t;
-    }
-
-    setup->vb_offset += setup->vertex_size;
-}
-
-
-static void
-_cairo_gl_emit_glyph_rectangle (cairo_gl_context_t *ctx,
-				cairo_gl_glyphs_setup_t *setup,
-				int x1, int y1,
-				int x2, int y2,
-				cairo_gl_glyph_private_t *glyph)
-{
-    if (setup->vb != NULL &&
-	setup->vb_offset + 4 * setup->vertex_size > setup->vbo_size) {
-	_cairo_gl_flush_glyphs (ctx, setup);
-    }
-
-    if (setup->vb == NULL) {
-	glBufferDataARB (GL_ARRAY_BUFFER_ARB,
-			 setup->vbo_size * sizeof (GLfloat),
-			 NULL, GL_STREAM_DRAW_ARB);
-	setup->vb = glMapBufferARB (GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB);
-	setup->vb_offset = 0;
-    }
-
-    _cairo_gl_glyphs_emit_vertex (setup, x1, y1, glyph->p1.x, glyph->p1.y);
-    _cairo_gl_glyphs_emit_vertex (setup, x2, y1, glyph->p2.x, glyph->p1.y);
-    _cairo_gl_glyphs_emit_vertex (setup, x2, y2, glyph->p2.x, glyph->p2.y);
-    _cairo_gl_glyphs_emit_vertex (setup, x1, y2, glyph->p1.x, glyph->p2.y);
-    setup->num_prims++;
-}
-
 static cairo_status_t
 _render_glyphs (cairo_gl_surface_t	*dst,
 	        int dst_x, int dst_y,
@@ -345,106 +232,51 @@ _render_glyphs (cairo_gl_surface_t	*dst,
 		cairo_region_t		*clip_region,
 		int			*remaining_glyphs)
 {
-    cairo_format_t last_format = (cairo_format_t) -1;
+    cairo_format_t last_format = CAIRO_FORMAT_INVALID;
     cairo_gl_glyph_cache_t *cache = NULL;
     cairo_gl_context_t *ctx;
-    cairo_gl_glyphs_setup_t setup;
-    cairo_gl_composite_setup_t composite_setup;
+    cairo_gl_composite_t setup;
     cairo_status_t status;
     int i = 0;
-    GLuint vbo = 0;
 
     *has_component_alpha = FALSE;
 
-    status = _cairo_gl_operand_init (&composite_setup.src, source, dst,
-				     glyph_extents->x, glyph_extents->y,
-				     dst_x, dst_y,
-				     glyph_extents->width,
-				     glyph_extents->height);
+    status = _cairo_gl_context_acquire (dst->base.device, &ctx);
     if (unlikely (status))
 	return status;
 
-    ctx = _cairo_gl_context_acquire (dst->ctx);
-
-    /* Set up the IN operator for source IN mask.
-     *
-     * IN (normal, any op): dst.argb = src.argb * mask.aaaa
-     * IN (component, ADD): dst.argb = src.argb * mask.argb
-     *
-     * The mask channel selection for component alpha ADD will be updated in
-     * the loop over glyphs below.
-     */
-    glActiveTexture (GL_TEXTURE1);
-    glEnable (GL_TEXTURE_2D);
-    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE1);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE1);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_ALPHA);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
-
-    _cairo_gl_set_destination (dst);
-    /* If we're doing some CA glyphs, we're only doing it for ADD,
-     * which doesn't require the source alpha value in blending.
-     */
-    _cairo_gl_set_operator (dst, op, FALSE);
-    _cairo_gl_set_src_operand (ctx, &composite_setup);
-
     _cairo_scaled_font_freeze_cache (scaled_font);
+
+    status = _cairo_gl_composite_init (&setup, op, dst,
+                                       TRUE, glyph_extents);
+
+    if (unlikely (status))
+	goto FINISH;
+
     if (! _cairo_gl_surface_owns_font (dst, scaled_font)) {
 	status = CAIRO_INT_STATUS_UNSUPPORTED;
-	goto CLEANUP_FONT;
+	goto FINISH;
     }
 
+    status = _cairo_gl_composite_set_source (&setup, source,
+                                             glyph_extents->x, glyph_extents->y,
+                                             dst_x, dst_y,
+                                             glyph_extents->width,
+                                             glyph_extents->height);
+    if (unlikely (status))
+	goto FINISH;
+
     if (scaled_font->surface_private == NULL) {
-	/* XXX couple into list to remove on context destruction */
 	scaled_font->surface_private = ctx;
 	scaled_font->surface_backend = &_cairo_gl_surface_backend;
+	cairo_list_add (&scaled_font->link, &ctx->fonts);
     }
 
-    /* Create our VBO so that we can accumulate a bunch of glyph primitives
-     * into one giant DrawArrays.
-     */
-    memset(&setup, 0, sizeof(setup));
-    setup.composite = &composite_setup;
-    setup.clip = clip_region;
-    setup.dst = dst;
-    setup.vertex_size = 4;
-    if (composite_setup.src.type == OPERAND_TEXTURE)
-	setup.vertex_size += 2;
-    setup.vbo_size = num_glyphs * 4 * setup.vertex_size;
-    if (setup.vbo_size > 4096)
-	setup.vbo_size = 4096;
-
-    glGenBuffersARB (1, &vbo);
-    glBindBufferARB (GL_ARRAY_BUFFER_ARB, vbo);
-
-    glVertexPointer (2, GL_FLOAT, setup.vertex_size * sizeof (GLfloat),
-		     (void *)(uintptr_t)(0));
-    glEnableClientState (GL_VERTEX_ARRAY);
-    if (composite_setup.src.type == OPERAND_TEXTURE) {
-	/* Note that we're packing texcoord 0 after texcoord 1, for
-	 * convenience.
-	 */
-	glClientActiveTexture (GL_TEXTURE0);
-	glTexCoordPointer (2, GL_FLOAT, setup.vertex_size * sizeof (GLfloat),
-			   (void *)(uintptr_t)(4 * sizeof (GLfloat)));
-	glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-    }
-    glClientActiveTexture (GL_TEXTURE1);
-    glTexCoordPointer (2, GL_FLOAT, setup.vertex_size * sizeof (GLfloat),
-		       (void *)(uintptr_t)(2 * sizeof (GLfloat)));
-    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+    _cairo_gl_composite_set_clip_region (&setup, clip_region);
 
     for (i = 0; i < num_glyphs; i++) {
 	cairo_scaled_glyph_t *scaled_glyph;
+	cairo_gl_glyph_private_t *glyph;
 	double x_offset, y_offset;
 	double x1, x2, y1, y2;
 
@@ -468,39 +300,40 @@ _render_glyphs (cairo_gl_surface_t	*dst,
 	}
 
 	if (scaled_glyph->surface->format != last_format) {
-	    /* Switching textures, so flush any queued prims. */
-	    _cairo_gl_flush_glyphs (ctx, &setup);
-
-	    glActiveTexture (GL_TEXTURE1);
-	    cache = cairo_gl_context_get_glyph_cache (ctx,
-						      scaled_glyph->surface->format);
-
-	    glBindTexture (GL_TEXTURE_2D, cache->tex);
+	    status = cairo_gl_context_get_glyph_cache (ctx,
+						       scaled_glyph->surface->format,
+                                                       &cache);
+            if (unlikely (status))
+                goto FINISH;
 
 	    last_format = scaled_glyph->surface->format;
-	    /* If we're doing component alpha in this function, it should
-	     * only be in the case of CAIRO_OPERATOR_ADD.  In that case, we just
-	     * need to make sure we send the rgb bits down to the destination.
-	     */
-	    if (last_format == CAIRO_FORMAT_ARGB32) {
-		assert (op == CAIRO_OPERATOR_ADD);
-		glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-		*has_component_alpha = TRUE;
-	    } else {
-		glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_ALPHA);
-	    }
 
-	    /* XXX component alpha */
+            status = _cairo_gl_composite_set_mask (&setup,
+                                                   &cache->pattern.base,
+                                                   0, 0, 0, 0, 0, 0);
+            if (unlikely (status))
+                goto FINISH;
+
+	    *has_component_alpha |= cache->pattern.base.has_component_alpha;
+
+            /* XXX: _cairo_gl_composite_begin() acquires the context a
+             * second time. Need to refactor this loop so this doesn't happen.
+             */
+            status = _cairo_gl_composite_begin (&setup, &ctx);
+
+            status = _cairo_gl_context_release (ctx, status);
+	    if (unlikely (status))
+		goto FINISH;
 	}
 
 	if (scaled_glyph->surface_private == NULL) {
-	    status = _cairo_gl_glyph_cache_add_glyph (cache, scaled_glyph);
+	    status = _cairo_gl_glyph_cache_add_glyph (ctx, cache, scaled_glyph);
 
 	    if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
 		/* Cache is full, so flush existing prims and try again. */
-		_cairo_gl_flush_glyphs (ctx, &setup);
+                _cairo_gl_composite_flush (ctx);
 		_cairo_gl_glyph_cache_unlock (cache);
-		status = _cairo_gl_glyph_cache_add_glyph (cache, scaled_glyph);
+		status = _cairo_gl_glyph_cache_add_glyph (ctx, cache, scaled_glyph);
 	    }
 
 	    if (unlikely (_cairo_status_is_error (status)))
@@ -515,40 +348,20 @@ _render_glyphs (cairo_gl_surface_t	*dst,
 	x2 = x1 + scaled_glyph->surface->width;
 	y2 = y1 + scaled_glyph->surface->height;
 
-	_cairo_gl_emit_glyph_rectangle (ctx, &setup,
+	glyph = _cairo_gl_glyph_cache_lock (cache, scaled_glyph);
+	_cairo_gl_composite_emit_glyph (ctx,
 					x1, y1, x2, y2,
-					_cairo_gl_glyph_cache_lock (cache, scaled_glyph));
+                                        glyph->p1.x, glyph->p1.y,
+                                        glyph->p2.x, glyph->p2.y);
     }
 
     status = CAIRO_STATUS_SUCCESS;
   FINISH:
-    _cairo_gl_flush_glyphs (ctx, &setup);
-  CLEANUP_FONT:
     _cairo_scaled_font_thaw_cache (scaled_font);
 
-    glDisable (GL_BLEND);
-    glDisable (GL_SCISSOR_TEST);
+    status = _cairo_gl_context_release (ctx, status);
 
-    glDisableClientState (GL_VERTEX_ARRAY);
-
-    glClientActiveTexture (GL_TEXTURE0);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE0);
-    glDisable (GL_TEXTURE_2D);
-
-    glClientActiveTexture (GL_TEXTURE1);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE1);
-    glDisable (GL_TEXTURE_2D);
-
-    if (vbo != 0) {
-	glBindBufferARB (GL_ARRAY_BUFFER_ARB, 0);
-	glDeleteBuffersARB (1, &vbo);
-    }
-
-    _cairo_gl_context_release (ctx);
-
-    _cairo_gl_operand_destroy (&composite_setup.src);
+    _cairo_gl_composite_fini (&setup);
 
     *remaining_glyphs = num_glyphs - i;
     return status;
@@ -567,26 +380,25 @@ _cairo_gl_surface_show_glyphs_via_mask (cairo_gl_surface_t	*dst,
 {
     cairo_surface_t *mask;
     cairo_status_t status;
-    cairo_solid_pattern_t solid;
     cairo_bool_t has_component_alpha;
     int i;
 
     /* XXX: For non-CA, this should be CAIRO_CONTENT_ALPHA to save memory */
-    mask = cairo_gl_surface_create (dst->ctx,
-	                            CAIRO_CONTENT_COLOR_ALPHA,
-				    glyph_extents->width,
-				    glyph_extents->height);
+    mask = cairo_gl_surface_create (dst->base.device,
+                                    CAIRO_CONTENT_COLOR_ALPHA,
+                                    glyph_extents->width,
+                                    glyph_extents->height);
     if (unlikely (mask->status))
-	return mask->status;
+        return mask->status;
 
     for (i = 0; i < num_glyphs; i++) {
 	glyphs[i].x -= glyph_extents->x;
 	glyphs[i].y -= glyph_extents->y;
     }
 
-    _cairo_pattern_init_solid (&solid, CAIRO_COLOR_WHITE, CAIRO_CONTENT_COLOR_ALPHA);
     status = _render_glyphs ((cairo_gl_surface_t *) mask, 0, 0,
-	                     CAIRO_OPERATOR_ADD, &solid.base,
+	                     CAIRO_OPERATOR_ADD,
+			     &_cairo_pattern_white.base,
 	                     glyphs, num_glyphs, glyph_extents,
 			     scaled_font, &has_component_alpha,
 			     NULL, remaining_glyphs);
@@ -610,6 +422,7 @@ _cairo_gl_surface_show_glyphs_via_mask (cairo_gl_surface_t	*dst,
     }
 
     cairo_surface_destroy (mask);
+
     return status;
 }
 
@@ -627,15 +440,11 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
     cairo_rectangle_int_t surface_extents;
     cairo_rectangle_int_t extents;
     cairo_region_t *clip_region = NULL;
-    cairo_solid_pattern_t solid_pattern;
     cairo_bool_t overlap, use_mask = FALSE;
     cairo_bool_t has_component_alpha;
     cairo_status_t status;
     int i;
 
-    if (! GLEW_ARB_vertex_buffer_object)
-	return UNSUPPORTED ("requires ARB_vertex_buffer_object");
-
     if (! _cairo_gl_operator_is_supported (op))
 	return UNSUPPORTED ("unsupported operator");
 
@@ -646,18 +455,20 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
      * since only _cairo_gl_surface_composite() currently supports component
      * alpha.
      */
-    for (i = 0; i < num_glyphs; i++) {
-	cairo_scaled_glyph_t *scaled_glyph;
+    if (!use_mask && op != CAIRO_OPERATOR_OVER) {
+	for (i = 0; i < num_glyphs; i++) {
+	    cairo_scaled_glyph_t *scaled_glyph;
 
-	status = _cairo_scaled_glyph_lookup (scaled_font,
-					     glyphs[i].index,
-					     CAIRO_SCALED_GLYPH_INFO_SURFACE,
-					     &scaled_glyph);
-	if (!_cairo_status_is_error (status) &&
-	    scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
-	{
-	    use_mask = TRUE;
-	    break;
+	    status = _cairo_scaled_glyph_lookup (scaled_font,
+						 glyphs[i].index,
+						 CAIRO_SCALED_GLYPH_INFO_SURFACE,
+						 &scaled_glyph);
+	    if (!_cairo_status_is_error (status) &&
+		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
+	    {
+		use_mask = TRUE;
+		break;
+	    }
 	}
     }
 
@@ -682,9 +493,7 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
      *    mask IN clip ? 0 : dest
      */
     if (op == CAIRO_OPERATOR_CLEAR) {
-	_cairo_pattern_init_solid (&solid_pattern, CAIRO_COLOR_WHITE,
-				   CAIRO_CONTENT_COLOR);
-	source = &solid_pattern.base;
+	source = &_cairo_pattern_white.base;
 	op = CAIRO_OPERATOR_DEST_OUT;
     }
 
@@ -772,26 +581,25 @@ EMPTY:
 	return CAIRO_STATUS_SUCCESS;
 }
 
-void
-_cairo_gl_glyph_cache_fini (cairo_gl_glyph_cache_t *cache)
-{
-    if (cache->tex == 0)
-	return;
-
-    glDeleteTextures (1, &cache->tex);
-
-    _cairo_rtree_fini (&cache->rtree);
-}
-
 void
 _cairo_gl_glyph_cache_init (cairo_gl_glyph_cache_t *cache)
 {
-    cache->tex = 0;
-
     _cairo_rtree_init (&cache->rtree,
 		       GLYPH_CACHE_WIDTH,
 		       GLYPH_CACHE_HEIGHT,
 		       GLYPH_CACHE_MIN_SIZE,
-		       sizeof (cairo_gl_glyph_private_t),
-		       NULL);
+		       sizeof (cairo_gl_glyph_private_t));
 }
+
+void
+_cairo_gl_glyph_cache_fini (cairo_gl_context_t *ctx,
+			    cairo_gl_glyph_cache_t *cache)
+{
+    _cairo_rtree_fini (&cache->rtree);
+
+    if (cache->pattern.surface) {
+        _cairo_pattern_fini (&cache->pattern.base);
+        cache->pattern.surface = NULL;
+    }
+}
+
diff --git a/gfx/cairo/cairo/src/cairo-gl-private.h b/gfx/cairo/cairo/src/cairo-gl-private.h
index 490bc5c4903..54f226f425a 100644
--- a/gfx/cairo/cairo/src/cairo-gl-private.h
+++ b/gfx/cairo/cairo/src/cairo-gl-private.h
@@ -2,7 +2,7 @@
  *
  * Copyright © 2009 Eric Anholt
  * Copyright © 2009 Chris Wilson
- * Copyright © 2005 Red Hat, Inc
+ * Copyright © 2005,2010 Red Hat, Inc
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -32,16 +32,26 @@
  * The Initial Developer of the Original Code is Red Hat, Inc.
  *
  * Contributor(s):
+ *	Benjamin Otte <otte@gnome.org>
  *	Carl Worth <cworth@cworth.org>
  *	Chris Wilson <chris@chris-wilson.co.uk>
+ *	Eric Anholt <eric@anholt.net>
+ *	T. Zachary Laine <whatwasthataddress@gmail.com>
  */
 
 #ifndef CAIRO_GL_PRIVATE_H
 #define CAIRO_GL_PRIVATE_H
 
 #include "cairoint.h"
+
+#include "cairo-gl-gradient-private.h"
+
+#include "cairo-device-private.h"
+#include "cairo-error-private.h"
 #include "cairo-rtree-private.h"
 
+#include <assert.h>
+
 #include <GL/glew.h>
 
 #include "cairo-gl.h"
@@ -63,51 +73,75 @@
 #define UNSUPPORTED(reason) CAIRO_INT_STATUS_UNSUPPORTED
 #endif
 
+/* maximal number of shaders we keep in the cache.
+ * Random number that is hopefully big enough to not cause many cache evictions. */
+#define CAIRO_GL_MAX_SHADERS_PER_CONTEXT 64
+
+/* VBO size that we allocate, smaller size means we gotta flush more often */
+#define CAIRO_GL_VBO_SIZE 16384
+
 typedef struct _cairo_gl_surface {
     cairo_surface_t base;
 
-    cairo_gl_context_t *ctx;
     int width, height;
 
     GLuint tex; /* GL texture object containing our data. */
     GLuint fb; /* GL framebuffer object wrapping our data. */
+    GLuint depth; /* GL framebuffer object holding depth */
+    int owns_tex;
 } cairo_gl_surface_t;
 
 typedef struct cairo_gl_glyph_cache {
     cairo_rtree_t rtree;
-    GLuint tex;
-    unsigned int width, height;
+    cairo_surface_pattern_t pattern;
 } cairo_gl_glyph_cache_t;
 
-struct _cairo_gl_context {
-    cairo_reference_count_t ref_count;
-    cairo_status_t status;
+typedef enum cairo_gl_tex {
+    CAIRO_GL_TEX_SOURCE = 0,
+    CAIRO_GL_TEX_MASK = 1,
+    CAIRO_GL_TEX_TEMP = 2
+} cairo_gl_tex_t;
 
-    cairo_mutex_t mutex; /* needed? */
-    GLuint dummy_tex;
-    GLint fill_rectangles_shader;
-    GLint fill_rectangles_color_uniform;
-    GLint max_framebuffer_size;
-    GLint max_texture_size;
+typedef enum cairo_gl_operand_type {
+    CAIRO_GL_OPERAND_NONE,
+    CAIRO_GL_OPERAND_CONSTANT,
+    CAIRO_GL_OPERAND_TEXTURE,
+    CAIRO_GL_OPERAND_LINEAR_GRADIENT,
+    CAIRO_GL_OPERAND_RADIAL_GRADIENT,
+    CAIRO_GL_OPERAND_SPANS,
 
-    cairo_gl_surface_t *current_target;
-    cairo_gl_glyph_cache_t glyph_cache[2];
+    CAIRO_GL_OPERAND_COUNT
+} cairo_gl_operand_type_t;
 
-    void (*make_current)(void *ctx, cairo_gl_surface_t *surface);
-    void (*swap_buffers)(void *ctx, cairo_gl_surface_t *surface);
-    void (*destroy) (void *ctx);
-};
+typedef struct cairo_gl_shader_impl cairo_gl_shader_impl_t;
 
-enum cairo_gl_composite_operand_type {
-    OPERAND_CONSTANT,
-    OPERAND_TEXTURE,
-};
+typedef struct cairo_gl_shader {
+    GLuint fragment_shader;
+    GLuint program;
+} cairo_gl_shader_t;
+
+typedef enum cairo_gl_shader_in {
+    CAIRO_GL_SHADER_IN_NORMAL,
+    CAIRO_GL_SHADER_IN_CA_SOURCE,
+    CAIRO_GL_SHADER_IN_CA_SOURCE_ALPHA,
+
+    CAIRO_GL_SHADER_IN_COUNT
+} cairo_gl_shader_in_t;
+
+typedef enum cairo_gl_var_type {
+  CAIRO_GL_VAR_NONE,
+  CAIRO_GL_VAR_TEXCOORDS,
+  CAIRO_GL_VAR_COVERAGE
+} cairo_gl_var_type_t;
+
+#define cairo_gl_var_type_hash(src,mask,dest) ((mask) << 2 | (src << 1) | (dest))
+#define CAIRO_GL_VAR_TYPE_MAX ((CAIRO_GL_VAR_COVERAGE << 2) | (CAIRO_GL_VAR_TEXCOORDS << 1) | CAIRO_GL_VAR_TEXCOORDS)
 
 /* This union structure describes a potential source or mask operand to the
  * compositing equation.
  */
-typedef struct cairo_gl_composite_operand {
-    enum cairo_gl_composite_operand_type type;
+typedef struct cairo_gl_operand {
+    cairo_gl_operand_type_t type;
     union {
 	struct {
 	    GLuint tex;
@@ -117,30 +151,111 @@ typedef struct cairo_gl_composite_operand {
 	struct {
 	    GLfloat color[4];
 	} constant;
-    } operand;
+	struct {
+	    cairo_gl_gradient_t *gradient;
+	    cairo_matrix_t m;
+	    float segment_x;
+	    float segment_y;
+            cairo_extend_t extend;
+	} linear;
+	struct {
+	    cairo_gl_gradient_t *gradient;
+	    cairo_matrix_t m;
+	    float circle_1_x;
+	    float circle_1_y;
+	    float radius_0;
+	    float radius_1;
+            cairo_extend_t extend;
+	} radial;
+    };
+    unsigned int vertex_offset;
+} cairo_gl_operand_t;
 
-    const cairo_pattern_t *pattern;
-} cairo_gl_composite_operand_t;
+struct _cairo_gl_context {
+    cairo_device_t base;
 
-typedef struct _cairo_gl_composite_setup {
-    cairo_gl_composite_operand_t src;
-    cairo_gl_composite_operand_t mask;
-} cairo_gl_composite_setup_t;
+    GLuint dummy_tex;
+    GLuint texture_load_pbo;
+    GLuint vbo;
+    GLint max_framebuffer_size;
+    GLint max_texture_size;
+    GLint max_textures;
+    GLenum tex_target;
+
+    const cairo_gl_shader_impl_t *shader_impl;
+
+    GLuint vertex_shaders[CAIRO_GL_VAR_TYPE_MAX + 1];
+    cairo_gl_shader_t fill_rectangles_shader;
+    cairo_cache_t shaders;
+
+    cairo_cache_t gradients;
+
+    cairo_gl_glyph_cache_t glyph_cache[2];
+    cairo_list_t fonts;
+
+    cairo_gl_surface_t *current_target;
+    cairo_operator_t current_operator;
+    cairo_gl_shader_t *pre_shader; /* for component alpha */
+    cairo_gl_shader_t *current_shader;
+
+    cairo_gl_operand_t operands[2];
+
+    char *vb;
+    unsigned int vb_offset;
+    unsigned int vertex_size;
+    cairo_region_t *clip_region;
+
+    void (*acquire) (void *ctx);
+    void (*release) (void *ctx);
+
+    void (*make_current) (void *ctx, cairo_gl_surface_t *surface);
+    void (*swap_buffers)(void *ctx, cairo_gl_surface_t *surface);
+    void (*destroy) (void *ctx);
+};
+
+typedef struct _cairo_gl_composite {
+    cairo_gl_surface_t *dst;
+    cairo_operator_t op;
+    cairo_region_t *clip_region;
+
+    cairo_gl_operand_t src;
+    cairo_gl_operand_t mask;
+} cairo_gl_composite_t;
 
 cairo_private extern const cairo_surface_backend_t _cairo_gl_surface_backend;
 
-cairo_private cairo_gl_context_t *
-_cairo_gl_context_create_in_error (cairo_status_t status);
+static cairo_always_inline GLenum
+_cairo_gl_get_error (void)
+{
+    GLenum err = glGetError();
+
+    if (unlikely (err))
+        while (glGetError ());
+
+    return err;
+}
+
+static inline cairo_device_t *
+_cairo_gl_context_create_in_error (cairo_status_t status)
+{
+    return (cairo_device_t *) _cairo_device_create_in_error (status);
+}
 
 cairo_private cairo_status_t
 _cairo_gl_context_init (cairo_gl_context_t *ctx);
 
 cairo_private void
-_cairo_gl_surface_init (cairo_gl_context_t *ctx,
+_cairo_gl_surface_init (cairo_device_t *device,
 			cairo_gl_surface_t *surface,
 			cairo_content_t content,
 			int width, int height);
 
+static cairo_always_inline cairo_bool_t cairo_warn
+_cairo_gl_surface_is_texture (cairo_gl_surface_t *surface)
+{
+    return surface->tex != 0;
+}
+
 cairo_private cairo_status_t
 _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
 			      cairo_image_surface_t *src,
@@ -148,42 +263,133 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
 			      int width, int height,
 			      int dst_x, int dst_y);
 
-cairo_private cairo_int_status_t
-_cairo_gl_operand_init (cairo_gl_composite_operand_t *operand,
-			const cairo_pattern_t *pattern,
-			cairo_gl_surface_t *dst,
-			int src_x, int src_y,
-			int dst_x, int dst_y,
-			int width, int height);
+static cairo_always_inline cairo_bool_t
+_cairo_gl_device_has_glsl (cairo_device_t *device)
+{
+    return ((cairo_gl_context_t *) device)->shader_impl != NULL;
+}
 
-cairo_private cairo_gl_context_t *
-_cairo_gl_context_acquire (cairo_gl_context_t *ctx);
+static cairo_always_inline cairo_bool_t
+_cairo_gl_device_requires_power_of_two_textures (cairo_device_t *device)
+{
+    return ((cairo_gl_context_t *) device)->tex_target == GL_TEXTURE_RECTANGLE_EXT;
+}
+
+static cairo_always_inline cairo_status_t cairo_warn
+_cairo_gl_context_acquire (cairo_device_t *device,
+			   cairo_gl_context_t **ctx)
+{
+    cairo_status_t status;
+
+    status = cairo_device_acquire (device);
+    if (unlikely (status))
+	return status;
+
+    /* clear potential previous GL errors */
+    _cairo_gl_get_error ();
+
+    *ctx = (cairo_gl_context_t *) device;
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_always_inline cairo_warn cairo_status_t
+_cairo_gl_context_release (cairo_gl_context_t *ctx, cairo_status_t status)
+{
+    GLenum err;
+
+    err = _cairo_gl_get_error ();
+
+    if (unlikely (err)) {
+        cairo_status_t new_status;
+	new_status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR);
+        if (status == CAIRO_STATUS_SUCCESS)
+            status = new_status;
+    }
+
+    cairo_device_release (&(ctx)->base);
+
+    return status;
+}
 
 cairo_private void
-_cairo_gl_context_release (cairo_gl_context_t *ctx);
+_cairo_gl_context_set_destination (cairo_gl_context_t *ctx, cairo_gl_surface_t *surface);
 
 cairo_private void
-_cairo_gl_set_destination (cairo_gl_surface_t *surface);
+_cairo_gl_context_activate (cairo_gl_context_t *ctx,
+                            cairo_gl_tex_t      tex_unit);
 
 cairo_private cairo_bool_t
 _cairo_gl_operator_is_supported (cairo_operator_t op);
 
-cairo_private void
-_cairo_gl_set_operator (cairo_gl_surface_t *dst, cairo_operator_t op,
-			cairo_bool_t component_alpha);
+cairo_private cairo_status_t
+_cairo_gl_composite_init (cairo_gl_composite_t *setup,
+                          cairo_operator_t op,
+                          cairo_gl_surface_t *dst,
+                          cairo_bool_t has_component_alpha,
+                          const cairo_rectangle_int_t *rect);
 
 cairo_private void
-_cairo_gl_set_src_operand (cairo_gl_context_t *ctx,
-			   cairo_gl_composite_setup_t *setup);
+_cairo_gl_composite_fini (cairo_gl_composite_t *setup);
 
 cairo_private void
-_cairo_gl_operand_destroy (cairo_gl_composite_operand_t *operand);
+_cairo_gl_composite_set_clip_region (cairo_gl_composite_t *setup,
+                                     cairo_region_t *clip_region);
+
+cairo_private cairo_int_status_t
+_cairo_gl_composite_set_source (cairo_gl_composite_t *setup,
+			        const cairo_pattern_t *pattern,
+                                int src_x, int src_y,
+                                int dst_x, int dst_y,
+                                int width, int height);
+
+cairo_private cairo_int_status_t
+_cairo_gl_composite_set_mask (cairo_gl_composite_t *setup,
+			      const cairo_pattern_t *pattern,
+                              int src_x, int src_y,
+                              int dst_x, int dst_y,
+                              int width, int height);
+
+cairo_private void
+_cairo_gl_composite_set_mask_spans (cairo_gl_composite_t *setup);
+
+cairo_private cairo_status_t
+_cairo_gl_composite_begin (cairo_gl_composite_t *setup,
+                           cairo_gl_context_t **ctx);
+
+cairo_private void
+_cairo_gl_composite_emit_rect (cairo_gl_context_t *ctx,
+                               GLfloat x1,
+                               GLfloat y1,
+                               GLfloat x2,
+                               GLfloat y2,
+                               uint8_t alpha);
+
+cairo_private void
+_cairo_gl_composite_emit_glyph (cairo_gl_context_t *ctx,
+                                GLfloat x1,
+                                GLfloat y1,
+                                GLfloat x2,
+                                GLfloat y2,
+                                GLfloat glyph_x1,
+                                GLfloat glyph_y1,
+                                GLfloat glyph_x2,
+                                GLfloat glyph_y2);
+
+cairo_private void
+_cairo_gl_composite_flush (cairo_gl_context_t *ctx);
+
+cairo_private void
+_cairo_gl_context_destroy_operand (cairo_gl_context_t *ctx,
+                                   cairo_gl_tex_t tex_unit);
 
 cairo_private cairo_bool_t
 _cairo_gl_get_image_format_and_type (pixman_format_code_t pixman_format,
 				     GLenum *internal_format, GLenum *format,
 				     GLenum *type, cairo_bool_t *has_alpha);
 
+cairo_private void
+_cairo_gl_surface_scaled_font_fini ( cairo_scaled_font_t  *scaled_font);
+
 cairo_private void
 _cairo_gl_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 				     cairo_scaled_font_t  *scaled_font);
@@ -191,6 +397,10 @@ _cairo_gl_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 cairo_private void
 _cairo_gl_glyph_cache_init (cairo_gl_glyph_cache_t *cache);
 
+cairo_private void
+_cairo_gl_glyph_cache_fini (cairo_gl_context_t *ctx,
+			    cairo_gl_glyph_cache_t *cache);
+
 cairo_private cairo_int_status_t
 _cairo_gl_surface_show_glyphs (void			*abstract_dst,
 			       cairo_operator_t		 op,
@@ -201,13 +411,6 @@ _cairo_gl_surface_show_glyphs (void			*abstract_dst,
 			       cairo_clip_t		*clip,
 			       int			*remaining_glyphs);
 
-cairo_private void
-_cairo_gl_glyph_cache_fini (cairo_gl_glyph_cache_t *cache);
-
-cairo_private cairo_status_t
-_cairo_gl_load_glsl (GLint *shader,
-		     const char *vs_source, const char *fs_source);
-
 static inline int
 _cairo_gl_y_flip (cairo_gl_surface_t *surface, int y)
 {
@@ -217,6 +420,66 @@ _cairo_gl_y_flip (cairo_gl_surface_t *surface, int y)
 	return (surface->height - 1) - y;
 }
 
+cairo_private cairo_status_t
+_cairo_gl_context_init_shaders (cairo_gl_context_t *ctx);
+
+cairo_private void
+_cairo_gl_context_fini_shaders (cairo_gl_context_t *ctx);
+
+static cairo_always_inline cairo_bool_t
+_cairo_gl_context_is_flushed (cairo_gl_context_t *ctx)
+{
+    return ctx->vb == NULL;
+}
+
+cairo_private cairo_status_t
+_cairo_gl_get_shader_by_type (cairo_gl_context_t *ctx,
+                              cairo_gl_operand_type_t source,
+                              cairo_gl_operand_type_t mask,
+                              cairo_gl_shader_in_t in,
+                              cairo_gl_shader_t **shader);
+
+cairo_private void
+_cairo_gl_shader_bind_float (cairo_gl_context_t *ctx,
+			     const char *name,
+			     float value);
+
+cairo_private void
+_cairo_gl_shader_bind_vec2 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0, float value1);
+
+cairo_private void
+_cairo_gl_shader_bind_vec3 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0,
+			    float value1,
+			    float value2);
+
+cairo_private void
+_cairo_gl_shader_bind_vec4 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0, float value1,
+			    float value2, float value3);
+
+cairo_private void
+_cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx,
+			      const char *name,
+			      cairo_matrix_t* m);
+
+cairo_private void
+_cairo_gl_shader_bind_texture (cairo_gl_context_t *ctx,
+			       const char *name,
+			       GLuint tex_unit);
+
+cairo_private void
+_cairo_gl_set_shader (cairo_gl_context_t *ctx,
+		      cairo_gl_shader_t *shader);
+
+cairo_private void
+_cairo_gl_shader_fini (cairo_gl_context_t *ctx, cairo_gl_shader_t *shader);
+
 slim_hidden_proto (cairo_gl_surface_create);
+slim_hidden_proto (cairo_gl_surface_create_for_texture);
 
 #endif /* CAIRO_GL_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-gl-shaders.c b/gfx/cairo/cairo/src/cairo-gl-shaders.c
index f06991eefe5..d7773f56778 100644
--- a/gfx/cairo/cairo/src/cairo-gl-shaders.c
+++ b/gfx/cairo/cairo/src/cairo-gl-shaders.c
@@ -1,6 +1,8 @@
 /* cairo - a vector graphics library with display and print output
  *
+ * Copyright © 2009 T. Zachary Laine
  * Copyright © 2010 Eric Anholt
+ * Copyright © 2010 Red Hat, Inc
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -12,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -27,91 +29,967 @@
  *
  * The Original Code is the cairo graphics library.
  *
- * The Initial Developer of the Original Code is Eric Anholt.
+ * The Initial Developer of the Original Code is T. Zachary Laine.
+ *
+ * Contributor(s):
+ *	Benjamin Otte <otte@gnome.org>
+ *	Eric Anholt <eric@anholt.net>
+ *	T. Zachary Laine <whatwasthataddress@gmail.com>
  */
 
 #include "cairoint.h"
 #include "cairo-gl-private.h"
+#include "cairo-error-private.h"
+#include "cairo-output-stream-private.h"
 
-static GLint
-_cairo_gl_compile_glsl(GLenum type, GLint *shader_out, const char *source)
+typedef struct cairo_gl_shader_impl {
+    void
+    (*compile_shader) (GLuint *shader, GLenum type, const char *text);
+
+    void
+    (*link_shader) (GLuint *program, GLuint vert, GLuint frag);
+
+    void
+    (*destroy_shader) (GLuint shader);
+
+    void
+    (*destroy_program) (GLuint program);
+
+    void
+    (*bind_float) (cairo_gl_shader_t *shader,
+		   const char *name,
+		   float value);
+
+    void
+    (*bind_vec2) (cairo_gl_shader_t *shader,
+		  const char *name,
+		  float value0,
+		  float value1);
+
+    void
+    (*bind_vec3) (cairo_gl_shader_t *shader,
+		  const char *name,
+		  float value0,
+		  float value1,
+		  float value2);
+
+    void
+    (*bind_vec4) (cairo_gl_shader_t *shader,
+		  const char *name,
+		  float value0, float value1,
+		  float value2, float value3);
+
+    void
+    (*bind_matrix) (cairo_gl_shader_t *shader,
+		    const char *name,
+		    cairo_matrix_t* m);
+
+    void
+    (*bind_texture) (cairo_gl_shader_t *shader,
+		     const char *name,
+		     cairo_gl_tex_t tex_unit);
+
+    void
+    (*use) (cairo_gl_shader_t *shader);
+} shader_impl_t;
+
+static cairo_status_t
+_cairo_gl_shader_compile (cairo_gl_context_t *ctx,
+			  cairo_gl_shader_t *shader,
+			  cairo_gl_var_type_t src,
+			  cairo_gl_var_type_t mask,
+			  const char *fragment_text);
+
+/* ARB_shader_objects / ARB_vertex_shader / ARB_fragment_shader extensions
+   API. */
+static void
+compile_shader_arb (GLuint *shader, GLenum type, const char *text)
 {
-    GLint ok;
-    GLint shader;
+    const char* strings[1] = { text };
+    GLint gl_status;
 
-    shader = glCreateShaderObjectARB (type);
-    glShaderSourceARB (shader, 1, (const GLchar **)&source, NULL);
-    glCompileShaderARB (shader);
-    glGetObjectParameterivARB (shader, GL_OBJECT_COMPILE_STATUS_ARB, &ok);
-    if (!ok) {
-	GLchar *info;
-	GLint size;
+    *shader = glCreateShaderObjectARB (type);
+    glShaderSourceARB (*shader, 1, strings, 0);
+    glCompileShaderARB (*shader);
+    glGetObjectParameterivARB (*shader, GL_OBJECT_COMPILE_STATUS_ARB, &gl_status);
+    if (gl_status == GL_FALSE) {
+        GLint log_size;
+        glGetObjectParameterivARB (*shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &log_size);
+        if (0 < log_size) {
+            char *log = _cairo_malloc (log_size);
+            GLint chars;
 
-	glGetObjectParameterivARB (shader, GL_OBJECT_INFO_LOG_LENGTH_ARB,
-				   &size);
-	info = malloc (size);
+            log[log_size - 1] = '\0';
+            glGetInfoLogARB (*shader, log_size, &chars, log);
+            printf ("OpenGL shader compilation failed.  Shader:\n"
+                    "%s\n"
+                    "OpenGL compilation log:\n"
+                    "%s\n",
+                    text, log);
 
-	if (info)
-	    glGetInfoLogARB (shader, size, NULL, info);
-	fprintf (stderr, "Failed to compile %s: %s\n",
-		 type == GL_FRAGMENT_SHADER ? "FS" : "VS",
-		 info);
-	fprintf (stderr, "Shader source:\n%s", source);
-	fprintf (stderr, "GLSL compile failure\n");
+            free (log);
+        } else {
+            printf ("OpenGL shader compilation failed.\n");
+        }
 
-	glDeleteObjectARB (shader);
-
-	return CAIRO_INT_STATUS_UNSUPPORTED;
+	ASSERT_NOT_REACHED;
     }
+}
 
-    *shader_out = shader;
+static void
+link_shader_arb (GLuint *program, GLuint vert, GLuint frag)
+{
+    GLint gl_status;
 
-    return CAIRO_STATUS_SUCCESS;
+    *program = glCreateProgramObjectARB ();
+    glAttachObjectARB (*program, vert);
+    glAttachObjectARB (*program, frag);
+    glLinkProgramARB (*program);
+    glGetObjectParameterivARB (*program, GL_OBJECT_LINK_STATUS_ARB, &gl_status);
+    if (gl_status == GL_FALSE) {
+        GLint log_size;
+        glGetObjectParameterivARB (*program, GL_OBJECT_INFO_LOG_LENGTH_ARB, &log_size);
+        if (0 < log_size) {
+            char *log = _cairo_malloc (log_size);
+            GLint chars;
+
+            log[log_size - 1] = '\0';
+            glGetInfoLogARB (*program, log_size, &chars, log);
+            printf ("OpenGL shader link failed:\n%s\n", log);
+
+            free (log);
+        } else {
+            printf ("OpenGL shader link failed.\n");
+        }
+
+	ASSERT_NOT_REACHED;
+    }
+}
+
+static void
+destroy_shader_arb (GLuint shader)
+{
+  glDeleteObjectARB (shader);
+}
+
+static void
+destroy_program_arb (GLuint shader)
+{
+  glDeleteObjectARB (shader);
+}
+
+static void
+bind_float_arb (cairo_gl_shader_t *shader,
+		const char *name,
+		float value)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    assert (location != -1);
+    glUniform1fARB (location, value);
+}
+
+static void
+bind_vec2_arb (cairo_gl_shader_t *shader,
+	       const char *name,
+	       float value0,
+	       float value1)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    assert (location != -1);
+    glUniform2fARB (location, value0, value1);
+}
+
+static void
+bind_vec3_arb (cairo_gl_shader_t *shader,
+	       const char *name,
+	       float value0,
+	       float value1,
+	       float value2)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    assert (location != -1);
+    glUniform3fARB (location, value0, value1, value2);
+}
+
+static void
+bind_vec4_arb (cairo_gl_shader_t *shader,
+	       const char *name,
+	       float value0,
+	       float value1,
+	       float value2,
+	       float value3)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    assert (location != -1);
+    glUniform4fARB (location, value0, value1, value2, value3);
+}
+
+static void
+bind_matrix_arb (cairo_gl_shader_t *shader,
+		 const char *name,
+		 cairo_matrix_t* m)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    float gl_m[9] = {
+        m->xx, m->xy, m->x0,
+        m->yx, m->yy, m->y0,
+        0,     0,     1
+    };
+    assert (location != -1);
+    glUniformMatrix3fvARB (location, 1, GL_TRUE, gl_m);
+}
+
+static void
+bind_texture_arb (cairo_gl_shader_t *shader,
+		  const char *name,
+		  cairo_gl_tex_t tex_unit)
+{
+    GLint location = glGetUniformLocationARB (shader->program, name);
+    assert (location != -1);
+    glUniform1iARB (location, tex_unit);
+}
+
+static void
+use_program_arb (cairo_gl_shader_t *shader)
+{
+    if (shader)
+	glUseProgramObjectARB (shader->program);
+    else
+	glUseProgramObjectARB (0);
+}
+
+/* OpenGL Core 2.0 API. */
+static void
+compile_shader_core_2_0 (GLuint *shader, GLenum type, const char *text)
+{
+    const char* strings[1] = { text };
+    GLint gl_status;
+
+    *shader = glCreateShader (type);
+    glShaderSource (*shader, 1, strings, 0);
+    glCompileShader (*shader);
+    glGetShaderiv (*shader, GL_COMPILE_STATUS, &gl_status);
+    if (gl_status == GL_FALSE) {
+        GLint log_size;
+        glGetShaderiv (*shader, GL_INFO_LOG_LENGTH, &log_size);
+        if (0 < log_size) {
+            char *log = _cairo_malloc (log_size);
+            GLint chars;
+
+            log[log_size - 1] = '\0';
+            glGetShaderInfoLog (*shader, log_size, &chars, log);
+            printf ("OpenGL shader compilation failed.  Shader:\n"
+                    "%s\n"
+                    "OpenGL compilation log:\n"
+                    "%s\n",
+                    text, log);
+
+            free (log);
+        } else {
+            printf ("OpenGL shader compilation failed.\n");
+        }
+
+	ASSERT_NOT_REACHED;
+    }
+}
+
+static void
+link_shader_core_2_0 (GLuint *program, GLuint vert, GLuint frag)
+{
+    GLint gl_status;
+
+    *program = glCreateProgram ();
+    glAttachShader (*program, vert);
+    glAttachShader (*program, frag);
+    glLinkProgram (*program);
+    glGetProgramiv (*program, GL_LINK_STATUS, &gl_status);
+    if (gl_status == GL_FALSE) {
+        GLint log_size;
+        glGetProgramiv (*program, GL_INFO_LOG_LENGTH, &log_size);
+        if (0 < log_size) {
+            char *log = _cairo_malloc (log_size);
+            GLint chars;
+
+            log[log_size - 1] = '\0';
+            glGetProgramInfoLog (*program, log_size, &chars, log);
+            printf ("OpenGL shader link failed:\n%s\n", log);
+
+            free (log);
+        } else {
+            printf ("OpenGL shader link failed.\n");
+        }
+
+	ASSERT_NOT_REACHED;
+    }
+}
+
+static void
+destroy_shader_core_2_0 (GLuint shader)
+{
+  glDeleteShader (shader);
+}
+
+static void
+destroy_program_core_2_0 (GLuint shader)
+{
+    glDeleteProgram (shader);
+}
+
+static void
+bind_float_core_2_0 (cairo_gl_shader_t *shader,
+		     const char *name,
+		     float value)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    assert (location != -1);
+    glUniform1f (location, value);
+}
+
+static void
+bind_vec2_core_2_0 (cairo_gl_shader_t *shader,
+		    const char *name,
+		    float value0,
+		    float value1)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    assert (location != -1);
+    glUniform2f (location, value0, value1);
+}
+
+static void
+bind_vec3_core_2_0 (cairo_gl_shader_t *shader,
+		    const char *name,
+		    float value0,
+		    float value1,
+		    float value2)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    assert (location != -1);
+    glUniform3f (location, value0, value1, value2);
+}
+
+static void
+bind_vec4_core_2_0 (cairo_gl_shader_t *shader,
+		    const char *name,
+		    float value0,
+		    float value1,
+		    float value2,
+		    float value3)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    assert (location != -1);
+    glUniform4f (location, value0, value1, value2, value3);
+}
+
+static void
+bind_matrix_core_2_0 (cairo_gl_shader_t *shader, const char *name, cairo_matrix_t* m)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    float gl_m[16] = {
+        m->xx, m->xy, m->x0,
+        m->yx, m->yy, m->y0,
+        0,     0,     1
+    };
+    assert (location != -1);
+    glUniformMatrix3fv (location, 1, GL_TRUE, gl_m);
+}
+
+static void
+bind_texture_core_2_0 (cairo_gl_shader_t *shader, const char *name, cairo_gl_tex_t tex_unit)
+{
+    GLint location = glGetUniformLocation (shader->program, name);
+    assert (location != -1);
+    glUniform1i (location, tex_unit);
+}
+
+static void
+use_program_core_2_0 (cairo_gl_shader_t *shader)
+{
+    if (shader)
+	glUseProgram (shader->program);
+    else
+	glUseProgram (0);
+}
+
+static const cairo_gl_shader_impl_t shader_impl_core_2_0 = {
+    compile_shader_core_2_0,
+    link_shader_core_2_0,
+    destroy_shader_core_2_0,
+    destroy_program_core_2_0,
+    bind_float_core_2_0,
+    bind_vec2_core_2_0,
+    bind_vec3_core_2_0,
+    bind_vec4_core_2_0,
+    bind_matrix_core_2_0,
+    bind_texture_core_2_0,
+    use_program_core_2_0,
+};
+
+static const cairo_gl_shader_impl_t shader_impl_arb = {
+    compile_shader_arb,
+    link_shader_arb,
+    destroy_shader_arb,
+    destroy_program_arb,
+    bind_float_arb,
+    bind_vec2_arb,
+    bind_vec3_arb,
+    bind_vec4_arb,
+    bind_matrix_arb,
+    bind_texture_arb,
+    use_program_arb,
+};
+
+typedef struct _cairo_shader_cache_entry {
+    cairo_cache_entry_t base;
+
+    cairo_gl_operand_type_t src;
+    cairo_gl_operand_type_t mask;
+    cairo_gl_operand_type_t dest;
+    cairo_gl_shader_in_t in;
+
+    cairo_gl_context_t *ctx; /* XXX: needed to destroy the program */
+    cairo_gl_shader_t shader;
+} cairo_shader_cache_entry_t;
+
+static cairo_bool_t
+_cairo_gl_shader_cache_equal (const void *key_a, const void *key_b)
+{
+    const cairo_shader_cache_entry_t *a = key_a;
+    const cairo_shader_cache_entry_t *b = key_b;
+
+    return a->src  == b->src  &&
+           a->mask == b->mask &&
+           a->dest == b->dest &&
+           a->in   == b->in;
+}
+
+static unsigned long
+_cairo_gl_shader_cache_hash (const cairo_shader_cache_entry_t *entry)
+{
+    return (entry->src << 24) | (entry->mask << 16) | (entry->dest << 8) | (entry->in);
+}
+
+static void
+_cairo_gl_shader_cache_destroy (void *data)
+{
+    cairo_shader_cache_entry_t *entry = data;
+
+    _cairo_gl_shader_fini (entry->ctx, &entry->shader);
+    if (entry->ctx->current_shader == &entry->shader)
+        entry->ctx->current_shader = NULL;
+    free (entry);
+}
+
+static void
+_cairo_gl_shader_init (cairo_gl_shader_t *shader)
+{
+    shader->fragment_shader = 0;
+    shader->program = 0;
 }
 
 cairo_status_t
-_cairo_gl_load_glsl (GLint *shader_out,
-		     const char *vs_source, const char *fs_source)
+_cairo_gl_context_init_shaders (cairo_gl_context_t *ctx)
 {
-    GLint ok;
-    GLint shader, vs, fs;
+    static const char *fill_fs_source =
+	"uniform vec4 color;\n"
+	"void main()\n"
+	"{\n"
+	"	gl_FragColor = color;\n"
+	"}\n";
     cairo_status_t status;
 
-    shader = glCreateProgramObjectARB ();
-
-    status = _cairo_gl_compile_glsl (GL_VERTEX_SHADER_ARB, &vs, vs_source);
-    if (_cairo_status_is_error (status))
-	goto fail;
-    status = _cairo_gl_compile_glsl (GL_FRAGMENT_SHADER_ARB, &fs, fs_source);
-    if (_cairo_status_is_error (status))
-	goto fail;
-
-    glAttachObjectARB (shader, vs);
-    glAttachObjectARB (shader, fs);
-    glLinkProgram (shader);
-    glGetObjectParameterivARB (shader, GL_OBJECT_LINK_STATUS_ARB, &ok);
-    if (!ok) {
-	GLchar *info;
-	GLint size;
-
-	glGetObjectParameterivARB (shader, GL_OBJECT_INFO_LOG_LENGTH_ARB,
-				   &size);
-	info = malloc (size);
-
-	if (info)
-	    glGetInfoLogARB (shader, size, NULL, info);
-	fprintf (stderr, "Failed to link: %s\n", info);
-	free (info);
-	status = CAIRO_INT_STATUS_UNSUPPORTED;
-
-	return CAIRO_INT_STATUS_UNSUPPORTED;
+    /* XXX multiple device support? */
+    if (GLEW_VERSION_2_0) {
+        ctx->shader_impl = &shader_impl_core_2_0;
+    } else if (GLEW_ARB_shader_objects &&
+               GLEW_ARB_fragment_shader &&
+               GLEW_ARB_vertex_program) {
+        ctx->shader_impl = &shader_impl_arb;
+    } else {
+        ctx->shader_impl = NULL;
     }
 
-    *shader_out = shader;
+    memset (ctx->vertex_shaders, 0, sizeof (ctx->vertex_shaders));
+
+    status = _cairo_cache_init (&ctx->shaders,
+                                _cairo_gl_shader_cache_equal,
+                                NULL,
+                                _cairo_gl_shader_cache_destroy,
+                                CAIRO_GL_MAX_SHADERS_PER_CONTEXT);
+    if (unlikely (status))
+	return status;
+
+    if (ctx->shader_impl != NULL) {
+	_cairo_gl_shader_init (&ctx->fill_rectangles_shader);
+	status = _cairo_gl_shader_compile (ctx,
+					   &ctx->fill_rectangles_shader,
+					   CAIRO_GL_VAR_NONE,
+					   CAIRO_GL_VAR_NONE,
+					   fill_fs_source);
+	if (unlikely (status))
+	    return status;
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+void
+_cairo_gl_context_fini_shaders (cairo_gl_context_t *ctx)
+{
+    int i;
+
+    for (i = 0; i <= CAIRO_GL_VAR_TYPE_MAX; i++) {
+	if (ctx->vertex_shaders[i])
+	    ctx->shader_impl->destroy_shader (ctx->vertex_shaders[i]);
+    }
+
+    _cairo_cache_fini (&ctx->shaders);
+}
+
+void
+_cairo_gl_shader_fini (cairo_gl_context_t *ctx,
+		       cairo_gl_shader_t *shader)
+{
+    if (shader->fragment_shader)
+        ctx->shader_impl->destroy_shader (shader->fragment_shader);
+
+    if (shader->program)
+        ctx->shader_impl->destroy_program (shader->program);
+}
+
+static const char *operand_names[] = { "source", "mask", "dest" };
+
+static cairo_gl_var_type_t
+cairo_gl_operand_get_var_type (cairo_gl_operand_type_t type)
+{
+    switch (type) {
+    default:
+    case CAIRO_GL_OPERAND_COUNT:
+        ASSERT_NOT_REACHED;
+    case CAIRO_GL_OPERAND_NONE:
+    case CAIRO_GL_OPERAND_CONSTANT:
+    case CAIRO_GL_OPERAND_LINEAR_GRADIENT:
+    case CAIRO_GL_OPERAND_RADIAL_GRADIENT:
+        return CAIRO_GL_VAR_NONE;
+    case CAIRO_GL_OPERAND_TEXTURE:
+        return CAIRO_GL_VAR_TEXCOORDS;
+    case CAIRO_GL_OPERAND_SPANS:
+        return CAIRO_GL_VAR_COVERAGE;
+    }
+}
+
+static void
+cairo_gl_shader_emit_variable (cairo_output_stream_t *stream,
+                               cairo_gl_var_type_t type,
+                               cairo_gl_tex_t name)
+{
+    switch (type) {
+    default:
+        ASSERT_NOT_REACHED;
+    case CAIRO_GL_VAR_NONE:
+        break;
+    case CAIRO_GL_VAR_TEXCOORDS:
+        _cairo_output_stream_printf (stream, 
+                                     "varying vec2 %s_texcoords;\n", 
+                                     operand_names[name]);
+        break;
+    case CAIRO_GL_VAR_COVERAGE:
+        _cairo_output_stream_printf (stream, 
+                                     "varying float %s_coverage;\n", 
+                                     operand_names[name]);
+        break;
+    }
+}
+
+static void
+cairo_gl_shader_emit_vertex (cairo_output_stream_t *stream,
+                             cairo_gl_var_type_t type,
+                             cairo_gl_tex_t name)
+{
+    switch (type) {
+    default:
+        ASSERT_NOT_REACHED;
+    case CAIRO_GL_VAR_NONE:
+        break;
+    case CAIRO_GL_VAR_TEXCOORDS:
+        _cairo_output_stream_printf (stream, 
+                                     "    %s_texcoords = gl_MultiTexCoord%d.xy;\n",
+                                     operand_names[name], name);
+        break;
+    case CAIRO_GL_VAR_COVERAGE:
+        _cairo_output_stream_printf (stream, 
+                                     "    %s_coverage = gl_Color.a;\n",
+                                     operand_names[name]);
+        break;
+    }
+}
+
+static cairo_status_t
+cairo_gl_shader_get_vertex_source (cairo_gl_var_type_t src,
+                                   cairo_gl_var_type_t mask,
+                                   cairo_gl_var_type_t dest,
+				   char **out)
+{
+    cairo_output_stream_t *stream = _cairo_memory_stream_create ();
+    unsigned char *source;
+    unsigned int length;
+    cairo_status_t status;
+
+    cairo_gl_shader_emit_variable (stream, src, CAIRO_GL_TEX_SOURCE);
+    cairo_gl_shader_emit_variable (stream, mask, CAIRO_GL_TEX_MASK);
+
+    _cairo_output_stream_printf (stream,
+				 "void main()\n"
+				 "{\n"
+				 "    gl_Position = ftransform();\n");
+
+    cairo_gl_shader_emit_vertex (stream, src, CAIRO_GL_TEX_SOURCE);
+    cairo_gl_shader_emit_vertex (stream, mask, CAIRO_GL_TEX_MASK);
+
+    _cairo_output_stream_write (stream,
+				"}\n\0", 3);
+
+    status = _cairo_memory_stream_destroy (stream, &source, &length);
+    if (unlikely (status))
+	return status;
+
+    *out = (char *) source;
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+cairo_gl_shader_emit_color (cairo_output_stream_t *stream,
+                            GLuint tex_target,
+                            cairo_gl_operand_type_t type,
+                            cairo_gl_tex_t name)
+{
+    const char *namestr = operand_names[name];
+    const char *rectstr = (tex_target == GL_TEXTURE_RECTANGLE_EXT ? "Rect" : "");
+
+    switch (type) {
+    case CAIRO_GL_OPERAND_COUNT:
+    default:
+        ASSERT_NOT_REACHED;
+        break;
+    case CAIRO_GL_OPERAND_NONE:
+        _cairo_output_stream_printf (stream, 
+            "vec4 get_%s()\n"
+            "{\n"
+            "    return vec4 (0, 0, 0, 1);\n"
+            "}\n",
+            namestr);
+        break;
+    case CAIRO_GL_OPERAND_CONSTANT:
+        _cairo_output_stream_printf (stream, 
+            "uniform vec4 %s_constant;\n"
+            "vec4 get_%s()\n"
+            "{\n"
+            "    return %s_constant;\n"
+            "}\n",
+            namestr, namestr, namestr);
+        break;
+    case CAIRO_GL_OPERAND_TEXTURE:
+        _cairo_output_stream_printf (stream, 
+            "uniform sampler2D%s %s_sampler;\n"
+            "varying vec2 %s_texcoords;\n"
+            "vec4 get_%s()\n"
+            "{\n"
+            "    return texture2D%s(%s_sampler, %s_texcoords);\n"
+            "}\n",
+            rectstr, namestr, namestr, namestr, rectstr, namestr, namestr);
+        break;
+    case CAIRO_GL_OPERAND_LINEAR_GRADIENT:
+        _cairo_output_stream_printf (stream, 
+            "uniform sampler1D %s_sampler;\n"
+            "uniform mat3 %s_matrix;\n"
+            "uniform vec2 %s_segment;\n"
+            "\n"
+            "vec4 get_%s()\n"
+            "{\n"
+            "    vec2 pos = (%s_matrix * vec3 (gl_FragCoord.xy, 1.0)).xy;\n"
+            "    float t = dot (pos, %s_segment) / dot (%s_segment, %s_segment);\n"
+            "    return texture1D (%s_sampler, t);\n"
+            "}\n",
+            namestr, namestr, namestr, namestr, namestr, 
+            namestr, namestr, namestr, namestr);
+        break;
+    case CAIRO_GL_OPERAND_RADIAL_GRADIENT:
+        _cairo_output_stream_printf (stream, 
+            "uniform sampler1D %s_sampler;\n"
+            "uniform mat3 %s_matrix;\n"
+            "uniform vec2 %s_circle_1;\n"
+            "uniform float %s_radius_0;\n"
+            "uniform float %s_radius_1;\n"
+            "\n"
+            "vec4 get_%s()\n"
+            "{\n"
+            "    vec2 pos = (%s_matrix * vec3 (gl_FragCoord.xy, 1.0)).xy;\n"
+            "    \n"
+            "    float dr = %s_radius_1 - %s_radius_0;\n"
+            "    float dot_circle_1 = dot (%s_circle_1, %s_circle_1);\n"
+            "    float dot_pos_circle_1 = dot (pos, %s_circle_1);\n"
+            "    \n"
+            "    float A = dot_circle_1 - dr * dr;\n"
+            "    float B = -2.0 * (dot_pos_circle_1 + %s_radius_0 * dr);\n"
+            "    float C = dot (pos, pos) - %s_radius_0 * %s_radius_0;\n"
+            "    float det = B * B - 4.0 * A * C;\n"
+            "    det = max (det, 0.0);\n"
+            "    \n"
+            "    float sqrt_det = sqrt (det);\n"
+            "    sqrt_det *= sign(A);\n"
+            "    \n"
+            "    float t = (-B + sqrt_det) / (2.0 * A);\n"
+            "    return texture1D (%s_sampler, t);\n"
+            "}\n",
+            namestr, namestr, namestr, namestr, namestr, 
+            namestr, namestr, namestr, namestr, namestr, 
+            namestr, namestr, namestr, namestr, namestr, 
+            namestr);
+        break;
+    case CAIRO_GL_OPERAND_SPANS:
+        _cairo_output_stream_printf (stream, 
+            "varying float %s_coverage;\n"
+            "vec4 get_%s()\n"
+            "{\n"
+            "    return vec4(0, 0, 0, %s_coverage);\n"
+            "}\n",
+            namestr, namestr, namestr);
+        break;
+    }
+}
+
+static cairo_status_t
+cairo_gl_shader_get_fragment_source (GLuint tex_target,
+                                     cairo_gl_shader_in_t in,
+                                     cairo_gl_operand_type_t src,
+                                     cairo_gl_operand_type_t mask,
+                                     cairo_gl_operand_type_t dest,
+				     char **out)
+{
+    cairo_output_stream_t *stream = _cairo_memory_stream_create ();
+    unsigned char *source;
+    unsigned int length;
+    cairo_status_t status;
+
+    cairo_gl_shader_emit_color (stream, tex_target, src, CAIRO_GL_TEX_SOURCE);
+    cairo_gl_shader_emit_color (stream, tex_target, mask, CAIRO_GL_TEX_MASK);
+
+    _cairo_output_stream_printf (stream,
+        "void main()\n"
+        "{\n");
+    switch (in) {
+    case CAIRO_GL_SHADER_IN_COUNT:
+    default:
+        ASSERT_NOT_REACHED;
+    case CAIRO_GL_SHADER_IN_NORMAL:
+        _cairo_output_stream_printf (stream,
+            "    gl_FragColor = get_source() * get_mask().a;\n");
+        break;
+    case CAIRO_GL_SHADER_IN_CA_SOURCE:
+        _cairo_output_stream_printf (stream,
+            "    gl_FragColor = get_source() * get_mask();\n");
+        break;
+    case CAIRO_GL_SHADER_IN_CA_SOURCE_ALPHA:
+        _cairo_output_stream_printf (stream,
+            "    gl_FragColor = get_source().a * get_mask();\n");
+        break;
+    }
+
+    _cairo_output_stream_write (stream,
+                                "}\n\0", 3);
+
+    status = _cairo_memory_stream_destroy (stream, &source, &length);
+    if (unlikely (status))
+        return status;
+
+    *out = (char *) source;
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_cairo_gl_shader_compile (cairo_gl_context_t *ctx,
+			  cairo_gl_shader_t *shader,
+			  cairo_gl_var_type_t src,
+			  cairo_gl_var_type_t mask,
+			  const char *fragment_text)
+{
+    unsigned int vertex_shader;
+    cairo_status_t status;
+
+    if (ctx->shader_impl == NULL)
+        return CAIRO_STATUS_SUCCESS;
+
+    assert (shader->program == 0);
+
+    vertex_shader = cairo_gl_var_type_hash (src, mask, CAIRO_GL_VAR_NONE);
+    if (ctx->vertex_shaders[vertex_shader] == 0) {
+	char *source;
+
+	status = cairo_gl_shader_get_vertex_source (src,
+						    mask,
+						    CAIRO_GL_VAR_NONE,
+						    &source);
+        if (unlikely (status))
+            goto FAILURE;
+
+	ctx->shader_impl->compile_shader (&ctx->vertex_shaders[vertex_shader],
+					  GL_VERTEX_SHADER,
+					  source);
+        free (source);
+    }
+
+    ctx->shader_impl->compile_shader (&shader->fragment_shader,
+				      GL_FRAGMENT_SHADER,
+				      fragment_text);
+
+    ctx->shader_impl->link_shader (&shader->program,
+				   ctx->vertex_shaders[vertex_shader],
+				   shader->fragment_shader);
 
     return CAIRO_STATUS_SUCCESS;
 
-fail:
-    glDeleteObjectARB (shader);
+ FAILURE:
+    _cairo_gl_shader_fini (ctx, shader);
+    shader->fragment_shader = 0;
+    shader->program = 0;
+
     return status;
 }
+
+void
+_cairo_gl_shader_bind_float (cairo_gl_context_t *ctx,
+			     const char *name,
+			     float value)
+{
+    ctx->shader_impl->bind_float (ctx->current_shader, name, value);
+}
+
+void
+_cairo_gl_shader_bind_vec2 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0,
+			    float value1)
+{
+    ctx->shader_impl->bind_vec2 (ctx->current_shader, name, value0, value1);
+}
+
+void
+_cairo_gl_shader_bind_vec3 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0,
+			    float value1,
+			    float value2)
+{
+    ctx->shader_impl->bind_vec3 (ctx->current_shader, name, value0, value1, value2);
+}
+
+void
+_cairo_gl_shader_bind_vec4 (cairo_gl_context_t *ctx,
+			    const char *name,
+			    float value0, float value1,
+			    float value2, float value3)
+{
+    ctx->shader_impl->bind_vec4 (ctx->current_shader, name, value0, value1, value2, value3);
+}
+
+void
+_cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx,
+			      const char *name, cairo_matrix_t* m)
+{
+    ctx->shader_impl->bind_matrix (ctx->current_shader, name, m);
+}
+
+void
+_cairo_gl_shader_bind_texture (cairo_gl_context_t *ctx,
+			       const char *name, GLuint tex_unit)
+{
+    ctx->shader_impl->bind_texture (ctx->current_shader, name, tex_unit);
+}
+
+void
+_cairo_gl_set_shader (cairo_gl_context_t *ctx,
+		      cairo_gl_shader_t *shader)
+{
+    if (ctx->shader_impl == NULL)
+	return;
+
+    if (ctx->current_shader == shader)
+        return;
+
+    ctx->shader_impl->use (shader);
+
+    ctx->current_shader = shader;
+}
+
+cairo_status_t
+_cairo_gl_get_shader_by_type (cairo_gl_context_t *ctx,
+                              cairo_gl_operand_type_t source,
+                              cairo_gl_operand_type_t mask,
+                              cairo_gl_shader_in_t in,
+                              cairo_gl_shader_t **shader)
+{
+    cairo_shader_cache_entry_t lookup, *entry;
+    char *fs_source;
+    cairo_status_t status;
+
+    if (ctx->shader_impl == NULL) {
+        *shader = NULL;
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    lookup.src = source;
+    lookup.mask = mask;
+    lookup.dest = CAIRO_GL_OPERAND_NONE;
+    lookup.in = in;
+    lookup.base.hash = _cairo_gl_shader_cache_hash (&lookup);
+    lookup.base.size = 1;
+
+    entry = _cairo_cache_lookup (&ctx->shaders, &lookup.base);
+    if (entry) {
+        assert (entry->shader.program);
+        *shader = &entry->shader;
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    status = cairo_gl_shader_get_fragment_source (ctx->tex_target,
+						  in,
+						  source,
+						  mask,
+						  CAIRO_GL_OPERAND_NONE,
+						  &fs_source);
+    if (unlikely (status))
+	return status;
+
+    entry = malloc (sizeof (cairo_shader_cache_entry_t));
+    if (unlikely (entry == NULL)) {
+        free (fs_source);
+        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    memcpy (entry, &lookup, sizeof (cairo_shader_cache_entry_t));
+
+    entry->ctx = ctx;
+    _cairo_gl_shader_init (&entry->shader);
+    status = _cairo_gl_shader_compile (ctx,
+				       &entry->shader,
+				       cairo_gl_operand_get_var_type (source),
+				       cairo_gl_operand_get_var_type (mask),
+				       fs_source);
+    free (fs_source);
+
+    if (unlikely (status)) {
+	free (entry);
+	return status;
+    }
+
+    status = _cairo_cache_insert (&ctx->shaders, &entry->base);
+    if (unlikely (status)) {
+	_cairo_gl_shader_fini (ctx, &entry->shader);
+	free (entry);
+	return status;
+    }
+
+    *shader = &entry->shader;
+
+    return CAIRO_STATUS_SUCCESS;
+}
diff --git a/gfx/cairo/cairo/src/cairo-gl-surface.c b/gfx/cairo/cairo/src/cairo-gl-surface.c
index 019249e4452..278e6429dce 100644
--- a/gfx/cairo/cairo/src/cairo-gl-surface.c
+++ b/gfx/cairo/cairo/src/cairo-gl-surface.c
@@ -2,7 +2,7 @@
  *
  * Copyright © 2009 Eric Anholt
  * Copyright © 2009 Chris Wilson
- * Copyright © 2005 Red Hat, Inc
+ * Copyright © 2005,2010 Red Hat, Inc
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -32,161 +32,48 @@
  * The Initial Developer of the Original Code is Red Hat, Inc.
  *
  * Contributor(s):
+ *	Benjamin Otte <otte@gnome.org>
  *	Carl Worth <cworth@cworth.org>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ *	Eric Anholt <eric@anholt.net>
  */
 
 #include "cairoint.h"
 
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-gl-private.h"
 
-slim_hidden_proto (cairo_gl_context_reference);
-slim_hidden_proto (cairo_gl_context_destroy);
-
 static cairo_int_status_t
-_cairo_gl_surface_fill_rectangles (void			   *abstract_surface,
+_cairo_gl_surface_fill_rectangles (void			   *abstract_dst,
 				   cairo_operator_t	    op,
 				   const cairo_color_t     *color,
 				   cairo_rectangle_int_t   *rects,
 				   int			    num_rects);
 
-#define BIAS .375
+static cairo_int_status_t
+_cairo_gl_surface_composite (cairo_operator_t		  op,
+			     const cairo_pattern_t	 *src,
+			     const cairo_pattern_t	 *mask,
+			     void			 *abstract_dst,
+			     int			  src_x,
+			     int			  src_y,
+			     int			  mask_x,
+			     int			  mask_y,
+			     int			  dst_x,
+			     int			  dst_y,
+			     unsigned int		  width,
+			     unsigned int		  height,
+			     cairo_region_t		 *clip_region);
 
-static inline float
-int_as_float (uint32_t val)
-{
-    union fi {
-	float f;
-	uint32_t u;
-    } fi;
-
-    fi.u = val;
-    return fi.f;
-}
-
-static const cairo_gl_context_t _nil_context = {
-    CAIRO_REFERENCE_COUNT_INVALID,
-    CAIRO_STATUS_NO_MEMORY
-};
-
-static const cairo_gl_context_t _nil_context__invalid_format = {
-    CAIRO_REFERENCE_COUNT_INVALID,
-    CAIRO_STATUS_INVALID_FORMAT
-};
+static cairo_status_t
+_cairo_gl_surface_flush (void *abstract_surface);
 
 static cairo_bool_t _cairo_surface_is_gl (cairo_surface_t *surface)
 {
     return surface->backend == &_cairo_gl_surface_backend;
 }
 
-cairo_gl_context_t *
-_cairo_gl_context_create_in_error (cairo_status_t status)
-{
-    if (status == CAIRO_STATUS_NO_MEMORY)
-	return (cairo_gl_context_t *) &_nil_context;
-
-    if (status == CAIRO_STATUS_INVALID_FORMAT)
-	return (cairo_gl_context_t *) &_nil_context__invalid_format;
-
-    ASSERT_NOT_REACHED;
-    return NULL;
-}
-
-cairo_status_t
-_cairo_gl_context_init (cairo_gl_context_t *ctx)
-{
-    int n;
-
-    ctx->status = CAIRO_STATUS_SUCCESS;
-    CAIRO_REFERENCE_COUNT_INIT (&ctx->ref_count, 1);
-    CAIRO_MUTEX_INIT (ctx->mutex);
-
-    memset (ctx->glyph_cache, 0, sizeof (ctx->glyph_cache));
-
-    if (glewInit () != GLEW_OK)
-	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT); /* XXX */
-
-    if (! GLEW_EXT_framebuffer_object ||
-	! GLEW_ARB_texture_env_combine ||
-	! GLEW_ARB_texture_non_power_of_two)
-    {
-	fprintf (stderr,
-		 "Required GL extensions not available:\n");
-	if (! GLEW_EXT_framebuffer_object)
-	    fprintf (stderr, "    GL_EXT_framebuffer_object\n");
-	if (! GLEW_ARB_texture_env_combine)
-	    fprintf (stderr, "    GL_ARB_texture_env_combine\n");
-	if (! GLEW_ARB_texture_non_power_of_two)
-	    fprintf (stderr, "    GL_ARB_texture_non_power_of_two\n");
-
-	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT); /* XXX */
-    }
-
-    /* Set up the dummy texture for tex_env_combine with constant color. */
-    glGenTextures (1, &ctx->dummy_tex);
-    glBindTexture (GL_TEXTURE_2D, ctx->dummy_tex);
-    glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0,
-		  GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-    ctx->max_framebuffer_size = 0;
-    glGetIntegerv (GL_MAX_RENDERBUFFER_SIZE, &ctx->max_framebuffer_size);
-    ctx->max_texture_size = 0;
-    glGetIntegerv (GL_MAX_TEXTURE_SIZE, &ctx->max_texture_size);
-
-    for (n = 0; n < ARRAY_LENGTH (ctx->glyph_cache); n++)
-	_cairo_gl_glyph_cache_init (&ctx->glyph_cache[n]);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-cairo_gl_context_t *
-cairo_gl_context_reference (cairo_gl_context_t *context)
-{
-    if (context == NULL ||
-	CAIRO_REFERENCE_COUNT_IS_INVALID (&context->ref_count))
-    {
-	return context;
-    }
-
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&context->ref_count));
-    _cairo_reference_count_inc (&context->ref_count);
-
-    return context;
-}
-slim_hidden_def (cairo_gl_context_reference);
-
-void
-cairo_gl_context_destroy (cairo_gl_context_t *context)
-{
-    int n;
-
-    if (context == NULL ||
-	CAIRO_REFERENCE_COUNT_IS_INVALID (&context->ref_count))
-    {
-	return;
-    }
-
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&context->ref_count));
-    if (! _cairo_reference_count_dec_and_test (&context->ref_count))
-	return;
-
-    glDeleteTextures (1, &context->dummy_tex);
-
-    for (n = 0; n < ARRAY_LENGTH (context->glyph_cache); n++)
-	_cairo_gl_glyph_cache_fini (&context->glyph_cache[n]);
-
-    context->destroy (context);
-
-    free (context);
-}
-slim_hidden_def (cairo_gl_context_destroy);
-
-cairo_gl_context_t *
-_cairo_gl_context_acquire (cairo_gl_context_t *ctx)
-{
-    CAIRO_MUTEX_LOCK (ctx->mutex);
-    return ctx;
-}
-
 cairo_bool_t
 _cairo_gl_get_image_format_and_type (pixman_format_code_t pixman_format,
 				     GLenum *internal_format, GLenum *format,
@@ -218,7 +105,7 @@ _cairo_gl_get_image_format_and_type (pixman_format_code_t pixman_format,
 	*has_alpha = FALSE;
 	return TRUE;
     case PIXMAN_b8g8r8a8:
-	*internal_format = GL_BGRA;
+	*internal_format = GL_RGBA;
 	*format = GL_BGRA;
 	*type = GL_UNSIGNED_INT_8_8_8_8;
 	return TRUE;
@@ -301,54 +188,13 @@ _cairo_gl_get_image_format_and_type (pixman_format_code_t pixman_format,
     case PIXMAN_g1:
     case PIXMAN_yuy2:
     case PIXMAN_yv12:
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,15,16)
     case PIXMAN_x2r10g10b10:
     case PIXMAN_a2r10g10b10:
-#endif
     default:
 	return FALSE;
     }
 }
 
-void
-_cairo_gl_context_release (cairo_gl_context_t *ctx)
-{
-    CAIRO_MUTEX_UNLOCK (ctx->mutex);
-}
-
-void
-_cairo_gl_set_destination (cairo_gl_surface_t *surface)
-{
-    cairo_gl_context_t *ctx = surface->ctx;
-
-    if (ctx->current_target != surface) {
-	ctx->current_target = surface;
-
-	if (surface->fb) {
-	    glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, surface->fb);
-	    glDrawBuffer (GL_COLOR_ATTACHMENT0_EXT);
-	    glReadBuffer (GL_COLOR_ATTACHMENT0_EXT);
-	} else {
-	    ctx->make_current (ctx, surface);
-	    glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0);
-	    glDrawBuffer (GL_BACK_LEFT);
-	    glReadBuffer (GL_BACK_LEFT);
-	}
-    }
-
-    glViewport (0, 0, surface->width, surface->height);
-
-    glMatrixMode (GL_PROJECTION);
-    glLoadIdentity ();
-    if (surface->fb)
-	glOrtho (0, surface->width, 0, surface->height, -1.0, 1.0);
-    else
-	glOrtho (0, surface->width, surface->height, 0, -1.0, 1.0);
-
-    glMatrixMode (GL_MODELVIEW);
-    glLoadIdentity ();
-}
-
 cairo_bool_t
 _cairo_gl_operator_is_supported (cairo_operator_t op)
 {
@@ -356,116 +202,47 @@ _cairo_gl_operator_is_supported (cairo_operator_t op)
 }
 
 void
-_cairo_gl_set_operator (cairo_gl_surface_t *dst, cairo_operator_t op,
-			cairo_bool_t component_alpha)
-{
-    struct {
-	GLenum src;
-	GLenum dst;
-    } blend_factors[] = {
-	{ GL_ZERO, GL_ZERO }, /* Clear */
-	{ GL_ONE, GL_ZERO }, /* Source */
-	{ GL_ONE, GL_ONE_MINUS_SRC_ALPHA }, /* Over */
-	{ GL_DST_ALPHA, GL_ZERO }, /* In */
-	{ GL_ONE_MINUS_DST_ALPHA, GL_ZERO }, /* Out */
-	{ GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA }, /* Atop */
-
-	{ GL_ZERO, GL_ONE }, /* Dest */
-	{ GL_ONE_MINUS_DST_ALPHA, GL_ONE }, /* DestOver */
-	{ GL_ZERO, GL_SRC_ALPHA }, /* DestIn */
-	{ GL_ZERO, GL_ONE_MINUS_SRC_ALPHA }, /* DestOut */
-	{ GL_ONE_MINUS_DST_ALPHA, GL_SRC_ALPHA }, /* DestAtop */
-
-	{ GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA }, /* Xor */
-	{ GL_ONE, GL_ONE }, /* Add */
-    };
-    GLenum src_factor, dst_factor;
-
-    assert (op < ARRAY_LENGTH (blend_factors));
-
-    src_factor = blend_factors[op].src;
-    dst_factor = blend_factors[op].dst;
-
-    /* Even when the user requests CAIRO_CONTENT_COLOR, we use GL_RGBA
-     * due to texture filtering of GL_CLAMP_TO_BORDER.  So fix those
-     * bits in that case.
-     */
-    if (dst->base.content == CAIRO_CONTENT_COLOR) {
-	if (src_factor == GL_ONE_MINUS_DST_ALPHA)
-	    src_factor = GL_ZERO;
-	if (src_factor == GL_DST_ALPHA)
-	    src_factor = GL_ONE;
-    }
-
-    if (component_alpha) {
-	if (dst_factor == GL_ONE_MINUS_SRC_ALPHA)
-	    dst_factor = GL_ONE_MINUS_SRC_COLOR;
-	if (dst_factor == GL_SRC_ALPHA)
-	    dst_factor = GL_SRC_COLOR;
-    }
-
-    glEnable (GL_BLEND);
-    glBlendFunc (src_factor, dst_factor);
-}
-
-static void
-_cairo_gl_set_texture_surface (int tex_unit, GLuint tex,
-			       cairo_surface_attributes_t *attributes)
-{
-    glActiveTexture (GL_TEXTURE0 + tex_unit);
-    glBindTexture (GL_TEXTURE_2D, tex);
-    switch (attributes->extend) {
-    case CAIRO_EXTEND_NONE:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-	break;
-    case CAIRO_EXTEND_PAD:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	break;
-    case CAIRO_EXTEND_REPEAT:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-	break;
-    case CAIRO_EXTEND_REFLECT:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
-	break;
-    }
-    switch (attributes->filter) {
-    case CAIRO_FILTER_FAST:
-    case CAIRO_FILTER_NEAREST:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	break;
-    case CAIRO_FILTER_GOOD:
-    case CAIRO_FILTER_BEST:
-    case CAIRO_FILTER_BILINEAR:
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	break;
-    default:
-    case CAIRO_FILTER_GAUSSIAN:
-	ASSERT_NOT_REACHED;
-    }
-    glEnable (GL_TEXTURE_2D);
-}
-
-void
-_cairo_gl_surface_init (cairo_gl_context_t *ctx,
+_cairo_gl_surface_init (cairo_device_t *device,
 			cairo_gl_surface_t *surface,
 			cairo_content_t content,
 			int width, int height)
 {
     _cairo_surface_init (&surface->base,
 			 &_cairo_gl_surface_backend,
+			 device,
 			 content);
 
-    surface->ctx = cairo_gl_context_reference (ctx);
     surface->width = width;
     surface->height = height;
 }
 
+static cairo_surface_t *
+_cairo_gl_surface_create_scratch_for_texture (cairo_gl_context_t   *ctx,
+					      cairo_content_t	    content,
+					      GLuint		    tex,
+					      int		    width,
+					      int		    height)
+{
+    cairo_gl_surface_t *surface;
+
+    assert (width <= ctx->max_framebuffer_size && height <= ctx->max_framebuffer_size);
+
+    surface = calloc (1, sizeof (cairo_gl_surface_t));
+    if (unlikely (surface == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    _cairo_gl_surface_init (&ctx->base, surface, content, width, height);
+    surface->tex = tex;
+
+    /* Create the texture used to store the surface's data. */
+    _cairo_gl_context_activate (ctx, CAIRO_GL_TEX_TEMP);
+    glBindTexture (ctx->tex_target, surface->tex);
+    glTexParameteri (ctx->tex_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri (ctx->tex_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+    return &surface->base;
+}
+
 static cairo_surface_t *
 _cairo_gl_surface_create_scratch (cairo_gl_context_t   *ctx,
 				  cairo_content_t	content,
@@ -473,19 +250,23 @@ _cairo_gl_surface_create_scratch (cairo_gl_context_t   *ctx,
 				  int			height)
 {
     cairo_gl_surface_t *surface;
-    GLenum err, format;
-    cairo_status_t status;
+    GLenum format;
+    GLuint tex;
 
-    if (ctx->status)
-	return _cairo_surface_create_in_error (ctx->status);
+    glGenTextures (1, &tex);
+    surface = (cairo_gl_surface_t *)
+	_cairo_gl_surface_create_scratch_for_texture (ctx, content,
+						      tex, width, height);
+    if (unlikely (surface->base.status))
+	return &surface->base;
 
-    assert (width <= ctx->max_framebuffer_size && height <= ctx->max_framebuffer_size);
+    surface->owns_tex = TRUE;
 
-    surface = calloc (1, sizeof (cairo_gl_surface_t));
-    if (unlikely (surface == NULL))
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
-
-    _cairo_gl_surface_init (ctx, surface, content, width, height);
+    /* adjust the texture size after setting our real extents */
+    if (width < 1)
+	width = 1;
+    if (height < 1)
+	height = 1;
 
     switch (content) {
     default:
@@ -510,83 +291,157 @@ _cairo_gl_surface_create_scratch (cairo_gl_context_t   *ctx,
 	break;
     }
 
-    /* Create the texture used to store the surface's data. */
-    glGenTextures (1, &surface->tex);
-    glBindTexture (GL_TEXTURE_2D, surface->tex);
-    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexImage2D (GL_TEXTURE_2D, 0, format, width, height, 0,
+    glTexImage2D (ctx->tex_target, 0, format, width, height, 0,
 		  format, GL_UNSIGNED_BYTE, NULL);
 
-    /* Create a framebuffer object wrapping the texture so that we can render
-     * to it.
-     */
-    glGenFramebuffersEXT (1, &surface->fb);
-    glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, surface->fb);
-    glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT,
-			       GL_COLOR_ATTACHMENT0_EXT,
-			       GL_TEXTURE_2D,
-			       surface->tex,
-			       0);
-    ctx->current_target = NULL;
-
-    while ((err = glGetError ())) {
-	fprintf (stderr, "GL error in surface create: 0x%08x\n", err);
-    }
-
-    status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT);
-    if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
-	fprintf (stderr, "destination is framebuffer incomplete\n");
-
     return &surface->base;
 }
 
-static void
-_cairo_gl_surface_clear (cairo_gl_surface_t *surface)
+static cairo_status_t
+_cairo_gl_surface_clear (cairo_gl_surface_t  *surface,
+                         const cairo_color_t *color)
 {
     cairo_gl_context_t *ctx;
+    cairo_status_t status;
+    double r, g, b, a;
 
-    ctx = _cairo_gl_context_acquire (surface->ctx);
-    _cairo_gl_set_destination (surface);
-    if (surface->base.content == CAIRO_CONTENT_COLOR)
-	glClearColor (0.0, 0.0, 0.0, 1.0);
-    else
-	glClearColor (0.0, 0.0, 0.0, 0.0);
+    status = _cairo_gl_context_acquire (surface->base.device, &ctx);
+    if (unlikely (status))
+	return status;
+
+    _cairo_gl_context_set_destination (ctx, surface);
+    if (surface->base.content & CAIRO_CONTENT_COLOR) {
+        r = color->red   * color->alpha;
+        g = color->green * color->alpha;
+        b = color->blue  * color->alpha;
+    } else {
+        r = g = b = 0;
+    }
+    if (surface->base.content & CAIRO_CONTENT_ALPHA) {
+        a = color->alpha;
+    } else {
+        a = 1.0;
+    }
+
+    glDisable (GL_SCISSOR_TEST);
+    glClearColor (r, g, b, a);
     glClear (GL_COLOR_BUFFER_BIT);
-    _cairo_gl_context_release (ctx);
-
-    surface->base.is_clear = TRUE;
 
+    return _cairo_gl_context_release (ctx, status);
 }
 
 cairo_surface_t *
-cairo_gl_surface_create (cairo_gl_context_t   *ctx,
-			 cairo_content_t	content,
-			 int			width,
-			 int			height)
+cairo_gl_surface_create (cairo_device_t		*abstract_device,
+			 cairo_content_t	 content,
+			 int			 width,
+			 int			 height)
 {
+    cairo_gl_context_t *ctx;
     cairo_gl_surface_t *surface;
+    cairo_status_t status;
 
-    if (!CAIRO_CONTENT_VALID (content))
+    if (! CAIRO_CONTENT_VALID (content))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_CONTENT));
 
-    if (ctx == NULL) {
+    if (abstract_device == NULL) {
 	return cairo_image_surface_create (_cairo_format_from_content (content),
 					   width, height);
     }
 
+    if (abstract_device->status)
+	return _cairo_surface_create_in_error (abstract_device->status);
+
+    if (abstract_device->backend->type != CAIRO_DEVICE_TYPE_GL)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+
+    status = _cairo_gl_context_acquire (abstract_device, &ctx);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
+
     surface = (cairo_gl_surface_t *)
 	_cairo_gl_surface_create_scratch (ctx, content, width, height);
-    if (unlikely (surface->base.status))
-	return &surface->base;
+    if (unlikely (surface->base.status)) {
+	status = _cairo_gl_context_release (ctx, surface->base.status);
+	cairo_surface_destroy (&surface->base);
+	return _cairo_surface_create_in_error (status);
+    }
 
     /* Cairo surfaces start out initialized to transparent (black) */
-    _cairo_gl_surface_clear (surface);
+    status = _cairo_gl_surface_clear (surface, CAIRO_COLOR_TRANSPARENT);
+
+    status = _cairo_gl_context_release (ctx, status);
+    if (unlikely (status)) {
+	cairo_surface_destroy (&surface->base);
+	return _cairo_surface_create_in_error (status);
+    }
 
     return &surface->base;
 }
 slim_hidden_def (cairo_gl_surface_create);
 
+
+/**
+ * cairo_gl_surface_create_for_texture:
+ * @content: type of content in the surface
+ * @tex: name of texture to use for storage of surface pixels
+ * @width: width of the surface, in pixels
+ * @height: height of the surface, in pixels
+ *
+ * Creates a GL surface for the specified texture with the specified
+ * content and dimensions.  The texture must be kept around until the
+ * #cairo_surface_t is destroyed or cairo_surface_finish() is called
+ * on the surface.  The initial contents of @tex will be used as the
+ * initial image contents; you must explicitly clear the buffer,
+ * using, for example, cairo_rectangle() and cairo_fill() if you want
+ * it cleared.  The format of @tex should be compatible with @content,
+ * in the sense that it must have the color components required by
+ * @content.
+ *
+ * Return value: a pointer to the newly created surface. The caller
+ * owns the surface and should call cairo_surface_destroy() when done
+ * with it.
+ *
+ * This function always returns a valid pointer, but it will return a
+ * pointer to a "nil" surface if an error such as out of memory
+ * occurs. You can use cairo_surface_status() to check for this.
+ **/
+cairo_surface_t *
+cairo_gl_surface_create_for_texture (cairo_device_t	*abstract_device,
+				     cairo_content_t	 content,
+				     unsigned int	 tex,
+				     int		 width,
+				     int		 height)
+{
+    cairo_gl_context_t *ctx;
+    cairo_gl_surface_t *surface;
+    cairo_status_t status;
+
+    if (! CAIRO_CONTENT_VALID (content))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_CONTENT));
+
+    if (abstract_device == NULL)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NULL_POINTER));
+
+    if (abstract_device->status)
+	return _cairo_surface_create_in_error (abstract_device->status);
+
+    if (abstract_device->backend->type != CAIRO_DEVICE_TYPE_GL)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+
+    status = _cairo_gl_context_acquire (abstract_device, &ctx);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
+
+    surface = (cairo_gl_surface_t *)
+	_cairo_gl_surface_create_scratch_for_texture (ctx, content,
+						      tex, width, height);
+    status = _cairo_gl_context_release (ctx, status);
+
+    return &surface->base;
+}
+slim_hidden_def (cairo_gl_surface_create_for_texture);
+
+
 void
 cairo_gl_surface_set_size (cairo_surface_t *abstract_surface,
 			   int              width,
@@ -595,9 +450,18 @@ cairo_gl_surface_set_size (cairo_surface_t *abstract_surface,
     cairo_gl_surface_t *surface = (cairo_gl_surface_t *) abstract_surface;
     cairo_status_t status;
 
-    if (! _cairo_surface_is_gl (abstract_surface) || surface->fb) {
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
 	status = _cairo_surface_set_error (abstract_surface,
-		                           CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+		                           _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+        return;
+    }
+
+    if (! _cairo_surface_is_gl (abstract_surface) ||
+        ! _cairo_gl_surface_is_texture (surface)) {
+	status = _cairo_surface_set_error (abstract_surface,
+		                           _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
 	return;
     }
 
@@ -627,21 +491,42 @@ cairo_gl_surface_get_height (cairo_surface_t *abstract_surface)
     return surface->height;
 }
 
-
 void
 cairo_gl_surface_swapbuffers (cairo_surface_t *abstract_surface)
 {
     cairo_gl_surface_t *surface = (cairo_gl_surface_t *) abstract_surface;
     cairo_status_t status;
 
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
+	status = _cairo_surface_set_error (abstract_surface,
+		                           _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+        return;
+    }
+
     if (! _cairo_surface_is_gl (abstract_surface)) {
 	status = _cairo_surface_set_error (abstract_surface,
 		                           CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
 	return;
     }
 
-    if (! surface->fb)
-	surface->ctx->swap_buffers (surface->ctx, surface);
+    if (! _cairo_gl_surface_is_texture (surface)) {
+	cairo_gl_context_t *ctx;
+        cairo_status_t status;
+
+        status = _cairo_gl_context_acquire (surface->base.device, &ctx);
+        if (unlikely (status))
+            return;
+
+        cairo_surface_flush (abstract_surface);
+
+	ctx->swap_buffers (ctx, surface);
+
+        status = _cairo_gl_context_release (ctx, status);
+        if (status)
+            status = _cairo_surface_set_error (abstract_surface, status);         
+    }
 }
 
 static cairo_surface_t *
@@ -650,22 +535,35 @@ _cairo_gl_surface_create_similar (void		 *abstract_surface,
 				  int		  width,
 				  int		  height)
 {
-    cairo_gl_surface_t *surface = abstract_surface;
+    cairo_surface_t *surface = abstract_surface;
+    cairo_gl_context_t *ctx;
+    cairo_status_t status;
 
-    assert (CAIRO_CONTENT_VALID (content));
+    if (width < 1 || height < 1)
+        return cairo_image_surface_create (_cairo_format_from_content (content),
+                                           width, height);
 
-    if (width > surface->ctx->max_framebuffer_size ||
-	height > surface->ctx->max_framebuffer_size)
+    status = _cairo_gl_context_acquire (surface->device, &ctx);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
+
+    if (width > ctx->max_framebuffer_size ||
+	height > ctx->max_framebuffer_size)
     {
-	return NULL;
+	surface = NULL;
+        goto RELEASE;
     }
 
-    if (width < 1)
-	width = 1;
-    if (height < 1)
-	height = 1;
+    surface = _cairo_gl_surface_create_scratch (ctx, content, width, height);
 
-    return _cairo_gl_surface_create_scratch (surface->ctx, content, width, height);
+RELEASE:
+    status = _cairo_gl_context_release (ctx, status);
+    if (unlikely (status)) {
+        cairo_surface_destroy (surface);
+        return _cairo_surface_create_in_error (status);
+    }
+
+    return surface;
 }
 
 cairo_status_t
@@ -678,18 +576,19 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
     GLenum internal_format, format, type;
     cairo_bool_t has_alpha;
     cairo_image_surface_t *clone = NULL;
+    cairo_gl_context_t *ctx;
     int cpp;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
     if (! _cairo_gl_get_image_format_and_type (src->pixman_format,
-					      &internal_format,
-					      &format,
-					      &type,
-					      &has_alpha))
+					       &internal_format,
+					       &format,
+					       &type,
+					       &has_alpha))
     {
 	cairo_bool_t is_supported;
 
-	clone = _cairo_image_surface_coerce (src,
-		_cairo_format_from_content (src->base.content));
+	clone = _cairo_image_surface_coerce (src);
 	if (unlikely (clone->base.status))
 	    return clone->base.status;
 
@@ -705,46 +604,90 @@ _cairo_gl_surface_draw_image (cairo_gl_surface_t *dst,
 
     cpp = PIXMAN_FORMAT_BPP (src->pixman_format) / 8;
 
-    glBindTexture (GL_TEXTURE_2D, dst->tex);
-    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    status = _cairo_gl_context_acquire (dst->base.device, &ctx);
+    if (unlikely (status))
+	return status;
+
+    status = _cairo_gl_surface_flush (&dst->base);
+    if (unlikely (status))
+	goto FAIL;
+
     glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
     glPixelStorei (GL_UNPACK_ROW_LENGTH, src->stride / cpp);
-    glTexSubImage2D (GL_TEXTURE_2D, 0,
-	             dst_x, dst_y, width, height,
-		     format, GL_UNSIGNED_BYTE,
-		     src->data + src_y * src->stride + src_x * cpp);
-    glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+    if (_cairo_gl_surface_is_texture (dst)) {
+        _cairo_gl_context_activate (ctx, CAIRO_GL_TEX_TEMP);
+	glBindTexture (ctx->tex_target, dst->tex);
+	glTexParameteri (ctx->tex_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri (ctx->tex_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexSubImage2D (ctx->tex_target, 0,
+			 dst_x, dst_y, width, height,
+			 format, type,
+			 src->data + src_y * src->stride + src_x * cpp);
 
-    cairo_surface_destroy (&clone->base);
+	/* If we just treated some rgb-only data as rgba, then we have to
+	 * go back and fix up the alpha channel where we filled in this
+	 * texture data.
+	 */
+	if (!has_alpha) {
+	    cairo_rectangle_int_t rect;
 
-    /* If we just treated some rgb-only data as rgba, then we have to
-     * go back and fix up the alpha channel where we filled in this
-     * texture data.
-     */
-    if (!has_alpha) {
-	cairo_rectangle_int_t rect;
-	cairo_color_t color;
+	    rect.x = dst_x;
+	    rect.y = dst_y;
+	    rect.width = width;
+	    rect.height = height;
 
-	rect.x = dst_x;
-	rect.y = dst_y;
-	rect.width = width;
-	rect.height = height;
+            _cairo_gl_composite_flush (ctx);
+	    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
+	    _cairo_gl_surface_fill_rectangles (dst,
+					       CAIRO_OPERATOR_SOURCE,
+					       CAIRO_COLOR_BLACK,
+					       &rect, 1);
+            _cairo_gl_composite_flush (ctx);
+	    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+	}
+    } else {
+        cairo_surface_t *tmp;
+        
+        tmp = _cairo_gl_surface_create_scratch (ctx,
+                                                dst->base.content,
+                                                width, height);
+        if (unlikely (tmp->status)) {
+            cairo_surface_destroy (tmp);
+            goto FAIL;
+        }
+        status = _cairo_gl_surface_draw_image ((cairo_gl_surface_t *) tmp,
+                                               src,
+                                               src_x, src_y,
+                                               width, height,
+                                               0, 0);
+        if (status == CAIRO_STATUS_SUCCESS) {
+            cairo_surface_pattern_t tmp_pattern;
 
-	color.red = 0.0;
-	color.green = 0.0;
-	color.blue = 0.0;
-	color.alpha = 1.0;
+            _cairo_pattern_init_for_surface (&tmp_pattern, tmp);
+            _cairo_gl_surface_composite (CAIRO_OPERATOR_SOURCE,
+                                         &tmp_pattern.base,
+                                         NULL,
+                                         dst,
+                                         0, 0,
+                                         0, 0,
+                                         dst_x, dst_y,
+                                         width, height,
+                                         NULL);
+            _cairo_pattern_fini (&tmp_pattern.base);
+        }
 
-	glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
-	_cairo_gl_surface_fill_rectangles (dst,
-					   CAIRO_OPERATOR_SOURCE,
-					   &color,
-					   &rect, 1);
-	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        cairo_surface_destroy (tmp);
     }
 
-    return CAIRO_STATUS_SUCCESS;
+FAIL:
+    glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+
+    status = _cairo_gl_context_release (ctx, status);
+
+    if (clone)
+        cairo_surface_destroy (&clone->base);
+
+    return status;
 }
 
 static cairo_status_t
@@ -754,10 +697,11 @@ _cairo_gl_surface_get_image (cairo_gl_surface_t      *surface,
 			     cairo_rectangle_int_t   *rect_out)
 {
     cairo_image_surface_t *image;
-    GLenum err;
+    cairo_gl_context_t *ctx;
     GLenum format, type;
     cairo_format_t cairo_format;
     unsigned int cpp;
+    cairo_status_t status;
 
     /* Want to use a switch statement here but the compiler gets whiny. */
     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
@@ -790,20 +734,33 @@ _cairo_gl_surface_get_image (cairo_gl_surface_t      *surface,
      * it the destination.  But then, this is the fallback path, so let's not
      * fall back instead.
      */
-    _cairo_gl_set_destination (surface);
+    status = _cairo_gl_context_acquire (surface->base.device, &ctx);
+    if (unlikely (status))
+        return status;
+
+    _cairo_gl_composite_flush (ctx);
+    _cairo_gl_context_set_destination (ctx, surface);
 
     glPixelStorei (GL_PACK_ALIGNMENT, 1);
     glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
+    if (! _cairo_gl_surface_is_texture (surface) && GLEW_MESA_pack_invert)
+	glPixelStorei (GL_PACK_INVERT_MESA, 1);
     glReadPixels (interest->x, interest->y,
 		  interest->width, interest->height,
 		  format, type, image->data);
+    if (! _cairo_gl_surface_is_texture (surface) && GLEW_MESA_pack_invert)
+	glPixelStorei (GL_PACK_INVERT_MESA, 0);
 
-    while ((err = glGetError ()))
-	fprintf (stderr, "GL error 0x%08x\n", (int) err);
+    status = _cairo_gl_context_release (ctx, status);
+    if (unlikely (status)) {
+	cairo_surface_destroy (&image->base);
+	return status;
+    }
 
     *image_out = image;
     if (rect_out != NULL)
 	*rect_out = *interest;
+
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -811,16 +768,30 @@ static cairo_status_t
 _cairo_gl_surface_finish (void *abstract_surface)
 {
     cairo_gl_surface_t *surface = abstract_surface;
+    cairo_status_t status;
+    cairo_gl_context_t *ctx;
 
-    glDeleteFramebuffersEXT (1, &surface->fb);
-    glDeleteTextures (1, &surface->tex);
+    status = _cairo_gl_context_acquire (surface->base.device, &ctx);
+    if (unlikely (status))
+        return status;
 
-    if (surface->ctx->current_target == surface)
-	surface->ctx->current_target = NULL;
+    if (ctx->operands[CAIRO_GL_TEX_SOURCE].type == CAIRO_GL_OPERAND_TEXTURE &&
+        ctx->operands[CAIRO_GL_TEX_SOURCE].texture.surface == surface)
+        _cairo_gl_context_destroy_operand (ctx, CAIRO_GL_TEX_SOURCE);
+    if (ctx->operands[CAIRO_GL_TEX_MASK].type == CAIRO_GL_OPERAND_TEXTURE &&
+        ctx->operands[CAIRO_GL_TEX_MASK].texture.surface == surface)
+        _cairo_gl_context_destroy_operand (ctx, CAIRO_GL_TEX_MASK);
+    if (ctx->current_target == surface)
+	ctx->current_target = NULL;
 
-    cairo_gl_context_destroy (surface->ctx);
+    if (surface->depth)
+        glDeleteFramebuffersEXT (1, &surface->depth);
+    if (surface->fb)
+        glDeleteFramebuffersEXT (1, &surface->fb);
+    if (surface->owns_tex)
+	glDeleteTextures (1, &surface->tex);
 
-    return CAIRO_STATUS_SUCCESS;
+    return _cairo_gl_context_release (ctx, status);
 }
 
 static cairo_status_t
@@ -893,7 +864,9 @@ _cairo_gl_surface_clone_similar (void		     *abstract_surface,
 {
     cairo_gl_surface_t *surface = abstract_surface;
 
-    if (src->backend == surface->base.backend) {
+    /* XXX: Use GLCopyTexImage2D to clone non-texture-surfaces */
+    if (src->device == surface->base.device &&
+        _cairo_gl_surface_is_texture ((cairo_gl_surface_t *) src)) {
 	*clone_offset_x = 0;
 	*clone_offset_y = 0;
 	*clone_out = cairo_surface_reference (src);
@@ -984,557 +957,6 @@ _cairo_gl_get_traps_pattern (cairo_gl_surface_t *dst,
     return CAIRO_STATUS_SUCCESS;
 }
 
-/**
- * Like cairo_pattern_acquire_surface(), but returns a matrix that transforms
- * from dest to src coords.
- */
-static cairo_status_t
-_cairo_gl_pattern_texture_setup (cairo_gl_composite_operand_t *operand,
-				 const cairo_pattern_t *src,
-				 cairo_gl_surface_t *dst,
-				 int src_x, int src_y,
-				 int dst_x, int dst_y,
-				 int width, int height)
-{
-    cairo_status_t status;
-    cairo_matrix_t m;
-    cairo_gl_surface_t *surface;
-    cairo_surface_attributes_t *attributes;
-
-    attributes = &operand->operand.texture.attributes;
-
-    status = _cairo_pattern_acquire_surface (src, &dst->base,
-					     src_x, src_y,
-					     width, height,
-					     CAIRO_PATTERN_ACQUIRE_NONE,
-					     (cairo_surface_t **)
-					     &surface,
-					     attributes);
-    if (unlikely (status))
-	return status;
-
-    assert (surface->base.backend == &_cairo_gl_surface_backend);
-
-    operand->operand.texture.surface = surface;
-    operand->operand.texture.tex = surface->tex;
-
-    /* Translate the matrix from
-     * (unnormalized src -> unnormalized src) to
-     * (unnormalized dst -> unnormalized src)
-     */
-    cairo_matrix_init_translate (&m,
-				 src_x - dst_x + attributes->x_offset,
-				 src_y - dst_y + attributes->y_offset);
-    cairo_matrix_multiply (&attributes->matrix,
-			   &m,
-			   &attributes->matrix);
-
-
-    /* Translate the matrix from
-     * (unnormalized src -> unnormalized src) to
-     * (unnormalized dst -> normalized src)
-     */
-    cairo_matrix_init_scale (&m,
-			     1.0 / surface->width,
-			     1.0 / surface->height);
-    cairo_matrix_multiply (&attributes->matrix,
-			   &attributes->matrix,
-			   &m);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_gl_solid_operand_init (cairo_gl_composite_operand_t *operand,
-	                      const cairo_color_t *color)
-{
-    operand->type = OPERAND_CONSTANT;
-    operand->operand.constant.color[0] = color->red   * color->alpha;
-    operand->operand.constant.color[1] = color->green * color->alpha;
-    operand->operand.constant.color[2] = color->blue  * color->alpha;
-    operand->operand.constant.color[3] = color->alpha;
-    return CAIRO_STATUS_SUCCESS;
-}
-
-cairo_int_status_t
-_cairo_gl_operand_init (cairo_gl_composite_operand_t *operand,
-		       const cairo_pattern_t *pattern,
-		       cairo_gl_surface_t *dst,
-		       int src_x, int src_y,
-		       int dst_x, int dst_y,
-		       int width, int height)
-{
-    operand->pattern = pattern;
-
-    switch (pattern->type) {
-    case CAIRO_PATTERN_TYPE_SOLID:
-	return _cairo_gl_solid_operand_init (operand,
-		                             &((cairo_solid_pattern_t *) pattern)->color);
-    case CAIRO_PATTERN_TYPE_LINEAR:
-    case CAIRO_PATTERN_TYPE_RADIAL:
-	{
-	    cairo_gradient_pattern_t *src = (cairo_gradient_pattern_t *) pattern;
-
-	    /* Fast path for gradients with less than 2 color stops.
-	     * Required to prevent _cairo_pattern_acquire_surface() returning
-	     * a solid color which is cached beyond the life of the context.
-	     */
-	    if (src->n_stops < 2) {
-		if (src->n_stops) {
-		    return _cairo_gl_solid_operand_init (operand,
-			                                 &src->stops->color);
-		} else {
-		    return _cairo_gl_solid_operand_init (operand,
-			                                 CAIRO_COLOR_TRANSPARENT);
-		}
-	    } else {
-		unsigned int i;
-
-		/* Is the gradient a uniform colour?
-		 * Happens more often than you would believe.
-		 */
-		for (i = 1; i < src->n_stops; i++) {
-		    if (! _cairo_color_equal (&src->stops[0].color,
-				              &src->stops[i].color))
-		    {
-			break;
-		    }
-		}
-		if (i == src->n_stops) {
-		    return _cairo_gl_solid_operand_init (operand,
-			                                 &src->stops->color);
-		}
-	    }
-	}
-
-	/* fall through */
-
-    default:
-    case CAIRO_PATTERN_TYPE_SURFACE:
-	operand->type = OPERAND_TEXTURE;
-	return _cairo_gl_pattern_texture_setup (operand,
-						pattern, dst,
-						src_x, src_y,
-						dst_x, dst_y,
-						width, height);
-    }
-}
-
-void
-_cairo_gl_operand_destroy (cairo_gl_composite_operand_t *operand)
-{
-    switch (operand->type) {
-    case OPERAND_CONSTANT:
-	break;
-    case OPERAND_TEXTURE:
-	if (operand->operand.texture.surface != NULL) {
-	    cairo_gl_surface_t *surface = operand->operand.texture.surface;
-
-	    _cairo_pattern_release_surface (operand->pattern,
-					    &surface->base,
-					    &operand->operand.texture.attributes);
-	}
-	break;
-    }
-}
-
-static void
-_cairo_gl_set_tex_combine_constant_color (cairo_gl_context_t *ctx, int tex_unit,
-					  GLfloat *color)
-{
-    glActiveTexture (GL_TEXTURE0 + tex_unit);
-    /* Have to have a dummy texture bound in order to use the combiner unit. */
-    glBindTexture (GL_TEXTURE_2D, ctx->dummy_tex);
-    glEnable (GL_TEXTURE_2D);
-
-    glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);
-    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-    if (tex_unit == 0) {
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-    } else {
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-    }
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_CONSTANT);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_CONSTANT);
-    if (tex_unit == 0) {
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-    } else {
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_ALPHA);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_PREVIOUS);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
-    }
-}
-
-void
-_cairo_gl_set_src_operand (cairo_gl_context_t *ctx,
-			   cairo_gl_composite_setup_t *setup)
-{
-    cairo_surface_attributes_t *src_attributes;
-    GLfloat constant_color[4] = {0.0, 0.0, 0.0, 0.0};
-
-    src_attributes = &setup->src.operand.texture.attributes;
-
-    switch (setup->src.type) {
-    case OPERAND_CONSTANT:
-	_cairo_gl_set_tex_combine_constant_color (ctx, 0,
-						  setup->src.operand.constant.color);
-	break;
-    case OPERAND_TEXTURE:
-	_cairo_gl_set_texture_surface (0, setup->src.operand.texture.tex,
-				       src_attributes);
-	/* Set up the constant color we use to set color to 0 if needed. */
-	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, constant_color);
-	/* Set up the combiner to just set color to the sampled texture. */
-	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-
-	/* Force the src color to 0 if the surface should be alpha-only.
-	 * We may have a teximage with color bits if the implementation doesn't
-	 * support GL_ALPHA FBOs.
-	 */
-	if (setup->src.operand.texture.surface->base.content !=
-	    CAIRO_CONTENT_ALPHA)
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE0);
-	else
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_CONSTANT);
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE0);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-	break;
-    }
-}
-
-/* This is like _cairo_gl_set_src_operand, but instead swizzles the source
- * for creating the "source alpha" value (src.aaaa * mask.argb) required by
- * component alpha rendering.
- */
-static void
-_cairo_gl_set_src_alpha_operand (cairo_gl_context_t *ctx,
-				 cairo_gl_composite_setup_t *setup)
-{
-    GLfloat constant_color[4] = {0.0, 0.0, 0.0, 0.0};
-    cairo_surface_attributes_t *src_attributes;
-
-    src_attributes = &setup->src.operand.texture.attributes;
-
-    switch (setup->src.type) {
-    case OPERAND_CONSTANT:
-	constant_color[0] = setup->src.operand.constant.color[3];
-	constant_color[1] = setup->src.operand.constant.color[3];
-	constant_color[2] = setup->src.operand.constant.color[3];
-	constant_color[3] = setup->src.operand.constant.color[3];
-       _cairo_gl_set_tex_combine_constant_color (ctx, 0, constant_color);
-	break;
-    case OPERAND_TEXTURE:
-	constant_color[0] = 0.0;
-	constant_color[1] = 0.0;
-	constant_color[2] = 0.0;
-	constant_color[3] = 1.0;
-	_cairo_gl_set_texture_surface (0, setup->src.operand.texture.tex,
-				       src_attributes);
-	/* Set up the combiner to just set color to the sampled texture. */
-	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
-	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE0);
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE0);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_ALPHA);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-	break;
-    }
-}
-
-/* This is like _cairo_gl_set_src_alpha_operand, for component alpha setup
- * of the mask part of IN to produce a "source alpha" value.
- */
-static void
-_cairo_gl_set_component_alpha_mask_operand (cairo_gl_context_t *ctx,
-					    cairo_gl_composite_setup_t *setup)
-{
-    cairo_surface_attributes_t *mask_attributes;
-    GLfloat constant_color[4] = {0.0, 0.0, 0.0, 0.0};
-
-    mask_attributes = &setup->mask.operand.texture.attributes;
-
-    glActiveTexture (GL_TEXTURE1);
-    glEnable (GL_TEXTURE_2D);
-    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
-
-    switch (setup->mask.type) {
-    case OPERAND_CONSTANT:
-	/* Have to have a dummy texture bound in order to use the combiner unit. */
-	glBindTexture (GL_TEXTURE_2D, ctx->dummy_tex);
-
-	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR,
-		    setup->mask.operand.constant.color);
-
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_CONSTANT);
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_CONSTANT);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-
-	break;
-    case OPERAND_TEXTURE:
-	_cairo_gl_set_texture_surface (1, setup->mask.operand.texture.tex,
-				       mask_attributes);
-	/* Set up the constant color we use to set color to 0 if needed. */
-	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, constant_color);
-
-	/* Force the mask color to 0 if the surface should be alpha-only.
-	 * We may have a teximage with color bits if the implementation doesn't
-	 * support GL_ALPHA FBOs.
-	 */
-	if (setup->mask.operand.texture.surface->base.content !=
-	    CAIRO_CONTENT_ALPHA)
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_TEXTURE1);
-	else
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_CONSTANT);
-	glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_TEXTURE1);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-	break;
-    }
-}
-
-/**
- * implements component-alpha CAIRO_OPERATOR_SOURCE using two passes of
- * the simpler operations CAIRO_OPERATOR_DEST_OUT and CAIRO_OPERATOR_ADD.
- *
- * From http://anholt.livejournal.com/32058.html:
- *
- * The trouble is that component-alpha rendering requires two different sources
- * for blending: one for the source value to the blender, which is the
- * per-channel multiplication of source and mask, and one for the source alpha
- * for multiplying with the destination channels, which is the multiplication
- * of the source channels by the mask alpha. So the equation for Over is:
- *
- * dst.A = src.A * mask.A + (1 - (src.A * mask.A)) * dst.A
- * dst.R = src.R * mask.R + (1 - (src.A * mask.R)) * dst.R
- * dst.G = src.G * mask.G + (1 - (src.A * mask.G)) * dst.G
- * dst.B = src.B * mask.B + (1 - (src.A * mask.B)) * dst.B
- *
- * But we can do some simpler operations, right? How about PictOpOutReverse,
- * which has a source factor of 0 and dest factor of (1 - source alpha). We
- * can get the source alpha value (srca.X = src.A * mask.X) out of the texture
- * blenders pretty easily. So we can do a component-alpha OutReverse, which
- * gets us:
- *
- * dst.A = 0 + (1 - (src.A * mask.A)) * dst.A
- * dst.R = 0 + (1 - (src.A * mask.R)) * dst.R
- * dst.G = 0 + (1 - (src.A * mask.G)) * dst.G
- * dst.B = 0 + (1 - (src.A * mask.B)) * dst.B
- *
- * OK. And if an op doesn't use the source alpha value for the destination
- * factor, then we can do the channel multiplication in the texture blenders
- * to get the source value, and ignore the source alpha that we wouldn't use.
- * We've supported this in the Radeon driver for a long time. An example would
- * be PictOpAdd, which does:
- *
- * dst.A = src.A * mask.A + dst.A
- * dst.R = src.R * mask.R + dst.R
- * dst.G = src.G * mask.G + dst.G
- * dst.B = src.B * mask.B + dst.B
- *
- * Hey, this looks good! If we do a PictOpOutReverse and then a PictOpAdd right
- * after it, we get:
- *
- * dst.A = src.A * mask.A + ((1 - (src.A * mask.A)) * dst.A)
- * dst.R = src.R * mask.R + ((1 - (src.A * mask.R)) * dst.R)
- * dst.G = src.G * mask.G + ((1 - (src.A * mask.G)) * dst.G)
- * dst.B = src.B * mask.B + ((1 - (src.A * mask.B)) * dst.B)
- *
- * This two-pass trickery could be avoided using a new GL extension that
- * lets two values come out of the shader and into the blend unit.
- */
-static cairo_int_status_t
-_cairo_gl_surface_composite_component_alpha (cairo_operator_t op,
-					     const cairo_pattern_t *src,
-					     const cairo_pattern_t *mask,
-					     void *abstract_dst,
-					     int src_x,
-					     int src_y,
-					     int mask_x,
-					     int mask_y,
-					     int dst_x,
-					     int dst_y,
-					     unsigned int width,
-					     unsigned int height,
-					     cairo_region_t *clip_region)
-{
-    cairo_gl_surface_t	*dst = abstract_dst;
-    cairo_surface_attributes_t *src_attributes, *mask_attributes = NULL;
-    cairo_gl_context_t *ctx;
-    struct gl_point {
-	GLfloat x, y;
-    } vertices_stack[8], texcoord_src_stack[8], texcoord_mask_stack[8];
-    struct gl_point *vertices = vertices_stack;
-    struct gl_point *texcoord_src = texcoord_src_stack;
-    struct gl_point *texcoord_mask = texcoord_mask_stack;
-    cairo_status_t status;
-    int num_vertices, i;
-    GLenum err;
-    cairo_gl_composite_setup_t setup;
-
-    if (op != CAIRO_OPERATOR_OVER)
-	return UNSUPPORTED ("unsupported component alpha operator");
-
-    memset (&setup, 0, sizeof (setup));
-
-    status = _cairo_gl_operand_init (&setup.src, src, dst,
-				     src_x, src_y,
-				     dst_x, dst_y,
-				     width, height);
-    if (unlikely (status))
-	return status;
-    src_attributes = &setup.src.operand.texture.attributes;
-
-    status = _cairo_gl_operand_init (&setup.mask, mask, dst,
-				     mask_x, mask_y,
-				     dst_x, dst_y,
-				     width, height);
-    if (unlikely (status)) {
-	_cairo_gl_operand_destroy (&setup.src);
-	return status;
-    }
-    mask_attributes = &setup.mask.operand.texture.attributes;
-
-    ctx = _cairo_gl_context_acquire (dst->ctx);
-    _cairo_gl_set_destination (dst);
-
-    if (clip_region != NULL) {
-	int num_rectangles;
-
-	num_rectangles = cairo_region_num_rectangles (clip_region);
-	if (num_rectangles * 4 > ARRAY_LENGTH (vertices_stack)) {
-	    vertices = _cairo_malloc_ab (num_rectangles,
-					 4*3*sizeof (vertices[0]));
-	    if (unlikely (vertices == NULL)) {
-		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-		goto CONTEXT_RELEASE;
-	    }
-
-	    texcoord_src = vertices + num_rectangles * 4;
-	    texcoord_mask = texcoord_src + num_rectangles * 4;
-	}
-
-	for (i = 0; i < num_rectangles; i++) {
-	    cairo_rectangle_int_t rect;
-
-	    cairo_region_get_rectangle (clip_region, i, &rect);
-	    vertices[4*i + 0].x = rect.x;
-	    vertices[4*i + 0].y = rect.y;
-	    vertices[4*i + 1].x = rect.x + rect.width;
-	    vertices[4*i + 1].y = rect.y;
-	    vertices[4*i + 2].x = rect.x + rect.width;
-	    vertices[4*i + 2].y = rect.y + rect.height;
-	    vertices[4*i + 3].x = rect.x;
-	    vertices[4*i + 3].y = rect.y + rect.height;
-	}
-
-	num_vertices = 4 * num_rectangles;
-    } else {
-	vertices[0].x = dst_x;
-	vertices[0].y = dst_y;
-	vertices[1].x = dst_x + width;
-	vertices[1].y = dst_y;
-	vertices[2].x = dst_x + width;
-	vertices[2].y = dst_y + height;
-	vertices[3].x = dst_x;
-	vertices[3].y = dst_y + height;
-
-	num_vertices = 4;
-    }
-
-    glVertexPointer (2, GL_FLOAT, sizeof (GLfloat) * 2, vertices);
-    glEnableClientState (GL_VERTEX_ARRAY);
-
-    if (setup.src.type == OPERAND_TEXTURE) {
-	for (i = 0; i < num_vertices; i++) {
-	    double s, t;
-
-	    s = vertices[i].x;
-	    t = vertices[i].y;
-	    cairo_matrix_transform_point (&src_attributes->matrix, &s, &t);
-	    texcoord_src[i].x = s;
-	    texcoord_src[i].y = t;
-	}
-
-	glClientActiveTexture (GL_TEXTURE0);
-	glTexCoordPointer (2, GL_FLOAT, sizeof (GLfloat)*2, texcoord_src);
-	glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-    }
-
-    if (setup.mask.type == OPERAND_TEXTURE) {
-	for (i = 0; i < num_vertices; i++) {
-	    double s, t;
-
-	    s = vertices[i].x;
-	    t = vertices[i].y;
-	    cairo_matrix_transform_point (&mask_attributes->matrix, &s, &t);
-	    texcoord_mask[i].x = s;
-	    texcoord_mask[i].y = t;
-	}
-
-	glClientActiveTexture (GL_TEXTURE1);
-	glTexCoordPointer (2, GL_FLOAT, sizeof (GLfloat)*2, texcoord_mask);
-	glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-    }
-
-    _cairo_gl_set_operator (dst, CAIRO_OPERATOR_DEST_OUT, TRUE);
-    _cairo_gl_set_src_alpha_operand (ctx, &setup);
-    _cairo_gl_set_component_alpha_mask_operand (ctx, &setup);
-    glDrawArrays (GL_QUADS, 0, num_vertices);
-
-    _cairo_gl_set_operator (dst, CAIRO_OPERATOR_ADD, TRUE);
-    _cairo_gl_set_src_operand (ctx, &setup);
-    glDrawArrays (GL_QUADS, 0, num_vertices);
-
-    glDisable (GL_BLEND);
-
-    glDisableClientState (GL_VERTEX_ARRAY);
-
-    glClientActiveTexture (GL_TEXTURE0);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE0);
-    glDisable (GL_TEXTURE_2D);
-
-    glClientActiveTexture (GL_TEXTURE1);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE1);
-    glDisable (GL_TEXTURE_2D);
-
-    while ((err = glGetError ()))
-	fprintf (stderr, "GL error 0x%08x\n", (int) err);
-
-  CONTEXT_RELEASE:
-    _cairo_gl_context_release (ctx);
-
-    _cairo_gl_operand_destroy (&setup.src);
-    if (mask != NULL)
-	_cairo_gl_operand_destroy (&setup.mask);
-
-    if (vertices != vertices_stack)
-	free (vertices);
-
-    return status;
-}
-
 static cairo_int_status_t
 _cairo_gl_surface_composite (cairo_operator_t		  op,
 			     const cairo_pattern_t	 *src,
@@ -1550,206 +972,84 @@ _cairo_gl_surface_composite (cairo_operator_t		  op,
 			     unsigned int		  height,
 			     cairo_region_t		 *clip_region)
 {
-    cairo_gl_surface_t	*dst = abstract_dst;
-    cairo_surface_attributes_t *src_attributes, *mask_attributes = NULL;
+    cairo_gl_surface_t *dst = abstract_dst;
     cairo_gl_context_t *ctx;
-    struct gl_point {
-	GLfloat x, y;
-    } vertices_stack[8], texcoord_src_stack[8], texcoord_mask_stack[8];
-    struct gl_point *vertices = vertices_stack;
-    struct gl_point *texcoord_src = texcoord_src_stack;
-    struct gl_point *texcoord_mask = texcoord_mask_stack;
     cairo_status_t status;
-    int num_vertices, i;
-    GLenum err;
-    cairo_gl_composite_setup_t setup;
+    cairo_gl_composite_t setup;
+    cairo_rectangle_int_t rect = { dst_x, dst_y, width, height };
+    int dx, dy;
 
-    if (! _cairo_gl_operator_is_supported (op))
-	return UNSUPPORTED ("unsupported operator");
-
-    if (mask && mask->has_component_alpha) {
-	/* Try two-pass component alpha support, or bail. */
-	return _cairo_gl_surface_composite_component_alpha(op,
-							   src,
-							   mask,
-							   abstract_dst,
-							   src_x,
-							   src_y,
-							   mask_x,
-							   mask_y,
-							   dst_x,
-							   dst_y,
-							   width,
-							   height,
-							   clip_region);
+    if (op == CAIRO_OPERATOR_SOURCE &&
+        mask == NULL &&
+        src->type == CAIRO_PATTERN_TYPE_SURFACE &&
+        _cairo_surface_is_image (((cairo_surface_pattern_t *) src)->surface) &&
+        _cairo_matrix_is_integer_translation (&src->matrix, &dx, &dy)) {
+        cairo_image_surface_t *image = (cairo_image_surface_t *)
+            ((cairo_surface_pattern_t *) src)->surface;
+        dx += src_x;
+        dy += src_y;
+        if (dx >= 0 &&
+            dy >= 0 &&
+            dx + width <= (unsigned int) image->width &&
+            dy + height <= (unsigned int) image->height) {
+            status = _cairo_gl_surface_draw_image (dst, image,
+                                                   dx, dy,
+                                                   width, height,
+                                                   dst_x, dst_y);
+            if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+                return status;
+        }
     }
 
-    memset (&setup, 0, sizeof (setup));
-
-    status = _cairo_gl_operand_init (&setup.src, src, dst,
-				     src_x, src_y,
-				     dst_x, dst_y,
-				     width, height);
+    status = _cairo_gl_composite_init (&setup, op, dst,
+                                       mask && mask->has_component_alpha,
+                                       &rect);
     if (unlikely (status))
-	return status;
-    src_attributes = &setup.src.operand.texture.attributes;
+        goto CLEANUP;
 
-    if (mask != NULL) {
-	status = _cairo_gl_operand_init (&setup.mask, mask, dst,
-					 mask_x, mask_y,
-					 dst_x, dst_y,
-					 width, height);
-	if (unlikely (status)) {
-	    _cairo_gl_operand_destroy (&setup.src);
-	    return status;
-	}
-	mask_attributes = &setup.mask.operand.texture.attributes;
-    }
+    status = _cairo_gl_composite_set_source (&setup, src,
+                                             src_x, src_y,
+                                             dst_x, dst_y,
+                                             width, height);
+    if (unlikely (status))
+        goto CLEANUP;
 
-    ctx = _cairo_gl_context_acquire (dst->ctx);
-    _cairo_gl_set_destination (dst);
-    _cairo_gl_set_operator (dst, op, FALSE);
+    status = _cairo_gl_composite_set_mask (&setup, mask,
+                                           mask_x, mask_y,
+                                           dst_x, dst_y,
+                                           width, height);
+    if (unlikely (status))
+        goto CLEANUP;
 
-    _cairo_gl_set_src_operand (ctx, &setup);
-
-    if (mask != NULL) {
-	switch (setup.mask.type) {
-	case OPERAND_CONSTANT:
-	    _cairo_gl_set_tex_combine_constant_color (ctx, 1,
-						      setup.mask.operand.constant.color);
-	    break;
-
-	case OPERAND_TEXTURE:
-	    _cairo_gl_set_texture_surface (1, setup.mask.operand.texture.tex,
-					   mask_attributes);
-
-	    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-
-	    /* IN: dst.argb = src.argb * mask.aaaa */
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_RGB, GL_TEXTURE1);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_TEXTURE1);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_ALPHA);
-	    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
-	    break;
-	}
-    }
+    status = _cairo_gl_composite_begin (&setup, &ctx);
+    if (unlikely (status))
+	goto CLEANUP;
 
     if (clip_region != NULL) {
-	int num_rectangles;
+        int i, num_rectangles;
 
-	num_rectangles = cairo_region_num_rectangles (clip_region);
-	if (num_rectangles * 4 > ARRAY_LENGTH (vertices_stack)) {
-	    vertices = _cairo_malloc_ab (num_rectangles,
-					 4*3*sizeof (vertices[0]));
-	    if (unlikely (vertices == NULL)) {
-		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-		goto CONTEXT_RELEASE;
-	    }
-
-	    texcoord_src = vertices + num_rectangles * 4;
-	    texcoord_mask = texcoord_src + num_rectangles * 4;
-	}
+        num_rectangles = cairo_region_num_rectangles (clip_region);
 
 	for (i = 0; i < num_rectangles; i++) {
 	    cairo_rectangle_int_t rect;
 
 	    cairo_region_get_rectangle (clip_region, i, &rect);
-	    vertices[4*i + 0].x = rect.x;
-	    vertices[4*i + 0].y = rect.y;
-	    vertices[4*i + 1].x = rect.x + rect.width;
-	    vertices[4*i + 1].y = rect.y;
-	    vertices[4*i + 2].x = rect.x + rect.width;
-	    vertices[4*i + 2].y = rect.y + rect.height;
-	    vertices[4*i + 3].x = rect.x;
-	    vertices[4*i + 3].y = rect.y + rect.height;
+            _cairo_gl_composite_emit_rect (ctx,
+                                           rect.x,              rect.y,
+                                           rect.x + rect.width, rect.y + rect.height,
+                                           0);
 	}
-
-	num_vertices = 4 * num_rectangles;
     } else {
-	vertices[0].x = dst_x;
-	vertices[0].y = dst_y;
-	vertices[1].x = dst_x + width;
-	vertices[1].y = dst_y;
-	vertices[2].x = dst_x + width;
-	vertices[2].y = dst_y + height;
-	vertices[3].x = dst_x;
-	vertices[3].y = dst_y + height;
-
-	num_vertices = 4;
+        _cairo_gl_composite_emit_rect (ctx,
+                                       dst_x,         dst_y,
+                                       dst_x + width, dst_y + height,
+                                       0);
     }
 
-    glVertexPointer (2, GL_FLOAT, sizeof (GLfloat) * 2, vertices);
-    glEnableClientState (GL_VERTEX_ARRAY);
+    status = _cairo_gl_context_release (ctx, status);
 
-    if (setup.src.type == OPERAND_TEXTURE) {
-	for (i = 0; i < num_vertices; i++) {
-	    double s, t;
-
-	    s = vertices[i].x;
-	    t = vertices[i].y;
-	    cairo_matrix_transform_point (&src_attributes->matrix, &s, &t);
-	    texcoord_src[i].x = s;
-	    texcoord_src[i].y = t;
-	}
-
-	glClientActiveTexture (GL_TEXTURE0);
-	glTexCoordPointer (2, GL_FLOAT, sizeof (GLfloat)*2, texcoord_src);
-	glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-    }
-
-    if (mask != NULL) {
-	if (setup.mask.type == OPERAND_TEXTURE) {
-	    for (i = 0; i < num_vertices; i++) {
-		double s, t;
-
-		s = vertices[i].x;
-		t = vertices[i].y;
-		cairo_matrix_transform_point (&mask_attributes->matrix, &s, &t);
-		texcoord_mask[i].x = s;
-		texcoord_mask[i].y = t;
-	    }
-
-	    glClientActiveTexture (GL_TEXTURE1);
-	    glTexCoordPointer (2, GL_FLOAT, sizeof (GLfloat)*2, texcoord_mask);
-	    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-	}
-    }
-
-    glDrawArrays (GL_QUADS, 0, num_vertices);
-
-    glDisable (GL_BLEND);
-
-    glDisableClientState (GL_VERTEX_ARRAY);
-
-    glClientActiveTexture (GL_TEXTURE0);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE0);
-    glDisable (GL_TEXTURE_2D);
-
-    glClientActiveTexture (GL_TEXTURE1);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE1);
-    glDisable (GL_TEXTURE_2D);
-
-    while ((err = glGetError ()))
-	fprintf (stderr, "GL error 0x%08x\n", (int) err);
-
-  CONTEXT_RELEASE:
-    _cairo_gl_context_release (ctx);
-
-    _cairo_gl_operand_destroy (&setup.src);
-    if (mask != NULL)
-	_cairo_gl_operand_destroy (&setup.mask);
-
-    if (vertices != vertices_stack)
-	free (vertices);
+  CLEANUP:
+    _cairo_gl_composite_fini (&setup);
 
     return status;
 }
@@ -1774,20 +1074,6 @@ _cairo_gl_surface_composite_trapezoids (cairo_operator_t op,
     if (! _cairo_gl_operator_is_supported (op))
 	return UNSUPPORTED ("unsupported operator");
 
-    if (_cairo_surface_check_span_renderer (op,pattern,&dst->base, antialias)) {
-	status =
-	    _cairo_surface_composite_trapezoids_as_polygon (&dst->base,
-							    op, pattern,
-							    antialias,
-							    src_x, src_y,
-							    dst_x, dst_y,
-							    width, height,
-							    traps, num_traps,
-							    clip_region);
-	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	    return status;
-    }
-
     status = _cairo_gl_get_traps_pattern (dst,
 					  dst_x, dst_y, width, height,
 					  traps, num_traps, antialias,
@@ -1805,356 +1091,77 @@ _cairo_gl_surface_composite_trapezoids (cairo_operator_t op,
 
     _cairo_pattern_fini (&traps_pattern.base);
 
+    assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
     return status;
 }
 
 static cairo_int_status_t
-_cairo_gl_surface_fill_rectangles_fixed (void			 *abstract_surface,
-					 cairo_operator_t	  op,
-					 const cairo_color_t     *color,
-					 cairo_rectangle_int_t   *rects,
-					 int			  num_rects)
-{
-#define N_STACK_RECTS 4
-    cairo_gl_surface_t *surface = abstract_surface;
-    GLfloat vertices_stack[N_STACK_RECTS*4*2];
-    GLfloat colors_stack[N_STACK_RECTS*4*4];
-    cairo_gl_context_t *ctx;
-    int i;
-    GLfloat *vertices;
-    GLfloat *colors;
-
-    if (! _cairo_gl_operator_is_supported (op))
-	return UNSUPPORTED ("unsupported operator");
-
-    ctx = _cairo_gl_context_acquire (surface->ctx);
-
-    _cairo_gl_set_destination (surface);
-    _cairo_gl_set_operator (surface, op, FALSE);
-
-    if (num_rects > N_STACK_RECTS) {
-	vertices = _cairo_malloc_ab (num_rects, sizeof (GLfloat) * 4 * 2);
-	colors = _cairo_malloc_ab (num_rects, sizeof (GLfloat) * 4 * 4);
-	if (!vertices || !colors) {
-	    _cairo_gl_context_release (ctx);
-	    free (vertices);
-	    free (colors);
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	}
-    } else {
-	vertices = vertices_stack;
-	colors = colors_stack;
-    }
-
-    /* This should be loaded in as either a blend constant and an operator
-     * setup specific to this, or better, a fragment shader constant.
-     */
-    colors[0] = color->red * color->alpha;
-    colors[1] = color->green * color->alpha;
-    colors[2] = color->blue * color->alpha;
-    colors[3] = color->alpha;
-    for (i = 1; i < num_rects * 4; i++) {
-	colors[i*4 + 0] = colors[0];
-	colors[i*4 + 1] = colors[1];
-	colors[i*4 + 2] = colors[2];
-	colors[i*4 + 3] = colors[3];
-    }
-
-    for (i = 0; i < num_rects; i++) {
-	vertices[i * 8 + 0] = rects[i].x;
-	vertices[i * 8 + 1] = rects[i].y;
-	vertices[i * 8 + 2] = rects[i].x + rects[i].width;
-	vertices[i * 8 + 3] = rects[i].y;
-	vertices[i * 8 + 4] = rects[i].x + rects[i].width;
-	vertices[i * 8 + 5] = rects[i].y + rects[i].height;
-	vertices[i * 8 + 6] = rects[i].x;
-	vertices[i * 8 + 7] = rects[i].y + rects[i].height;
-    }
-
-    glVertexPointer (2, GL_FLOAT, sizeof (GLfloat)*2, vertices);
-    glEnableClientState (GL_VERTEX_ARRAY);
-    glColorPointer (4, GL_FLOAT, sizeof (GLfloat)*4, colors);
-    glEnableClientState (GL_COLOR_ARRAY);
-
-    glDrawArrays (GL_QUADS, 0, 4 * num_rects);
-
-    glDisableClientState (GL_COLOR_ARRAY);
-    glDisableClientState (GL_VERTEX_ARRAY);
-    glDisable (GL_BLEND);
-
-    _cairo_gl_context_release (ctx);
-    if (vertices != vertices_stack)
-	free (vertices);
-    if (colors != colors_stack)
-	free (colors);
-
-    return CAIRO_STATUS_SUCCESS;
-#undef N_STACK_RECTS
-}
-
-static cairo_int_status_t
-_cairo_gl_surface_fill_rectangles_glsl (void                  *abstract_surface,
-					cairo_operator_t       op,
-					const cairo_color_t   *color,
-					cairo_rectangle_int_t *rects,
-					int                    num_rects)
-{
-#define N_STACK_RECTS 4
-    cairo_gl_surface_t *surface = abstract_surface;
-    GLfloat vertices_stack[N_STACK_RECTS*4*2];
-    GLfloat gl_color[4];
-    cairo_gl_context_t *ctx;
-    int i;
-    GLfloat *vertices;
-    static const char *fill_vs_source =
-	"void main()\n"
-	"{\n"
-	"	gl_Position = ftransform();\n"
-	"}\n";
-    static const char *fill_fs_source =
-	"uniform vec4 color;\n"
-	"void main()\n"
-	"{\n"
-	"	gl_FragColor = color;\n"
-	"}\n";
-    cairo_status_t status;
-
-    if (! _cairo_gl_operator_is_supported (op))
-	return UNSUPPORTED ("unsupported operator");
-
-    ctx = _cairo_gl_context_acquire (surface->ctx);
-
-    if (ctx->fill_rectangles_shader == 0) {
-	status = _cairo_gl_load_glsl (&ctx->fill_rectangles_shader,
-				      fill_vs_source, fill_fs_source);
-	if (_cairo_status_is_error (status))
-	    return status;
-
-	ctx->fill_rectangles_color_uniform =
-	    glGetUniformLocationARB (ctx->fill_rectangles_shader, "color");
-    }
-
-    if (num_rects > N_STACK_RECTS) {
-	vertices = _cairo_malloc_ab (num_rects, sizeof (GLfloat) * 4 * 2);
-	if (!vertices) {
-	    _cairo_gl_context_release (ctx);
-	    free (vertices);
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	}
-    } else {
-	vertices = vertices_stack;
-    }
-
-    glUseProgramObjectARB (ctx->fill_rectangles_shader);
-
-    _cairo_gl_set_destination (surface);
-    _cairo_gl_set_operator (surface, op, FALSE);
-
-    gl_color[0] = color->red * color->alpha;
-    gl_color[1] = color->green * color->alpha;
-    gl_color[2] = color->blue * color->alpha;
-    gl_color[3] = color->alpha;
-    glUniform4fvARB (ctx->fill_rectangles_color_uniform, 1, gl_color);
-
-    for (i = 0; i < num_rects; i++) {
-	vertices[i * 8 + 0] = rects[i].x;
-	vertices[i * 8 + 1] = rects[i].y;
-	vertices[i * 8 + 2] = rects[i].x + rects[i].width;
-	vertices[i * 8 + 3] = rects[i].y;
-	vertices[i * 8 + 4] = rects[i].x + rects[i].width;
-	vertices[i * 8 + 5] = rects[i].y + rects[i].height;
-	vertices[i * 8 + 6] = rects[i].x;
-	vertices[i * 8 + 7] = rects[i].y + rects[i].height;
-    }
-
-    glVertexPointer (2, GL_FLOAT, sizeof (GLfloat)*2, vertices);
-    glEnableClientState (GL_VERTEX_ARRAY);
-
-    glDrawArrays (GL_QUADS, 0, 4 * num_rects);
-
-    glDisableClientState (GL_VERTEX_ARRAY);
-    glDisable (GL_BLEND);
-    glUseProgramObjectARB (0);
-
-    _cairo_gl_context_release (ctx);
-    if (vertices != vertices_stack)
-	free (vertices);
-
-    return CAIRO_STATUS_SUCCESS;
-#undef N_STACK_RECTS
-}
-
-
-static cairo_int_status_t
-_cairo_gl_surface_fill_rectangles (void			   *abstract_surface,
+_cairo_gl_surface_fill_rectangles (void			   *abstract_dst,
 				   cairo_operator_t	    op,
 				   const cairo_color_t     *color,
 				   cairo_rectangle_int_t   *rects,
 				   int			    num_rects)
 {
-    if (GLEW_ARB_fragment_shader && GLEW_ARB_vertex_shader) {
-	return _cairo_gl_surface_fill_rectangles_glsl(abstract_surface,
-						      op,
-						      color,
-						      rects,
-						      num_rects);
-    } else {
-	return _cairo_gl_surface_fill_rectangles_fixed(abstract_surface,
-						       op,
-						       color,
-						       rects,
-						       num_rects);
+    cairo_gl_surface_t *dst = abstract_dst;
+    cairo_solid_pattern_t solid;
+    cairo_gl_context_t *ctx;
+    cairo_status_t status;
+    cairo_gl_composite_t setup;
+    int i;
+
+    status = _cairo_gl_composite_init (&setup, op, dst,
+                                       FALSE,
+                                       /* XXX */ NULL);
+    if (unlikely (status))
+        goto CLEANUP;
+
+    _cairo_pattern_init_solid (&solid, color);
+    status = _cairo_gl_composite_set_source (&setup, &solid.base,
+                                             0, 0,
+                                             0, 0,
+                                             0, 0);
+    if (unlikely (status))
+        goto CLEANUP;
+
+    status = _cairo_gl_composite_set_mask (&setup, NULL,
+                                           0, 0,
+                                           0, 0,
+                                           0, 0);
+    if (unlikely (status))
+        goto CLEANUP;
+
+    status = _cairo_gl_composite_begin (&setup, &ctx);
+    if (unlikely (status))
+        goto CLEANUP;
+
+    for (i = 0; i < num_rects; i++) {
+        _cairo_gl_composite_emit_rect (ctx,
+                                       rects[i].x,
+                                       rects[i].y,
+                                       rects[i].x + rects[i].width,
+                                       rects[i].y + rects[i].height,
+                                       0);
     }
+
+    status = _cairo_gl_context_release (ctx, status);
+
+  CLEANUP:
+    _cairo_gl_composite_fini (&setup);
+
+    return status;
 }
 
 typedef struct _cairo_gl_surface_span_renderer {
     cairo_span_renderer_t base;
 
-    cairo_gl_composite_setup_t setup;
+    cairo_gl_composite_t setup;
 
     int xmin, xmax;
+    int ymin, ymax;
 
-    cairo_operator_t op;
-    cairo_antialias_t antialias;
-
-    cairo_gl_surface_t *dst;
-    cairo_region_t *clip;
-
-    GLuint vbo;
-    void *vbo_base;
-    unsigned int vbo_size;
-    unsigned int vbo_offset;
-    unsigned int vertex_size;
+    cairo_gl_context_t *ctx;
 } cairo_gl_surface_span_renderer_t;
 
-static void
-_cairo_gl_span_renderer_flush (cairo_gl_surface_span_renderer_t *renderer)
-{
-    int count;
-
-    if (renderer->vbo_offset == 0)
-	return;
-
-    glUnmapBufferARB (GL_ARRAY_BUFFER_ARB);
-
-    count = renderer->vbo_offset / renderer->vertex_size;
-    renderer->vbo_offset = 0;
-
-    if (renderer->clip) {
-	int i, num_rectangles = cairo_region_num_rectangles (renderer->clip);
-
-	glEnable (GL_SCISSOR_TEST);
-	for (i = 0; i < num_rectangles; i++) {
-	    cairo_rectangle_int_t rect;
-
-	    cairo_region_get_rectangle (renderer->clip, i, &rect);
-
-	    glScissor (rect.x, rect.y, rect.width, rect.height);
-	    glDrawArrays (GL_QUADS, 0, count);
-	}
-	glDisable (GL_SCISSOR_TEST);
-    } else {
-	glDrawArrays (GL_QUADS, 0, count);
-    }
-}
-
-static void *
-_cairo_gl_span_renderer_get_vbo (cairo_gl_surface_span_renderer_t *renderer,
-				 unsigned int num_vertices)
-{
-    unsigned int offset;
-
-    if (renderer->vbo == 0) {
-	renderer->vbo_size = 16384;
-	glGenBuffersARB (1, &renderer->vbo);
-	glBindBufferARB (GL_ARRAY_BUFFER_ARB, renderer->vbo);
-
-	if (renderer->setup.src.type == OPERAND_TEXTURE)
-	    renderer->vertex_size = 4 * sizeof (float) + sizeof (uint32_t);
-	else
-	    renderer->vertex_size = 2 * sizeof (float) + sizeof (uint32_t);
-
-	glVertexPointer (2, GL_FLOAT, renderer->vertex_size, 0);
-	glEnableClientState (GL_VERTEX_ARRAY);
-
-	glColorPointer (4, GL_UNSIGNED_BYTE, renderer->vertex_size,
-			(void *) (uintptr_t) (2 * sizeof (float)));
-	glEnableClientState (GL_COLOR_ARRAY);
-
-	if (renderer->setup.src.type == OPERAND_TEXTURE) {
-	    glClientActiveTexture (GL_TEXTURE0);
-	    glTexCoordPointer (2, GL_FLOAT, renderer->vertex_size,
-			       (void *) (uintptr_t) (2 * sizeof (float) +
-						     sizeof (uint32_t)));
-	    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-	}
-    }
-
-    if (renderer->vbo_offset + num_vertices * renderer->vertex_size >
-	renderer->vbo_size) {
-	_cairo_gl_span_renderer_flush (renderer);
-    }
-
-    if (renderer->vbo_offset == 0) {
-	/* We'll only be using these vertices once. */
-	glBufferDataARB (GL_ARRAY_BUFFER_ARB, renderer->vbo_size, NULL,
-		      GL_STREAM_DRAW_ARB);
-	renderer->vbo_base = glMapBufferARB (GL_ARRAY_BUFFER_ARB,
-					     GL_WRITE_ONLY_ARB);
-    }
-
-    offset = renderer->vbo_offset;
-    renderer->vbo_offset += num_vertices * renderer->vertex_size;
-
-    return (char *) renderer->vbo_base + offset;
-}
-
-static void
-_cairo_gl_emit_span_vertex (cairo_gl_surface_span_renderer_t *renderer,
-			    int dst_x, int dst_y, uint8_t alpha,
-			    float *vertices)
-{
-    cairo_surface_attributes_t *src_attributes;
-    int v = 0;
-
-    src_attributes = &renderer->setup.src.operand.texture.attributes;
-
-    vertices[v++] = dst_x + BIAS;
-    vertices[v++] = dst_y + BIAS;
-    vertices[v++] = int_as_float (alpha << 24);
-    if (renderer->setup.src.type == OPERAND_TEXTURE) {
-	double s, t;
-
-	s = dst_x + BIAS;
-	t = dst_y + BIAS;
-	cairo_matrix_transform_point (&src_attributes->matrix, &s, &t);
-	vertices[v++] = s;
-	vertices[v++] = t;
-    }
-}
-
-static void
-_cairo_gl_emit_span (cairo_gl_surface_span_renderer_t *renderer,
-		     int x, int y1, int y2,
-		     uint8_t alpha)
-{
-    float *vertices = _cairo_gl_span_renderer_get_vbo (renderer, 2);
-
-    _cairo_gl_emit_span_vertex (renderer, x, y1, alpha, vertices);
-    _cairo_gl_emit_span_vertex (renderer, x, y2, alpha,
-			       vertices + renderer->vertex_size / 4);
-}
-
-static void
-_cairo_gl_emit_rectangle (cairo_gl_surface_span_renderer_t *renderer,
-			  int x1, int y1,
-			  int x2, int y2,
-			  int coverage)
-{
-    _cairo_gl_emit_span (renderer, x1, y1, y2, coverage);
-    _cairo_gl_emit_span (renderer, x2, y2, y1, coverage);
-}
-
 static cairo_status_t
 _cairo_gl_render_bounded_spans (void *abstract_renderer,
 				int y, int height,
@@ -2168,10 +1175,10 @@ _cairo_gl_render_bounded_spans (void *abstract_renderer,
 
     do {
 	if (spans[0].coverage) {
-	    _cairo_gl_emit_rectangle (renderer,
-				      spans[0].x, y,
-				      spans[1].x, y + height,
-				      spans[0].coverage);
+            _cairo_gl_composite_emit_rect (renderer->ctx,
+                                           spans[0].x, y,
+                                           spans[1].x, y + height,
+                                           spans[0].coverage);
 	}
 
 	spans++;
@@ -2188,39 +1195,69 @@ _cairo_gl_render_unbounded_spans (void *abstract_renderer,
 {
     cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
 
+    if (y > renderer->ymin) {
+        _cairo_gl_composite_emit_rect (renderer->ctx,
+                                       renderer->xmin, renderer->ymin,
+                                       renderer->xmax, y,
+                                       0);
+    }
+
     if (num_spans == 0) {
-	_cairo_gl_emit_rectangle (renderer,
-				  renderer->xmin, y,
-				  renderer->xmax, y + height,
-				  0);
-	return CAIRO_STATUS_SUCCESS;
-    }
-
-    if (spans[0].x != renderer->xmin) {
-	_cairo_gl_emit_rectangle (renderer,
-				  renderer->xmin, y,
-				  spans[0].x, y + height,
-				  0);
-    }
-
-    do {
-	_cairo_gl_emit_rectangle (renderer,
-				  spans[0].x, y,
-				  spans[1].x, y + height,
-				  spans[0].coverage);
-	spans++;
-    } while (--num_spans > 1);
-
-    if (spans[0].x != renderer->xmax) {
-	_cairo_gl_emit_rectangle (renderer,
-				  spans[0].x, y,
-				  renderer->xmax, y + height,
-				  0);
+        _cairo_gl_composite_emit_rect (renderer->ctx,
+                                       renderer->xmin, y,
+                                       renderer->xmax, y + height,
+                                       0);
+    } else {
+        if (spans[0].x != renderer->xmin) {
+            _cairo_gl_composite_emit_rect (renderer->ctx,
+                                           renderer->xmin, y,
+                                           spans[0].x,     y + height,
+                                           0);
+        }
+
+        do {
+            _cairo_gl_composite_emit_rect (renderer->ctx,
+                                           spans[0].x, y,
+                                           spans[1].x, y + height,
+                                           spans[0].coverage);
+            spans++;
+        } while (--num_spans > 1);
+
+        if (spans[0].x != renderer->xmax) {
+            _cairo_gl_composite_emit_rect (renderer->ctx,
+                                           spans[0].x,     y,
+                                           renderer->xmax, y + height,
+                                           0);
+        }
     }
 
+    renderer->ymin = y + height;
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_status_t
+_cairo_gl_finish_unbounded_spans (void *abstract_renderer)
+{
+    cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
+
+    if (renderer->ymax > renderer->ymin) {
+        _cairo_gl_composite_emit_rect (renderer->ctx,
+                                       renderer->xmin, renderer->ymin,
+                                       renderer->xmax, renderer->ymax,
+                                       0);
+    }
+
+    return _cairo_gl_context_release (renderer->ctx, CAIRO_STATUS_SUCCESS);
+}
+
+static cairo_status_t
+_cairo_gl_finish_bounded_spans (void *abstract_renderer)
+{
+    cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
+
+    return _cairo_gl_context_release (renderer->ctx, CAIRO_STATUS_SUCCESS);
+}
+
 static void
 _cairo_gl_surface_span_renderer_destroy (void *abstract_renderer)
 {
@@ -2229,49 +1266,20 @@ _cairo_gl_surface_span_renderer_destroy (void *abstract_renderer)
     if (!renderer)
 	return;
 
-    _cairo_gl_operand_destroy (&renderer->setup.src);
-    _cairo_gl_context_release (renderer->dst->ctx);
+    _cairo_gl_composite_fini (&renderer->setup);
 
     free (renderer);
 }
 
-static cairo_status_t
-_cairo_gl_surface_span_renderer_finish (void *abstract_renderer)
-{
-    cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
-
-    _cairo_gl_span_renderer_flush (renderer);
-
-    glBindBufferARB (GL_ARRAY_BUFFER_ARB, 0);
-    glDeleteBuffersARB (1, &renderer->vbo);
-    glDisableClientState (GL_VERTEX_ARRAY);
-    glDisableClientState (GL_COLOR_ARRAY);
-
-    glClientActiveTexture (GL_TEXTURE0);
-    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-    glActiveTexture (GL_TEXTURE0);
-    glDisable (GL_TEXTURE_2D);
-
-    glActiveTexture (GL_TEXTURE1);
-    glDisable (GL_TEXTURE_2D);
-
-    glDisable (GL_BLEND);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 static cairo_bool_t
-_cairo_gl_surface_check_span_renderer (cairo_operator_t	  op,
+_cairo_gl_surface_check_span_renderer (cairo_operator_t	       op,
 				       const cairo_pattern_t  *pattern,
-				       void			 *abstract_dst,
-				       cairo_antialias_t	  antialias)
+				       void		      *abstract_dst,
+				       cairo_antialias_t       antialias)
 {
     if (! _cairo_gl_operator_is_supported (op))
 	return FALSE;
 
-    if (! GLEW_ARB_vertex_buffer_object)
-	return FALSE;
-
     return TRUE;
 
     (void) pattern;
@@ -2290,65 +1298,53 @@ _cairo_gl_surface_create_span_renderer (cairo_operator_t	 op,
     cairo_gl_surface_t *dst = abstract_dst;
     cairo_gl_surface_span_renderer_t *renderer;
     cairo_status_t status;
-    cairo_surface_attributes_t *src_attributes;
-    GLenum err;
+    const cairo_rectangle_int_t *extents;
 
     renderer = calloc (1, sizeof (*renderer));
     if (unlikely (renderer == NULL))
 	return _cairo_span_renderer_create_in_error (CAIRO_STATUS_NO_MEMORY);
 
     renderer->base.destroy = _cairo_gl_surface_span_renderer_destroy;
-    renderer->base.finish = _cairo_gl_surface_span_renderer_finish;
-    renderer->base.render_row =
-	_cairo_gl_surface_span_renderer_render_row;
-    renderer->op = op;
-    renderer->antialias = antialias;
-    renderer->dst = dst;
-    renderer->clip = clip_region;
-
-    renderer->composite_rectangles = *rects;
-
-    status = _cairo_gl_operand_init (&renderer->setup.src, src, dst,
-				     rects->src.x, rects->src.y,
-				     rects->dst.x, rects->dst.y,
-				     width, height);
-    if (unlikely (status)) {
-	_cairo_gl_context_acquire (dst->ctx);
-	_cairo_gl_surface_span_renderer_destroy (renderer);
-	return _cairo_span_renderer_create_in_error (status);
+    if (rects->is_bounded) {
+	renderer->base.render_rows = _cairo_gl_render_bounded_spans;
+        renderer->base.finish =      _cairo_gl_finish_bounded_spans;
+	extents = &rects->bounded;
+    } else {
+	renderer->base.render_rows = _cairo_gl_render_unbounded_spans;
+        renderer->base.finish =      _cairo_gl_finish_unbounded_spans;
+	extents = &rects->unbounded;
     }
+    renderer->xmin = extents->x;
+    renderer->xmax = extents->x + extents->width;
+    renderer->ymin = extents->y;
+    renderer->ymax = extents->y + extents->height;
 
-    _cairo_gl_context_acquire (dst->ctx);
-    _cairo_gl_set_destination (dst);
+    status = _cairo_gl_composite_init (&renderer->setup,
+                                       op, dst,
+                                       FALSE, extents);
+    if (unlikely (status))
+        goto FAIL;
 
-    src_attributes = &renderer->setup.src.operand.texture.attributes;
+    status = _cairo_gl_composite_set_source (&renderer->setup, src,
+                                             extents->x, extents->y,
+                                             extents->x, extents->y,
+                                             extents->width, extents->height);
+    if (unlikely (status))
+        goto FAIL;
 
-    _cairo_gl_set_operator (dst, op, FALSE);
-    _cairo_gl_set_src_operand (dst->ctx, &renderer->setup);
+    _cairo_gl_composite_set_mask_spans (&renderer->setup);
+    _cairo_gl_composite_set_clip_region (&renderer->setup, clip_region);
 
-    /* Set up the mask to source from the incoming vertex color. */
-    glActiveTexture (GL_TEXTURE1);
-    /* Have to have a dummy texture bound in order to use the combiner unit. */
-    glBindTexture (GL_TEXTURE_2D, dst->ctx->dummy_tex);
-    glEnable (GL_TEXTURE_2D);
-    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-    glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_RGB, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PREVIOUS);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
-
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_RGB, GL_PRIMARY_COLOR);
-    glTexEnvi (GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_PRIMARY_COLOR);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_ALPHA);
-    glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
-
-    while ((err = glGetError ()))
-	fprintf (stderr, "GL error 0x%08x\n", (int) err);
+    status = _cairo_gl_composite_begin (&renderer->setup, &renderer->ctx);
+    if (unlikely (status))
+        goto FAIL;
 
     return &renderer->base;
+
+FAIL:
+    _cairo_gl_composite_fini (&renderer->setup);
+    free (renderer);
+    return _cairo_span_renderer_create_in_error (status);
 }
 
 static cairo_bool_t
@@ -2372,8 +1368,29 @@ _cairo_gl_surface_get_font_options (void                  *abstract_surface,
     _cairo_font_options_init_default (options);
 
     cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+    _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON);
 }
 
+static cairo_status_t
+_cairo_gl_surface_flush (void *abstract_surface)
+{
+    cairo_gl_surface_t *surface = abstract_surface;
+    cairo_status_t status;
+    cairo_gl_context_t *ctx;
+
+    status = _cairo_gl_context_acquire (surface->base.device, &ctx);
+    if (unlikely (status))
+        return status;
+
+    if ((ctx->operands[CAIRO_GL_TEX_SOURCE].type == CAIRO_GL_OPERAND_TEXTURE &&
+         ctx->operands[CAIRO_GL_TEX_SOURCE].texture.surface == surface) ||
+        (ctx->operands[CAIRO_GL_TEX_MASK].type == CAIRO_GL_OPERAND_TEXTURE &&
+         ctx->operands[CAIRO_GL_TEX_MASK].texture.surface == surface) ||
+        (ctx->current_target == surface))
+      _cairo_gl_composite_flush (ctx);
+
+    return _cairo_gl_context_release (ctx, status);
+}
 
 static cairo_int_status_t
 _cairo_gl_surface_paint (void *abstract_surface,
@@ -2382,15 +1399,209 @@ _cairo_gl_surface_paint (void *abstract_surface,
 			 cairo_clip_t	    *clip)
 {
     /* simplify the common case of clearing the surface */
-    if (op == CAIRO_OPERATOR_CLEAR && clip == NULL) {
-	_cairo_gl_surface_clear (abstract_surface);
-
-	return CAIRO_STATUS_SUCCESS;
+    if (clip == NULL) {
+        if (op == CAIRO_OPERATOR_CLEAR)
+            return _cairo_gl_surface_clear (abstract_surface, CAIRO_COLOR_TRANSPARENT);
+       else if (source->type == CAIRO_PATTERN_TYPE_SOLID &&
+                (op == CAIRO_OPERATOR_SOURCE ||
+                 (op == CAIRO_OPERATOR_OVER && _cairo_pattern_is_opaque_solid (source)))) {
+            return _cairo_gl_surface_clear (abstract_surface,
+                                            &((cairo_solid_pattern_t *) source)->color);
+        }
     }
 
     return CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
+static cairo_int_status_t
+_cairo_gl_surface_polygon (cairo_gl_surface_t *dst,
+                           cairo_operator_t op,
+                           const cairo_pattern_t *src,
+                           cairo_polygon_t *polygon,
+                           cairo_fill_rule_t fill_rule,
+                           cairo_antialias_t antialias,
+                           const cairo_composite_rectangles_t *extents,
+                           cairo_clip_t *clip)
+{
+    cairo_status_t status;
+    cairo_region_t *clip_region = NULL;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	    return CAIRO_STATUS_SUCCESS;
+	if (unlikely (_cairo_status_is_error (status)))
+	    return status;
+
+	if (status == CAIRO_INT_STATUS_UNSUPPORTED)
+            return UNSUPPORTED ("a clip surface would be required");
+    }
+
+    if (! _cairo_surface_check_span_renderer (op, src, &dst->base, antialias))
+        return UNSUPPORTED ("no span renderer");
+
+    if (op == CAIRO_OPERATOR_SOURCE)
+        return UNSUPPORTED ("SOURCE compositing doesn't work in GL");
+    if (op == CAIRO_OPERATOR_CLEAR) {
+        op = CAIRO_OPERATOR_DEST_OUT;
+        src = &_cairo_pattern_white.base;
+    }
+
+    status = _cairo_surface_composite_polygon (&dst->base,
+                                               op,
+                                               src,
+                                               fill_rule,
+                                               antialias,
+                                               extents,
+                                               polygon,
+                                               clip_region);
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_gl_surface_stroke (void			        *abstract_surface,
+                          cairo_operator_t		 op,
+                          const cairo_pattern_t	        *source,
+                          cairo_path_fixed_t		*path,
+                          const cairo_stroke_style_t	*style,
+                          const cairo_matrix_t	        *ctm,
+                          const cairo_matrix_t	        *ctm_inverse,
+                          double			 tolerance,
+                          cairo_antialias_t		 antialias,
+                          cairo_clip_t		        *clip)
+{
+    cairo_gl_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    cairo_polygon_t polygon;
+    cairo_status_t status;
+
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  surface->width,
+							  surface->height,
+							  op, source,
+							  path, style, ctm,
+							  clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (clip != NULL) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	have_clip = TRUE;
+    }
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status)) {
+	if (have_clip)
+	    _cairo_clip_fini (&local_clip);
+
+	return status;
+    }
+
+    _cairo_polygon_init (&polygon);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+    status = _cairo_path_fixed_stroke_to_polygon (path,
+                                                  style,
+                                                  ctm, ctm_inverse,
+                                                  tolerance,
+                                                  &polygon);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+        status = _cairo_gl_surface_polygon (surface, op, source, &polygon,
+                                            CAIRO_FILL_RULE_WINDING, antialias,
+                                            &extents, clip);
+    }
+
+    _cairo_polygon_fini (&polygon);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_gl_surface_fill (void			*abstract_surface,
+                        cairo_operator_t	 op,
+                        const cairo_pattern_t	*source,
+                        cairo_path_fixed_t	*path,
+                        cairo_fill_rule_t	 fill_rule,
+                        double			 tolerance,
+                        cairo_antialias_t	 antialias,
+                        cairo_clip_t		*clip)
+{
+    cairo_gl_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_polygon_t polygon;
+    cairo_status_t status;
+
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							surface->width,
+							surface->height,
+							op, source, path,
+							clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+#if 0
+    if (extents.is_bounded && clip != NULL) {
+	cairo_clip_path_t *clip_path;
+
+	if (((clip_path = _clip_get_single_path (clip)) != NULL) &&
+	    _cairo_path_fixed_equal (&clip_path->path, path))
+	{
+	    clip = NULL;
+	}
+    }
+#endif
+
+    if (clip != NULL) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	have_clip = TRUE;
+    }
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status)) {
+	if (have_clip)
+	    _cairo_clip_fini (&local_clip);
+
+	return status;
+    }
+
+    _cairo_polygon_init (&polygon);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+    status = _cairo_path_fixed_fill_to_polygon (path, tolerance, &polygon);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+        status = _cairo_gl_surface_polygon (surface, op, source, &polygon,
+                                            fill_rule, antialias,
+                                            &extents, clip);
+    }
+
+    _cairo_polygon_fini (&polygon);
+
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
 const cairo_surface_backend_t _cairo_gl_surface_backend = {
     CAIRO_SURFACE_TYPE_GL,
     _cairo_gl_surface_create_similar,
@@ -2413,23 +1624,14 @@ const cairo_surface_backend_t _cairo_gl_surface_backend = {
     _cairo_gl_surface_get_extents,
     NULL, /* old_show_glyphs */
     _cairo_gl_surface_get_font_options,
-    NULL, /* flush */
+    _cairo_gl_surface_flush,
     NULL, /* mark_dirty_rectangle */
-    NULL, /* scaled_font_fini */
+    _cairo_gl_surface_scaled_font_fini,
     _cairo_gl_surface_scaled_glyph_fini,
     _cairo_gl_surface_paint,
     NULL, /* mask */
-    NULL, /* stroke */
-    NULL, /* fill */
+    _cairo_gl_surface_stroke,
+    _cairo_gl_surface_fill,
     _cairo_gl_surface_show_glyphs, /* show_glyphs */
     NULL  /* snapshot */
 };
-
-/** Call glFinish(), used for accurate performance testing. */
-cairo_status_t
-cairo_gl_surface_glfinish (cairo_surface_t *surface)
-{
-    glFinish ();
-
-    return CAIRO_STATUS_SUCCESS;
-}
diff --git a/gfx/cairo/cairo/src/cairo-gl.h b/gfx/cairo/cairo/src/cairo-gl.h
index 1b8f79554a1..131d1148bee 100644
--- a/gfx/cairo/cairo/src/cairo-gl.h
+++ b/gfx/cairo/cairo/src/cairo-gl.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,19 +40,16 @@
 
 CAIRO_BEGIN_DECLS
 
-typedef struct _cairo_gl_context cairo_gl_context_t;
-
-cairo_public cairo_gl_context_t *
-cairo_gl_context_reference (cairo_gl_context_t *context);
-
-cairo_public void
-cairo_gl_context_destroy (cairo_gl_context_t *context);
-
 cairo_public cairo_surface_t *
-cairo_gl_surface_create (cairo_gl_context_t *ctx,
+cairo_gl_surface_create (cairo_device_t *device,
 			 cairo_content_t content,
 			 int width, int height);
 
+cairo_public cairo_surface_t *
+cairo_gl_surface_create_for_texture (cairo_device_t *abstract_device,
+				     cairo_content_t content,
+				     unsigned int tex,
+                                     int width, int height);
 cairo_public void
 cairo_gl_surface_set_size (cairo_surface_t *surface, int width, int height);
 
@@ -65,31 +62,52 @@ cairo_gl_surface_get_height (cairo_surface_t *abstract_surface);
 cairo_public void
 cairo_gl_surface_swapbuffers (cairo_surface_t *surface);
 
-cairo_public cairo_status_t
-cairo_gl_surface_glfinish (cairo_surface_t *surface);
-
 #if CAIRO_HAS_GLX_FUNCTIONS
 #include <GL/glx.h>
 
-cairo_public cairo_gl_context_t *
-cairo_glx_context_create (Display *dpy, GLXContext gl_ctx);
+cairo_public cairo_device_t *
+cairo_glx_device_create (Display *dpy, GLXContext gl_ctx);
+
+cairo_public Display *
+cairo_glx_device_get_display (cairo_device_t *device);
+
+cairo_public GLXContext
+cairo_glx_device_get_context (cairo_device_t *device);
 
 cairo_public cairo_surface_t *
-cairo_gl_surface_create_for_window (cairo_gl_context_t *ctx,
+cairo_gl_surface_create_for_window (cairo_device_t *device,
 				    Window win,
 				    int width, int height);
 #endif
 
-#if CAIRO_HAS_EAGLE_FUNCTIONS
-#include <eagle.h>
+#if CAIRO_HAS_WGL_FUNCTIONS
+#include <windows.h>
 
-cairo_public cairo_gl_context_t *
-cairo_eagle_context_create (EGLDisplay display, EGLContext context);
+cairo_public cairo_device_t *
+cairo_wgl_device_create (HGLRC rc);
+
+cairo_public HGLRC
+cairo_wgl_device_get_context (cairo_device_t *device);
 
 cairo_public cairo_surface_t *
-cairo_gl_surface_create_for_eagle (cairo_gl_context_t *ctx,
-				   EGLSurface surface,
-				   int width, int height);
+cairo_gl_surface_create_for_dc (cairo_device_t		*device,
+				HDC			 dc,
+				int			 width,
+				int			 height);
+#endif
+
+#if CAIRO_HAS_EGL_FUNCTIONS
+#include <EGL/egl.h>
+
+cairo_public cairo_device_t *
+cairo_egl_device_create (EGLDisplay dpy, EGLContext egl);
+
+cairo_public cairo_surface_t *
+cairo_gl_surface_create_for_egl (cairo_device_t	*device,
+				 EGLSurface	 egl,
+				 int		 width,
+				 int		 height);
+
 #endif
 
 CAIRO_END_DECLS
diff --git a/gfx/cairo/cairo/src/cairo-glx-context.c b/gfx/cairo/cairo/src/cairo-glx-context.c
index b442a1fc5ed..fa9d8be962e 100644
--- a/gfx/cairo/cairo/src/cairo-glx-context.c
+++ b/gfx/cairo/cairo/src/cairo-glx-context.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,6 +40,8 @@
 
 #include "cairo-gl-private.h"
 
+#include "cairo-error-private.h"
+
 #include <X11/Xutil.h>
 
 /* XXX needs hooking into XCloseDisplay() */
@@ -59,8 +61,24 @@ typedef struct _cairo_glx_surface {
 } cairo_glx_surface_t;
 
 static void
-_glx_make_current (void *abstract_ctx,
-	           cairo_gl_surface_t *abstract_surface)
+_glx_acquire (void *abstract_ctx)
+{
+    cairo_glx_context_t *ctx = abstract_ctx;
+    GLXDrawable current_drawable;
+
+    if (ctx->base.current_target == NULL ||
+        _cairo_gl_surface_is_texture (ctx->base.current_target)) {
+        current_drawable = ctx->dummy_window;
+    } else {
+        cairo_glx_surface_t *surface = (cairo_glx_surface_t *) ctx->base.current_target;
+        current_drawable = surface->win;
+    }
+
+    glXMakeCurrent (ctx->display, current_drawable, ctx->context);
+}
+
+static void
+_glx_make_current (void *abstract_ctx, cairo_gl_surface_t *abstract_surface)
 {
     cairo_glx_context_t *ctx = abstract_ctx;
     cairo_glx_surface_t *surface = (cairo_glx_surface_t *) abstract_surface;
@@ -69,6 +87,14 @@ _glx_make_current (void *abstract_ctx,
     glXMakeCurrent (ctx->display, surface->win, ctx->context);
 }
 
+static void
+_glx_release (void *abstract_ctx)
+{
+    cairo_glx_context_t *ctx = abstract_ctx;
+
+    glXMakeCurrent (ctx->display, None, None);
+}
+
 static void
 _glx_swap_buffers (void *abstract_ctx,
 		   cairo_gl_surface_t *abstract_surface)
@@ -86,6 +112,8 @@ _glx_destroy (void *abstract_ctx)
 
     if (ctx->dummy_window != None)
 	XDestroyWindow (ctx->display, ctx->dummy_window);
+
+    glXMakeCurrent (ctx->display, 0, 0);
 }
 
 static cairo_status_t
@@ -140,8 +168,8 @@ _glx_dummy_ctx (Display *dpy, GLXContext gl_ctx, Window *dummy)
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_gl_context_t *
-cairo_glx_context_create (Display *dpy, GLXContext gl_ctx)
+cairo_device_t *
+cairo_glx_device_create (Display *dpy, GLXContext gl_ctx)
 {
     cairo_glx_context_t *ctx;
     cairo_status_t status;
@@ -159,6 +187,8 @@ cairo_glx_context_create (Display *dpy, GLXContext gl_ctx)
     ctx->dummy_window = dummy;
     ctx->context = gl_ctx;
 
+    ctx->base.acquire = _glx_acquire;
+    ctx->base.release = _glx_release;
     ctx->base.make_current = _glx_make_current;
     ctx->base.swap_buffers = _glx_swap_buffers;
     ctx->base.destroy = _glx_destroy;
@@ -169,25 +199,60 @@ cairo_glx_context_create (Display *dpy, GLXContext gl_ctx)
 	return _cairo_gl_context_create_in_error (status);
     }
 
-    return &ctx->base;
+    ctx->base.release (ctx);
+
+    return &ctx->base.base;
+}
+
+Display *
+cairo_glx_device_get_display (cairo_device_t *device)
+{
+    cairo_glx_context_t *ctx;
+
+    if (device->backend->type != CAIRO_DEVICE_TYPE_GL) {
+	_cairo_error_throw (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+	return NULL;
+    }
+
+    ctx = (cairo_glx_context_t *) device;
+
+    return ctx->display;
+}
+
+GLXContext
+cairo_glx_device_get_context (cairo_device_t *device)
+{
+    cairo_glx_context_t *ctx;
+
+    if (device->backend->type != CAIRO_DEVICE_TYPE_GL) {
+	_cairo_error_throw (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+	return NULL;
+    }
+
+    ctx = (cairo_glx_context_t *) device;
+
+    return ctx->context;
 }
 
 cairo_surface_t *
-cairo_gl_surface_create_for_window (cairo_gl_context_t   *ctx,
-				    Window                win,
-				    int                   width,
-				    int                   height)
+cairo_gl_surface_create_for_window (cairo_device_t	*device,
+				    Window		 win,
+				    int			 width,
+				    int			 height)
 {
     cairo_glx_surface_t *surface;
 
-    if (unlikely (ctx->status))
-	return _cairo_surface_create_in_error (ctx->status);
+    if (unlikely (device->status))
+	return _cairo_surface_create_in_error (device->status);
+
+    if (device->backend->type != CAIRO_DEVICE_TYPE_GL)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
 
     surface = calloc (1, sizeof (cairo_glx_surface_t));
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_gl_surface_init (ctx, &surface->base,
+    _cairo_gl_surface_init (device, &surface->base,
 			    CAIRO_CONTENT_COLOR_ALPHA, width, height);
     surface->win = win;
 
diff --git a/gfx/cairo/cairo/src/cairo-gstate-private.h b/gfx/cairo/cairo/src/cairo-gstate-private.h
index cb278e806e3..b41c7a296c3 100644
--- a/gfx/cairo/cairo/src/cairo-gstate-private.h
+++ b/gfx/cairo/cairo/src/cairo-gstate-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -60,13 +60,326 @@ struct _cairo_gstate {
     cairo_surface_t *parent_target;	/* The previous target which was receiving rendering */
     cairo_surface_t *original_target;	/* The original target the initial gstate was created with */
 
+    /* the user is allowed to update the device after we have cached the matrices... */
+    cairo_observer_t device_transform_observer;
+
     cairo_matrix_t ctm;
     cairo_matrix_t ctm_inverse;
     cairo_matrix_t source_ctm_inverse; /* At the time ->source was set */
+    cairo_bool_t is_identity;
 
     cairo_pattern_t *source;
 
     struct _cairo_gstate *next;
 };
 
+/* cairo-gstate.c */
+cairo_private cairo_status_t
+_cairo_gstate_init (cairo_gstate_t  *gstate,
+		    cairo_surface_t *target);
+
+cairo_private void
+_cairo_gstate_fini (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_save (cairo_gstate_t **gstate, cairo_gstate_t **freelist);
+
+cairo_private cairo_status_t
+_cairo_gstate_restore (cairo_gstate_t **gstate, cairo_gstate_t **freelist);
+
+cairo_private cairo_bool_t
+_cairo_gstate_is_redirected (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_redirect_target (cairo_gstate_t *gstate, cairo_surface_t *child);
+
+cairo_private cairo_surface_t *
+_cairo_gstate_get_target (cairo_gstate_t *gstate);
+
+cairo_private cairo_surface_t *
+_cairo_gstate_get_parent_target (cairo_gstate_t *gstate);
+
+cairo_private cairo_surface_t *
+_cairo_gstate_get_original_target (cairo_gstate_t *gstate);
+
+cairo_private cairo_clip_t *
+_cairo_gstate_get_clip (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_source (cairo_gstate_t *gstate, cairo_pattern_t *source);
+
+cairo_private cairo_pattern_t *
+_cairo_gstate_get_source (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t op);
+
+cairo_private cairo_operator_t
+_cairo_gstate_get_operator (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_tolerance (cairo_gstate_t *gstate, double tolerance);
+
+cairo_private double
+_cairo_gstate_get_tolerance (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_fill_rule (cairo_gstate_t *gstate, cairo_fill_rule_t fill_rule);
+
+cairo_private cairo_fill_rule_t
+_cairo_gstate_get_fill_rule (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_line_width (cairo_gstate_t *gstate, double width);
+
+cairo_private double
+_cairo_gstate_get_line_width (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_line_cap (cairo_gstate_t *gstate, cairo_line_cap_t line_cap);
+
+cairo_private cairo_line_cap_t
+_cairo_gstate_get_line_cap (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_line_join (cairo_gstate_t *gstate, cairo_line_join_t line_join);
+
+cairo_private cairo_line_join_t
+_cairo_gstate_get_line_join (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_dash (cairo_gstate_t *gstate, const double *dash, int num_dashes, double offset);
+
+cairo_private void
+_cairo_gstate_get_dash (cairo_gstate_t *gstate, double *dash, int *num_dashes, double *offset);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_miter_limit (cairo_gstate_t *gstate, double limit);
+
+cairo_private double
+_cairo_gstate_get_miter_limit (cairo_gstate_t *gstate);
+
+cairo_private void
+_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix);
+
+cairo_private cairo_status_t
+_cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty);
+
+cairo_private cairo_status_t
+_cairo_gstate_scale (cairo_gstate_t *gstate, double sx, double sy);
+
+cairo_private cairo_status_t
+_cairo_gstate_rotate (cairo_gstate_t *gstate, double angle);
+
+cairo_private cairo_status_t
+_cairo_gstate_transform (cairo_gstate_t	      *gstate,
+			 const cairo_matrix_t *matrix);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_matrix (cairo_gstate_t       *gstate,
+			  const cairo_matrix_t *matrix);
+
+cairo_private void
+_cairo_gstate_identity_matrix (cairo_gstate_t *gstate);
+
+cairo_private void
+_cairo_gstate_user_to_device (cairo_gstate_t *gstate, double *x, double *y);
+
+cairo_private void
+_cairo_gstate_user_to_device_distance (cairo_gstate_t *gstate, double *dx, double *dy);
+
+cairo_private void
+_cairo_gstate_device_to_user (cairo_gstate_t *gstate, double *x, double *y);
+
+cairo_private void
+_cairo_gstate_device_to_user_distance (cairo_gstate_t *gstate, double *dx, double *dy);
+
+cairo_private void
+_do_cairo_gstate_user_to_backend (cairo_gstate_t *gstate, double *x, double *y);
+
+static inline void
+_cairo_gstate_user_to_backend (cairo_gstate_t *gstate, double *x, double *y)
+{
+    if (! gstate->is_identity)
+	_do_cairo_gstate_user_to_backend (gstate, x, y);
+}
+
+cairo_private void
+_do_cairo_gstate_backend_to_user (cairo_gstate_t *gstate, double *x, double *y);
+
+static inline void
+_cairo_gstate_backend_to_user (cairo_gstate_t *gstate, double *x, double *y)
+{
+    if (! gstate->is_identity)
+	_do_cairo_gstate_backend_to_user (gstate, x, y);
+}
+
+cairo_private void
+_cairo_gstate_backend_to_user_rectangle (cairo_gstate_t *gstate,
+                                         double *x1, double *y1,
+                                         double *x2, double *y2,
+                                         cairo_bool_t *is_tight);
+
+cairo_private void
+_cairo_gstate_path_extents (cairo_gstate_t     *gstate,
+			    cairo_path_fixed_t *path,
+			    double *x1, double *y1,
+			    double *x2, double *y2);
+
+cairo_private cairo_status_t
+_cairo_gstate_paint (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_mask (cairo_gstate_t  *gstate,
+		    cairo_pattern_t *mask);
+
+cairo_private cairo_status_t
+_cairo_gstate_stroke (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
+
+cairo_private cairo_status_t
+_cairo_gstate_fill (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
+
+cairo_private cairo_status_t
+_cairo_gstate_copy_page (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_show_page (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_stroke_extents (cairo_gstate_t	 *gstate,
+			      cairo_path_fixed_t *path,
+                              double *x1, double *y1,
+			      double *x2, double *y2);
+
+cairo_private cairo_status_t
+_cairo_gstate_fill_extents (cairo_gstate_t     *gstate,
+			    cairo_path_fixed_t *path,
+                            double *x1, double *y1,
+			    double *x2, double *y2);
+
+cairo_private cairo_status_t
+_cairo_gstate_in_stroke (cairo_gstate_t	    *gstate,
+			 cairo_path_fixed_t *path,
+			 double		     x,
+			 double		     y,
+			 cairo_bool_t	    *inside_ret);
+
+cairo_private cairo_bool_t
+_cairo_gstate_in_fill (cairo_gstate_t	  *gstate,
+		       cairo_path_fixed_t *path,
+		       double		   x,
+		       double		   y);
+
+cairo_private cairo_bool_t
+_cairo_gstate_in_clip (cairo_gstate_t	  *gstate,
+		       double		   x,
+		       double		   y);
+
+cairo_private cairo_status_t
+_cairo_gstate_clip (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
+
+cairo_private cairo_status_t
+_cairo_gstate_reset_clip (cairo_gstate_t *gstate);
+
+cairo_private cairo_bool_t
+_cairo_gstate_clip_extents (cairo_gstate_t *gstate,
+		            double         *x1,
+		            double         *y1,
+			    double         *x2,
+			    double         *y2);
+
+cairo_private cairo_rectangle_list_t*
+_cairo_gstate_copy_clip_rectangle_list (cairo_gstate_t *gstate);
+
+cairo_private cairo_status_t
+_cairo_gstate_show_surface (cairo_gstate_t	*gstate,
+			    cairo_surface_t	*surface,
+			    double		 x,
+			    double		 y,
+			    double		width,
+			    double		height);
+
+cairo_private cairo_status_t
+_cairo_gstate_select_font_face (cairo_gstate_t *gstate,
+				const char *family,
+				cairo_font_slant_t slant,
+				cairo_font_weight_t weight);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_font_size (cairo_gstate_t *gstate,
+			     double          size);
+
+cairo_private void
+_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
+			       cairo_matrix_t *matrix);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate,
+			       const cairo_matrix_t *matrix);
+
+cairo_private void
+_cairo_gstate_get_font_options (cairo_gstate_t       *gstate,
+				cairo_font_options_t *options);
+
+cairo_private void
+_cairo_gstate_set_font_options (cairo_gstate_t	           *gstate,
+				const cairo_font_options_t *options);
+
+cairo_private cairo_status_t
+_cairo_gstate_get_font_face (cairo_gstate_t     *gstate,
+			     cairo_font_face_t **font_face);
+
+cairo_private cairo_status_t
+_cairo_gstate_get_scaled_font (cairo_gstate_t       *gstate,
+			       cairo_scaled_font_t **scaled_font);
+
+cairo_private cairo_status_t
+_cairo_gstate_get_font_extents (cairo_gstate_t *gstate,
+				cairo_font_extents_t *extents);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
+			     cairo_font_face_t *font_face);
+
+cairo_private cairo_status_t
+_cairo_gstate_text_to_glyphs (cairo_gstate_t	         *gstate,
+			      double		          x,
+			      double		          y,
+			      const char	         *utf8,
+			      int		          utf8_len,
+			      cairo_glyph_t	        **glyphs,
+			      int		         *num_glyphs,
+			      cairo_text_cluster_t      **clusters,
+			      int		         *num_clusters,
+			      cairo_text_cluster_flags_t *cluster_flags);
+
+cairo_private cairo_status_t
+_cairo_gstate_glyph_extents (cairo_gstate_t *gstate,
+			     const cairo_glyph_t *glyphs,
+			     int num_glyphs,
+			     cairo_text_extents_t *extents);
+
+cairo_private cairo_status_t
+_cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
+				const char		   *utf8,
+				int			    utf8_len,
+				const cairo_glyph_t	   *glyphs,
+				int			    num_glyphs,
+				const cairo_text_cluster_t *clusters,
+				int			    num_clusters,
+			        cairo_text_cluster_flags_t  cluster_flags);
+
+cairo_private cairo_status_t
+_cairo_gstate_glyph_path (cairo_gstate_t      *gstate,
+			  const cairo_glyph_t *glyphs,
+			  int		       num_glyphs,
+			  cairo_path_fixed_t  *path);
+
+cairo_private cairo_status_t
+_cairo_gstate_set_antialias (cairo_gstate_t *gstate,
+			     cairo_antialias_t antialias);
+
+cairo_private cairo_antialias_t
+_cairo_gstate_get_antialias (cairo_gstate_t *gstate);
+
 #endif /* CAIRO_GSTATE_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-gstate.c b/gfx/cairo/cairo/src/cairo-gstate.c
index ddd6f0a52fe..c04ac7cbe43 100644
--- a/gfx/cairo/cairo/src/cairo-gstate.c
+++ b/gfx/cairo/cairo/src/cairo-gstate.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,11 +35,10 @@
  *	Carl D. Worth <cworth@cworth.org>
  */
 
-#define _GNU_SOURCE
-
 #include "cairoint.h"
 
 #include "cairo-clip-private.h"
+#include "cairo-error-private.h"
 #include "cairo-gstate-private.h"
 
 #if _XOPEN_SOURCE >= 600 || defined (_ISOC99_SOURCE)
@@ -71,6 +70,18 @@ _cairo_gstate_transform_glyphs_to_backend (cairo_gstate_t      *gstate,
 					   int			*num_transformed_glyphs,
 					   cairo_text_cluster_t *transformed_clusters);
 
+static void
+_cairo_gstate_update_device_transform (cairo_observer_t *observer,
+				       void *arg)
+{
+    cairo_gstate_t *gstate = cairo_container_of (observer,
+						 cairo_gstate_t,
+						 device_transform_observer);
+
+    gstate->is_identity = (_cairo_matrix_is_identity (&gstate->ctm) &&
+			   _cairo_matrix_is_identity (&gstate->target->device_transform));
+}
+
 cairo_status_t
 _cairo_gstate_init (cairo_gstate_t  *gstate,
 		    cairo_surface_t *target)
@@ -106,6 +117,11 @@ _cairo_gstate_init (cairo_gstate_t  *gstate,
     gstate->parent_target = NULL;
     gstate->original_target = cairo_surface_reference (target);
 
+    gstate->device_transform_observer.callback = _cairo_gstate_update_device_transform;
+    cairo_list_add (&gstate->device_transform_observer.link,
+		    &gstate->target->device_transform_observers);
+
+    gstate->is_identity = _cairo_matrix_is_identity (&gstate->target->device_transform);
     cairo_matrix_init_identity (&gstate->ctm);
     gstate->ctm_inverse = gstate->ctm;
     gstate->source_ctm_inverse = gstate->ctm;
@@ -115,10 +131,6 @@ _cairo_gstate_init (cairo_gstate_t  *gstate,
     /* Now that the gstate is fully initialized and ready for the eventual
      * _cairo_gstate_fini(), we can check for errors (and not worry about
      * the resource deallocation). */
-
-    if (target == NULL)
-	return _cairo_error (CAIRO_STATUS_NULL_POINTER);
-
     status = target->status;
     if (unlikely (status))
 	return status;
@@ -171,6 +183,11 @@ _cairo_gstate_init_copy (cairo_gstate_t *gstate, cairo_gstate_t *other)
     gstate->parent_target = NULL;
     gstate->original_target = cairo_surface_reference (other->original_target);
 
+    gstate->device_transform_observer.callback = _cairo_gstate_update_device_transform;
+    cairo_list_add (&gstate->device_transform_observer.link,
+		    &gstate->target->device_transform_observers);
+
+    gstate->is_identity = other->is_identity;
     gstate->ctm = other->ctm;
     gstate->ctm_inverse = other->ctm_inverse;
     gstate->source_ctm_inverse = other->source_ctm_inverse;
@@ -198,6 +215,8 @@ _cairo_gstate_fini (cairo_gstate_t *gstate)
 
     _cairo_clip_reset (&gstate->clip);
 
+    cairo_list_del (&gstate->device_transform_observer.link);
+
     cairo_surface_destroy (gstate->target);
     gstate->target = NULL;
 
@@ -307,6 +326,9 @@ _cairo_gstate_redirect_target (cairo_gstate_t *gstate, cairo_surface_t *child)
     /* Now set up our new target; we overwrite gstate->target directly,
      * since its ref is now owned by gstate->parent_target */
     gstate->target = cairo_surface_reference (child);
+    gstate->is_identity &= _cairo_matrix_is_identity (&child->device_transform);
+    cairo_list_move (&gstate->device_transform_observer.link,
+		     &gstate->target->device_transform_observers);
 
     /* The clip is in surface backend coordinates for the previous target;
      * translate it into the child's backend coordinates. */
@@ -413,8 +435,7 @@ _cairo_gstate_get_source (cairo_gstate_t *gstate)
 {
     if (gstate->source == &_cairo_pattern_black.base) {
 	/* do not expose the static object to the user */
-	gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK,
-						      CAIRO_CONTENT_COLOR);
+        gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK);
     }
 
     return gstate->source;
@@ -533,6 +554,7 @@ _cairo_gstate_set_dash (cairo_gstate_t *gstate, const double *dash, int num_dash
     for (i = 0; i < gstate->stroke_style.num_dashes; i++) {
 	if (gstate->stroke_style.dash[i] < 0)
 	    return _cairo_error (CAIRO_STATUS_INVALID_DASH);
+
 	dash_total += gstate->stroke_style.dash[i];
     }
 
@@ -563,10 +585,11 @@ _cairo_gstate_get_dash (cairo_gstate_t *gstate,
 			int            *num_dashes,
 			double         *offset)
 {
-    if (dashes)
+    if (dashes) {
 	memcpy (dashes,
 		gstate->stroke_style.dash,
 		sizeof (double) * gstate->stroke_style.num_dashes);
+    }
 
     if (num_dashes)
 	*num_dashes = gstate->stroke_style.num_dashes;
@@ -607,6 +630,7 @@ _cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty)
 
     cairo_matrix_init_translate (&tmp, tx, ty);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
+    gstate->is_identity = FALSE;
 
     /* paranoid check against gradual numerical instability */
     if (! _cairo_matrix_is_invertible (&gstate->ctm))
@@ -632,6 +656,7 @@ _cairo_gstate_scale (cairo_gstate_t *gstate, double sx, double sy)
 
     cairo_matrix_init_scale (&tmp, sx, sy);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
+    gstate->is_identity = FALSE;
 
     /* paranoid check against gradual numerical instability */
     if (! _cairo_matrix_is_invertible (&gstate->ctm))
@@ -658,6 +683,7 @@ _cairo_gstate_rotate (cairo_gstate_t *gstate, double angle)
 
     cairo_matrix_init_rotate (&tmp, angle);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
+    gstate->is_identity = FALSE;
 
     /* paranoid check against gradual numerical instability */
     if (! _cairo_matrix_is_invertible (&gstate->ctm))
@@ -676,6 +702,9 @@ _cairo_gstate_transform (cairo_gstate_t	      *gstate,
     cairo_matrix_t tmp;
     cairo_status_t status;
 
+    if (! _cairo_matrix_is_invertible (matrix))
+	return _cairo_error (CAIRO_STATUS_INVALID_MATRIX);
+
     if (_cairo_matrix_is_identity (matrix))
 	return CAIRO_STATUS_SUCCESS;
 
@@ -688,6 +717,7 @@ _cairo_gstate_transform (cairo_gstate_t	      *gstate,
 
     cairo_matrix_multiply (&gstate->ctm, matrix, &gstate->ctm);
     cairo_matrix_multiply (&gstate->ctm_inverse, &gstate->ctm_inverse, &tmp);
+    gstate->is_identity = FALSE;
 
     /* paranoid check against gradual numerical instability */
     if (! _cairo_matrix_is_invertible (&gstate->ctm))
@@ -708,12 +738,18 @@ _cairo_gstate_set_matrix (cairo_gstate_t       *gstate,
     if (! _cairo_matrix_is_invertible (matrix))
 	return _cairo_error (CAIRO_STATUS_INVALID_MATRIX);
 
+    if (_cairo_matrix_is_identity (matrix)) {
+	_cairo_gstate_identity_matrix (gstate);
+	return CAIRO_STATUS_SUCCESS;
+    }
+
     _cairo_gstate_unset_scaled_font (gstate);
 
     gstate->ctm = *matrix;
     gstate->ctm_inverse = *matrix;
     status = cairo_matrix_invert (&gstate->ctm_inverse);
     assert (status == CAIRO_STATUS_SUCCESS);
+    gstate->is_identity = FALSE;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -728,6 +764,7 @@ _cairo_gstate_identity_matrix (cairo_gstate_t *gstate)
 
     cairo_matrix_init_identity (&gstate->ctm);
     cairo_matrix_init_identity (&gstate->ctm_inverse);
+    gstate->is_identity = _cairo_matrix_is_identity (&gstate->target->device_transform);
 }
 
 void
@@ -757,14 +794,14 @@ _cairo_gstate_device_to_user_distance (cairo_gstate_t *gstate,
 }
 
 void
-_cairo_gstate_user_to_backend (cairo_gstate_t *gstate, double *x, double *y)
+_do_cairo_gstate_user_to_backend (cairo_gstate_t *gstate, double *x, double *y)
 {
     cairo_matrix_transform_point (&gstate->ctm, x, y);
     cairo_matrix_transform_point (&gstate->target->device_transform, x, y);
 }
 
 void
-_cairo_gstate_backend_to_user (cairo_gstate_t *gstate, double *x, double *y)
+_do_cairo_gstate_backend_to_user (cairo_gstate_t *gstate, double *x, double *y)
 {
     cairo_matrix_transform_point (&gstate->target->device_transform_inverse, x, y);
     cairo_matrix_transform_point (&gstate->ctm_inverse, x, y);
@@ -802,14 +839,25 @@ _cairo_gstate_path_extents (cairo_gstate_t     *gstate,
 			    double *x1, double *y1,
 			    double *x2, double *y2)
 {
+    cairo_box_t box;
     double px1, py1, px2, py2;
 
-    _cairo_path_fixed_bounds (path,
-			      &px1, &py1, &px2, &py2);
+    if (_cairo_path_fixed_extents (path, &box)) {
+	px1 = _cairo_fixed_to_double (box.p1.x);
+	py1 = _cairo_fixed_to_double (box.p1.y);
+	px2 = _cairo_fixed_to_double (box.p2.x);
+	py2 = _cairo_fixed_to_double (box.p2.y);
+
+	_cairo_gstate_backend_to_user_rectangle (gstate,
+						 &px1, &py1, &px2, &py2,
+						 NULL);
+    } else {
+	px1 = 0.0;
+	py1 = 0.0;
+	px2 = 0.0;
+	py2 = 0.0;
+    }
 
-    _cairo_gstate_backend_to_user_rectangle (gstate,
-					     &px1, &py1, &px2, &py2,
-					     NULL);
     if (x1)
 	*x1 = px1;
     if (y1)
@@ -820,70 +868,32 @@ _cairo_gstate_path_extents (cairo_gstate_t     *gstate,
 	*y2 = py2;
 }
 
-static void
-_init_solid_for_color_stop (cairo_solid_pattern_t *solid,
-			    const cairo_color_t *color)
-{
-    cairo_color_t premult;
-
-    /* Color stops aren't premultiplied, so fix that here */
-    _cairo_color_init_rgba (&premult,
-			    color->red,
-			    color->green,
-			    color->blue,
-			    color->alpha);
-    _cairo_pattern_init_solid (solid, &premult, CAIRO_CONTENT_COLOR_ALPHA);
-}
-
 static void
 _cairo_gstate_copy_pattern (cairo_pattern_t *pattern,
 			    const cairo_pattern_t *original)
 {
     /* First check if the we can replace the original with a much simpler
      * pattern. For example, gradients that are uniform or just have a single
-     * stop can be replace with a solid.
+     * stop can sometimes be replaced with a solid.
      */
-    switch (original->type) {
-    case CAIRO_PATTERN_TYPE_SOLID:
-    case CAIRO_PATTERN_TYPE_SURFACE:
-	break;
 
-    case CAIRO_PATTERN_TYPE_LINEAR:
-    case CAIRO_PATTERN_TYPE_RADIAL:
+    if (_cairo_pattern_is_clear (original)) {
+        _cairo_pattern_init_solid ((cairo_solid_pattern_t *) pattern,
+				   CAIRO_COLOR_TRANSPARENT);
+	return;
+    }
+
+    if (original->type == CAIRO_PATTERN_TYPE_LINEAR ||
+	original->type == CAIRO_PATTERN_TYPE_RADIAL)
+    {
+        cairo_color_t color;
+	if (_cairo_gradient_pattern_is_solid ((cairo_gradient_pattern_t *) original,
+					      NULL,
+					      &color))
 	{
-	    cairo_gradient_pattern_t *src = (cairo_gradient_pattern_t *) original;
-
-	    /* fast path for gradients with less than 2 color stops */
-	    if (src->n_stops < 2) {
-		if (src->n_stops) {
-		    _init_solid_for_color_stop ((cairo_solid_pattern_t *) pattern,
-						&src->stops->color);
-		} else {
-		    _cairo_pattern_init_solid ((cairo_solid_pattern_t *) pattern,
-					       CAIRO_COLOR_TRANSPARENT,
-					       CAIRO_CONTENT_ALPHA);
-		}
-
-		return;
-	    } else {
-		unsigned int i;
-
-		/* Is the gradient a uniform colour?
-		 * Happens more often than you would believe.
-		 */
-		for (i = 1; i < src->n_stops; i++) {
-		    if (! _cairo_color_equal (&src->stops[0].color,
-					      &src->stops[i].color))
-		    {
-			break;
-		    }
-		}
-		if (i == src->n_stops) {
-		    _init_solid_for_color_stop ((cairo_solid_pattern_t *) pattern,
-						&src->stops->color);
-		    return;
-		}
-	    }
+	    _cairo_pattern_init_solid ((cairo_solid_pattern_t *) pattern,
+				       &color);
+	    return;
 	}
     }
 
@@ -913,9 +923,10 @@ _cairo_gstate_copy_transformed_pattern (cairo_gstate_t  *gstate,
     if (! _cairo_matrix_is_identity (ctm_inverse))
 	_cairo_pattern_transform (pattern, ctm_inverse);
 
-    if (_cairo_surface_has_device_transform (gstate->target))
+    if (_cairo_surface_has_device_transform (gstate->target)) {
         _cairo_pattern_transform (pattern,
                                   &gstate->target->device_transform_inverse);
+    }
 }
 
 static void
@@ -970,24 +981,73 @@ _clipped (cairo_gstate_t *gstate)
     return _cairo_clip_get_region (&gstate->clip, NULL) == CAIRO_INT_STATUS_NOTHING_TO_DO;
 }
 
+static cairo_operator_t
+_reduce_op (cairo_gstate_t *gstate)
+{
+    cairo_operator_t op;
+    const cairo_pattern_t *pattern;
+
+    op = gstate->op;
+    if (op != CAIRO_OPERATOR_SOURCE)
+	return op;
+
+    pattern = gstate->source;
+    if (pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
+	const cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) pattern;
+	if (solid->color.alpha_short <= 0x00ff) {
+	    op = CAIRO_OPERATOR_CLEAR;
+	} else if ((gstate->target->content & CAIRO_CONTENT_ALPHA) == 0) {
+	    if ((solid->color.red_short |
+		 solid->color.green_short |
+		 solid->color.blue_short) <= 0x00ff)
+	    {
+		op = CAIRO_OPERATOR_CLEAR;
+	    }
+	}
+    } else if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE) {
+	const cairo_surface_pattern_t *surface = (cairo_surface_pattern_t *) pattern;
+	if (surface->surface->is_clear &&
+	    surface->surface->content & CAIRO_CONTENT_ALPHA)
+	{
+	    op = CAIRO_OPERATOR_CLEAR;
+	}
+    } else {
+	const cairo_gradient_pattern_t *gradient = (cairo_gradient_pattern_t *) pattern;
+	if (gradient->n_stops == 0)
+	    op = CAIRO_OPERATOR_CLEAR;
+    }
+
+    return op;
+}
+
 cairo_status_t
 _cairo_gstate_paint (cairo_gstate_t *gstate)
 {
-    cairo_pattern_union_t pattern;
+    cairo_pattern_union_t source_pattern;
+    const cairo_pattern_t *pattern;
     cairo_clip_t clip;
     cairo_status_t status;
+    cairo_operator_t op;
 
     if (unlikely (gstate->source->status))
 	return gstate->source->status;
 
+    if (gstate->op == CAIRO_OPERATOR_DEST)
+	return CAIRO_STATUS_SUCCESS;
+
     if (_clipped (gstate))
 	return CAIRO_STATUS_SUCCESS;
 
-    _cairo_gstate_copy_transformed_source (gstate, &pattern.base);
+    op = _reduce_op (gstate);
+    if (op == CAIRO_OPERATOR_CLEAR) {
+	pattern = &_cairo_pattern_clear.base;
+    } else {
+	_cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+	pattern = &source_pattern.base;
+    }
 
     status = _cairo_surface_paint (gstate->target,
-				   gstate->op,
-				   &pattern.base,
+				   op, pattern,
 				   _gstate_get_clip (gstate, &clip));
     _cairo_clip_fini (&clip);
 
@@ -999,6 +1059,8 @@ _cairo_gstate_mask (cairo_gstate_t  *gstate,
 		    cairo_pattern_t *mask)
 {
     cairo_pattern_union_t source_pattern, mask_pattern;
+    const cairo_pattern_t *source;
+    cairo_operator_t op;
     cairo_clip_t clip;
     cairo_status_t status;
 
@@ -1008,46 +1070,59 @@ _cairo_gstate_mask (cairo_gstate_t  *gstate,
     if (unlikely (gstate->source->status))
 	return gstate->source->status;
 
+    if (gstate->op == CAIRO_OPERATOR_DEST)
+	return CAIRO_STATUS_SUCCESS;
+
     if (_clipped (gstate))
 	return CAIRO_STATUS_SUCCESS;
 
-    if (_cairo_pattern_is_opaque (mask))
+    if (_cairo_pattern_is_opaque (mask, NULL))
 	return _cairo_gstate_paint (gstate);
 
-    _cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+    if (_cairo_pattern_is_clear (mask) &&
+	_cairo_operator_bounded_by_mask (gstate->op))
+    {
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    op = _reduce_op (gstate);
+    if (op == CAIRO_OPERATOR_CLEAR) {
+	source = &_cairo_pattern_clear.base;
+    } else {
+	_cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+	source = &source_pattern.base;
+    }
     _cairo_gstate_copy_transformed_mask (gstate, &mask_pattern.base, mask);
 
-    if (source_pattern.type == CAIRO_PATTERN_TYPE_SOLID &&
-	mask_pattern.type == CAIRO_PATTERN_TYPE_SOLID)
+    if (source->type == CAIRO_PATTERN_TYPE_SOLID &&
+	mask_pattern.type == CAIRO_PATTERN_TYPE_SOLID &&
+	_cairo_operator_bounded_by_source (op))
     {
+	const cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) source;
 	cairo_color_t combined;
 
 	if (mask_pattern.base.has_component_alpha) {
 #define M(R, A, B, c) R.c = A.c * B.c
-	    M(combined, source_pattern.solid.color, mask_pattern.solid.color, red);
-	    M(combined, source_pattern.solid.color, mask_pattern.solid.color, green);
-	    M(combined, source_pattern.solid.color, mask_pattern.solid.color, blue);
-	    M(combined, source_pattern.solid.color, mask_pattern.solid.color, alpha);
+	    M(combined, solid->color, mask_pattern.solid.color, red);
+	    M(combined, solid->color, mask_pattern.solid.color, green);
+	    M(combined, solid->color, mask_pattern.solid.color, blue);
+	    M(combined, solid->color, mask_pattern.solid.color, alpha);
 #undef M
 	} else {
-	    combined = source_pattern.solid.color;
+	    combined = solid->color;
 	    _cairo_color_multiply_alpha (&combined, mask_pattern.solid.color.alpha);
 	}
 
-	_cairo_pattern_init_solid (&source_pattern.solid, &combined,
-				   source_pattern.solid.content |
-				   mask_pattern.solid.content);
+	_cairo_pattern_init_solid (&source_pattern.solid, &combined);
 
-	status = _cairo_surface_paint (gstate->target,
-				       gstate->op,
+	status = _cairo_surface_paint (gstate->target, op,
 				       &source_pattern.base,
 				       _gstate_get_clip (gstate, &clip));
     }
     else
     {
-	status = _cairo_surface_mask (gstate->target,
-				      gstate->op,
-				      &source_pattern.base,
+	status = _cairo_surface_mask (gstate->target, op,
+				      source,
 				      &mask_pattern.base,
 				      _gstate_get_clip (gstate, &clip));
     }
@@ -1060,25 +1135,39 @@ cairo_status_t
 _cairo_gstate_stroke (cairo_gstate_t *gstate, cairo_path_fixed_t *path)
 {
     cairo_pattern_union_t source_pattern;
+    cairo_stroke_style_t style;
+    double dash[2];
     cairo_clip_t clip;
     cairo_status_t status;
 
     if (unlikely (gstate->source->status))
 	return gstate->source->status;
 
+    if (gstate->op == CAIRO_OPERATOR_DEST)
+	return CAIRO_STATUS_SUCCESS;
+
     if (gstate->stroke_style.line_width <= 0.0)
 	return CAIRO_STATUS_SUCCESS;
 
     if (_clipped (gstate))
 	return CAIRO_STATUS_SUCCESS;
 
+    memcpy (&style, &gstate->stroke_style, sizeof (gstate->stroke_style));
+    if (_cairo_stroke_style_dash_can_approximate (&gstate->stroke_style, &gstate->ctm, gstate->tolerance)) {
+        style.dash = dash;
+        _cairo_stroke_style_dash_approximate (&gstate->stroke_style, &gstate->ctm, gstate->tolerance,
+					      &style.dash_offset,
+					      style.dash,
+					      &style.num_dashes);
+    }
+
     _cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
 
     status = _cairo_surface_stroke (gstate->target,
 				    gstate->op,
 				    &source_pattern.base,
 				    path,
-				    &gstate->stroke_style,
+				    &style,
 				    &gstate->ctm,
 				    &gstate->ctm_inverse,
 				    gstate->tolerance,
@@ -1150,13 +1239,15 @@ BAIL:
 cairo_status_t
 _cairo_gstate_fill (cairo_gstate_t *gstate, cairo_path_fixed_t *path)
 {
-    cairo_pattern_union_t pattern;
     cairo_clip_t clip;
     cairo_status_t status;
 
     if (unlikely (gstate->source->status))
 	return gstate->source->status;
 
+    if (gstate->op == CAIRO_OPERATOR_DEST)
+	return CAIRO_STATUS_SUCCESS;
+
     if (_clipped (gstate))
 	return CAIRO_STATUS_SUCCESS;
 
@@ -1164,24 +1255,45 @@ _cairo_gstate_fill (cairo_gstate_t *gstate, cairo_path_fixed_t *path)
 	if (_cairo_operator_bounded_by_mask (gstate->op))
 	    return CAIRO_STATUS_SUCCESS;
 
-	_cairo_pattern_init_solid (&pattern.solid,
-				   CAIRO_COLOR_TRANSPARENT,
-				   CAIRO_CONTENT_COLOR_ALPHA);
 	status = _cairo_surface_paint (gstate->target,
 				       CAIRO_OPERATOR_CLEAR,
-				       &pattern.base,
+				       &_cairo_pattern_clear.base,
 				       _gstate_get_clip (gstate, &clip));
     } else {
-	_cairo_gstate_copy_transformed_source (gstate, &pattern.base);
+	cairo_pattern_union_t source_pattern;
+	const cairo_pattern_t *pattern;
+	cairo_operator_t op;
+	cairo_rectangle_int_t extents;
+	cairo_box_t box;
 
-	status = _cairo_surface_fill (gstate->target,
-				      gstate->op,
-				      &pattern.base,
-				      path,
-				      gstate->fill_rule,
-				      gstate->tolerance,
-				      gstate->antialias,
-				      _gstate_get_clip (gstate, &clip));
+	op = _reduce_op (gstate);
+	if (op == CAIRO_OPERATOR_CLEAR) {
+	    pattern = &_cairo_pattern_clear.base;
+	} else {
+	    _cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+	    pattern = &source_pattern.base;
+	}
+
+	/* Toolkits often paint the entire background with a fill */
+	if (_cairo_surface_get_extents (gstate->target, &extents) &&
+	    _cairo_path_fixed_is_box (path, &box) &&
+	    box.p1.x <= _cairo_fixed_from_int (extents.x) &&
+	    box.p1.y <= _cairo_fixed_from_int (extents.y) &&
+	    box.p2.x >= _cairo_fixed_from_int (extents.x + extents.width) &&
+	    box.p2.y >= _cairo_fixed_from_int (extents.y + extents.height))
+	{
+	    status = _cairo_surface_paint (gstate->target, op, pattern,
+					   _gstate_get_clip (gstate, &clip));
+	}
+	else
+	{
+	    status = _cairo_surface_fill (gstate->target, op, pattern,
+					  path,
+					  gstate->fill_rule,
+					  gstate->tolerance,
+					  gstate->antialias,
+					  _gstate_get_clip (gstate, &clip));
+	}
     }
 
     _cairo_clip_fini (&clip);
@@ -1793,16 +1905,21 @@ _cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
 				cairo_text_cluster_flags_t  cluster_flags)
 {
     cairo_pattern_union_t source_pattern;
+    const cairo_pattern_t *pattern;
     cairo_glyph_t stack_transformed_glyphs[CAIRO_STACK_ARRAY_LENGTH (cairo_glyph_t)];
     cairo_glyph_t *transformed_glyphs;
     cairo_text_cluster_t stack_transformed_clusters[CAIRO_STACK_ARRAY_LENGTH (cairo_text_cluster_t)];
     cairo_text_cluster_t *transformed_clusters;
+    cairo_operator_t op;
     cairo_status_t status;
     cairo_clip_t clip;
 
     if (unlikely (gstate->source->status))
 	return gstate->source->status;
 
+    if (gstate->op == CAIRO_OPERATOR_DEST)
+	return CAIRO_STATUS_SUCCESS;
+
     if (_clipped (gstate))
 	return CAIRO_STATUS_SUCCESS;
 
@@ -1845,7 +1962,13 @@ _cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
     if (status || num_glyphs == 0)
 	goto CLEANUP_GLYPHS;
 
-    _cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+    op = _reduce_op (gstate);
+    if (op == CAIRO_OPERATOR_CLEAR) {
+	pattern = &_cairo_pattern_clear.base;
+    } else {
+	_cairo_gstate_copy_transformed_source (gstate, &source_pattern.base);
+	pattern = &source_pattern.base;
+    }
     _cairo_clip_init(&clip);
 
     /* For really huge font sizes, we can just do path;fill instead of
@@ -1864,10 +1987,9 @@ _cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
      * Needless to say, do this only if show_text_glyphs is not available. */
     if (cairo_surface_has_show_text_glyphs (gstate->target) ||
 	_cairo_scaled_font_get_max_scale (gstate->scaled_font) <=
-	_cairo_surface_get_text_path_fill_threshold (gstate->target)) {
-	status = _cairo_surface_show_text_glyphs (gstate->target,
-						  gstate->op,
-						  &source_pattern.base,
+	_cairo_surface_get_text_path_fill_threshold (gstate->target))
+    {
+	status = _cairo_surface_show_text_glyphs (gstate->target, op, pattern,
 						  utf8, utf8_len,
 						  transformed_glyphs, num_glyphs,
 						  transformed_clusters, num_clusters,
@@ -1886,9 +2008,7 @@ _cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
 						&path);
 
 	if (status == CAIRO_STATUS_SUCCESS) {
-	    status = _cairo_surface_fill (gstate->target,
-					  gstate->op,
-					  &source_pattern.base,
+	    status = _cairo_surface_fill (gstate->target, op, pattern,
 					  &path,
 					  CAIRO_FILL_RULE_WINDING,
 					  gstate->tolerance,
@@ -2044,6 +2164,7 @@ _cairo_gstate_transform_glyphs_to_backend (cairo_gstate_t	*gstate,
 	if (! drop) {
 	    memcpy (transformed_glyphs, glyphs,
 		    num_glyphs * sizeof (cairo_glyph_t));
+	    j = num_glyphs;
 	} else if (num_clusters == 0) {
 	    for (i = 0; i < num_glyphs; i++) {
 		transformed_glyphs[j].index = glyphs[i].index;
diff --git a/gfx/cairo/cairo/src/cairo-hash-private.h b/gfx/cairo/cairo/src/cairo-hash-private.h
index 32078bd212c..30e51ffe669 100644
--- a/gfx/cairo/cairo/src/cairo-hash-private.h
+++ b/gfx/cairo/cairo/src/cairo-hash-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-hash.c b/gfx/cairo/cairo/src/cairo-hash.c
index 15159d928b3..81a48a23598 100644
--- a/gfx/cairo/cairo/src/cairo-hash.c
+++ b/gfx/cairo/cairo/src/cairo-hash.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 /*
  * An entry can be in one of three states:
diff --git a/gfx/cairo/cairo/src/cairo-hull.c b/gfx/cairo/cairo/src/cairo-hull.c
index 8a1a31e24e3..c65593327f6 100644
--- a/gfx/cairo/cairo/src/cairo-hull.c
+++ b/gfx/cairo/cairo/src/cairo-hull.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -36,6 +36,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-slope-private.h"
 
 typedef struct cairo_hull {
@@ -94,6 +95,13 @@ _cairo_hull_vertex_compare (const void *av, const void *bv)
     cairo_hull_t *b = (cairo_hull_t *) bv;
     int ret;
 
+    /* Some libraries are reported to actually compare identical
+     * pointers and require the result to be 0. This is the crazy world we
+     * have to live in.
+     */
+    if (a == b)
+	return 0;
+
     ret = _cairo_slope_compare (&a->slope, &b->slope);
 
     /*
diff --git a/gfx/cairo/cairo/src/cairo-image-info-private.h b/gfx/cairo/cairo/src/cairo-image-info-private.h
index 6e1c4ad751c..0d9ef84985f 100644
--- a/gfx/cairo/cairo/src/cairo-image-info-private.h
+++ b/gfx/cairo/cairo/src/cairo-image-info-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -53,11 +53,11 @@ _cairo_image_info_get_jpeg_info (cairo_image_info_t	*info,
 cairo_private cairo_int_status_t
 _cairo_image_info_get_jpx_info (cairo_image_info_t	*info,
 				const unsigned char	*data,
-				long			 length);
+				unsigned long		 length);
 
 cairo_private cairo_int_status_t
-_cairo_image_info_get_png_info (cairo_image_info_t     	*info,
+_cairo_image_info_get_png_info (cairo_image_info_t	*info,
 				const unsigned char     *data,
-				long                     length);
+				unsigned long            length);
 
 #endif /* CAIRO_IMAGE_INFO_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-image-info.c b/gfx/cairo/cairo/src/cairo-image-info.c
index 8fc770550ec..63201e65bee 100644
--- a/gfx/cairo/cairo/src/cairo-image-info.c
+++ b/gfx/cairo/cairo/src/cairo-image-info.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -214,7 +214,7 @@ _jpx_extract_info (const unsigned char *p, cairo_image_info_t *info)
 cairo_int_status_t
 _cairo_image_info_get_jpx_info (cairo_image_info_t	*info,
 				const unsigned char	*data,
-				long			 length)
+				unsigned long		 length)
 {
     const unsigned char *p = data;
     const unsigned char *end = data + length;
@@ -262,7 +262,7 @@ static const unsigned char _png_magic[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
 cairo_int_status_t
 _cairo_image_info_get_png_info (cairo_image_info_t     *info,
                                const unsigned char     *data,
-                               long                     length)
+                               unsigned long            length)
 {
     const unsigned char *p = data;
     const unsigned char *end = data + length;
diff --git a/gfx/cairo/cairo/src/cairo-image-surface.c b/gfx/cairo/cairo/src/cairo-image-surface.c
index 1ca25b0b722..10c302e680a 100644
--- a/gfx/cairo/cairo/src/cairo-image-surface.c
+++ b/gfx/cairo/cairo/src/cairo-image-surface.c
@@ -2,6 +2,7 @@
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2003 University of Southern California
+ * Copyright © 2009,2010 Intel Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -13,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -33,17 +34,59 @@
  *
  * Contributor(s):
  *	Carl D. Worth <cworth@cworth.org>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #include "cairoint.h"
 
+#include "cairo-boxes-private.h"
 #include "cairo-clip-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-region-private.h"
+#include "cairo-scaled-font-private.h"
+#include "cairo-surface-snapshot-private.h"
+#include "cairo-surface-subsurface-private.h"
 
 /* Limit on the width / height of an image surface in pixels.  This is
  * mainly determined by coordinates of things sent to pixman at the
  * moment being in 16.16 format. */
 #define MAX_IMAGE_SIZE 32767
+#define PIXMAN_MAX_INT ((pixman_fixed_1 >> 1) - pixman_fixed_e) /* need to ensure deltas also fit */
+
+/**
+ * SECTION:cairo-image
+ * @Title: Image Surfaces
+ * @Short_Description: Rendering to memory buffers
+ * @See_Also: #cairo_surface_t
+ *
+ * Image surfaces provide the ability to render to memory buffers
+ * either allocated by cairo or by the calling code.  The supported
+ * image formats are those defined in #cairo_format_t.
+ */
+
+/**
+ * CAIRO_HAS_IMAGE_SURFACE:
+ *
+ * Defined if the image surface backend is available.
+ * The image surface backend is always built in.
+ * This macro was added for completeness in cairo 1.8.
+ *
+ * @Since: 1.8
+ */
+
+static cairo_int_status_t
+_cairo_image_surface_fill (void *dst,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   cairo_path_fixed_t	*path,
+			   cairo_fill_rule_t		 fill_rule,
+			   double			 tolerance,
+			   cairo_antialias_t		 antialias,
+			   cairo_clip_t		*clip);
+
+static pixman_image_t *
+_pixman_image_for_solid (const cairo_solid_pattern_t *pattern);
 
 static cairo_bool_t
 _cairo_image_surface_is_size_valid (int width, int height)
@@ -52,7 +95,7 @@ _cairo_image_surface_is_size_valid (int width, int height)
 	   0 <= height && height <= MAX_IMAGE_SIZE;
 }
 
-static cairo_format_t
+cairo_format_t
 _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
 {
     switch (pixman_format) {
@@ -77,18 +120,12 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
     case PIXMAN_a1r1g1b1: case PIXMAN_a1b1g1r1: case PIXMAN_c4:
     case PIXMAN_g4:       case PIXMAN_g1:
     case PIXMAN_yuy2:     case PIXMAN_yv12:
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,11,9)
-    case PIXMAN_x2b10g10r10:
-    case PIXMAN_a2b10g10r10:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,14,1)
     case PIXMAN_b8g8r8x8:
     case PIXMAN_b8g8r8a8:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,15,16)
+    case PIXMAN_x2b10g10r10:
+    case PIXMAN_a2b10g10r10:
     case PIXMAN_x2r10g10b10:
     case PIXMAN_a2r10g10b10:
-#endif
     default:
 	return CAIRO_FORMAT_INVALID;
     }
@@ -96,69 +133,18 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
     return CAIRO_FORMAT_INVALID;
 }
 
-static cairo_content_t
+cairo_content_t
 _cairo_content_from_pixman_format (pixman_format_code_t pixman_format)
 {
-    switch (pixman_format) {
-    case PIXMAN_a8r8g8b8:
-    case PIXMAN_a8b8g8r8:
-    case PIXMAN_a1r5g5b5:
-    case PIXMAN_a1b5g5r5:
-    case PIXMAN_a4r4g4b4:
-    case PIXMAN_a4b4g4r4:
-    case PIXMAN_a2r2g2b2:
-    case PIXMAN_a2b2g2r2:
-    case PIXMAN_a1r1g1b1:
-    case PIXMAN_a1b1g1r1:
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,11,9)
-    case PIXMAN_a2b10g10r10:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,14,1)
-    case PIXMAN_b8g8r8a8:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,15,16)
-    case PIXMAN_a2r10g10b10:
-#endif
-	return CAIRO_CONTENT_COLOR_ALPHA;
-    case PIXMAN_x8r8g8b8:
-    case PIXMAN_x8b8g8r8:
-    case PIXMAN_r8g8b8:
-    case PIXMAN_b8g8r8:
-    case PIXMAN_r5g6b5:
-    case PIXMAN_b5g6r5:
-    case PIXMAN_x1r5g5b5:
-    case PIXMAN_x1b5g5r5:
-    case PIXMAN_x4r4g4b4:
-    case PIXMAN_x4b4g4r4:
-    case PIXMAN_r3g3b2:
-    case PIXMAN_b2g3r3:
-    case PIXMAN_c8:
-    case PIXMAN_g8:
-    case PIXMAN_r1g2b1:
-    case PIXMAN_b1g2r1:
-    case PIXMAN_c4:
-    case PIXMAN_g4:
-    case PIXMAN_g1:
-    case PIXMAN_yuy2:
-    case PIXMAN_yv12:
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,11,9)
-    case PIXMAN_x2b10g10r10:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,14,1)
-    case PIXMAN_b8g8r8x8:
-#endif
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,15,16)
-    case PIXMAN_x2r10g10b10:
-#endif
-	return CAIRO_CONTENT_COLOR;
-    case PIXMAN_a8:
-    case PIXMAN_a1:
-    case PIXMAN_x4a4:
-    case PIXMAN_a4:
-	return CAIRO_CONTENT_ALPHA;
-    }
+    cairo_content_t content;
 
-    return CAIRO_CONTENT_COLOR_ALPHA;
+    content = 0;
+    if (PIXMAN_FORMAT_RGB (pixman_format))
+	content |= CAIRO_CONTENT_COLOR;
+    if (PIXMAN_FORMAT_A (pixman_format))
+	content |= CAIRO_CONTENT_ALPHA;
+
+    return content;
 }
 
 cairo_surface_t *
@@ -169,22 +155,20 @@ _cairo_image_surface_create_for_pixman_image (pixman_image_t		*pixman_image,
     int width = pixman_image_get_width (pixman_image);
     int height = pixman_image_get_height (pixman_image);
 
-    if (! _cairo_image_surface_is_size_valid (width, height)) {
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_SIZE));
-    }
-
     surface = malloc (sizeof (cairo_image_surface_t));
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&surface->base, &_cairo_image_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &_cairo_image_surface_backend,
+			 NULL, /* device */
 			 _cairo_content_from_pixman_format (pixman_format));
 
     surface->pixman_image = pixman_image;
 
     surface->pixman_format = pixman_format;
     surface->format = _cairo_format_from_pixman_format (pixman_format);
-    surface->data = (unsigned char *) pixman_image_get_data (pixman_image);
+    surface->data = (uint8_t *) pixman_image_get_data (pixman_image);
     surface->owns_data = FALSE;
     surface->transparency = CAIRO_IMAGE_UNKNOWN;
 
@@ -193,8 +177,6 @@ _cairo_image_surface_create_for_pixman_image (pixman_image_t		*pixman_image,
     surface->stride = pixman_image_get_stride (pixman_image);
     surface->depth = pixman_image_get_depth (pixman_image);
 
-    surface->clip_region = NULL;
-
     return &surface->base;
 }
 
@@ -303,47 +285,7 @@ _pixman_format_to_masks (pixman_format_code_t	 format,
     }
 }
 
-/* XXX: This function really should be eliminated. We don't really
- * want to advertise a cairo image surface that supports any possible
- * format. A minimal step would be to replace this function with one
- * that accepts a #cairo_internal_format_t rather than mask values. */
-cairo_surface_t *
-_cairo_image_surface_create_with_masks (unsigned char	       *data,
-					cairo_format_masks_t   *masks,
-					int			width,
-					int			height,
-					int			stride)
-{
-    pixman_format_code_t pixman_format;
-
-    if (! _pixman_format_from_masks (masks, &pixman_format)) {
-	fprintf (stderr,
-		 "Error: Cairo %s does not yet support the requested image format:\n"
-		 "\tDepth: %d\n"
-		 "\tAlpha mask: 0x%08lx\n"
-		 "\tRed   mask: 0x%08lx\n"
-		 "\tGreen mask: 0x%08lx\n"
-		 "\tBlue  mask: 0x%08lx\n"
-#ifdef PACKAGE_BUGGREPORT
-		 "Please file an enhancement request (quoting the above) at:\n"
-		 PACKAGE_BUGREPORT"\n"
-#endif
-		 ,
-		 cairo_version_string (),
-		 masks->bpp, masks->alpha_mask,
-		 masks->red_mask, masks->green_mask, masks->blue_mask);
-
-	ASSERT_NOT_REACHED;
-    }
-
-    return _cairo_image_surface_create_with_pixman_format (data,
-							   pixman_format,
-							   width,
-							   height,
-							   stride);
-}
-
-static pixman_format_code_t
+pixman_format_code_t
 _cairo_format_to_pixman_format_code (cairo_format_t format)
 {
     pixman_format_code_t ret;
@@ -361,6 +303,7 @@ _cairo_format_to_pixman_format_code (cairo_format_t format)
 	ret = PIXMAN_r5g6b5;
 	break;
     case CAIRO_FORMAT_ARGB32:
+    case CAIRO_FORMAT_INVALID:
     default:
 	ret = PIXMAN_a8r8g8b8;
 	break;
@@ -443,9 +386,6 @@ _cairo_image_surface_create_with_content (cairo_content_t	content,
 					  int			width,
 					  int			height)
 {
-    if (! CAIRO_CONTENT_VALID (content))
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_CONTENT));
-
     return cairo_image_surface_create (_cairo_format_from_content (content),
 				       width, height);
 }
@@ -555,6 +495,9 @@ cairo_image_surface_create_for_data (unsigned char     *data,
     if ((stride & (CAIRO_STRIDE_ALIGNMENT-1)) != 0)
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_STRIDE));
 
+    if (! _cairo_image_surface_is_size_valid (width, height))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_SIZE));
+
     minstride = cairo_format_stride_for_width (format, width);
     if (stride < 0) {
 	if (stride > -minstride) {
@@ -574,21 +517,6 @@ cairo_image_surface_create_for_data (unsigned char     *data,
 }
 slim_hidden_def (cairo_image_surface_create_for_data);
 
-cairo_surface_t *
-_cairo_image_surface_create_for_data_with_content (unsigned char	*data,
-						   cairo_content_t	 content,
-						   int			 width,
-						   int			 height,
-						   int			 stride)
-{
-    if (! CAIRO_CONTENT_VALID (content))
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_CONTENT));
-
-    return cairo_image_surface_create_for_data (data,
-						_cairo_format_from_content (content),
-						width, height, stride);
-}
-
 /**
  * cairo_image_surface_get_data:
  * @surface: a #cairo_image_surface_t
@@ -725,7 +653,7 @@ _cairo_format_from_content (cairo_content_t content)
     }
 
     ASSERT_NOT_REACHED;
-    return CAIRO_FORMAT_ARGB32;
+    return CAIRO_FORMAT_INVALID;
 }
 
 cairo_content_t
@@ -741,6 +669,8 @@ _cairo_content_from_format (cairo_format_t format)
     case CAIRO_FORMAT_A8:
     case CAIRO_FORMAT_A1:
 	return CAIRO_CONTENT_ALPHA;
+    case CAIRO_FORMAT_INVALID:
+	break;
     }
 
     ASSERT_NOT_REACHED;
@@ -761,6 +691,7 @@ _cairo_format_bits_per_pixel (cairo_format_t format)
 	return 8;
     case CAIRO_FORMAT_A1:
 	return 1;
+    case CAIRO_FORMAT_INVALID:
     default:
 	ASSERT_NOT_REACHED;
 	return 0;
@@ -775,6 +706,9 @@ _cairo_image_surface_create_similar (void	       *abstract_other,
 {
     cairo_image_surface_t *other = abstract_other;
 
+    if (! _cairo_image_surface_is_size_valid (width, height))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_SIZE));
+
     if (content == other->base.content) {
 	return _cairo_image_surface_create_with_pixman_format (NULL,
 							       other->pixman_format,
@@ -801,8 +735,6 @@ _cairo_image_surface_finish (void *abstract_surface)
 	surface->data = NULL;
     }
 
-    cairo_region_destroy (surface->clip_region);
-
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -830,176 +762,6 @@ _cairo_image_surface_release_source_image (void                   *abstract_surf
 {
 }
 
-static cairo_status_t
-_cairo_image_surface_acquire_dest_image (void                    *abstract_surface,
-					 cairo_rectangle_int_t   *interest_rect,
-					 cairo_image_surface_t  **image_out,
-					 cairo_rectangle_int_t   *image_rect_out,
-					 void                   **image_extra)
-{
-    cairo_image_surface_t *surface = abstract_surface;
-
-    image_rect_out->x = 0;
-    image_rect_out->y = 0;
-    image_rect_out->width = surface->width;
-    image_rect_out->height = surface->height;
-
-    *image_out = surface;
-    *image_extra = NULL;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-_cairo_image_surface_release_dest_image (void                    *abstract_surface,
-					 cairo_rectangle_int_t   *interest_rect,
-					 cairo_image_surface_t   *image,
-					 cairo_rectangle_int_t   *image_rect,
-					 void                    *image_extra)
-{
-}
-
-static cairo_status_t
-_cairo_image_surface_clone_similar (void		*abstract_surface,
-				    cairo_surface_t	*src,
-				    int                  src_x,
-				    int                  src_y,
-				    int                  width,
-				    int                  height,
-				    int                 *clone_offset_x,
-				    int                 *clone_offset_y,
-				    cairo_surface_t    **clone_out)
-{
-    cairo_image_surface_t *surface = abstract_surface;
-
-    if (src->backend == surface->base.backend) {
-	*clone_offset_x = *clone_offset_y = 0;
-	*clone_out = cairo_surface_reference (src);
-
-	return CAIRO_STATUS_SUCCESS;
-    }
-
-    return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_status_t
-_cairo_image_surface_set_matrix (cairo_image_surface_t	*surface,
-				 const cairo_matrix_t	*matrix,
-				 double xc, double yc)
-{
-    pixman_transform_t pixman_transform;
-
-    _cairo_matrix_to_pixman_matrix (matrix, &pixman_transform, xc, yc);
-
-    if (! pixman_image_set_transform (surface->pixman_image, &pixman_transform))
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_image_surface_set_filter (cairo_image_surface_t *surface,
-				 cairo_filter_t filter)
-{
-    pixman_filter_t pixman_filter;
-
-    switch (filter) {
-    case CAIRO_FILTER_FAST:
-	pixman_filter = PIXMAN_FILTER_FAST;
-	break;
-    case CAIRO_FILTER_GOOD:
-	pixman_filter = PIXMAN_FILTER_GOOD;
-	break;
-    case CAIRO_FILTER_BEST:
-	pixman_filter = PIXMAN_FILTER_BEST;
-	break;
-    case CAIRO_FILTER_NEAREST:
-	pixman_filter = PIXMAN_FILTER_NEAREST;
-	break;
-    case CAIRO_FILTER_BILINEAR:
-	pixman_filter = PIXMAN_FILTER_BILINEAR;
-	break;
-    case CAIRO_FILTER_GAUSSIAN:
-	/* XXX: The GAUSSIAN value has no implementation in cairo
-	 * whatsoever, so it was really a mistake to have it in the
-	 * API. We could fix this by officially deprecating it, or
-	 * else inventing semantics and providing an actual
-	 * implementation for it. */
-    default:
-	pixman_filter = PIXMAN_FILTER_BEST;
-    }
-
-    if (! pixman_image_set_filter (surface->pixman_image,
-				   pixman_filter,
-				   NULL, 0))
-    {
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_image_surface_set_extend (cairo_image_surface_t *surface,
-				 cairo_extend_t extend)
-{
-    pixman_repeat_t pixman_repeat;
-
-    switch (extend) {
-    case CAIRO_EXTEND_NONE:
-	pixman_repeat = PIXMAN_REPEAT_NONE;
-	break;
-    case CAIRO_EXTEND_REPEAT:
-	pixman_repeat = PIXMAN_REPEAT_NORMAL;
-	break;
-    case CAIRO_EXTEND_REFLECT:
-	pixman_repeat = PIXMAN_REPEAT_REFLECT;
-	break;
-    case CAIRO_EXTEND_PAD:
-	pixman_repeat = PIXMAN_REPEAT_PAD;
-	break;
-    }
-
-    pixman_image_set_repeat (surface->pixman_image, pixman_repeat);
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_image_surface_set_component_alpha (cairo_image_surface_t *surface,
-					  cairo_bool_t ca)
-{
-    pixman_image_set_component_alpha (surface->pixman_image, ca);
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_image_surface_set_attributes (cairo_image_surface_t      *surface,
-				     cairo_surface_attributes_t *attributes,
-				     double xc, double yc)
-{
-    cairo_int_status_t status;
-
-    status = _cairo_image_surface_set_matrix (surface, &attributes->matrix,
-					      xc, yc);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_image_surface_set_filter (surface, attributes->filter);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_image_surface_set_extend (surface, attributes->extend);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_image_surface_set_component_alpha (surface,
-						       attributes->has_component_alpha);
-    if (unlikely (status))
-	return status;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 /* XXX: I think we should fix pixman to match the names/order of the
  * cairo operators, but that will likely be better done at the same
  * time the X server is ported to pixman, (which will change a lot of
@@ -1082,24 +844,3325 @@ static cairo_status_t
 _cairo_image_surface_set_clip_region (cairo_image_surface_t *surface,
 				      cairo_region_t *region)
 {
-    if (region == surface->clip_region)
-	return CAIRO_STATUS_SUCCESS;
-
-    if (cairo_region_equal (surface->clip_region, region))
-	return CAIRO_STATUS_SUCCESS;
-
-    cairo_region_destroy (surface->clip_region);
-    surface->clip_region = cairo_region_reference (region);
-
-    if (! pixman_image_set_clip_region32 (surface->pixman_image,
-					  region ? &region->rgn : NULL))
-    {
+    if (! pixman_image_set_clip_region32 (surface->pixman_image, &region->rgn))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_cairo_image_surface_unset_clip_region (cairo_image_surface_t *surface)
+{
+    pixman_image_set_clip_region32 (surface->pixman_image, NULL);
+}
+
+static double
+_pixman_nearest_sample (double d)
+{
+    return ceil (d - .5);
+}
+
+static cairo_bool_t
+_nearest_sample (cairo_filter_t filter, double *tx, double *ty)
+{
+    if (filter == CAIRO_FILTER_FAST || filter == CAIRO_FILTER_NEAREST) {
+	*tx = _pixman_nearest_sample (*tx);
+	*ty = _pixman_nearest_sample (*ty);
+    } else {
+	if (*tx != floor (*tx) || *ty != floor (*ty))
+	    return FALSE;
+    }
+    return fabs (*tx) < PIXMAN_MAX_INT && fabs (*ty) < PIXMAN_MAX_INT;
+}
+
+#if HAS_ATOMIC_OPS
+static pixman_image_t *__pixman_transparent_image;
+static pixman_image_t *__pixman_black_image;
+static pixman_image_t *__pixman_white_image;
+
+static pixman_image_t *
+_pixman_transparent_image (void)
+{
+    pixman_image_t *image;
+
+    image = __pixman_transparent_image;
+    if (unlikely (image == NULL)) {
+	pixman_color_t color;
+
+	color.red   = 0x00;
+	color.green = 0x00;
+	color.blue  = 0x00;
+	color.alpha = 0x00;
+
+	image = pixman_image_create_solid_fill (&color);
+	if (unlikely (image == NULL))
+	    return NULL;
+
+	if (_cairo_atomic_ptr_cmpxchg (&__pixman_transparent_image,
+				       NULL, image))
+	{
+	    pixman_image_ref (image);
+	}
+    } else {
+	pixman_image_ref (image);
+    }
+
+    return image;
+}
+
+static pixman_image_t *
+_pixman_black_image (void)
+{
+    pixman_image_t *image;
+
+    image = __pixman_black_image;
+    if (unlikely (image == NULL)) {
+	pixman_color_t color;
+
+	color.red   = 0x00;
+	color.green = 0x00;
+	color.blue  = 0x00;
+	color.alpha = 0xffff;
+
+	image = pixman_image_create_solid_fill (&color);
+	if (unlikely (image == NULL))
+	    return NULL;
+
+	if (_cairo_atomic_ptr_cmpxchg (&__pixman_black_image,
+				       NULL, image))
+	{
+	    pixman_image_ref (image);
+	}
+    } else {
+	pixman_image_ref (image);
+    }
+
+    return image;
+}
+
+static pixman_image_t *
+_pixman_white_image (void)
+{
+    pixman_image_t *image;
+
+    image = __pixman_white_image;
+    if (unlikely (image == NULL)) {
+	pixman_color_t color;
+
+	color.red   = 0xffff;
+	color.green = 0xffff;
+	color.blue  = 0xffff;
+	color.alpha = 0xffff;
+
+	image = pixman_image_create_solid_fill (&color);
+	if (unlikely (image == NULL))
+	    return NULL;
+
+	if (_cairo_atomic_ptr_cmpxchg (&__pixman_white_image,
+				       NULL, image))
+	{
+	    pixman_image_ref (image);
+	}
+    } else {
+	pixman_image_ref (image);
+    }
+
+    return image;
+}
+#else
+static pixman_image_t *
+_pixman_transparent_image (void)
+{
+    return _pixman_image_for_solid (&_cairo_pattern_clear);
+}
+static pixman_image_t *
+_pixman_black_image (void)
+{
+    return _pixman_image_for_solid (&_cairo_pattern_black);
+}
+static pixman_image_t *
+_pixman_white_image (void)
+{
+    return _pixman_image_for_solid (&_cairo_pattern_white);
+}
+#endif
+
+static uint32_t
+hars_petruska_f54_1_random (void)
+{
+#define rol(x,k) ((x << k) | (x >> (32-k)))
+    static uint32_t x;
+    return x = (x ^ rol (x, 5) ^ rol (x, 24)) + 0x37798849;
+#undef rol
+}
+
+static struct {
+    cairo_color_t color;
+    pixman_image_t *image;
+} cache[16];
+static int n_cached;
+
+void
+_cairo_image_reset_static_data (void)
+{
+    while (n_cached)
+	pixman_image_unref (cache[--n_cached].image);
+
+#if HAS_ATOMIC_OPS
+    if (__pixman_transparent_image) {
+	pixman_image_unref (__pixman_transparent_image);
+	__pixman_transparent_image = NULL;
+    }
+
+    if (__pixman_black_image) {
+	pixman_image_unref (__pixman_black_image);
+	__pixman_black_image = NULL;
+    }
+
+    if (__pixman_white_image) {
+	pixman_image_unref (__pixman_white_image);
+	__pixman_white_image = NULL;
+    }
+#endif
+}
+
+static pixman_image_t *
+_pixman_image_for_solid (const cairo_solid_pattern_t *pattern)
+{
+    pixman_color_t color;
+    pixman_image_t *image;
+    int i;
+
+#if HAS_ATOMIC_OPS
+    if (pattern->color.alpha_short <= 0x00ff)
+	return _pixman_transparent_image ();
+
+    if (pattern->color.alpha_short >= 0xff00) {
+	if (pattern->color.red_short <= 0x00ff &&
+	    pattern->color.green_short <= 0x00ff &&
+	    pattern->color.blue_short <= 0x00ff)
+	{
+	    return _pixman_black_image ();
+	}
+
+	if (pattern->color.red_short >= 0xff00 &&
+	    pattern->color.green_short >= 0xff00 &&
+	    pattern->color.blue_short >= 0xff00)
+	{
+	    return _pixman_white_image ();
+	}
+    }
+#endif
+
+    CAIRO_MUTEX_LOCK (_cairo_image_solid_cache_mutex);
+    for (i = 0; i < n_cached; i++) {
+	if (_cairo_color_equal (&cache[i].color, &pattern->color)) {
+	    image = pixman_image_ref (cache[i].image);
+	    goto UNLOCK;
+	}
+    }
+
+    color.red   = pattern->color.red_short;
+    color.green = pattern->color.green_short;
+    color.blue  = pattern->color.blue_short;
+    color.alpha = pattern->color.alpha_short;
+
+    image = pixman_image_create_solid_fill (&color);
+    if (image == NULL)
+	goto UNLOCK;
+
+    if (n_cached < ARRAY_LENGTH (cache)) {
+	i = n_cached++;
+    } else {
+	i = hars_petruska_f54_1_random () % ARRAY_LENGTH (cache);
+	pixman_image_unref (cache[i].image);
+    }
+    cache[i].image = pixman_image_ref (image);
+    cache[i].color = pattern->color;
+
+UNLOCK:
+    CAIRO_MUTEX_UNLOCK (_cairo_image_solid_cache_mutex);
+    return image;
+}
+
+static pixman_image_t *
+_pixman_image_for_gradient (const cairo_gradient_pattern_t *pattern,
+			    const cairo_rectangle_int_t *extents,
+			    int *ix, int *iy)
+{
+    pixman_image_t	  *pixman_image;
+    pixman_gradient_stop_t pixman_stops_static[2];
+    pixman_gradient_stop_t *pixman_stops = pixman_stops_static;
+    cairo_matrix_t matrix = pattern->base.matrix;
+    double tx, ty;
+    unsigned int i;
+
+    if (pattern->n_stops > ARRAY_LENGTH(pixman_stops_static)) {
+	pixman_stops = _cairo_malloc_ab (pattern->n_stops,
+					 sizeof(pixman_gradient_stop_t));
+	if (unlikely (pixman_stops == NULL))
+	    return NULL;
+    }
+
+    for (i = 0; i < pattern->n_stops; i++) {
+	pixman_stops[i].x = _cairo_fixed_16_16_from_double (pattern->stops[i].offset);
+	pixman_stops[i].color.red   = pattern->stops[i].color.red_short;
+	pixman_stops[i].color.green = pattern->stops[i].color.green_short;
+	pixman_stops[i].color.blue  = pattern->stops[i].color.blue_short;
+	pixman_stops[i].color.alpha = pattern->stops[i].color.alpha_short;
+    }
+
+    if (pattern->base.type == CAIRO_PATTERN_TYPE_LINEAR) {
+	cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) pattern;
+	pixman_point_fixed_t p1, p2;
+	cairo_fixed_t xdim, ydim;
+
+	xdim = fabs (linear->p2.x - linear->p1.x);
+	ydim = fabs (linear->p2.y - linear->p1.y);
+
+	/*
+	 * Transform the matrix to avoid overflow when converting between
+	 * cairo_fixed_t and pixman_fixed_t (without incurring performance
+	 * loss when the transformation is unnecessary).
+	 *
+	 * XXX: Consider converting out-of-range co-ordinates and transforms.
+	 * Having a function to compute the required transformation to
+	 * "normalize" a given bounding box would be generally useful -
+	 * cf linear patterns, gradient patterns, surface patterns...
+	 */
+	if (_cairo_fixed_integer_ceil (xdim) > PIXMAN_MAX_INT ||
+	    _cairo_fixed_integer_ceil (ydim) > PIXMAN_MAX_INT)
+	{
+	    double sf;
+
+	    if (xdim > ydim)
+		sf = PIXMAN_MAX_INT / _cairo_fixed_to_double (xdim);
+	    else
+		sf = PIXMAN_MAX_INT / _cairo_fixed_to_double (ydim);
+
+	    p1.x = _cairo_fixed_16_16_from_double (_cairo_fixed_to_double (linear->p1.x) * sf);
+	    p1.y = _cairo_fixed_16_16_from_double (_cairo_fixed_to_double (linear->p1.y) * sf);
+	    p2.x = _cairo_fixed_16_16_from_double (_cairo_fixed_to_double (linear->p2.x) * sf);
+	    p2.y = _cairo_fixed_16_16_from_double (_cairo_fixed_to_double (linear->p2.y) * sf);
+
+	    cairo_matrix_scale (&matrix, sf, sf);
+	}
+	else
+	{
+	    p1.x = _cairo_fixed_to_16_16 (linear->p1.x);
+	    p1.y = _cairo_fixed_to_16_16 (linear->p1.y);
+	    p2.x = _cairo_fixed_to_16_16 (linear->p2.x);
+	    p2.y = _cairo_fixed_to_16_16 (linear->p2.y);
+	}
+
+	pixman_image = pixman_image_create_linear_gradient (&p1, &p2,
+							    pixman_stops,
+							    pattern->n_stops);
+    } else {
+	cairo_radial_pattern_t *radial = (cairo_radial_pattern_t *) pattern;
+	pixman_point_fixed_t c1, c2;
+	pixman_fixed_t r1, r2;
+
+	c1.x = _cairo_fixed_to_16_16 (radial->c1.x);
+	c1.y = _cairo_fixed_to_16_16 (radial->c1.y);
+	r1   = _cairo_fixed_to_16_16 (radial->r1);
+
+	c2.x = _cairo_fixed_to_16_16 (radial->c2.x);
+	c2.y = _cairo_fixed_to_16_16 (radial->c2.y);
+	r2   = _cairo_fixed_to_16_16 (radial->r2);
+
+	pixman_image = pixman_image_create_radial_gradient (&c1, &c2, r1, r2,
+							    pixman_stops,
+							    pattern->n_stops);
+    }
+
+    if (pixman_stops != pixman_stops_static)
+	free (pixman_stops);
+
+    if (unlikely (pixman_image == NULL))
+	return NULL;
+
+    tx = pattern->base.matrix.x0;
+    ty = pattern->base.matrix.y0;
+    if (! _cairo_matrix_is_translation (&pattern->base.matrix) ||
+	! _nearest_sample (pattern->base.filter, &tx, &ty))
+    {
+	pixman_transform_t pixman_transform;
+
+	if (tx != 0. || ty != 0.) {
+	    cairo_matrix_t m, inv;
+	    cairo_status_t status;
+	    double x, y;
+
+	    /* pixman also limits the [xy]_offset to 16 bits so evenly
+	     * spread the bits between the two.
+	     */
+	    inv = pattern->base.matrix;
+	    status = cairo_matrix_invert (&inv);
+	    assert (status == CAIRO_STATUS_SUCCESS);
+
+	    x = _cairo_lround (inv.x0 / 2);
+	    y = _cairo_lround (inv.y0 / 2);
+	    tx = -x;
+	    ty = -y;
+	    cairo_matrix_init_translate (&inv, x, y);
+	    cairo_matrix_multiply (&m, &inv, &pattern->base.matrix);
+	    _cairo_matrix_to_pixman_matrix (&m, &pixman_transform,
+					    extents->x + extents->width/2.,
+					    extents->y + extents->height/2.);
+	} else {
+	    tx = ty = 0;
+	    _cairo_matrix_to_pixman_matrix (&pattern->base.matrix,
+					    &pixman_transform,
+					    extents->x + extents->width/2.,
+					    extents->y + extents->height/2.);
+	}
+
+	if (! pixman_image_set_transform (pixman_image, &pixman_transform)) {
+	    pixman_image_unref (pixman_image);
+	    return NULL;
+	}
+    }
+    *ix = tx;
+    *iy = ty;
+
+    {
+	pixman_repeat_t pixman_repeat;
+
+	switch (pattern->base.extend) {
+	default:
+	case CAIRO_EXTEND_NONE:
+	    pixman_repeat = PIXMAN_REPEAT_NONE;
+	    break;
+	case CAIRO_EXTEND_REPEAT:
+	    pixman_repeat = PIXMAN_REPEAT_NORMAL;
+	    break;
+	case CAIRO_EXTEND_REFLECT:
+	    pixman_repeat = PIXMAN_REPEAT_REFLECT;
+	    break;
+	case CAIRO_EXTEND_PAD:
+	    pixman_repeat = PIXMAN_REPEAT_PAD;
+	    break;
+	}
+
+	pixman_image_set_repeat (pixman_image, pixman_repeat);
+    }
+
+    return pixman_image;
+}
+
+struct acquire_source_cleanup {
+    cairo_surface_t *surface;
+    cairo_image_surface_t *image;
+    void *image_extra;
+};
+
+static void
+_acquire_source_cleanup (pixman_image_t *pixman_image,
+			 void *closure)
+{
+    struct acquire_source_cleanup *data = closure;
+
+    _cairo_surface_release_source_image (data->surface,
+					 data->image,
+					 data->image_extra);
+    free (data);
+}
+
+static cairo_filter_t
+sampled_area (const cairo_surface_pattern_t *pattern,
+	      const cairo_rectangle_int_t *extents,
+	      cairo_rectangle_int_t *sample)
+{
+    cairo_filter_t filter;
+    double x1, x2, y1, y2;
+    double pad;
+
+    x1 = extents->x;
+    y1 = extents->y;
+    x2 = extents->x + (int) extents->width;
+    y2 = extents->y + (int) extents->height;
+
+    _cairo_matrix_transform_bounding_box (&pattern->base.matrix,
+                                          &x1, &y1, &x2, &y2,
+                                          NULL);
+
+    filter = _cairo_pattern_analyze_filter (&pattern->base, &pad);
+    sample->x = floor (x1 - pad);
+    sample->y = floor (y1 - pad);
+    sample->width  = ceil (x2 + pad) - sample->x;
+    sample->height = ceil (y2 + pad) - sample->y;
+
+    return filter;
+}
+
+static uint16_t
+expand_channel (uint16_t v, uint32_t bits)
+{
+    int offset = 16 - bits;
+    while (offset > 0) {
+	v |= v >> bits;
+	offset -= bits;
+	bits += bits;
+    }
+    return v;
+}
+
+static pixman_image_t *
+_pixel_to_solid (cairo_image_surface_t *image, int x, int y)
+{
+    uint32_t pixel;
+    pixman_color_t color;
+
+    switch (image->format) {
+    default:
+    case CAIRO_FORMAT_INVALID:
+	ASSERT_NOT_REACHED;
+	return NULL;
+
+    case CAIRO_FORMAT_A1:
+	pixel = *(uint8_t *) (image->data + y * image->stride + x/8);
+	return pixel & (1 << (x&7)) ? _pixman_white_image () : _pixman_transparent_image ();
+
+    case CAIRO_FORMAT_A8:
+	color.alpha = *(uint8_t *) (image->data + y * image->stride + x);
+	color.alpha |= color.alpha << 8;
+	if (color.alpha == 0)
+	    return _pixman_transparent_image ();
+
+	color.red = color.green = color.blue = 0;
+	return pixman_image_create_solid_fill (&color);
+
+    case CAIRO_FORMAT_RGB16_565:
+	pixel = *(uint16_t *) (image->data + y * image->stride + 2 * x);
+	if (pixel == 0)
+	    return _pixman_black_image ();
+	if (pixel == 0xffff)
+	    return _pixman_white_image ();
+
+	color.alpha = 0xffff;
+	color.red = expand_channel ((pixel >> 11 & 0x1f) << 11, 5);
+	color.green = expand_channel ((pixel >> 5 & 0x3f) << 10, 6);
+	color.blue = expand_channel ((pixel & 0x1f) << 11, 5);
+	return pixman_image_create_solid_fill (&color);
+
+    case CAIRO_FORMAT_ARGB32:
+    case CAIRO_FORMAT_RGB24:
+	pixel = *(uint32_t *) (image->data + y * image->stride + 4 * x);
+	color.alpha = image->format == CAIRO_FORMAT_ARGB32 ? (pixel >> 24) | (pixel >> 16 & 0xff00) : 0xffff;
+	if (color.alpha == 0)
+	    return _pixman_transparent_image ();
+	if (pixel == 0xffffffff)
+	    return _pixman_white_image ();
+	if (color.alpha == 0xffff && (pixel & 0xffffff) == 0)
+	    return _pixman_black_image ();
+
+	color.red = (pixel >> 16 & 0xff) | (pixel >> 8 & 0xff00);
+	color.green = (pixel >> 8 & 0xff) | (pixel & 0xff00);
+	color.blue = (pixel & 0xff) | (pixel << 8 & 0xff00);
+	return pixman_image_create_solid_fill (&color);
+    }
+}
+
+static pixman_image_t *
+_pixman_image_for_surface (const cairo_surface_pattern_t *pattern,
+			   cairo_bool_t is_mask,
+			   const cairo_rectangle_int_t *extents,
+			   int *ix, int *iy)
+{
+    pixman_image_t *pixman_image;
+    cairo_rectangle_int_t sample;
+    cairo_extend_t extend;
+    cairo_filter_t filter;
+    double tx, ty;
+
+    tx = pattern->base.matrix.x0;
+    ty = pattern->base.matrix.y0;
+
+    extend = pattern->base.extend;
+    filter = sampled_area (pattern, extents, &sample);
+
+    pixman_image = NULL;
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_IMAGE &&
+	(! is_mask || ! pattern->base.has_component_alpha ||
+	 (pattern->surface->content & CAIRO_CONTENT_COLOR) == 0))
+    {
+	cairo_image_surface_t *source = (cairo_image_surface_t *) pattern->surface;
+	cairo_surface_type_t type;
+
+	if (source->base.backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT)
+	    source = (cairo_image_surface_t *) ((cairo_surface_snapshot_t *) pattern->surface)->target;
+
+	type = source->base.backend->type;
+	if (type == CAIRO_SURFACE_TYPE_IMAGE) {
+	    if (extend != CAIRO_EXTEND_NONE &&
+		sample.x >= 0 &&
+		sample.y >= 0 &&
+		sample.x + sample.width  <= source->width &&
+		sample.y + sample.height <= source->height)
+	    {
+		extend = CAIRO_EXTEND_NONE;
+	    }
+
+	    if (sample.width == 1 && sample.height == 1) {
+		if (sample.x < 0 ||
+		    sample.y < 0 ||
+		    sample.x >= source->width ||
+		    sample.y >= source->height)
+		{
+		    if (extend == CAIRO_EXTEND_NONE)
+			return _pixman_transparent_image ();
+		}
+		else
+		{
+		    return _pixel_to_solid (source, sample.x, sample.y);
+		}
+	    }
+
+	    /* avoid allocating a 'pattern' image if we can reuse the original */
+	    if (extend == CAIRO_EXTEND_NONE &&
+		_cairo_matrix_is_translation (&pattern->base.matrix) &&
+		_nearest_sample (filter, &tx, &ty))
+	    {
+		*ix = tx;
+		*iy = ty;
+		return pixman_image_ref (source->pixman_image);
+	    }
+
+	    pixman_image = pixman_image_create_bits (source->pixman_format,
+						     source->width,
+						     source->height,
+						     (uint32_t *) source->data,
+						     source->stride);
+	    if (unlikely (pixman_image == NULL))
+		return NULL;
+	} else if (type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	    cairo_surface_subsurface_t *sub;
+	    cairo_bool_t is_contained = FALSE;
+
+	    sub = (cairo_surface_subsurface_t *) source;
+	    source = (cairo_image_surface_t *) sub->target;
+
+	    if (sample.x >= 0 &&
+		sample.y >= 0 &&
+		sample.x + sample.width  <= sub->extents.width &&
+		sample.y + sample.height <= sub->extents.height)
+	    {
+		is_contained = TRUE;
+	    }
+
+	    if (sample.width == 1 && sample.height == 1) {
+		if (is_contained) {
+		    return _pixel_to_solid (source,
+					    sub->extents.x + sample.x,
+					    sub->extents.y + sample.y);
+		} else {
+		    if (extend == CAIRO_EXTEND_NONE)
+			return _pixman_transparent_image ();
+		}
+	    }
+
+	    if (is_contained &&
+		_cairo_matrix_is_translation (&pattern->base.matrix) &&
+		_nearest_sample (filter, &tx, &ty))
+	    {
+		*ix = tx + sub->extents.x;
+		*iy = ty + sub->extents.y;
+		return pixman_image_ref (source->pixman_image);
+	    }
+
+	    /* Avoid sub-byte offsets, force a copy in that case. */
+	    if (PIXMAN_FORMAT_BPP (source->pixman_format) >= 8) {
+		pixman_image = pixman_image_create_bits (source->pixman_format,
+							 sub->extents.width,
+							 sub->extents.height,
+							 (uint32_t *) (source->data + sub->extents.x * PIXMAN_FORMAT_BPP(source->pixman_format)/8 + sub->extents.y * source->stride),
+							 source->stride);
+		if (unlikely (pixman_image == NULL))
+		    return NULL;
+	    }
+	}
+    }
+
+    if (pixman_image == NULL) {
+	struct acquire_source_cleanup *cleanup;
+	cairo_image_surface_t *image;
+	void *extra;
+	cairo_status_t status;
+
+	status = _cairo_surface_acquire_source_image (pattern->surface, &image, &extra);
+	if (unlikely (status))
+	    return NULL;
+
+	if (sample.width == 1 && sample.height == 1) {
+	    if (sample.x < 0 ||
+		sample.y < 0 ||
+		sample.x >= image->width ||
+		sample.y >= image->height)
+	    {
+		if (extend == CAIRO_EXTEND_NONE) {
+		    pixman_image = _pixman_transparent_image ();
+		    _cairo_surface_release_source_image (pattern->surface, image, extra);
+		    return pixman_image;
+		}
+	    }
+	    else
+	    {
+		pixman_image = _pixel_to_solid (image, sample.x, sample.y);
+		_cairo_surface_release_source_image (pattern->surface, image, extra);
+		return pixman_image;
+	    }
+	}
+
+	pixman_image = pixman_image_create_bits (image->pixman_format,
+						 image->width,
+						 image->height,
+						 (uint32_t *) image->data,
+						 image->stride);
+	if (unlikely (pixman_image == NULL)) {
+	    _cairo_surface_release_source_image (pattern->surface, image, extra);
+	    return NULL;
+	}
+
+	cleanup = malloc (sizeof (*cleanup));
+	if (unlikely (cleanup == NULL)) {
+	    _cairo_surface_release_source_image (pattern->surface, image, extra);
+	    pixman_image_unref (pixman_image);
+	    return NULL;
+	}
+
+	cleanup->surface = pattern->surface;
+	cleanup->image = image;
+	cleanup->image_extra = extra;
+	pixman_image_set_destroy_function (pixman_image,
+					   _acquire_source_cleanup, cleanup);
+    }
+
+    if (! _cairo_matrix_is_translation (&pattern->base.matrix) ||
+	! _nearest_sample (filter, &tx, &ty))
+    {
+	pixman_transform_t pixman_transform;
+	cairo_matrix_t m;
+
+	m = pattern->base.matrix;
+	if (m.x0 != 0. || m.y0 != 0.) {
+	    cairo_matrix_t inv;
+	    cairo_status_t status;
+	    double x, y;
+
+	    /* pixman also limits the [xy]_offset to 16 bits so evenly
+	     * spread the bits between the two.
+	     */
+	    inv = m;
+	    status = cairo_matrix_invert (&inv);
+	    assert (status == CAIRO_STATUS_SUCCESS);
+
+	    x = floor (inv.x0 / 2);
+	    y = floor (inv.y0 / 2);
+	    tx = -x;
+	    ty = -y;
+	    cairo_matrix_init_translate (&inv, x, y);
+	    cairo_matrix_multiply (&m, &inv, &m);
+	} else {
+	    tx = ty = 0;
+	}
+
+	_cairo_matrix_to_pixman_matrix (&m, &pixman_transform,
+					extents->x + extents->width/2.,
+					extents->y + extents->height/2.);
+	if (! pixman_image_set_transform (pixman_image, &pixman_transform)) {
+	    pixman_image_unref (pixman_image);
+	    return NULL;
+	}
+    }
+    *ix = tx;
+    *iy = ty;
+
+    if (_cairo_matrix_has_unity_scale (&pattern->base.matrix) &&
+	tx == pattern->base.matrix.x0 &&
+	ty == pattern->base.matrix.y0)
+    {
+	pixman_image_set_filter (pixman_image, PIXMAN_FILTER_NEAREST, NULL, 0);
+    }
+    else
+    {
+	pixman_filter_t pixman_filter;
+
+	switch (filter) {
+	case CAIRO_FILTER_FAST:
+	    pixman_filter = PIXMAN_FILTER_FAST;
+	    break;
+	case CAIRO_FILTER_GOOD:
+	    pixman_filter = PIXMAN_FILTER_GOOD;
+	    break;
+	case CAIRO_FILTER_BEST:
+	    pixman_filter = PIXMAN_FILTER_BEST;
+	    break;
+	case CAIRO_FILTER_NEAREST:
+	    pixman_filter = PIXMAN_FILTER_NEAREST;
+	    break;
+	case CAIRO_FILTER_BILINEAR:
+	    pixman_filter = PIXMAN_FILTER_BILINEAR;
+	    break;
+	case CAIRO_FILTER_GAUSSIAN:
+	    /* XXX: The GAUSSIAN value has no implementation in cairo
+	     * whatsoever, so it was really a mistake to have it in the
+	     * API. We could fix this by officially deprecating it, or
+	     * else inventing semantics and providing an actual
+	     * implementation for it. */
+	default:
+	    pixman_filter = PIXMAN_FILTER_BEST;
+	}
+
+	pixman_image_set_filter (pixman_image, pixman_filter, NULL, 0);
+    }
+
+    {
+	pixman_repeat_t pixman_repeat;
+
+	switch (extend) {
+	default:
+	case CAIRO_EXTEND_NONE:
+	    pixman_repeat = PIXMAN_REPEAT_NONE;
+	    break;
+	case CAIRO_EXTEND_REPEAT:
+	    pixman_repeat = PIXMAN_REPEAT_NORMAL;
+	    break;
+	case CAIRO_EXTEND_REFLECT:
+	    pixman_repeat = PIXMAN_REPEAT_REFLECT;
+	    break;
+	case CAIRO_EXTEND_PAD:
+	    pixman_repeat = PIXMAN_REPEAT_PAD;
+	    break;
+	}
+
+	pixman_image_set_repeat (pixman_image, pixman_repeat);
+    }
+
+    if (pattern->base.has_component_alpha)
+	pixman_image_set_component_alpha (pixman_image, TRUE);
+
+    return pixman_image;
+}
+
+static pixman_image_t *
+_pixman_image_for_pattern (const cairo_pattern_t *pattern,
+			   cairo_bool_t is_mask,
+			   const cairo_rectangle_int_t *extents,
+			   int *tx, int *ty)
+{
+    *tx = *ty = 0;
+
+    if (pattern == NULL)
+	return _pixman_white_image ();
+
+    switch (pattern->type) {
+    default:
+	ASSERT_NOT_REACHED;
+    case CAIRO_PATTERN_TYPE_SOLID:
+	return _pixman_image_for_solid ((const cairo_solid_pattern_t *) pattern);
+
+    case CAIRO_PATTERN_TYPE_RADIAL:
+    case CAIRO_PATTERN_TYPE_LINEAR:
+	return _pixman_image_for_gradient ((const cairo_gradient_pattern_t *) pattern,
+					   extents, tx, ty);
+
+    case CAIRO_PATTERN_TYPE_SURFACE:
+	return _pixman_image_for_surface ((const cairo_surface_pattern_t *) pattern,
+					  is_mask, extents, tx, ty);
+    }
+}
+
+static cairo_status_t
+_cairo_image_surface_fixup_unbounded (cairo_image_surface_t *dst,
+				      const cairo_composite_rectangles_t *rects,
+				      cairo_clip_t *clip)
+{
+    pixman_image_t *mask = NULL;
+    pixman_box32_t boxes[4];
+    int i, mask_x = 0, mask_y = 0, n_boxes = 0;
+
+    if (clip != NULL) {
+	cairo_surface_t *clip_surface;
+	int clip_x, clip_y;
+
+	clip_surface = _cairo_clip_get_surface (clip, &dst->base, &clip_x, &clip_y);
+	if (unlikely (clip_surface->status))
+	    return clip_surface->status;
+
+	mask = ((cairo_image_surface_t *) clip_surface)->pixman_image;
+	mask_x = -clip_x;
+	mask_y = -clip_y;
+    } else {
+	if (rects->bounded.width  == rects->unbounded.width &&
+	    rects->bounded.height == rects->unbounded.height)
+	{
+	    return CAIRO_STATUS_SUCCESS;
+	}
+    }
+
+    /* wholly unbounded? */
+    if (rects->bounded.width == 0 || rects->bounded.height == 0) {
+	int x = rects->unbounded.x;
+	int y = rects->unbounded.y;
+	int width = rects->unbounded.width;
+	int height = rects->unbounded.height;
+
+	if (mask != NULL) {
+	    pixman_image_composite32 (PIXMAN_OP_OUT_REVERSE,
+                                      mask, NULL, dst->pixman_image,
+                                      x + mask_x, y + mask_y,
+                                      0, 0,
+                                      x, y,
+                                      width, height);
+	} else {
+            pixman_color_t color = { 0, };
+            pixman_box32_t box = { x, y, x + width, y + height };
+
+            if (! pixman_image_fill_boxes (PIXMAN_OP_CLEAR,
+					   dst->pixman_image,
+					   &color,
+					   1, &box))
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    /* top */
+    if (rects->bounded.y != rects->unbounded.y) {
+        boxes[n_boxes].x1 = rects->unbounded.x;
+        boxes[n_boxes].y1 = rects->unbounded.y;
+        boxes[n_boxes].x2 = rects->unbounded.x + rects->unbounded.width;
+        boxes[n_boxes].y2 = rects->bounded.y;
+        n_boxes++;
+    }
+
+    /* left */
+    if (rects->bounded.x != rects->unbounded.x) {
+        boxes[n_boxes].x1 = rects->unbounded.x;
+        boxes[n_boxes].y1 = rects->bounded.y;
+        boxes[n_boxes].x2 = rects->bounded.x;
+        boxes[n_boxes].y2 = rects->bounded.y + rects->bounded.height;
+        n_boxes++;
+    }
+
+    /* right */
+    if (rects->bounded.x + rects->bounded.width != rects->unbounded.x + rects->unbounded.width) {
+        boxes[n_boxes].x1 = rects->bounded.x + rects->bounded.width;
+        boxes[n_boxes].y1 = rects->bounded.y;
+        boxes[n_boxes].x2 = rects->unbounded.x + rects->unbounded.width;
+        boxes[n_boxes].y2 = rects->bounded.y + rects->bounded.height;
+        n_boxes++;
+    }
+
+    /* bottom */
+    if (rects->bounded.y + rects->bounded.height != rects->unbounded.y + rects->unbounded.height) {
+        boxes[n_boxes].x1 = rects->unbounded.x;
+        boxes[n_boxes].y1 = rects->bounded.y + rects->bounded.height;
+        boxes[n_boxes].x2 = rects->unbounded.x + rects->unbounded.width;
+        boxes[n_boxes].y2 = rects->unbounded.y + rects->unbounded.height;
+        n_boxes++;
+    }
+
+    if (mask != NULL) {
+        for (i = 0; i < n_boxes; i++) {
+            pixman_image_composite32 (PIXMAN_OP_OUT_REVERSE,
+                                      mask, NULL, dst->pixman_image,
+                                      boxes[i].x1 + mask_x, boxes[i].y1 + mask_y,
+                                      0, 0,
+                                      boxes[i].x1, boxes[i].y1,
+                                      boxes[i].x2 - boxes[i].x1, boxes[i].y2 - boxes[i].y1);
+        }
+    } else {
+        pixman_color_t color = { 0, };
+
+        if (! pixman_image_fill_boxes (PIXMAN_OP_CLEAR,
+				       dst->pixman_image,
+				       &color,
+				       n_boxes,
+				       boxes))
+	{
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
     }
 
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_status_t
+_cairo_image_surface_fixup_unbounded_boxes (cairo_image_surface_t *dst,
+					    const cairo_composite_rectangles_t *extents,
+					    cairo_region_t *clip_region,
+					    cairo_boxes_t *boxes)
+{
+    cairo_boxes_t clear;
+    cairo_box_t box;
+    cairo_status_t status;
+    struct _cairo_boxes_chunk *chunk;
+    int i;
+
+    if (boxes->num_boxes <= 1 && clip_region == NULL)
+	return _cairo_image_surface_fixup_unbounded (dst, extents, NULL);
+
+    _cairo_boxes_init (&clear);
+
+    box.p1.x = _cairo_fixed_from_int (extents->unbounded.x + extents->unbounded.width);
+    box.p1.y = _cairo_fixed_from_int (extents->unbounded.y);
+    box.p2.x = _cairo_fixed_from_int (extents->unbounded.x);
+    box.p2.y = _cairo_fixed_from_int (extents->unbounded.y + extents->unbounded.height);
+
+    if (clip_region == NULL) {
+	cairo_boxes_t tmp;
+
+	_cairo_boxes_init (&tmp);
+
+	status = _cairo_boxes_add (&tmp, &box);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	tmp.chunks.next = &boxes->chunks;
+	tmp.num_boxes += boxes->num_boxes;
+
+	status = _cairo_bentley_ottmann_tessellate_boxes (&tmp,
+							  CAIRO_FILL_RULE_WINDING,
+							  &clear);
+
+	tmp.chunks.next = NULL;
+    } else {
+	pixman_box32_t *pbox;
+
+	pbox = pixman_region32_rectangles (&clip_region->rgn, &i);
+	_cairo_boxes_limit (&clear, (cairo_box_t *) pbox, i);
+
+	status = _cairo_boxes_add (&clear, &box);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	    for (i = 0; i < chunk->count; i++) {
+		status = _cairo_boxes_add (&clear, &chunk->base[i]);
+		if (unlikely (status)) {
+		    _cairo_boxes_fini (&clear);
+		    return status;
+		}
+	    }
+	}
+
+	status = _cairo_bentley_ottmann_tessellate_boxes (&clear,
+							  CAIRO_FILL_RULE_WINDING,
+							  &clear);
+    }
+
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	for (chunk = &clear.chunks; chunk != NULL; chunk = chunk->next) {
+	    for (i = 0; i < chunk->count; i++) {
+		int x1 = _cairo_fixed_integer_part (chunk->base[i].p1.x);
+		int y1 = _cairo_fixed_integer_part (chunk->base[i].p1.y);
+		int x2 = _cairo_fixed_integer_part (chunk->base[i].p2.x);
+		int y2 = _cairo_fixed_integer_part (chunk->base[i].p2.y);
+
+		pixman_fill ((uint32_t *) dst->data, dst->stride / sizeof (uint32_t),
+			     PIXMAN_FORMAT_BPP (dst->pixman_format),
+			     x1, y1, x2 - x1, y2 - y1,
+			     0);
+	    }
+	}
+    }
+
+    _cairo_boxes_fini (&clear);
+
+    return status;
+}
+
+static cairo_bool_t
+can_reduce_alpha_op (cairo_operator_t op)
+{
+    int iop = op;
+    switch (iop) {
+    case CAIRO_OPERATOR_OVER:
+    case CAIRO_OPERATOR_SOURCE:
+    case CAIRO_OPERATOR_ADD:
+	return TRUE;
+    default:
+	return FALSE;
+    }
+}
+
+static cairo_bool_t
+reduce_alpha_op (cairo_image_surface_t *dst,
+		 cairo_operator_t op,
+		 const cairo_pattern_t *pattern)
+{
+    return dst->base.is_clear &&
+	   dst->base.content == CAIRO_CONTENT_ALPHA &&
+	   _cairo_pattern_is_opaque_solid (pattern) &&
+	   can_reduce_alpha_op (op);
+}
+
+/* low level compositor */
+typedef cairo_status_t
+(*image_draw_func_t) (void				*closure,
+		      pixman_image_t			*dst,
+		      pixman_format_code_t		 dst_format,
+		      cairo_operator_t			 op,
+		      const cairo_pattern_t		*src,
+		      int				 dst_x,
+		      int				 dst_y,
+		      const cairo_rectangle_int_t	*extents,
+		      cairo_region_t			*clip_region);
+
+static pixman_image_t *
+_create_composite_mask_pattern (cairo_clip_t                  *clip,
+				image_draw_func_t              draw_func,
+				void                          *draw_closure,
+				cairo_image_surface_t         *dst,
+				const cairo_rectangle_int_t   *extents)
+{
+    cairo_region_t *clip_region = NULL;
+    pixman_image_t *mask;
+    cairo_status_t status;
+    cairo_bool_t need_clip_surface = FALSE;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	assert (! _cairo_status_is_error (status));
+
+	/* The all-clipped state should never propagate this far. */
+	assert (status != CAIRO_INT_STATUS_NOTHING_TO_DO);
+
+	need_clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+
+	if (clip_region != NULL && cairo_region_num_rectangles (clip_region) == 1)
+	    clip_region = NULL;
+    }
+
+    mask = pixman_image_create_bits (PIXMAN_a8, extents->width, extents->height,
+				     NULL, 0);
+    if (unlikely (mask == NULL))
+	return NULL;
+
+    /* Is it worth setting the clip region here? */
+    if (clip_region != NULL) {
+	pixman_bool_t ret;
+
+	pixman_region32_translate (&clip_region->rgn, -extents->x, -extents->y);
+	ret = pixman_image_set_clip_region32 (mask, &clip_region->rgn);
+	pixman_region32_translate (&clip_region->rgn, extents->x, extents->y);
+
+	if (! ret) {
+	    pixman_image_unref (mask);
+	    return NULL;
+	}
+    }
+
+    status = draw_func (draw_closure,
+			mask, PIXMAN_a8,
+			CAIRO_OPERATOR_ADD, NULL,
+			extents->x, extents->y,
+			extents, NULL);
+    if (unlikely (status)) {
+	pixman_image_unref (mask);
+	return NULL;
+    }
+
+    if (need_clip_surface) {
+	cairo_surface_t *tmp;
+
+	tmp = _cairo_image_surface_create_for_pixman_image (mask, PIXMAN_a8);
+	if (unlikely (tmp->status)) {
+	    pixman_image_unref (mask);
+	    return NULL;
+	}
+
+	pixman_image_ref (mask);
+
+	status = _cairo_clip_combine_with_surface (clip, tmp, extents->x, extents->y);
+	cairo_surface_destroy (tmp);
+	if (unlikely (status)) {
+	    pixman_image_unref (mask);
+	    return NULL;
+	}
+    }
+
+    if (clip_region != NULL)
+	pixman_image_set_clip_region (mask, NULL);
+
+    return mask;
+}
+
+/* Handles compositing with a clip surface when the operator allows
+ * us to combine the clip with the mask
+ */
+static cairo_status_t
+_clip_and_composite_with_mask (cairo_clip_t                  *clip,
+			       cairo_operator_t               op,
+			       const cairo_pattern_t         *pattern,
+			       image_draw_func_t              draw_func,
+			       void                          *draw_closure,
+			       cairo_image_surface_t         *dst,
+			       const cairo_rectangle_int_t   *extents)
+{
+    pixman_image_t *mask;
+
+    mask = _create_composite_mask_pattern (clip, draw_func, draw_closure, dst, extents);
+    if (unlikely (mask == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    if (pattern == NULL) {
+	if (dst->pixman_format == PIXMAN_a8) {
+	    pixman_image_composite32 (_pixman_operator (op),
+                                      mask, NULL, dst->pixman_image,
+                                      0, 0, 0, 0,
+                                      extents->x,      extents->y,
+                                      extents->width,  extents->height);
+	} else {
+	    pixman_image_t *src;
+
+	    src = _pixman_white_image ();
+	    if (unlikely (src == NULL)) {
+		pixman_image_unref (mask);
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    }
+
+	    pixman_image_composite32 (_pixman_operator (op),
+                                      src, mask, dst->pixman_image,
+                                      0, 0, 0, 0,
+                                      extents->x,      extents->y,
+                                      extents->width,  extents->height);
+	    pixman_image_unref (src);
+	}
+    } else {
+	pixman_image_t *src;
+	int src_x, src_y;
+
+	src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+	if (unlikely (src == NULL)) {
+	    pixman_image_unref (mask);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+
+	pixman_image_composite32 (_pixman_operator (op),
+                                  src, mask, dst->pixman_image,
+                                  extents->x + src_x,  extents->y + src_y,
+                                  0, 0,
+                                  extents->x,          extents->y,
+                                  extents->width,      extents->height);
+	pixman_image_unref (src);
+    }
+
+    pixman_image_unref (mask);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+/* Handles compositing with a clip surface when we have to do the operation
+ * in two pieces and combine them together.
+ */
+static cairo_status_t
+_clip_and_composite_combine (cairo_clip_t                  *clip,
+			     cairo_operator_t               op,
+			     const cairo_pattern_t         *src,
+			     image_draw_func_t              draw_func,
+			     void                          *draw_closure,
+			     cairo_image_surface_t               *dst,
+			     const cairo_rectangle_int_t   *extents)
+{
+    pixman_image_t *tmp;
+    cairo_surface_t *clip_surface;
+    int clip_x, clip_y;
+    cairo_status_t status;
+
+    tmp  = pixman_image_create_bits (dst->pixman_format,
+				     extents->width, extents->height,
+				     NULL, 0);
+    if (unlikely (tmp == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    if (src == NULL) {
+	status = (*draw_func) (draw_closure,
+			       tmp, dst->pixman_format,
+			       CAIRO_OPERATOR_ADD, NULL,
+			       extents->x, extents->y,
+			       extents, NULL);
+    } else {
+	/* Initialize the temporary surface from the destination surface */
+	if (! dst->base.is_clear) {
+	    pixman_image_composite32 (PIXMAN_OP_SRC,
+                                      dst->pixman_image, NULL, tmp,
+                                      extents->x, extents->y,
+                                      0, 0,
+                                      0, 0,
+                                      extents->width, extents->height);
+	}
+
+	status = (*draw_func) (draw_closure,
+			       tmp, dst->pixman_format,
+			       op, src,
+			       extents->x, extents->y,
+			       extents, NULL);
+    }
+    if (unlikely (status))
+	goto CLEANUP_SURFACE;
+
+    assert (clip->path != NULL);
+    clip_surface = _cairo_clip_get_surface (clip, &dst->base, &clip_x, &clip_y);
+    if (unlikely (clip_surface->status))
+	goto CLEANUP_SURFACE;
+
+    if (! dst->base.is_clear) {
+#if PIXMAN_HAS_OP_LERP
+	pixman_image_composite32 (PIXMAN_OP_LERP,
+                                  tmp,
+                                  ((cairo_image_surface_t *) clip_surface)->pixman_image,
+                                  dst->pixman_image,
+                                  0, 0,
+                                  extents->x - clip_x,
+                                  extents->y - clip_y,
+                                  extents->x, extents->y,
+                                  extents->width, extents->height);
+#else
+	/* Punch the clip out of the destination */
+	pixman_image_composite32 (PIXMAN_OP_OUT_REVERSE,
+                                  ((cairo_image_surface_t *) clip_surface)->pixman_image,
+                                  NULL, dst->pixman_image,
+                                  extents->x - clip_x,
+                                  extents->y - clip_y,
+                                  0, 0,
+                                  extents->x, extents->y,
+                                  extents->width, extents->height);
+
+	/* Now add the two results together */
+	pixman_image_composite32 (PIXMAN_OP_ADD,
+                                  tmp,
+                                  ((cairo_image_surface_t *) clip_surface)->pixman_image,
+                                  dst->pixman_image,
+                                  0, 0,
+                                  extents->x - clip_x,
+                                  extents->y - clip_y,
+                                  extents->x, extents->y,
+                                  extents->width, extents->height);
+#endif
+    } else {
+	pixman_image_composite32 (PIXMAN_OP_SRC,
+                                  tmp,
+                                  ((cairo_image_surface_t *) clip_surface)->pixman_image,
+                                  dst->pixman_image,
+                                  0, 0,
+                                  extents->x - clip_x,
+                                  extents->y - clip_y,
+                                  extents->x, extents->y,
+                                  extents->width, extents->height);
+    }
+
+ CLEANUP_SURFACE:
+    pixman_image_unref (tmp);
+
+    return status;
+}
+
+/* Handles compositing for %CAIRO_OPERATOR_SOURCE, which is special; it's
+ * defined as (src IN mask IN clip) ADD (dst OUT (mask IN clip))
+ */
+static cairo_status_t
+_clip_and_composite_source (cairo_clip_t                  *clip,
+			    const cairo_pattern_t         *pattern,
+			    image_draw_func_t              draw_func,
+			    void                          *draw_closure,
+			    cairo_image_surface_t         *dst,
+			    const cairo_rectangle_int_t   *extents)
+{
+    pixman_image_t *mask, *src;
+    int src_x, src_y;
+
+    if (pattern == NULL) {
+	cairo_region_t *clip_region;
+	cairo_status_t status;
+
+	status = draw_func (draw_closure,
+			    dst->pixman_image, dst->pixman_format,
+			    CAIRO_OPERATOR_SOURCE, NULL,
+			    extents->x, extents->y,
+			    extents, NULL);
+	if (unlikely (status))
+	    return status;
+
+	if (_cairo_clip_get_region (clip, &clip_region) == CAIRO_INT_STATUS_UNSUPPORTED)
+	    status = _cairo_clip_combine_with_surface (clip, &dst->base, 0, 0);
+
+	return status;
+    }
+
+    /* Create a surface that is mask IN clip */
+    mask = _create_composite_mask_pattern (clip, draw_func, draw_closure, dst, extents);
+    if (unlikely (mask == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+    if (unlikely (src == NULL)) {
+	pixman_image_unref (mask);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    if (! dst->base.is_clear) {
+#if PIXMAN_HAS_OP_LERP
+	pixman_image_composite32 (PIXMAN_OP_LERP,
+                                  src, mask, dst->pixman_image,
+                                  extents->x + src_x, extents->y + src_y,
+                                  0, 0,
+                                  extents->x,     extents->y,
+                                  extents->width, extents->height);
+#else
+	/* Compute dest' = dest OUT (mask IN clip) */
+	pixman_image_composite32 (PIXMAN_OP_OUT_REVERSE,
+                                  mask, NULL, dst->pixman_image,
+                                  0, 0, 0, 0,
+                                  extents->x,     extents->y,
+                                  extents->width, extents->height);
+
+	/* Now compute (src IN (mask IN clip)) ADD dest' */
+	pixman_image_composite32 (PIXMAN_OP_ADD,
+                                  src, mask, dst->pixman_image,
+                                  extents->x + src_x, extents->y + src_y,
+                                  0, 0,
+                                  extents->x,     extents->y,
+                                  extents->width, extents->height);
+#endif
+    } else {
+	pixman_image_composite32 (PIXMAN_OP_SRC,
+                                  src, mask, dst->pixman_image,
+                                  extents->x + src_x, extents->y + src_y,
+                                  0, 0,
+                                  extents->x,     extents->y,
+                                  extents->width, extents->height);
+    }
+
+    pixman_image_unref (src);
+    pixman_image_unref (mask);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_clip_and_composite (cairo_image_surface_t	*dst,
+		     cairo_operator_t		 op,
+		     const cairo_pattern_t	*src,
+		     image_draw_func_t		 draw_func,
+		     void			*draw_closure,
+		     cairo_composite_rectangles_t*extents,
+		     cairo_clip_t		*clip)
+{
+    cairo_status_t status;
+    cairo_region_t *clip_region = NULL;
+    cairo_bool_t need_clip_surface = FALSE;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	    return CAIRO_STATUS_SUCCESS;
+	if (unlikely (_cairo_status_is_error (status)))
+	    return status;
+
+	need_clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+
+	if (clip_region != NULL) {
+	    cairo_rectangle_int_t rect;
+	    cairo_bool_t is_empty;
+
+	    cairo_region_get_extents (clip_region, &rect);
+	    is_empty = ! _cairo_rectangle_intersect (&extents->unbounded, &rect);
+	    if (unlikely (is_empty))
+		return CAIRO_STATUS_SUCCESS;
+
+	    is_empty = ! _cairo_rectangle_intersect (&extents->bounded, &rect);
+	    if (unlikely (is_empty && extents->is_bounded))
+		return CAIRO_STATUS_SUCCESS;
+
+	    if (cairo_region_num_rectangles (clip_region) == 1)
+		clip_region = NULL;
+	}
+    }
+
+    if (clip_region != NULL) {
+	status = _cairo_image_surface_set_clip_region (dst, clip_region);
+	if (unlikely (status))
+	    return status;
+    }
+
+    if (reduce_alpha_op (dst, op, src)) {
+	op = CAIRO_OPERATOR_ADD;
+	src = NULL;
+    }
+
+    if (op == CAIRO_OPERATOR_SOURCE) {
+	status = _clip_and_composite_source (clip, src,
+					     draw_func, draw_closure,
+					     dst, &extents->bounded);
+    } else {
+	if (op == CAIRO_OPERATOR_CLEAR) {
+	    src = NULL;
+	    op = CAIRO_OPERATOR_DEST_OUT;
+	}
+
+	if (need_clip_surface) {
+	    if (extents->is_bounded) {
+		status = _clip_and_composite_with_mask (clip, op, src,
+							draw_func, draw_closure,
+							dst, &extents->bounded);
+	    } else {
+		status = _clip_and_composite_combine (clip, op, src,
+						      draw_func, draw_closure,
+						      dst, &extents->bounded);
+	    }
+	} else {
+	    status = draw_func (draw_closure,
+				dst->pixman_image, dst->pixman_format,
+				op, src,
+				0, 0,
+				&extents->bounded,
+				clip_region);
+	}
+    }
+
+    if (status == CAIRO_STATUS_SUCCESS && ! extents->is_bounded) {
+	status = _cairo_image_surface_fixup_unbounded (dst, extents,
+						       need_clip_surface ? clip : NULL);
+    }
+
+    if (clip_region != NULL)
+	_cairo_image_surface_unset_clip_region (dst);
+
+    return status;
+}
+
+#define CAIRO_FIXED_16_16_MIN _cairo_fixed_from_int (-32768)
+#define CAIRO_FIXED_16_16_MAX _cairo_fixed_from_int (32767)
+
+static cairo_bool_t
+_line_exceeds_16_16 (const cairo_line_t *line)
+{
+    return
+	line->p1.x <= CAIRO_FIXED_16_16_MIN ||
+	line->p1.x >= CAIRO_FIXED_16_16_MAX ||
+
+	line->p2.x <= CAIRO_FIXED_16_16_MIN ||
+	line->p2.x >= CAIRO_FIXED_16_16_MAX ||
+
+	line->p1.y <= CAIRO_FIXED_16_16_MIN ||
+	line->p1.y >= CAIRO_FIXED_16_16_MAX ||
+
+	line->p2.y <= CAIRO_FIXED_16_16_MIN ||
+	line->p2.y >= CAIRO_FIXED_16_16_MAX;
+}
+
+static void
+_project_line_x_onto_16_16 (const cairo_line_t *line,
+			    cairo_fixed_t top,
+			    cairo_fixed_t bottom,
+			    pixman_line_fixed_t *out)
+{
+    cairo_point_double_t p1, p2;
+    double m;
+
+    p1.x = _cairo_fixed_to_double (line->p1.x);
+    p1.y = _cairo_fixed_to_double (line->p1.y);
+
+    p2.x = _cairo_fixed_to_double (line->p2.x);
+    p2.y = _cairo_fixed_to_double (line->p2.y);
+
+    m = (p2.x - p1.x) / (p2.y - p1.y);
+    out->p1.x = _cairo_fixed_16_16_from_double (p1.x + m * _cairo_fixed_to_double (top - line->p1.y));
+    out->p2.x = _cairo_fixed_16_16_from_double (p1.x + m * _cairo_fixed_to_double (bottom - line->p1.y));
+}
+
+
+typedef struct {
+    cairo_trapezoid_t *traps;
+    int num_traps;
+    cairo_antialias_t antialias;
+} composite_traps_info_t;
+
+static void
+_pixman_image_add_traps (pixman_image_t *image,
+			 int dst_x, int dst_y,
+			 composite_traps_info_t *info)
+{
+    cairo_trapezoid_t *t = info->traps;
+    int num_traps = info->num_traps;
+    while (num_traps--) {
+	pixman_trapezoid_t trap;
+
+	/* top/bottom will be clamped to surface bounds */
+	trap.top = _cairo_fixed_to_16_16 (t->top);
+	trap.bottom = _cairo_fixed_to_16_16 (t->bottom);
+
+	/* However, all the other coordinates will have been left untouched so
+	 * as not to introduce numerical error. Recompute them if they
+	 * exceed the 16.16 limits.
+	 */
+	if (unlikely (_line_exceeds_16_16 (&t->left))) {
+	    _project_line_x_onto_16_16 (&t->left, t->top, t->bottom, &trap.left);
+	    trap.left.p1.y = trap.top;
+	    trap.left.p2.y = trap.bottom;
+	} else {
+	    trap.left.p1.x = _cairo_fixed_to_16_16 (t->left.p1.x);
+	    trap.left.p1.y = _cairo_fixed_to_16_16 (t->left.p1.y);
+	    trap.left.p2.x = _cairo_fixed_to_16_16 (t->left.p2.x);
+	    trap.left.p2.y = _cairo_fixed_to_16_16 (t->left.p2.y);
+	}
+
+	if (unlikely (_line_exceeds_16_16 (&t->right))) {
+	    _project_line_x_onto_16_16 (&t->right, t->top, t->bottom, &trap.right);
+	    trap.right.p1.y = trap.top;
+	    trap.right.p2.y = trap.bottom;
+	} else {
+	    trap.right.p1.x = _cairo_fixed_to_16_16 (t->right.p1.x);
+	    trap.right.p1.y = _cairo_fixed_to_16_16 (t->right.p1.y);
+	    trap.right.p2.x = _cairo_fixed_to_16_16 (t->right.p2.x);
+	    trap.right.p2.y = _cairo_fixed_to_16_16 (t->right.p2.y);
+	}
+
+	pixman_rasterize_trapezoid (image, &trap, -dst_x, -dst_y);
+
+	t++;
+    }
+}
+
+static cairo_status_t
+_composite_traps (void                          *closure,
+		  pixman_image_t		*dst,
+		  pixman_format_code_t		 dst_format,
+		  cairo_operator_t               op,
+		  const cairo_pattern_t         *pattern,
+		  int                            dst_x,
+		  int                            dst_y,
+		  const cairo_rectangle_int_t   *extents,
+		  cairo_region_t		*clip_region)
+{
+    composite_traps_info_t *info = closure;
+    pixman_image_t *src, *mask;
+    pixman_format_code_t format;
+    int src_x = 0, src_y = 0;
+    cairo_status_t status;
+
+    /* Special case adding trapezoids onto a mask surface; we want to avoid
+     * creating an intermediate temporary mask unnecessarily.
+     *
+     * We make the assumption here that the portion of the trapezoids
+     * contained within the surface is bounded by [dst_x,dst_y,width,height];
+     * the Cairo core code passes bounds based on the trapezoid extents.
+     */
+    format = info->antialias == CAIRO_ANTIALIAS_NONE ? PIXMAN_a1 : PIXMAN_a8;
+    if (dst_format == format &&
+	(pattern == NULL ||
+	 (op == CAIRO_OPERATOR_ADD && _cairo_pattern_is_opaque_solid (pattern))))
+    {
+	_pixman_image_add_traps (dst, dst_x, dst_y, info);
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+    if (unlikely (src == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    mask = pixman_image_create_bits (format, extents->width, extents->height,
+				     NULL, 0);
+    if (unlikely (mask == NULL)) {
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto CLEANUP_SOURCE;
+    }
+
+    _pixman_image_add_traps (mask, extents->x, extents->y, info);
+    pixman_image_composite32 (_pixman_operator (op),
+                              src, mask, dst,
+                              extents->x + src_x, extents->y + src_y,
+                              0, 0,
+                              extents->x - dst_x, extents->y - dst_y,
+                              extents->width, extents->height);
+
+    pixman_image_unref (mask);
+
+    status = CAIRO_STATUS_SUCCESS;
+ CLEANUP_SOURCE:
+    pixman_image_unref (src);
+
+    return status;
+}
+
+static inline uint32_t
+color_to_uint32 (const cairo_color_t *color)
+{
+    return
+        (color->alpha_short >> 8 << 24) |
+        (color->red_short >> 8 << 16)   |
+        (color->green_short & 0xff00)   |
+        (color->blue_short >> 8);
+}
+
+static inline cairo_bool_t
+color_to_pixel (const cairo_color_t	*color,
+                pixman_format_code_t	 format,
+                uint32_t		*pixel)
+{
+    uint32_t c;
+
+    if (!(format == PIXMAN_a8r8g8b8     ||
+          format == PIXMAN_x8r8g8b8     ||
+          format == PIXMAN_a8b8g8r8     ||
+          format == PIXMAN_x8b8g8r8     ||
+          format == PIXMAN_b8g8r8a8     ||
+          format == PIXMAN_b8g8r8x8     ||
+          format == PIXMAN_r5g6b5       ||
+          format == PIXMAN_b5g6r5       ||
+          format == PIXMAN_a8))
+    {
+	return FALSE;
+    }
+
+    c = color_to_uint32 (color);
+
+    if (PIXMAN_FORMAT_TYPE (format) == PIXMAN_TYPE_ABGR) {
+	c = ((c & 0xff000000) >>  0) |
+	    ((c & 0x00ff0000) >> 16) |
+	    ((c & 0x0000ff00) >>  0) |
+	    ((c & 0x000000ff) << 16);
+    }
+
+    if (PIXMAN_FORMAT_TYPE (format) == PIXMAN_TYPE_BGRA) {
+	c = ((c & 0xff000000) >> 24) |
+	    ((c & 0x00ff0000) >>  8) |
+	    ((c & 0x0000ff00) <<  8) |
+	    ((c & 0x000000ff) << 24);
+    }
+
+    if (format == PIXMAN_a8) {
+	c = c >> 24;
+    } else if (format == PIXMAN_r5g6b5 || format == PIXMAN_b5g6r5) {
+	c = ((((c) >> 3) & 0x001f) |
+	     (((c) >> 5) & 0x07e0) |
+	     (((c) >> 8) & 0xf800));
+    }
+
+    *pixel = c;
+    return TRUE;
+}
+
+static inline cairo_bool_t
+pattern_to_pixel (const cairo_solid_pattern_t *solid,
+		  cairo_operator_t op,
+		  pixman_format_code_t format,
+		  uint32_t *pixel)
+{
+    if (op == CAIRO_OPERATOR_CLEAR) {
+	*pixel = 0;
+	return TRUE;
+    }
+
+    if (solid->base.type != CAIRO_PATTERN_TYPE_SOLID)
+	return FALSE;
+
+    if (op == CAIRO_OPERATOR_OVER) {
+	if (solid->color.alpha_short >= 0xff00)
+	    op = CAIRO_OPERATOR_SOURCE;
+    }
+
+    if (op != CAIRO_OPERATOR_SOURCE)
+	return FALSE;
+
+    return color_to_pixel (&solid->color, format, pixel);
+}
+
+typedef struct _fill_span {
+    cairo_span_renderer_t base;
+
+    uint8_t *mask_data;
+    pixman_image_t *src, *dst, *mask;
+} fill_span_renderer_t;
+
+static cairo_status_t
+_fill_span (void *abstract_renderer,
+	    int y, int height,
+	    const cairo_half_open_span_t *spans,
+	    unsigned num_spans)
+{
+    fill_span_renderer_t *renderer = abstract_renderer;
+    uint8_t *row;
+    unsigned i;
+
+    if (num_spans == 0)
+	return CAIRO_STATUS_SUCCESS;
+
+    row = renderer->mask_data - spans[0].x;
+    for (i = 0; i < num_spans - 1; i++) {
+	/* We implement setting the most common single pixel wide
+	 * span case to avoid the overhead of a memset call.
+	 * Open coding setting longer spans didn't show a
+	 * noticeable improvement over memset.
+	 */
+	if (spans[i+1].x == spans[i].x + 1) {
+	    row[spans[i].x] = spans[i].coverage;
+	} else {
+	    memset (row + spans[i].x,
+		    spans[i].coverage,
+		    spans[i+1].x - spans[i].x);
+	}
+    }
+
+    do {
+	pixman_image_composite32 (PIXMAN_OP_OVER,
+                                  renderer->src, renderer->mask, renderer->dst,
+                                  0, 0, 0, 0,
+                                  spans[0].x, y++,
+                                  spans[i].x - spans[0].x, 1);
+    } while (--height);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+/* avoid using region code to re-validate boxes */
+static cairo_status_t
+_fill_unaligned_boxes (cairo_image_surface_t *dst,
+		       const cairo_pattern_t *pattern,
+		       uint32_t pixel,
+		       const cairo_boxes_t *boxes,
+		       const cairo_composite_rectangles_t *extents)
+{
+    uint8_t buf[CAIRO_STACK_BUFFER_SIZE];
+    fill_span_renderer_t renderer;
+    cairo_rectangular_scan_converter_t converter;
+    const struct _cairo_boxes_chunk *chunk;
+    cairo_status_t status;
+    int i;
+
+    /* XXX
+     * using composite for fill:
+     *   spiral-box-nonalign-evenodd-fill.512    2201957    2.202
+     *   spiral-box-nonalign-nonzero-fill.512     336726    0.337
+     *   spiral-box-pixalign-evenodd-fill.512     352256    0.352
+     *   spiral-box-pixalign-nonzero-fill.512     147056    0.147
+     * using fill:
+     *   spiral-box-nonalign-evenodd-fill.512    3174565    3.175
+     *   spiral-box-nonalign-nonzero-fill.512     182710    0.183
+     *   spiral-box-pixalign-evenodd-fill.512     353863    0.354
+     *   spiral-box-pixalign-nonzero-fill.512     147402    0.147
+     *
+     * cairo-perf-trace seems to favour using fill.
+     */
+
+    renderer.base.render_rows = _fill_span;
+    renderer.dst = dst->pixman_image;
+
+    if ((unsigned) extents->bounded.width <= sizeof (buf)) {
+	renderer.mask = pixman_image_create_bits (PIXMAN_a8,
+						  extents->bounded.width, 1,
+						  (uint32_t *) buf,
+						  sizeof (buf));
+    } else {
+	renderer.mask = pixman_image_create_bits (PIXMAN_a8,
+						  extents->bounded.width, 1,
+						  NULL,  0);
+    }
+    if (unlikely (renderer.mask == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    renderer.mask_data = (uint8_t *) pixman_image_get_data (renderer.mask);
+
+    renderer.src = _pixman_image_for_solid ((const cairo_solid_pattern_t *) pattern);
+    if (unlikely (renderer.src == NULL)) {
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto CLEANUP_MASK;
+    }
+
+    _cairo_rectangular_scan_converter_init (&converter, &extents->bounded);
+
+    /* first blit any aligned part of the boxes */
+    for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	const cairo_box_t *box = chunk->base;
+
+	for (i = 0; i < chunk->count; i++) {
+	    int x1 = _cairo_fixed_integer_ceil (box[i].p1.x);
+	    int y1 = _cairo_fixed_integer_ceil (box[i].p1.y);
+	    int x2 = _cairo_fixed_integer_floor (box[i].p2.x);
+	    int y2 = _cairo_fixed_integer_floor (box[i].p2.y);
+
+	    if (x2 > x1 && y2 > y1) {
+		cairo_box_t b;
+
+		pixman_fill ((uint32_t *) dst->data,
+			     dst->stride / sizeof (uint32_t),
+			     PIXMAN_FORMAT_BPP (dst->pixman_format),
+			     x1, y1, x2 - x1, y2 - y1,
+			     pixel);
+
+		/* top */
+		if (! _cairo_fixed_is_integer (box[i].p1.y)) {
+		    b.p1.x = box[i].p1.x;
+		    b.p1.y = box[i].p1.y;
+		    b.p2.x = box[i].p2.x;
+		    b.p2.y = _cairo_fixed_from_int (y1);
+
+		    status = _cairo_rectangular_scan_converter_add_box (&converter, &b, 1);
+		    if (unlikely (status))
+			goto CLEANUP_CONVERTER;
+		}
+
+		/* left */
+		if (! _cairo_fixed_is_integer (box[i].p1.x)) {
+		    b.p1.x = box[i].p1.x;
+		    b.p1.y = box[i].p1.y;
+		    b.p2.x = _cairo_fixed_from_int (x1);
+		    b.p2.y = box[i].p2.y;
+
+		    status = _cairo_rectangular_scan_converter_add_box (&converter, &b, 1);
+		    if (unlikely (status))
+			goto CLEANUP_CONVERTER;
+		}
+
+		/* right */
+		if (! _cairo_fixed_is_integer (box[i].p2.x)) {
+		    b.p1.x = _cairo_fixed_from_int (x2);
+		    b.p1.y = box[i].p1.y;
+		    b.p2.x = box[i].p2.x;
+		    b.p2.y = box[i].p2.y;
+
+		    status = _cairo_rectangular_scan_converter_add_box (&converter, &b, 1);
+		    if (unlikely (status))
+			goto CLEANUP_CONVERTER;
+		}
+
+		/* bottom */
+		if (! _cairo_fixed_is_integer (box[i].p2.y)) {
+		    b.p1.x = box[i].p1.x;
+		    b.p1.y = _cairo_fixed_from_int (y2);
+		    b.p2.x = box[i].p2.x;
+		    b.p2.y = box[i].p2.y;
+
+		    status = _cairo_rectangular_scan_converter_add_box (&converter, &b, 1);
+		    if (unlikely (status))
+			goto CLEANUP_CONVERTER;
+		}
+	    } else {
+		status = _cairo_rectangular_scan_converter_add_box (&converter, &box[i], 1);
+		if (unlikely (status))
+		    goto CLEANUP_CONVERTER;
+	    }
+	}
+    }
+
+    status = converter.base.generate (&converter.base, &renderer.base);
+
+  CLEANUP_CONVERTER:
+    converter.base.destroy (&converter.base);
+    pixman_image_unref (renderer.src);
+  CLEANUP_MASK:
+    pixman_image_unref (renderer.mask);
+
+    return status;
+}
+
+typedef struct _cairo_image_surface_span_renderer {
+    cairo_span_renderer_t base;
+
+    uint8_t *mask_data;
+    uint32_t mask_stride;
+} cairo_image_surface_span_renderer_t;
+
+cairo_status_t
+_cairo_image_surface_span (void *abstract_renderer,
+			   int y, int height,
+			   const cairo_half_open_span_t *spans,
+			   unsigned num_spans)
+{
+    cairo_image_surface_span_renderer_t *renderer = abstract_renderer;
+    uint8_t *row;
+    unsigned i;
+
+    if (num_spans == 0)
+	return CAIRO_STATUS_SUCCESS;
+
+    /* XXX will it be quicker to repeat the sparse memset,
+     * or perform a simpler memcpy?
+     * The fairly dense spiral benchmarks suggests that the sparse
+     * memset is a win there as well.
+     */
+    row = renderer->mask_data + y * renderer->mask_stride;
+    do {
+	for (i = 0; i < num_spans - 1; i++) {
+	    if (! spans[i].coverage)
+		continue;
+
+	    /* We implement setting rendering the most common single
+	     * pixel wide span case to avoid the overhead of a memset
+	     * call.  Open coding setting longer spans didn't show a
+	     * noticeable improvement over memset. */
+	    if (spans[i+1].x == spans[i].x + 1) {
+		row[spans[i].x] = spans[i].coverage;
+	    } else {
+		memset (row + spans[i].x,
+			spans[i].coverage,
+			spans[i+1].x - spans[i].x);
+	    }
+	}
+	row += renderer->mask_stride;
+    } while (--height);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_composite_unaligned_boxes (cairo_image_surface_t *dst,
+			    cairo_operator_t op,
+			    const cairo_pattern_t *pattern,
+			    const cairo_boxes_t *boxes,
+			    const cairo_composite_rectangles_t *extents)
+{
+    uint8_t buf[CAIRO_STACK_BUFFER_SIZE];
+    cairo_image_surface_span_renderer_t renderer;
+    cairo_rectangular_scan_converter_t converter;
+    pixman_image_t *mask, *src;
+    cairo_status_t status;
+    const struct _cairo_boxes_chunk *chunk;
+    int i, src_x, src_y;
+
+    i = CAIRO_STRIDE_FOR_WIDTH_BPP (extents->bounded.width, 8) * extents->bounded.height;
+    if ((unsigned) i <= sizeof (buf)) {
+	mask = pixman_image_create_bits (PIXMAN_a8,
+					 extents->bounded.width,
+					 extents->bounded.height,
+					 (uint32_t *) buf,
+					 CAIRO_STRIDE_FOR_WIDTH_BPP (extents->bounded.width, 8));
+	memset (buf, 0, i);
+    } else {
+	mask = pixman_image_create_bits (PIXMAN_a8,
+					 extents->bounded.width,
+					 extents->bounded.height,
+					 NULL,  0);
+    }
+    if (unlikely (mask == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    renderer.base.render_rows = _cairo_image_surface_span;
+    renderer.mask_stride = pixman_image_get_stride (mask);
+    renderer.mask_data = (uint8_t *) pixman_image_get_data (mask);
+    renderer.mask_data -= extents->bounded.y * renderer.mask_stride + extents->bounded.x;
+
+    _cairo_rectangular_scan_converter_init (&converter, &extents->bounded);
+
+    for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	const cairo_box_t *box = chunk->base;
+
+	for (i = 0; i < chunk->count; i++) {
+	    status = _cairo_rectangular_scan_converter_add_box (&converter, &box[i], 1);
+	    if (unlikely (status))
+		goto CLEANUP;
+	}
+    }
+
+    status = converter.base.generate (&converter.base, &renderer.base);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    src = _pixman_image_for_pattern (pattern, FALSE, &extents->bounded, &src_x, &src_y);
+    if (unlikely (src == NULL)) {
+	status =  _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto CLEANUP;
+    }
+
+    pixman_image_composite32 (_pixman_operator (op),
+                              src, mask, dst->pixman_image,
+                              extents->bounded.x + src_x, extents->bounded.y + src_y,
+                              0, 0,
+                              extents->bounded.x, extents->bounded.y,
+                              extents->bounded.width, extents->bounded.height);
+    pixman_image_unref (src);
+
+  CLEANUP:
+    converter.base.destroy (&converter.base);
+    pixman_image_unref (mask);
+
+    return status;
+}
+
+static cairo_status_t
+_composite_boxes (cairo_image_surface_t *dst,
+		  cairo_operator_t op,
+		  const cairo_pattern_t *pattern,
+		  cairo_boxes_t *boxes,
+		  cairo_antialias_t antialias,
+		  cairo_clip_t *clip,
+		  const cairo_composite_rectangles_t *extents)
+{
+    cairo_region_t *clip_region = NULL;
+    cairo_bool_t need_clip_mask = FALSE;
+    cairo_status_t status;
+    struct _cairo_boxes_chunk *chunk;
+    uint32_t pixel;
+    int i;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	need_clip_mask = status == CAIRO_INT_STATUS_UNSUPPORTED;
+	if (need_clip_mask &&
+	    (op == CAIRO_OPERATOR_SOURCE || ! extents->is_bounded))
+	{
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+
+	if (clip_region != NULL && cairo_region_num_rectangles (clip_region) == 1)
+	    clip_region = NULL;
+    }
+
+    if (antialias != CAIRO_ANTIALIAS_NONE) {
+	if (! boxes->is_pixel_aligned) {
+	    if (need_clip_mask)
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+
+	    if (pattern_to_pixel ((cairo_solid_pattern_t *) pattern, op,
+				  dst->pixman_format, &pixel))
+	    {
+		return _fill_unaligned_boxes (dst, pattern, pixel, boxes, extents);
+	    }
+	    else
+	    {
+		return _composite_unaligned_boxes (dst, op, pattern, boxes, extents);
+	    }
+	}
+    }
+
+    status = CAIRO_STATUS_SUCCESS;
+    if (! need_clip_mask &&
+	pattern_to_pixel ((cairo_solid_pattern_t *) pattern, op, dst->pixman_format,
+			  &pixel))
+    {
+	for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	    cairo_box_t *box = chunk->base;
+
+	    for (i = 0; i < chunk->count; i++) {
+		int x1 = _cairo_fixed_integer_round_down (box[i].p1.x);
+		int y1 = _cairo_fixed_integer_round_down (box[i].p1.y);
+		int x2 = _cairo_fixed_integer_round_down (box[i].p2.x);
+		int y2 = _cairo_fixed_integer_round_down (box[i].p2.y);
+
+		if (x2 == x1 || y2 == y1)
+		    continue;
+
+		pixman_fill ((uint32_t *) dst->data, dst->stride / sizeof (uint32_t),
+			     PIXMAN_FORMAT_BPP (dst->pixman_format),
+			     x1, y1, x2 - x1, y2 - y1,
+			     pixel);
+	    }
+	}
+    }
+    else
+    {
+	pixman_image_t *src = NULL, *mask = NULL;
+	int src_x, src_y, mask_x = 0, mask_y = 0;
+	pixman_op_t pixman_op = _pixman_operator (op);
+
+	if (need_clip_mask) {
+	    cairo_surface_t *clip_surface;
+	    int clip_x, clip_y;
+
+	    clip_surface = _cairo_clip_get_surface (clip, &dst->base, &clip_x, &clip_y);
+	    if (unlikely (clip_surface->status))
+		return clip_surface->status;
+
+	    mask_x = -clip_x;
+	    mask_y = -clip_y;
+
+	    if (op == CAIRO_OPERATOR_CLEAR) {
+		pattern = NULL;
+		pixman_op = PIXMAN_OP_OUT_REVERSE;
+	    }
+
+	    mask = ((cairo_image_surface_t *) clip_surface)->pixman_image;
+	}
+
+	if (pattern != NULL) {
+	    src = _pixman_image_for_pattern (pattern, FALSE, &extents->bounded, &src_x, &src_y);
+	    if (unlikely (src == NULL))
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	} else {
+	    src = mask;
+	    src_x = mask_x;
+	    src_y = mask_y;
+	    mask = NULL;
+	}
+
+	for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	    const cairo_box_t *box = chunk->base;
+
+	    for (i = 0; i < chunk->count; i++) {
+		int x1 = _cairo_fixed_integer_round_down (box[i].p1.x);
+		int y1 = _cairo_fixed_integer_round_down (box[i].p1.y);
+		int x2 = _cairo_fixed_integer_round_down (box[i].p2.x);
+		int y2 = _cairo_fixed_integer_round_down (box[i].p2.y);
+
+		if (x2 == x1 || y2 == y1)
+		    continue;
+
+		pixman_image_composite32 (pixman_op,
+                                          src, mask, dst->pixman_image,
+                                          x1 + src_x,  y1 + src_y,
+                                          x1 + mask_x, y1 + mask_y,
+                                          x1, y1,
+                                          x2 - x1, y2 - y1);
+	    }
+	}
+
+	if (pattern != NULL)
+	    pixman_image_unref (src);
+
+	if (! extents->is_bounded) {
+	    status =
+		_cairo_image_surface_fixup_unbounded_boxes (dst, extents,
+							    clip_region, boxes);
+	}
+    }
+
+    return status;
+}
+
+static cairo_status_t
+_clip_and_composite_boxes (cairo_image_surface_t *dst,
+			   cairo_operator_t op,
+			   const cairo_pattern_t *src,
+			   cairo_boxes_t *boxes,
+			   cairo_antialias_t antialias,
+			   cairo_composite_rectangles_t *extents,
+			   cairo_clip_t *clip)
+{
+    cairo_traps_t traps;
+    cairo_status_t status;
+    composite_traps_info_t info;
+
+    if (boxes->num_boxes == 0 && extents->is_bounded)
+	return CAIRO_STATUS_SUCCESS;
+
+    /* Use a fast path if the boxes are pixel aligned */
+    status = _composite_boxes (dst, op, src, boxes, antialias, clip, extents);
+    if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	return status;
+
+    /* Otherwise render via a mask and composite in the usual fashion.  */
+    status = _cairo_traps_init_boxes (&traps, boxes);
+    if (unlikely (status))
+	return status;
+
+    info.num_traps = traps.num_traps;
+    info.traps = traps.traps;
+    info.antialias = antialias;
+    status = _clip_and_composite (dst, op, src,
+				  _composite_traps, &info,
+				  extents, clip);
+
+    _cairo_traps_fini (&traps);
+    return status;
+}
+
+static cairo_bool_t
+_mono_edge_is_vertical (const cairo_line_t *line)
+{
+    return _cairo_fixed_integer_round_down (line->p1.x) == _cairo_fixed_integer_round_down (line->p2.x);
+}
+
+static cairo_bool_t
+_traps_are_pixel_aligned (cairo_traps_t *traps,
+			  cairo_antialias_t antialias)
+{
+    int i;
+
+    if (antialias == CAIRO_ANTIALIAS_NONE) {
+	for (i = 0; i < traps->num_traps; i++) {
+	    if (! _mono_edge_is_vertical (&traps->traps[i].left)   ||
+		! _mono_edge_is_vertical (&traps->traps[i].right))
+	    {
+		traps->maybe_region = FALSE;
+		return FALSE;
+	    }
+	}
+    } else {
+	for (i = 0; i < traps->num_traps; i++) {
+	    if (traps->traps[i].left.p1.x != traps->traps[i].left.p2.x   ||
+		traps->traps[i].right.p1.x != traps->traps[i].right.p2.x ||
+		! _cairo_fixed_is_integer (traps->traps[i].top)          ||
+		! _cairo_fixed_is_integer (traps->traps[i].bottom)       ||
+		! _cairo_fixed_is_integer (traps->traps[i].left.p1.x)    ||
+		! _cairo_fixed_is_integer (traps->traps[i].right.p1.x))
+	    {
+		traps->maybe_region = FALSE;
+		return FALSE;
+	    }
+	}
+    }
+
+    return TRUE;
+}
+
+static void
+_boxes_for_traps (cairo_boxes_t *boxes,
+		  cairo_traps_t *traps,
+		  cairo_antialias_t antialias)
+{
+    int i;
+
+    _cairo_boxes_init (boxes);
+
+    boxes->num_boxes    = traps->num_traps;
+    boxes->chunks.base  = (cairo_box_t *) traps->traps;
+    boxes->chunks.count = traps->num_traps;
+    boxes->chunks.size  = traps->num_traps;
+
+    if (antialias != CAIRO_ANTIALIAS_NONE) {
+	for (i = 0; i < traps->num_traps; i++) {
+	    /* Note the traps and boxes alias so we need to take the local copies first. */
+	    cairo_fixed_t x1 = traps->traps[i].left.p1.x;
+	    cairo_fixed_t x2 = traps->traps[i].right.p1.x;
+	    cairo_fixed_t y1 = traps->traps[i].top;
+	    cairo_fixed_t y2 = traps->traps[i].bottom;
+
+	    boxes->chunks.base[i].p1.x = x1;
+	    boxes->chunks.base[i].p1.y = y1;
+	    boxes->chunks.base[i].p2.x = x2;
+	    boxes->chunks.base[i].p2.y = y2;
+
+	    if (boxes->is_pixel_aligned) {
+		boxes->is_pixel_aligned =
+		    _cairo_fixed_is_integer (x1) && _cairo_fixed_is_integer (y1) &&
+		    _cairo_fixed_is_integer (x2) && _cairo_fixed_is_integer (y2);
+	    }
+	}
+    } else {
+	boxes->is_pixel_aligned = TRUE;
+
+	for (i = 0; i < traps->num_traps; i++) {
+	    /* Note the traps and boxes alias so we need to take the local copies first. */
+	    cairo_fixed_t x1 = traps->traps[i].left.p1.x;
+	    cairo_fixed_t x2 = traps->traps[i].right.p1.x;
+	    cairo_fixed_t y1 = traps->traps[i].top;
+	    cairo_fixed_t y2 = traps->traps[i].bottom;
+
+	    /* round down here to match Pixman's behavior when using traps. */
+	    boxes->chunks.base[i].p1.x = _cairo_fixed_round_down (x1);
+	    boxes->chunks.base[i].p1.y = _cairo_fixed_round_down (y1);
+	    boxes->chunks.base[i].p2.x = _cairo_fixed_round_down (x2);
+	    boxes->chunks.base[i].p2.y = _cairo_fixed_round_down (y2);
+	}
+    }
+}
+
+static cairo_status_t
+_clip_and_composite_trapezoids (cairo_image_surface_t *dst,
+				cairo_operator_t op,
+				const cairo_pattern_t *src,
+				cairo_traps_t *traps,
+				cairo_antialias_t antialias,
+				cairo_composite_rectangles_t *extents,
+				cairo_clip_t *clip)
+{
+    composite_traps_info_t info;
+    cairo_bool_t need_clip_surface = FALSE;
+    cairo_status_t status;
+
+    if (traps->num_traps == 0 && extents->is_bounded)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (clip != NULL) {
+	cairo_region_t *clip_region;
+
+	status = _cairo_clip_get_region (clip, &clip_region);
+	need_clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    if (traps->has_intersections) {
+	if (traps->is_rectangular)
+	    status = _cairo_bentley_ottmann_tessellate_rectangular_traps (traps, CAIRO_FILL_RULE_WINDING);
+	else if (traps->is_rectilinear)
+	    status = _cairo_bentley_ottmann_tessellate_rectilinear_traps (traps, CAIRO_FILL_RULE_WINDING);
+	else
+	    status = _cairo_bentley_ottmann_tessellate_traps (traps, CAIRO_FILL_RULE_WINDING);
+	if (unlikely (status))
+	    return status;
+    }
+
+    /* Use a fast path if the trapezoids consist of a simple region,
+     * but we can only do this if we do not have a clip surface, or can
+     * substitute the mask with the clip.
+     */
+    if (traps->maybe_region && _traps_are_pixel_aligned (traps, antialias) &&
+	(! need_clip_surface ||
+	 (extents->is_bounded && op != CAIRO_OPERATOR_SOURCE)))
+    {
+	cairo_boxes_t boxes;
+
+	_boxes_for_traps (&boxes, traps, antialias);
+	return _clip_and_composite_boxes (dst, op, src,
+					  &boxes, antialias,
+					  extents, clip);
+    }
+
+    /* No fast path, exclude self-intersections and clip trapezoids. */
+    /* Otherwise render the trapezoids to a mask and composite in the usual
+     * fashion.
+     */
+    info.traps = traps->traps;
+    info.num_traps = traps->num_traps;
+    info.antialias = antialias;
+    return _clip_and_composite (dst, op, src,
+				_composite_traps, &info,
+				extents, clip);
+}
+
+static cairo_clip_path_t *
+_clip_get_single_path (cairo_clip_t *clip)
+{
+    cairo_clip_path_t *iter = clip->path;
+    cairo_clip_path_t *path = NULL;
+
+    do {
+	if ((iter->flags & CAIRO_CLIP_PATH_IS_BOX) == 0) {
+	    if (path != NULL)
+		return FALSE;
+
+	    path = iter;
+	}
+	iter = iter->prev;
+    } while (iter != NULL);
+
+    return path;
+}
+
+/* high level image interface */
+
+static cairo_int_status_t
+_cairo_image_surface_paint (void			*abstract_surface,
+			    cairo_operator_t		 op,
+			    const cairo_pattern_t	*source,
+			    cairo_clip_t		*clip)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_clip_path_t *clip_path;
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_paint (&extents,
+							 &rect,
+							 op, source,
+							 clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (clip != NULL) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	have_clip = TRUE;
+    }
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status)) {
+	if (have_clip)
+	    _cairo_clip_fini (&local_clip);
+
+	return status;
+    }
+
+    /* If the clip cannot be reduced to a set of boxes, we will need to
+     * use a clipmask. Paint is special as it is the only operation that
+     * does not implicitly use a mask, so we may be able to reduce this
+     * operation to a fill...
+     */
+    if (clip != NULL &&
+	extents.is_bounded &&
+	(clip_path = _clip_get_single_path (clip)) != NULL)
+    {
+	status = _cairo_image_surface_fill (surface, op, source,
+					    &clip_path->path,
+					    clip_path->fill_rule,
+					    clip_path->tolerance,
+					    clip_path->antialias,
+					    NULL);
+    }
+    else
+    {
+	cairo_boxes_t boxes;
+
+	_cairo_boxes_init_for_array (&boxes, clip_boxes, num_boxes);
+	status = _clip_and_composite_boxes (surface, op, source,
+					    &boxes, CAIRO_ANTIALIAS_DEFAULT,
+					    &extents, clip);
+    }
+
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
+static cairo_status_t
+_composite_mask (void				*closure,
+		 pixman_image_t			*dst,
+		 pixman_format_code_t		 dst_format,
+		 cairo_operator_t		 op,
+		 const cairo_pattern_t		*src_pattern,
+		 int				 dst_x,
+		 int				 dst_y,
+		 const cairo_rectangle_int_t	*extents,
+		 cairo_region_t			*clip_region)
+{
+    const cairo_pattern_t *mask_pattern = closure;
+    pixman_image_t *src, *mask = NULL;
+    int src_x = 0, src_y = 0;
+    int mask_x = 0, mask_y = 0;
+
+    if (src_pattern != NULL) {
+	src = _pixman_image_for_pattern (src_pattern, FALSE, extents, &src_x, &src_y);
+	if (unlikely (src == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+	mask = _pixman_image_for_pattern (mask_pattern, TRUE, extents, &mask_x, &mask_y);
+	if (unlikely (mask == NULL)) {
+	    pixman_image_unref (src);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+
+	if (mask_pattern->has_component_alpha)
+	    pixman_image_set_component_alpha (mask, TRUE);
+    } else {
+	src = _pixman_image_for_pattern (mask_pattern, FALSE, extents, &src_x, &src_y);
+	if (unlikely (src == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    pixman_image_composite32 (_pixman_operator (op), src, mask, dst,
+                              extents->x + src_x,  extents->y + src_y,
+                              extents->x + mask_x, extents->y + mask_y,
+                              extents->x - dst_x,  extents->y - dst_y,
+                              extents->width,      extents->height);
+
+    if (mask != NULL)
+	pixman_image_unref (mask);
+    pixman_image_unref (src);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_int_status_t
+_cairo_image_surface_mask (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   const cairo_pattern_t	*mask,
+			   cairo_clip_t			*clip)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_mask (&extents,
+							&rect,
+							op, source, mask, clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (clip != NULL && extents.is_bounded) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status)) {
+	    _cairo_clip_fini (&local_clip);
+	    return status;
+	}
+
+	have_clip = TRUE;
+    }
+
+    status = _clip_and_composite (surface, op, source,
+				  _composite_mask, (void *) mask,
+				  &extents, clip);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
+typedef struct {
+    cairo_polygon_t		*polygon;
+    cairo_fill_rule_t		 fill_rule;
+    cairo_antialias_t		 antialias;
+} composite_spans_info_t;
+
+//#define USE_BOTOR_SCAN_CONVERTER
+static cairo_status_t
+_composite_spans (void                          *closure,
+		  pixman_image_t		*dst,
+		  pixman_format_code_t		 dst_format,
+		  cairo_operator_t               op,
+		  const cairo_pattern_t         *pattern,
+		  int                            dst_x,
+		  int                            dst_y,
+		  const cairo_rectangle_int_t   *extents,
+		  cairo_region_t		*clip_region)
+{
+    uint8_t mask_buf[CAIRO_STACK_BUFFER_SIZE];
+    composite_spans_info_t *info = closure;
+    cairo_image_surface_span_renderer_t renderer;
+#if USE_BOTOR_SCAN_CONVERTER
+    cairo_box_t box;
+    cairo_botor_scan_converter_t converter;
+#else
+    cairo_scan_converter_t *converter;
+#endif
+    pixman_image_t *mask;
+    cairo_status_t status;
+
+#if USE_BOTOR_SCAN_CONVERTER
+    box.p1.x = _cairo_fixed_from_int (extents->x);
+    box.p1.y = _cairo_fixed_from_int (extents->y);
+    box.p2.x = _cairo_fixed_from_int (extents->x + extents->width);
+    box.p2.y = _cairo_fixed_from_int (extents->y + extents->height);
+    _cairo_botor_scan_converter_init (&converter, &box, info->fill_rule);
+    status = converter.base.add_polygon (&converter.base, info->polygon);
+#else
+    converter = _cairo_tor_scan_converter_create (extents->x, extents->y,
+						  extents->x + extents->width,
+						  extents->y + extents->height,
+						  info->fill_rule);
+    status = converter->add_polygon (converter, info->polygon);
+#endif
+    if (unlikely (status))
+	goto CLEANUP_CONVERTER;
+
+    /* TODO: support rendering to A1 surfaces (or: go add span
+     * compositing to pixman.) */
+
+    if (pattern == NULL &&
+	dst_format == PIXMAN_a8 &&
+	op == CAIRO_OPERATOR_SOURCE)
+    {
+	mask = dst;
+	dst = NULL;
+    }
+    else
+    {
+	int stride = CAIRO_STRIDE_FOR_WIDTH_BPP (extents->width, 8);
+	uint8_t *data = mask_buf;
+
+	if (extents->height * stride <= (int) sizeof (mask_buf))
+	    memset (data, 0, extents->height * stride);
+	else
+	    data = NULL, stride = 0;
+
+	mask = pixman_image_create_bits (PIXMAN_a8,
+					 extents->width,
+					 extents->height,
+					 (uint32_t *) data,
+					 stride);
+	if (unlikely (mask == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto CLEANUP_CONVERTER;
+	}
+    }
+
+    renderer.base.render_rows = _cairo_image_surface_span;
+    renderer.mask_stride = pixman_image_get_stride (mask);
+    renderer.mask_data = (uint8_t *) pixman_image_get_data (mask);
+    if (dst != NULL)
+	renderer.mask_data -= extents->y * renderer.mask_stride + extents->x;
+    else
+	renderer.mask_data -= dst_y * renderer.mask_stride + dst_x;
+
+#if USE_BOTOR_SCAN_CONVERTER
+    status = converter.base.generate (&converter.base, &renderer.base);
+#else
+    status = converter->generate (converter, &renderer.base);
+#endif
+    if (unlikely (status))
+	goto CLEANUP_RENDERER;
+
+    if (dst != NULL) {
+	pixman_image_t *src;
+	int src_x, src_y;
+
+	src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+	if (unlikely (src == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto CLEANUP_RENDERER;
+	}
+
+	pixman_image_composite32 (_pixman_operator (op), src, mask, dst,
+                                  extents->x + src_x, extents->y + src_y,
+                                  0, 0, /* mask.x, mask.y */
+                                  extents->x - dst_x, extents->y - dst_y,
+                                  extents->width, extents->height);
+	pixman_image_unref (src);
+    }
+
+ CLEANUP_RENDERER:
+    if (dst != NULL)
+	pixman_image_unref (mask);
+ CLEANUP_CONVERTER:
+#if USE_BOTOR_SCAN_CONVERTER
+    converter.base.destroy (&converter.base);
+#else
+    converter->destroy (converter);
+#endif
+    return status;
+}
+
+static cairo_status_t
+_clip_and_composite_polygon (cairo_image_surface_t *dst,
+			     cairo_operator_t op,
+			     const cairo_pattern_t *src,
+			     cairo_polygon_t *polygon,
+			     cairo_fill_rule_t fill_rule,
+			     cairo_antialias_t antialias,
+			     cairo_composite_rectangles_t *extents,
+			     cairo_clip_t *clip)
+{
+    cairo_status_t status;
+
+    if (polygon->num_edges == 0) {
+	cairo_traps_t traps;
+
+	if (extents->is_bounded)
+	    return CAIRO_STATUS_SUCCESS;
+
+	_cairo_traps_init (&traps);
+	status = _clip_and_composite_trapezoids (dst, op, src,
+						 &traps, antialias,
+						 extents, clip);
+	_cairo_traps_fini (&traps);
+
+	return status;
+    }
+
+    _cairo_box_round_to_rectangle (&polygon->extents, &extents->mask);
+    if (! _cairo_rectangle_intersect (&extents->bounded, &extents->mask))
+	return CAIRO_STATUS_SUCCESS;
+
+    if (antialias != CAIRO_ANTIALIAS_NONE) {
+	composite_spans_info_t info;
+
+	info.polygon = polygon;
+	info.fill_rule = fill_rule;
+	info.antialias = antialias;
+
+	status = _clip_and_composite (dst, op, src,
+				      _composite_spans, &info,
+				      extents, clip);
+    } else {
+	cairo_traps_t traps;
+
+	_cairo_traps_init (&traps);
+
+	/* Fall back to trapezoid fills. */
+	status = _cairo_bentley_ottmann_tessellate_polygon (&traps,
+							    polygon,
+							    fill_rule);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    status = _clip_and_composite_trapezoids (dst, op, src,
+						     &traps, antialias,
+						     extents, clip);
+	}
+
+	_cairo_traps_fini (&traps);
+    }
+
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_image_surface_stroke (void			*abstract_surface,
+			     cairo_operator_t		 op,
+			     const cairo_pattern_t	*source,
+			     cairo_path_fixed_t		*path,
+			     const cairo_stroke_style_t	*style,
+			     const cairo_matrix_t	*ctm,
+			     const cairo_matrix_t	*ctm_inverse,
+			     double			 tolerance,
+			     cairo_antialias_t		 antialias,
+			     cairo_clip_t		*clip)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  &rect,
+							  op, source,
+							  path, style, ctm,
+							  clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (clip != NULL) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	have_clip = TRUE;
+    }
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status)) {
+	if (have_clip)
+	    _cairo_clip_fini (&local_clip);
+
+	return status;
+    }
+
+    status = CAIRO_INT_STATUS_UNSUPPORTED;
+    if (path->is_rectilinear) {
+	cairo_boxes_t boxes;
+
+	_cairo_boxes_init (&boxes);
+	_cairo_boxes_limit (&boxes, clip_boxes, num_boxes);
+
+	status = _cairo_path_fixed_stroke_rectilinear_to_boxes (path,
+								style,
+								ctm,
+								&boxes);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    status = _clip_and_composite_boxes (surface, op, source,
+						&boxes, antialias,
+						&extents, clip);
+	}
+
+	_cairo_boxes_fini (&boxes);
+    }
+
+    if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
+	cairo_polygon_t polygon;
+
+	_cairo_polygon_init (&polygon);
+	_cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+	status = _cairo_path_fixed_stroke_to_polygon (path,
+						      style,
+						      ctm, ctm_inverse,
+						      tolerance,
+						      &polygon);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    status = _clip_and_composite_polygon (surface, op, source, &polygon,
+						  CAIRO_FILL_RULE_WINDING, antialias,
+						  &extents, clip);
+	}
+
+	_cairo_polygon_fini (&polygon);
+    }
+
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_image_surface_fill (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   cairo_path_fixed_t		*path,
+			   cairo_fill_rule_t		 fill_rule,
+			   double			 tolerance,
+			   cairo_antialias_t		 antialias,
+			   cairo_clip_t			*clip)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							&rect,
+							op, source, path,
+							clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (extents.is_bounded && clip != NULL) {
+	cairo_clip_path_t *clip_path;
+
+	if (((clip_path = _clip_get_single_path (clip)) != NULL) &&
+	    _cairo_path_fixed_equal (&clip_path->path, path))
+	{
+	    clip = NULL;
+	}
+    }
+
+    if (clip != NULL) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	have_clip = TRUE;
+    }
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status)) {
+	if (have_clip)
+	    _cairo_clip_fini (&local_clip);
+
+	return status;
+    }
+
+    if (_cairo_path_fixed_is_rectilinear_fill (path)) {
+	cairo_boxes_t boxes;
+
+	_cairo_boxes_init (&boxes);
+	_cairo_boxes_limit (&boxes, clip_boxes, num_boxes);
+
+	status = _cairo_path_fixed_fill_rectilinear_to_boxes (path,
+							      fill_rule,
+							      &boxes);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    status = _clip_and_composite_boxes (surface, op, source,
+						&boxes, antialias,
+						&extents, clip);
+	}
+
+	_cairo_boxes_fini (&boxes);
+    } else {
+	cairo_polygon_t polygon;
+
+	assert (! path->is_empty_fill);
+
+	_cairo_polygon_init (&polygon);
+	_cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+	status = _cairo_path_fixed_fill_to_polygon (path, tolerance, &polygon);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    status = _clip_and_composite_polygon (surface, op, source, &polygon,
+						  fill_rule, antialias,
+						  &extents, clip);
+	}
+
+	_cairo_polygon_fini (&polygon);
+    }
+
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    return status;
+}
+
+typedef struct {
+    cairo_scaled_font_t *font;
+    cairo_glyph_t *glyphs;
+    int num_glyphs;
+} composite_glyphs_info_t;
+
+static cairo_status_t
+_composite_glyphs_via_mask (void			*closure,
+			    pixman_image_t		*dst,
+			    pixman_format_code_t	 dst_format,
+			    cairo_operator_t		 op,
+			    const cairo_pattern_t	*pattern,
+			    int				 dst_x,
+			    int				 dst_y,
+			    const cairo_rectangle_int_t	*extents,
+			    cairo_region_t		*clip_region)
+{
+    composite_glyphs_info_t *info = closure;
+    cairo_scaled_font_t *font = info->font;
+    cairo_glyph_t *glyphs = info->glyphs;
+    int num_glyphs = info->num_glyphs;
+    pixman_image_t *mask = NULL;
+    pixman_image_t *src;
+    pixman_image_t *white;
+    pixman_format_code_t mask_format = 0; /* silence gcc */
+    cairo_status_t status;
+    int src_x, src_y;
+    int i;
+
+    src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+    if (unlikely (src == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    white = _pixman_white_image ();
+    if (unlikely (white == NULL)) {
+	pixman_image_unref (src);
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    _cairo_scaled_font_freeze_cache (font);
+
+    for (i = 0; i < num_glyphs; i++) {
+	int x, y;
+	cairo_image_surface_t *glyph_surface;
+	cairo_scaled_glyph_t *scaled_glyph;
+
+	status = _cairo_scaled_glyph_lookup (font, glyphs[i].index,
+					     CAIRO_SCALED_GLYPH_INFO_SURFACE,
+					     &scaled_glyph);
+
+	if (unlikely (status))
+	    goto CLEANUP;
+
+	glyph_surface = scaled_glyph->surface;
+
+	if (glyph_surface->width == 0 || glyph_surface->height == 0)
+	    continue;
+
+	/* To start, create the mask using the format from the first
+	 * glyph. Later we'll deal with different formats. */
+	if (mask == NULL) {
+	    mask_format = glyph_surface->pixman_format;
+	    mask = pixman_image_create_bits (mask_format,
+					     extents->width, extents->height,
+					     NULL, 0);
+	    if (unlikely (mask == NULL)) {
+		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+		goto CLEANUP;
+	    }
+
+	    if (PIXMAN_FORMAT_RGB (mask_format))
+		pixman_image_set_component_alpha (mask, TRUE);
+	}
+
+	/* If we have glyphs of different formats, we "upgrade" the mask
+	 * to the wider of the formats. */
+	if (glyph_surface->pixman_format != mask_format &&
+	    PIXMAN_FORMAT_BPP (mask_format) <
+	    PIXMAN_FORMAT_BPP (glyph_surface->pixman_format))
+	{
+	    pixman_image_t *new_mask;
+
+	    mask_format = glyph_surface->pixman_format;
+	    new_mask = pixman_image_create_bits (mask_format,
+						 extents->width, extents->height,
+						 NULL, 0);
+	    if (unlikely (new_mask == NULL)) {
+		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+		goto CLEANUP;
+	    }
+
+	    pixman_image_composite32 (PIXMAN_OP_SRC,
+                                      white, mask, new_mask,
+                                      0, 0, 0, 0, 0, 0,
+                                      extents->width, extents->height);
+
+	    pixman_image_unref (mask);
+	    mask = new_mask;
+	    if (PIXMAN_FORMAT_RGB (mask_format))
+		pixman_image_set_component_alpha (mask, TRUE);
+	}
+
+	/* round glyph locations to the nearest pixel */
+	/* XXX: FRAGILE: We're ignoring device_transform scaling here. A bug? */
+	x = _cairo_lround (glyphs[i].x -
+			   glyph_surface->base.device_transform.x0);
+	y = _cairo_lround (glyphs[i].y -
+			   glyph_surface->base.device_transform.y0);
+	if (glyph_surface->pixman_format == mask_format) {
+	    pixman_image_composite32 (PIXMAN_OP_ADD,
+                                      glyph_surface->pixman_image, NULL, mask,
+                                      0, 0, 0, 0,
+                                      x - extents->x, y - extents->y,
+                                      glyph_surface->width,
+                                      glyph_surface->height);
+	} else {
+	    pixman_image_composite32 (PIXMAN_OP_ADD,
+                                      white, glyph_surface->pixman_image, mask,
+                                      0, 0, 0, 0,
+                                      x - extents->x, y - extents->y,
+                                      glyph_surface->width,
+                                      glyph_surface->height);
+	}
+    }
+
+    pixman_image_composite32 (_pixman_operator (op),
+                              src, mask, dst,
+                              extents->x + src_x, extents->y + src_y,
+                              0, 0,
+                              extents->x - dst_x, extents->y - dst_y,
+                              extents->width,     extents->height);
+
+CLEANUP:
+    _cairo_scaled_font_thaw_cache (font);
+    if (mask != NULL)
+	pixman_image_unref (mask);
+    pixman_image_unref (src);
+    pixman_image_unref (white);
+
+    return status;
+}
+
+static cairo_status_t
+_composite_glyphs (void				*closure,
+		   pixman_image_t		*dst,
+		   pixman_format_code_t		 dst_format,
+		   cairo_operator_t		 op,
+		   const cairo_pattern_t	*pattern,
+		   int				 dst_x,
+		   int				 dst_y,
+		   const cairo_rectangle_int_t	*extents,
+		   cairo_region_t		*clip_region)
+{
+    composite_glyphs_info_t *info = closure;
+    cairo_scaled_glyph_t *glyph_cache[64];
+    pixman_op_t pixman_op = _pixman_operator (op);
+    pixman_image_t *src = NULL;
+    int src_x = 0, src_y = 0;
+    cairo_status_t status;
+    int i;
+
+    if (pattern != NULL) {
+	src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+	src_x -= dst_x;
+	src_y -= dst_y;
+    } else {
+	src = _pixman_white_image ();
+    }
+    if (unlikely (src == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    memset (glyph_cache, 0, sizeof (glyph_cache));
+    status = CAIRO_STATUS_SUCCESS;
+
+    _cairo_scaled_font_freeze_cache (info->font);
+    for (i = 0; i < info->num_glyphs; i++) {
+	int x, y;
+	cairo_image_surface_t *glyph_surface;
+	cairo_scaled_glyph_t *scaled_glyph;
+	unsigned long glyph_index = info->glyphs[i].index;
+	int cache_index = glyph_index % ARRAY_LENGTH (glyph_cache);
+
+	scaled_glyph = glyph_cache[cache_index];
+	if (scaled_glyph == NULL ||
+	    _cairo_scaled_glyph_index (scaled_glyph) != glyph_index)
+	{
+	    status = _cairo_scaled_glyph_lookup (info->font, glyph_index,
+						 CAIRO_SCALED_GLYPH_INFO_SURFACE,
+						 &scaled_glyph);
+
+	    if (unlikely (status))
+		break;
+
+	    glyph_cache[cache_index] = scaled_glyph;
+	}
+
+	glyph_surface = scaled_glyph->surface;
+	if (glyph_surface->width && glyph_surface->height) {
+	    int x1, y1, x2, y2;
+
+	    /* round glyph locations to the nearest pixel */
+	    /* XXX: FRAGILE: We're ignoring device_transform scaling here. A bug? */
+	    x = _cairo_lround (info->glyphs[i].x -
+			       glyph_surface->base.device_transform.x0);
+	    y = _cairo_lround (info->glyphs[i].y -
+			       glyph_surface->base.device_transform.y0);
+
+	    x1 = x;
+	    if (x1 < extents->x)
+		x1 = extents->x;
+	    x2 = x + glyph_surface->width;
+	    if (x2 > extents->x + extents->width)
+		x2 = extents->x + extents->width;
+
+	    y1 = y;
+	    if (y1 < extents->y)
+		y1 = extents->y;
+	    y2 = y + glyph_surface->height;
+	    if (y2 > extents->y + extents->height)
+		y2 = extents->y + extents->height;
+
+	    pixman_image_composite32 (pixman_op,
+                                      src, glyph_surface->pixman_image, dst,
+                                      x1 + src_x,  y1 + src_y,
+                                      x1 - x, y1 - y,
+                                      x1 - dst_x, y1 - dst_y,
+                                      x2 - x1, y2 - y1);
+	}
+    }
+    _cairo_scaled_font_thaw_cache (info->font);
+
+    pixman_image_unref (src);
+
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_image_surface_glyphs (void			*abstract_surface,
+			     cairo_operator_t		 op,
+			     const cairo_pattern_t	*source,
+			     cairo_glyph_t		*glyphs,
+			     int			 num_glyphs,
+			     cairo_scaled_font_t	*scaled_font,
+			     cairo_clip_t		*clip,
+			     int *num_remaining)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    composite_glyphs_info_t glyph_info;
+    cairo_clip_t local_clip;
+    cairo_bool_t have_clip = FALSE;
+    cairo_bool_t overlap;
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_glyphs (&extents,
+							  &rect,
+							  op, source,
+							  scaled_font,
+							  glyphs, num_glyphs,
+							  clip,
+							  &overlap);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_rectangle (clip, &extents.mask))
+	clip = NULL;
+
+    if (clip != NULL && extents.is_bounded) {
+	clip = _cairo_clip_init_copy (&local_clip, clip);
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status))
+	    return status;
+
+	have_clip = TRUE;
+    }
+
+    glyph_info.font = scaled_font;
+    glyph_info.glyphs = glyphs;
+    glyph_info.num_glyphs = num_glyphs;
+
+    status = _clip_and_composite (surface, op, source,
+				  overlap || extents.is_bounded == 0 ? _composite_glyphs_via_mask : _composite_glyphs,
+				  &glyph_info,
+				  &extents, clip);
+
+    if (have_clip)
+	_cairo_clip_fini (&local_clip);
+
+    *num_remaining = 0;
+    return status;
+}
+
+static cairo_bool_t
+_cairo_image_surface_get_extents (void			  *abstract_surface,
+				  cairo_rectangle_int_t   *rectangle)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+
+    rectangle->x = 0;
+    rectangle->y = 0;
+    rectangle->width  = surface->width;
+    rectangle->height = surface->height;
+
+    return TRUE;
+}
+
+static void
+_cairo_image_surface_get_font_options (void                  *abstract_surface,
+				       cairo_font_options_t  *options)
+{
+    _cairo_font_options_init_default (options);
+
+    cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+    _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON);
+}
+
+/* legacy interface kept for compatibility until surface-fallback is removed */
+static cairo_status_t
+_cairo_image_surface_acquire_dest_image (void                    *abstract_surface,
+					 cairo_rectangle_int_t   *interest_rect,
+					 cairo_image_surface_t  **image_out,
+					 cairo_rectangle_int_t   *image_rect_out,
+					 void                   **image_extra)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+
+    image_rect_out->x = 0;
+    image_rect_out->y = 0;
+    image_rect_out->width = surface->width;
+    image_rect_out->height = surface->height;
+
+    *image_out = surface;
+    *image_extra = NULL;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_cairo_image_surface_release_dest_image (void                    *abstract_surface,
+                                        cairo_rectangle_int_t   *interest_rect,
+                                        cairo_image_surface_t   *image,
+                                        cairo_rectangle_int_t   *image_rect,
+                                        void                    *image_extra)
+{
+}
+
+static cairo_status_t
+_cairo_image_surface_clone_similar (void               *abstract_surface,
+				    cairo_surface_t     *src,
+				    int                  src_x,
+				    int                  src_y,
+				    int                  width,
+				    int                  height,
+				    int                 *clone_offset_x,
+				    int                 *clone_offset_y,
+				    cairo_surface_t    **clone_out)
+{
+    cairo_image_surface_t *surface = abstract_surface;
+
+    if (src->backend == surface->base.backend) {
+	*clone_offset_x = *clone_offset_y = 0;
+	*clone_out = cairo_surface_reference (src);
+
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
+
 static cairo_int_status_t
 _cairo_image_surface_composite (cairo_operator_t	 op,
 				const cairo_pattern_t	*src_pattern,
@@ -1115,91 +4178,88 @@ _cairo_image_surface_composite (cairo_operator_t	 op,
 				unsigned int		 height,
 				cairo_region_t		*clip_region)
 {
-    cairo_surface_attributes_t	 src_attr, mask_attr;
-    cairo_image_surface_t	*dst = abstract_dst;
-    cairo_image_surface_t	*src;
-    cairo_image_surface_t	*mask;
-    cairo_int_status_t		 status;
+    cairo_image_surface_t *dst = abstract_dst;
+    cairo_composite_rectangles_t extents;
+    pixman_image_t *src;
+    int src_offset_x, src_offset_y;
+    cairo_status_t status;
 
-    status = _cairo_image_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_pattern_acquire_surfaces (src_pattern, mask_pattern,
-					      &dst->base,
-					      src_x, src_y,
-					      mask_x, mask_y,
-					      width, height,
-					      CAIRO_PATTERN_ACQUIRE_NONE,
-					      (cairo_surface_t **) &src,
-					      (cairo_surface_t **) &mask,
-					      &src_attr, &mask_attr);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_image_surface_set_attributes (src, &src_attr,
-						  dst_x + width / 2.,
-						  dst_y + height / 2.);
-    if (unlikely (status))
-	goto CLEANUP_SURFACES;
-
-    /* we sometimes get destinations with transforms.
-     * we're not equiped to deal with this */
-    {
-        static const pixman_transform_t id = {
-           {{ pixman_fixed_1, 0, 0 },
-            { 0, pixman_fixed_1, 0 },
-            { 0, 0, pixman_fixed_1 }}
-        };
-        pixman_image_set_transform (dst->pixman_image, &id);
-    }
-
-    if (mask) {
-	status = _cairo_image_surface_set_attributes (mask, &mask_attr,
-						      dst_x + width / 2.,
-						      dst_y + height / 2.);
+    if (clip_region != NULL) {
+	status = _cairo_image_surface_set_clip_region (dst, clip_region);
 	if (unlikely (status))
-	    goto CLEANUP_SURFACES;
+	    return status;
+    }
 
-	pixman_image_composite (_pixman_operator (op),
-				src->pixman_image,
-				mask->pixman_image,
-				dst->pixman_image,
-				src_x + src_attr.x_offset,
-				src_y + src_attr.y_offset,
-				mask_x + mask_attr.x_offset,
-				mask_y + mask_attr.y_offset,
-				dst_x, dst_y,
-				width, height);
+    extents.source.x = src_x;
+    extents.source.y = src_y;
+    extents.source.width  = width;
+    extents.source.height = height;
+
+    extents.mask.x = mask_x;
+    extents.mask.y = mask_y;
+    extents.mask.width  = width;
+    extents.mask.height = height;
+
+    extents.bounded.x = dst_x;
+    extents.bounded.y = dst_y;
+    extents.bounded.width  = width;
+    extents.bounded.height = height;
+
+    extents.unbounded.x = 0;
+    extents.unbounded.y = 0;
+    extents.unbounded.width  = dst->width;
+    extents.unbounded.height = dst->height;
+
+    if (clip_region != NULL) {
+	cairo_rectangle_int_t rect;
+
+	cairo_region_get_extents (clip_region, &rect);
+	if (! _cairo_rectangle_intersect (&extents.unbounded, &rect))
+	    return CAIRO_STATUS_SUCCESS;
+    }
+
+    extents.is_bounded = _cairo_operator_bounded_by_either (op);
+
+    src = _pixman_image_for_pattern (src_pattern, FALSE, &extents.source, &src_offset_x, &src_offset_y);
+    if (unlikely (src == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    status = CAIRO_STATUS_SUCCESS;
+    if (mask_pattern != NULL) {
+	pixman_image_t *mask;
+	int mask_offset_x, mask_offset_y;
+
+	mask = _pixman_image_for_pattern (mask_pattern, TRUE, &extents.mask, &mask_offset_x, &mask_offset_y);
+	if (unlikely (mask == NULL)) {
+	    pixman_image_unref (src);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+
+	pixman_image_composite32 (_pixman_operator (op),
+                                  src, mask, dst->pixman_image,
+                                  src_x + src_offset_x,
+                                  src_y + src_offset_y,
+                                  mask_x + mask_offset_x,
+                                  mask_y + mask_offset_y,
+				  dst_x, dst_y, width, height);
+
+	pixman_image_unref (mask);
     } else {
-	pixman_image_composite (_pixman_operator (op),
-				src->pixman_image,
-				NULL,
-				dst->pixman_image,
-				src_x + src_attr.x_offset,
-				src_y + src_attr.y_offset,
-				0, 0,
-				dst_x, dst_y,
-				width, height);
+	pixman_image_composite32 (_pixman_operator (op),
+                                  src, NULL, dst->pixman_image,
+                                  src_x + src_offset_x,
+                                  src_y + src_offset_y,
+                                  0, 0,
+                                  dst_x, dst_y, width, height);
     }
 
-    if (! _cairo_operator_bounded_by_source (op)) {
-	status = _cairo_surface_composite_fixup_unbounded (&dst->base,
-							   &src_attr, src->width, src->height,
-							   mask ? &mask_attr : NULL,
-							   mask ? mask->width : 0,
-							   mask ? mask->height : 0,
-							   src_x, src_y,
-							   mask_x, mask_y,
-							   dst_x, dst_y, width, height,
-							   clip_region);
-    }
+    pixman_image_unref (src);
 
- CLEANUP_SURFACES:
-    if (mask)
-	_cairo_pattern_release_surface (mask_pattern, &mask->base, &mask_attr);
+    if (! extents.is_bounded)
+	status = _cairo_image_surface_fixup_unbounded (dst, &extents, NULL);
 
-    _cairo_pattern_release_surface (src_pattern, &src->base, &src_attr);
+    if (clip_region != NULL)
+	_cairo_image_surface_unset_clip_region (dst);
 
     return status;
 }
@@ -1214,8 +4274,8 @@ _cairo_image_surface_fill_rectangles (void		      *abstract_surface,
     cairo_image_surface_t *surface = abstract_surface;
 
     pixman_color_t pixman_color;
-    pixman_rectangle16_t stack_rects[CAIRO_STACK_ARRAY_LENGTH (pixman_rectangle16_t)];
-    pixman_rectangle16_t *pixman_rects = stack_rects;
+    pixman_box32_t stack_boxes[CAIRO_STACK_ARRAY_LENGTH (pixman_box32_t)];
+    pixman_box32_t *pixman_boxes = stack_boxes;
     int i;
 
     cairo_int_status_t status;
@@ -1228,75 +4288,35 @@ _cairo_image_surface_fill_rectangles (void		      *abstract_surface,
     pixman_color.blue  = color->blue_short;
     pixman_color.alpha = color->alpha_short;
 
-    status = _cairo_image_surface_set_clip_region (surface, NULL);
-    assert (status == CAIRO_STATUS_SUCCESS);
-
-    if (num_rects > ARRAY_LENGTH (stack_rects)) {
-	pixman_rects = _cairo_malloc_ab (num_rects, sizeof (pixman_rectangle16_t));
-	if (unlikely (pixman_rects == NULL))
+    if (num_rects > ARRAY_LENGTH (stack_boxes)) {
+	pixman_boxes = _cairo_malloc_ab (num_rects, sizeof (pixman_box32_t));
+	if (unlikely (pixman_boxes == NULL))
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
     for (i = 0; i < num_rects; i++) {
-	pixman_rects[i].x = rects[i].x;
-	pixman_rects[i].y = rects[i].y;
-	pixman_rects[i].width = rects[i].width;
-	pixman_rects[i].height = rects[i].height;
+	pixman_boxes[i].x1 = rects[i].x;
+	pixman_boxes[i].y1 = rects[i].y;
+	pixman_boxes[i].x2 = rects[i].x + rects[i].width;
+	pixman_boxes[i].y2 = rects[i].y + rects[i].height;
     }
 
-    /* XXX: pixman_fill_region() should be implemented */
     status = CAIRO_STATUS_SUCCESS;
-    if (! pixman_image_fill_rectangles (_pixman_operator (op),
-					surface->pixman_image,
-					&pixman_color,
-					num_rects,
-					pixman_rects))
+    if (! pixman_image_fill_boxes (_pixman_operator (op),
+                                   surface->pixman_image,
+                                   &pixman_color,
+                                   num_rects,
+                                   pixman_boxes))
     {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
-    if (pixman_rects != stack_rects)
-	free (pixman_rects);
+    if (pixman_boxes != stack_boxes)
+	free (pixman_boxes);
 
     return status;
 }
 
-static pixman_format_code_t
-_pixman_mask_format_from_antialias (cairo_antialias_t antialias)
-{
-    if (antialias == CAIRO_ANTIALIAS_NONE)
-	return PIXMAN_a1;
-    return PIXMAN_a8;
-}
-
-static void
-_pixman_add_trapezoids (pixman_image_t *image,
-	                int dst_x, int dst_y,
-			const cairo_trapezoid_t *traps,
-			int num_traps)
-{
-    while (num_traps--) {
-	pixman_trapezoid_t trap;
-
-	trap.top = _cairo_fixed_to_16_16 (traps->top);
-	trap.bottom = _cairo_fixed_to_16_16 (traps->bottom);
-
-	trap.left.p1.x = _cairo_fixed_to_16_16 (traps->left.p1.x);
-	trap.left.p1.y = _cairo_fixed_to_16_16 (traps->left.p1.y);
-	trap.left.p2.x = _cairo_fixed_to_16_16 (traps->left.p2.x);
-	trap.left.p2.y = _cairo_fixed_to_16_16 (traps->left.p2.y);
-
-	trap.right.p1.x = _cairo_fixed_to_16_16 (traps->right.p1.x);
-	trap.right.p1.y = _cairo_fixed_to_16_16 (traps->right.p1.y);
-	trap.right.p2.x = _cairo_fixed_to_16_16 (traps->right.p2.x);
-	trap.right.p2.y = _cairo_fixed_to_16_16 (traps->right.p2.y);
-
-	pixman_rasterize_trapezoid (image, &trap, -dst_x, -dst_y);
-
-	traps++;
-    }
-}
-
 static cairo_int_status_t
 _cairo_image_surface_composite_trapezoids (cairo_operator_t	op,
 					   const cairo_pattern_t *pattern,
@@ -1312,11 +4332,11 @@ _cairo_image_surface_composite_trapezoids (cairo_operator_t	op,
 					   int			num_traps,
 					   cairo_region_t	*clip_region)
 {
-    cairo_surface_attributes_t	attributes;
     cairo_image_surface_t	*dst = abstract_dst;
-    cairo_image_surface_t	*src;
-    cairo_int_status_t		 status;
-    pixman_image_t		*mask;
+    cairo_composite_rectangles_t extents;
+    cairo_pattern_union_t        source_pattern;
+    composite_traps_info_t	 info;
+    cairo_status_t		 status;
 
     if (height == 0 || width == 0)
 	return CAIRO_STATUS_SUCCESS;
@@ -1324,101 +4344,83 @@ _cairo_image_surface_composite_trapezoids (cairo_operator_t	op,
     if (CAIRO_INJECT_FAULT ())
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    /* Special case adding trapezoids onto a mask surface; we want to avoid
-     * creating an intermediate temporary mask unnecessarily.
-     *
-     * We make the assumption here that the portion of the trapezoids
-     * contained within the surface is bounded by [dst_x,dst_y,width,height];
-     * the Cairo core code passes bounds based on the trapezoid extents.
-     *
-     * Currently the check clip_region == NULL is needed for correct
-     * functioning, since pixman_add_trapezoids() doesn't obey the
-     * surface clip, which is a libpixman bug , but there's no harm in
-     * falling through to the general case when the surface is clipped
-     * since libpixman would have to generate an intermediate mask anyways.
-     */
-    if (op == CAIRO_OPERATOR_ADD &&
-	clip_region == NULL &&
-	_cairo_pattern_is_opaque_solid (pattern) &&
-	dst->base.content == CAIRO_CONTENT_ALPHA &&
-	antialias != CAIRO_ANTIALIAS_NONE)
-    {
-	_pixman_add_trapezoids (dst->pixman_image, 0, 0, traps, num_traps);
-	return CAIRO_STATUS_SUCCESS;
+    extents.source.x = src_x;
+    extents.source.y = src_y;
+    extents.source.width  = width;
+    extents.source.height = height;
+
+    extents.mask.x = dst_x;
+    extents.mask.y = dst_y;
+    extents.mask.width  = width;
+    extents.mask.height = height;
+
+    extents.bounded.x = dst_x;
+    extents.bounded.y = dst_y;
+    extents.bounded.width  = width;
+    extents.bounded.height = height;
+
+    extents.unbounded.x = 0;
+    extents.unbounded.y = 0;
+    extents.unbounded.width  = dst->width;
+    extents.unbounded.height = dst->height;
+
+    if (clip_region != NULL) {
+	cairo_rectangle_int_t rect;
+
+	cairo_region_get_extents (clip_region, &rect);
+	if (! _cairo_rectangle_intersect (&extents.unbounded, &rect))
+	    return CAIRO_STATUS_SUCCESS;
     }
 
-    status = _cairo_image_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	return status;
+    extents.is_bounded = _cairo_operator_bounded_by_either (op);
 
-    status = _cairo_pattern_acquire_surface (pattern, &dst->base,
-					     src_x, src_y, width, height,
-					     CAIRO_PATTERN_ACQUIRE_NONE,
-					     (cairo_surface_t **) &src,
-					     &attributes);
-    if (unlikely (status))
-	return status;
-
-    status = _cairo_image_surface_set_attributes (src, &attributes,
-						  dst_x + width / 2.,
-						  dst_y + height / 2.);
-    if (unlikely (status))
-	goto CLEANUP_SOURCE;
-
-    mask = pixman_image_create_bits (_pixman_mask_format_from_antialias (antialias),
-	                             width, height, NULL, 0);
-    if (unlikely (mask == NULL)) {
-	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	goto CLEANUP_SOURCE;
+    if (clip_region != NULL) {
+	status = _cairo_image_surface_set_clip_region (dst, clip_region);
+	if (unlikely (status))
+	    return status;
     }
 
-    _pixman_add_trapezoids (mask, dst_x, dst_y, traps, num_traps);
+    _cairo_pattern_init_static_copy (&source_pattern.base, pattern);
+    cairo_matrix_translate (&source_pattern.base.matrix,
+                            src_x - extents.bounded.x,
+                            src_y - extents.bounded.y);
 
-    pixman_image_composite (_pixman_operator (op),
-			    src->pixman_image,
-			    mask,
-			    dst->pixman_image,
-			    src_x + attributes.x_offset,
-			    src_y + attributes.y_offset,
-			    0, 0,
-			    dst_x, dst_y,
-			    width, height);
+    info.traps = traps;
+    info.num_traps = num_traps;
+    info.antialias = antialias;
+    status = _composite_traps (&info,
+			       dst->pixman_image,
+			       dst->pixman_format,
+			       op,
+			       &source_pattern.base,
+			       0, 0,
+			       &extents.bounded,
+			       clip_region);
 
-    pixman_image_unref (mask);
+    if (status == CAIRO_STATUS_SUCCESS && ! extents.is_bounded)
+	status = _cairo_image_surface_fixup_unbounded (dst, &extents, NULL);
 
-    if (! _cairo_operator_bounded_by_mask (op)) {
-	status = _cairo_surface_composite_shape_fixup_unbounded (&dst->base,
-								 &attributes,
-								 src->width, src->height,
-								 width, height,
-								 src_x, src_y,
-								 0, 0,
-								 dst_x, dst_y, width, height,
-								 clip_region);
-    }
-
- CLEANUP_SOURCE:
-    _cairo_pattern_release_surface (pattern, &src->base, &attributes);
+    if (clip_region != NULL)
+	_cairo_image_surface_unset_clip_region (dst);
 
     return status;
 }
 
-typedef struct _cairo_image_surface_span_renderer {
+typedef struct _legacy_image_surface_span_renderer {
     cairo_span_renderer_t base;
 
     cairo_operator_t op;
     const cairo_pattern_t *pattern;
     cairo_antialias_t antialias;
+    cairo_region_t *clip_region;
 
+    pixman_image_t *mask;
     uint8_t *mask_data;
     uint32_t mask_stride;
 
-    cairo_image_surface_t *src;
-    cairo_surface_attributes_t src_attributes;
-    cairo_image_surface_t *mask;
     cairo_image_surface_t *dst;
     cairo_composite_rectangles_t composite_rectangles;
-} cairo_image_surface_span_renderer_t;
+} legacy_image_surface_span_renderer_t;
 
 void
 _cairo_image_surface_span_render_row (
@@ -1462,7 +4464,7 @@ _cairo_image_surface_span_renderer_render_rows (
     const cairo_half_open_span_t	*spans,
     unsigned				 num_spans)
 {
-    cairo_image_surface_span_renderer_t *renderer = abstract_renderer;
+    legacy_image_surface_span_renderer_t *renderer = abstract_renderer;
     while (height--)
 	_cairo_image_surface_span_render_row (y++, spans, num_spans, renderer->mask_data, renderer->mask_stride);
     return CAIRO_STATUS_SUCCESS;
@@ -1471,17 +4473,11 @@ _cairo_image_surface_span_renderer_render_rows (
 static void
 _cairo_image_surface_span_renderer_destroy (void *abstract_renderer)
 {
-    cairo_image_surface_span_renderer_t *renderer = abstract_renderer;
-    if (!renderer) return;
+    legacy_image_surface_span_renderer_t *renderer = abstract_renderer;
+    if (renderer == NULL)
+	return;
 
-    if (renderer->src != NULL) {
-	_cairo_pattern_release_surface (renderer->pattern,
-					&renderer->src->base,
-					&renderer->src_attributes);
-    }
-
-    if (renderer->mask != NULL)
-	cairo_surface_destroy (&renderer->mask->base);
+    pixman_image_unref (renderer->mask);
 
     free (renderer);
 }
@@ -1489,48 +4485,41 @@ _cairo_image_surface_span_renderer_destroy (void *abstract_renderer)
 static cairo_status_t
 _cairo_image_surface_span_renderer_finish (void *abstract_renderer)
 {
-    cairo_image_surface_span_renderer_t *renderer = abstract_renderer;
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    legacy_image_surface_span_renderer_t *renderer = abstract_renderer;
+    cairo_composite_rectangles_t *rects = &renderer->composite_rectangles;
+    cairo_image_surface_t *dst = renderer->dst;
+    pixman_image_t *src;
+    int src_x, src_y;
+    cairo_status_t status;
 
-    if (renderer->src == NULL || renderer->mask == NULL)
-	return CAIRO_STATUS_SUCCESS;
-
-    status = cairo_surface_status (&renderer->mask->base);
-    if (status == CAIRO_STATUS_SUCCESS) {
-	cairo_composite_rectangles_t *rects = &renderer->composite_rectangles;
-	cairo_image_surface_t *src = renderer->src;
-	cairo_image_surface_t *dst = renderer->dst;
-	cairo_surface_attributes_t *src_attributes = &renderer->src_attributes;
-	int width = rects->width;
-	int height = rects->height;
-
-	pixman_image_composite (_pixman_operator (renderer->op),
-				src->pixman_image,
-				renderer->mask->pixman_image,
-				dst->pixman_image,
-				rects->src.x + src_attributes->x_offset,
-				rects->src.y + src_attributes->y_offset,
-				0, 0,		/* mask.x, mask.y */
-				rects->dst.x, rects->dst.y,
-				width, height);
-
-	if (! _cairo_operator_bounded_by_mask (renderer->op)) {
-	    status = _cairo_surface_composite_shape_fixup_unbounded (
-		&dst->base,
-		src_attributes,
-		src->width, src->height,
-		width, height,
-		rects->src.x, rects->src.y,
-		0, 0,		/* mask.x, mask.y */
-		rects->dst.x, rects->dst.y,
-		width, height,
-		dst->clip_region);
-	}
+    if (renderer->clip_region != NULL) {
+	status = _cairo_image_surface_set_clip_region (dst, renderer->clip_region);
+	if (unlikely (status))
+	    return status;
     }
-    if (status != CAIRO_STATUS_SUCCESS)
-	return _cairo_span_renderer_set_error (abstract_renderer,
-					       status);
-    return CAIRO_STATUS_SUCCESS;
+
+    src = _pixman_image_for_pattern (renderer->pattern, FALSE, &rects->bounded, &src_x, &src_y);
+    if (src == NULL)
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    status = CAIRO_STATUS_SUCCESS;
+    pixman_image_composite32 (_pixman_operator (renderer->op),
+                              src,
+                              renderer->mask,
+                              dst->pixman_image,
+                              rects->bounded.x + src_x,
+                              rects->bounded.y + src_y,
+                              0, 0,
+                              rects->bounded.x, rects->bounded.y,
+                              rects->bounded.width, rects->bounded.height);
+
+    if (! rects->is_bounded)
+	status = _cairo_image_surface_fixup_unbounded (dst, rects, NULL);
+
+    if (renderer->clip_region != NULL)
+	 _cairo_image_surface_unset_clip_region (dst);
+
+    return status;
 }
 
 static cairo_bool_t
@@ -1555,16 +4544,10 @@ _cairo_image_surface_create_span_renderer (cairo_operator_t	 op,
 					   cairo_region_t *clip_region)
 {
     cairo_image_surface_t *dst = abstract_dst;
-    cairo_image_surface_span_renderer_t *renderer = calloc(1, sizeof(*renderer));
-    cairo_status_t status;
-    int width = rects->width;
-    int height = rects->height;
+    legacy_image_surface_span_renderer_t *renderer;
 
-    status = _cairo_image_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	return _cairo_span_renderer_create_in_error (status);
-
-    if (renderer == NULL)
+    renderer = calloc(1, sizeof(*renderer));
+    if (unlikely (renderer == NULL))
 	return _cairo_span_renderer_create_in_error (CAIRO_STATUS_NO_MEMORY);
 
     renderer->base.destroy = _cairo_image_surface_span_renderer_destroy;
@@ -1574,67 +4557,27 @@ _cairo_image_surface_create_span_renderer (cairo_operator_t	 op,
     renderer->pattern = pattern;
     renderer->antialias = antialias;
     renderer->dst = dst;
+    renderer->clip_region = clip_region;
 
     renderer->composite_rectangles = *rects;
 
-    status = _cairo_pattern_acquire_surface (
-	renderer->pattern, &renderer->dst->base,
-	rects->src.x, rects->src.y,
-	width, height,
-	CAIRO_PATTERN_ACQUIRE_NONE,
-	(cairo_surface_t **) &renderer->src,
-	&renderer->src_attributes);
-    if (status)
-	goto unwind;
-
-    status = _cairo_image_surface_set_attributes (
-	renderer->src, &renderer->src_attributes,
-	rects->dst.x + width/2, rects->dst.y + height/2);
-    if (status)
-	goto unwind;
-
     /* TODO: support rendering to A1 surfaces (or: go add span
      * compositing to pixman.) */
-    renderer->mask = (cairo_image_surface_t *)
-	cairo_image_surface_create (CAIRO_FORMAT_A8,
-				    width, height);
-
-    status = cairo_surface_status (&renderer->mask->base);
-
- unwind:
-    if (status != CAIRO_STATUS_SUCCESS) {
-	_cairo_image_surface_span_renderer_destroy (renderer);
-	return _cairo_span_renderer_create_in_error (status);
+    renderer->mask = pixman_image_create_bits (PIXMAN_a8,
+					       rects->bounded.width,
+					       rects->bounded.height,
+					       NULL, 0);
+    if (renderer->mask == NULL) {
+	free (renderer);
+	return _cairo_span_renderer_create_in_error (CAIRO_STATUS_NO_MEMORY);
     }
 
-    renderer->mask_data = renderer->mask->data - rects->mask.x - rects->mask.y * renderer->mask->stride;
-    renderer->mask_stride = renderer->mask->stride;
+    renderer->mask_stride = pixman_image_get_stride (renderer->mask);
+    renderer->mask_data = (uint8_t *) pixman_image_get_data (renderer->mask) - rects->bounded.x - rects->bounded.y * renderer->mask_stride;
+
     return &renderer->base;
 }
 
-static cairo_bool_t
-_cairo_image_surface_get_extents (void			  *abstract_surface,
-				  cairo_rectangle_int_t   *rectangle)
-{
-    cairo_image_surface_t *surface = abstract_surface;
-
-    rectangle->x = 0;
-    rectangle->y = 0;
-    rectangle->width  = surface->width;
-    rectangle->height = surface->height;
-
-    return TRUE;
-}
-
-static void
-_cairo_image_surface_get_font_options (void                  *abstract_surface,
-				       cairo_font_options_t  *options)
-{
-    _cairo_font_options_init_default (options);
-
-    cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
-}
-
 /**
  * _cairo_surface_is_image:
  * @surface: a #cairo_surface_t
@@ -1663,6 +4606,7 @@ const cairo_surface_backend_t _cairo_image_surface_backend = {
     _cairo_image_surface_composite_trapezoids,
     _cairo_image_surface_create_span_renderer,
     _cairo_image_surface_check_span_renderer,
+
     NULL, /* copy_page */
     NULL, /* show_page */
     _cairo_image_surface_get_extents,
@@ -1673,11 +4617,12 @@ const cairo_surface_backend_t _cairo_image_surface_backend = {
     NULL, /* font_fini */
     NULL, /* glyph_fini */
 
-    NULL, /* paint */
-    NULL, /* mask */
-    NULL, /* stroke */
-    NULL, /* fill */
-    NULL, /* show_glyphs */
+    _cairo_image_surface_paint,
+    _cairo_image_surface_mask,
+    _cairo_image_surface_stroke,
+    _cairo_image_surface_fill,
+    _cairo_image_surface_glyphs,
+    NULL, /* show_text_glyphs */
     NULL, /* snapshot */
     NULL, /* is_similar */
 };
@@ -1685,11 +4630,20 @@ const cairo_surface_backend_t _cairo_image_surface_backend = {
 /* A convenience function for when one needs to coerce an image
  * surface to an alternate format. */
 cairo_image_surface_t *
-_cairo_image_surface_coerce (cairo_image_surface_t	*surface,
-			     cairo_format_t		 format)
+_cairo_image_surface_coerce (cairo_image_surface_t *surface)
+{
+    return _cairo_image_surface_coerce_to_format (surface,
+		                                  _cairo_format_from_content (surface->base.content));
+        
+}
+
+/* A convenience function for when one needs to coerce an image
+ * surface to an alternate format. */
+cairo_image_surface_t *
+_cairo_image_surface_coerce_to_format (cairo_image_surface_t *surface,
+			               cairo_format_t	      format)
 {
     cairo_image_surface_t *clone;
-    cairo_surface_pattern_t pattern;
     cairo_status_t status;
 
     status = surface->base.status;
@@ -1704,17 +4658,13 @@ _cairo_image_surface_coerce (cairo_image_surface_t	*surface,
     if (unlikely (clone->base.status))
 	return clone;
 
-    _cairo_pattern_init_for_surface (&pattern, &surface->base);
-    status = _cairo_surface_paint (&clone->base,
-				   CAIRO_OPERATOR_SOURCE,
-				   &pattern.base,
-				   NULL);
-    _cairo_pattern_fini (&pattern.base);
-
-    if (unlikely (status)) {
-	cairo_surface_destroy (&clone->base);
-	return (cairo_image_surface_t *)_cairo_surface_create_in_error (status);
-    }
+    pixman_image_composite32 (PIXMAN_OP_SRC,
+                              surface->pixman_image, NULL, clone->pixman_image,
+                              0, 0,
+                              0, 0,
+                              0, 0,
+                              surface->width, surface->height);
+    clone->base.is_clear = FALSE;
 
     clone->base.device_transform =
 	surface->base.device_transform;
diff --git a/gfx/cairo/cairo/src/cairo-list-private.h b/gfx/cairo/cairo/src/cairo-list-private.h
index b8254bb74dc..ddfd0a4c6d4 100644
--- a/gfx/cairo/cairo/src/cairo-list-private.h
+++ b/gfx/cairo/cairo/src/cairo-list-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -73,19 +73,38 @@ typedef struct _cairo_list {
 	     &pos->member != (head);					\
 	     pos = cairo_list_entry(pos->member.prev, type, member))
 
+#define cairo_list_foreach_entry_reverse_safe(pos, n, type, head, member)	\
+	for (pos = cairo_list_entry((head)->prev, type, member),\
+	     n = cairo_list_entry (pos->member.prev, type, member);\
+	     &pos->member != (head);					\
+	     pos = n, n = cairo_list_entry (n->member.prev, type, member))
+
 #ifdef CAIRO_LIST_DEBUG
 static inline void
+_cairo_list_validate (const cairo_list_t *link)
+{
+    assert (link->next->prev == link);
+    assert (link->prev->next == link);
+}
+static inline void
 cairo_list_validate (const cairo_list_t *head)
 {
     cairo_list_t *link;
 
-    cairo_list_foreach (link, head) {
-	assert (link->next->prev == link);
-	assert (link->prev->next == link);
-    }
+    cairo_list_foreach (link, head)
+	_cairo_list_validate (link);
+}
+static inline cairo_bool_t
+cairo_list_is_empty (const cairo_list_t *head);
+static inline void
+cairo_list_validate_is_empty (const cairo_list_t *head)
+{
+    assert (head->next == NULL || (cairo_list_is_empty (head) && head->next == head->prev));
 }
 #else
+#define _cairo_list_validate(link)
 #define cairo_list_validate(head)
+#define cairo_list_validate_is_empty(head)
 #endif
 
 static inline void
@@ -110,6 +129,7 @@ static inline void
 cairo_list_add (cairo_list_t *entry, cairo_list_t *head)
 {
     cairo_list_validate (head);
+    cairo_list_validate_is_empty (entry);
     __cairo_list_add (entry, head, head->next);
     cairo_list_validate (head);
 }
@@ -118,6 +138,7 @@ static inline void
 cairo_list_add_tail (cairo_list_t *entry, cairo_list_t *head)
 {
     cairo_list_validate (head);
+    cairo_list_validate_is_empty (entry);
     __cairo_list_add (entry, head->prev, head);
     cairo_list_validate (head);
 }
@@ -157,10 +178,8 @@ cairo_list_move_tail (cairo_list_t *entry, cairo_list_t *head)
 static inline void
 cairo_list_swap (cairo_list_t *entry, cairo_list_t *other)
 {
-    cairo_list_validate (head);
     __cairo_list_add (entry, other->prev, other->next);
     cairo_list_init (other);
-    cairo_list_validate (head);
 }
 
 static inline cairo_bool_t
@@ -186,4 +205,11 @@ cairo_list_is_empty (const cairo_list_t *head)
     return head->next == head;
 }
 
+static inline cairo_bool_t
+cairo_list_is_singular (const cairo_list_t *head)
+{
+    cairo_list_validate (head);
+    return head->next == head || head->next == head->prev;
+}
+
 #endif /* CAIRO_LIST_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-lzw.c b/gfx/cairo/cairo/src/cairo-lzw.c
index a4fdf738f6f..de7f9998376 100644
--- a/gfx/cairo/cairo/src/cairo-lzw.c
+++ b/gfx/cairo/cairo/src/cairo-lzw.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 typedef struct _lzw_buf {
     cairo_status_t status;
diff --git a/gfx/cairo/cairo/src/cairo-malloc-private.h b/gfx/cairo/cairo/src/cairo-malloc-private.h
index 082480826da..e5776abd0c3 100644
--- a/gfx/cairo/cairo/src/cairo-malloc-private.h
+++ b/gfx/cairo/cairo/src/cairo-malloc-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-matrix.c b/gfx/cairo/cairo/src/cairo-matrix.c
index bf20ee4fc12..2536ebffddc 100644
--- a/gfx/cairo/cairo/src/cairo-matrix.c
+++ b/gfx/cairo/cairo/src/cairo-matrix.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -34,9 +34,8 @@
  *	Carl D. Worth <cworth@cworth.org>
  */
 
-#define _GNU_SOURCE
-
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if _XOPEN_SOURCE >= 600 || defined (_ISOC99_SOURCE)
 #define ISFINITE(x) isfinite (x)
@@ -44,6 +43,29 @@
 #define ISFINITE(x) ((x) * (x) >= 0.) /* check for NaNs */
 #endif
 
+/**
+ * SECTION:cairo-matrix
+ * @Title: cairo_matrix_t
+ * @Short_Description: Generic matrix operations
+ * @See_Also: #cairo_t
+ *
+ * #cairo_matrix_t is used throughout cairo to convert between different
+ * coordinate spaces.  A #cairo_matrix_t holds an affine transformation,
+ * such as a scale, rotation, shear, or a combination of these.
+ * The transformation of a point (<literal>x</literal>,<literal>y</literal>)
+ * is given by:
+ *
+ * <programlisting>
+ * x_new = xx * x + xy * y + x0;
+ * y_new = yx * x + yy * y + y0;
+ * </programlisting>
+ *
+ * The current transformation matrix of a #cairo_t, represented as a
+ * #cairo_matrix_t, defines the transformation from user-space
+ * coordinates to device-space coordinates. See cairo_get_matrix() and
+ * cairo_set_matrix().
+ */
+
 static void
 _cairo_matrix_scalar_multiply (cairo_matrix_t *matrix, double scalar);
 
@@ -579,6 +601,15 @@ _cairo_matrix_is_invertible (const cairo_matrix_t *matrix)
     return ISFINITE (det) && det != 0.;
 }
 
+cairo_bool_t
+_cairo_matrix_is_scale_0 (const cairo_matrix_t *matrix)
+{
+    return matrix->xx == 0. &&
+           matrix->xy == 0. &&
+           matrix->yx == 0. &&
+           matrix->yy == 0.;
+}
+
 double
 _cairo_matrix_compute_determinant (const cairo_matrix_t *matrix)
 {
@@ -916,7 +947,7 @@ _cairo_matrix_to_pixman_matrix (const cairo_matrix_t	*matrix,
          * that point.
 	 */
 
-	if (_cairo_matrix_is_translation (matrix))
+	if (_cairo_matrix_has_unity_scale (matrix))
 	    return;
 
         /* Note: If we can't invert the transformation, skip the adjustment. */
diff --git a/gfx/cairo/cairo/src/cairo-misc.c b/gfx/cairo/cairo/src/cairo-misc.c
index 56c7d0b5e6a..60372595581 100644
--- a/gfx/cairo/cairo/src/cairo-misc.c
+++ b/gfx/cairo/cairo/src/cairo-misc.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,10 +39,31 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 COMPILE_TIME_ASSERT (CAIRO_STATUS_LAST_STATUS < CAIRO_INT_STATUS_UNSUPPORTED);
 COMPILE_TIME_ASSERT (CAIRO_INT_STATUS_LAST_STATUS <= 127);
 
+/**
+ * SECTION:cairo-status
+ * @Title: Error handling
+ * @Short_Description: Decoding cairo's status
+ * @See_Also: cairo_status(), cairo_surface_status(), cairo_pattern_status(),
+ *            cairo_font_face_status(), cairo_scaled_font_status(), 
+ *            cairo_region_status()
+ *
+ * Cairo uses a single status type to represent all kinds of errors.  A status
+ * value of %CAIRO_STATUS_SUCCESS represents no error and has an integer value
+ * of zero.  All other status values represent an error.
+ *
+ * Cairo's error handling is designed to be easy to use and safe.  All major
+ * cairo objects <firstterm>retain</firstterm> an error status internally which
+ * can be queried anytime by the users using cairo*_status() calls.  In
+ * the mean time, it is safe to call all cairo functions normally even if the
+ * underlying object is in an error status.  This means that no error handling
+ * code is required before or after each individual cairo function call.
+ */
+
 /* Public stuff */
 
 /**
@@ -125,6 +146,10 @@ cairo_status_to_string (cairo_status_t status)
 	return "invalid value (typically too big) for the size of the input (surface, pattern, etc.)";
     case CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED:
 	return "user-font method not implemented";
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH:
+	return "the device type is not appropriate for the operation";
+    case CAIRO_STATUS_DEVICE_ERROR:
+	return "an operation to the device caused an unspecified error";
     default:
     case CAIRO_STATUS_LAST_STATUS:
 	return "<unknown error status>";
@@ -416,7 +441,49 @@ _cairo_operator_bounded_by_source (cairo_operator_t op)
     return FALSE;
 }
 
+uint32_t
+_cairo_operator_bounded_by_either (cairo_operator_t op)
+{
+    switch (op) {
+    default:
+	ASSERT_NOT_REACHED;
+    case CAIRO_OPERATOR_OVER:
+    case CAIRO_OPERATOR_ATOP:
+    case CAIRO_OPERATOR_DEST:
+    case CAIRO_OPERATOR_DEST_OVER:
+    case CAIRO_OPERATOR_DEST_OUT:
+    case CAIRO_OPERATOR_XOR:
+    case CAIRO_OPERATOR_ADD:
+    case CAIRO_OPERATOR_SATURATE:
+    case CAIRO_OPERATOR_MULTIPLY:
+    case CAIRO_OPERATOR_SCREEN:
+    case CAIRO_OPERATOR_OVERLAY:
+    case CAIRO_OPERATOR_DARKEN:
+    case CAIRO_OPERATOR_LIGHTEN:
+    case CAIRO_OPERATOR_COLOR_DODGE:
+    case CAIRO_OPERATOR_COLOR_BURN:
+    case CAIRO_OPERATOR_HARD_LIGHT:
+    case CAIRO_OPERATOR_SOFT_LIGHT:
+    case CAIRO_OPERATOR_DIFFERENCE:
+    case CAIRO_OPERATOR_EXCLUSION:
+    case CAIRO_OPERATOR_HSL_HUE:
+    case CAIRO_OPERATOR_HSL_SATURATION:
+    case CAIRO_OPERATOR_HSL_COLOR:
+    case CAIRO_OPERATOR_HSL_LUMINOSITY:
+	return CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE;
+    case CAIRO_OPERATOR_CLEAR:
+    case CAIRO_OPERATOR_SOURCE:
+	return CAIRO_OPERATOR_BOUND_BY_MASK;
+    case CAIRO_OPERATOR_OUT:
+    case CAIRO_OPERATOR_IN:
+    case CAIRO_OPERATOR_DEST_IN:
+    case CAIRO_OPERATOR_DEST_ATOP:
+	return 0;
+    }
 
+}
+
+#if DISABLE_SOME_FLOATING_POINT
 /* This function is identical to the C99 function lround(), except that it
  * performs arithmetic rounding (floor(d + .5) instead of away-from-zero rounding) and
  * has a valid input range of (INT_MIN, INT_MAX] instead of
@@ -627,6 +694,64 @@ _cairo_lround (double d)
 #undef MSW
 #undef LSW
 }
+#endif
+
+/* Convert a 32-bit IEEE single precision floating point number to a
+ * 'half' representation (s10.5)
+ */
+uint16_t
+_cairo_half_from_float (float f)
+{
+    union {
+	uint32_t ui;
+	float f;
+    } u;
+    int s, e, m;
+
+    u.f = f;
+    s =  (u.ui >> 16) & 0x00008000;
+    e = ((u.ui >> 23) & 0x000000ff) - (127 - 15);
+    m =   u.ui        & 0x007fffff;
+    if (e <= 0) {
+	if (e < -10) {
+	    /* underflow */
+	    return 0;
+	}
+
+	m = (m | 0x00800000) >> (1 - e);
+
+	/* round to nearest, round 0.5 up. */
+	if (m &  0x00001000)
+	    m += 0x00002000;
+	return s | (m >> 13);
+    } else if (e == 0xff - (127 - 15)) {
+	if (m == 0) {
+	    /* infinity */
+	    return s | 0x7c00;
+	} else {
+	    /* nan */
+	    m >>= 13;
+	    return s | 0x7c00 | m | (m == 0);
+	}
+    } else {
+	/* round to nearest, round 0.5 up. */
+	if (m &  0x00001000) {
+	    m += 0x00002000;
+
+	    if (m & 0x00800000) {
+		m =  0;
+		e += 1;
+	    }
+	}
+
+	if (e > 30) {
+	    /* overflow -> infinity */
+	    return s | 0x7c00;
+	}
+
+	return s | (e << 10) | (m >> 13);
+    }
+}
 
 
 #ifdef _WIN32
diff --git a/gfx/cairo/cairo/src/cairo-mutex-impl-private.h b/gfx/cairo/cairo/src/cairo-mutex-impl-private.h
index 06938b5a5f6..25223f3eac0 100644
--- a/gfx/cairo/cairo/src/cairo-mutex-impl-private.h
+++ b/gfx/cairo/cairo/src/cairo-mutex-impl-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -168,6 +168,13 @@
 # define CAIRO_MUTEX_IMPL_UNLOCK(mutex) CAIRO_MUTEX_IMPL_NOOP1(mutex)
 # define CAIRO_MUTEX_IMPL_NIL_INITIALIZER 0
 
+# define CAIRO_MUTEX_HAS_RECURSIVE_IMPL 1
+
+  typedef int cairo_recursive_mutex_impl_t;
+
+# define CAIRO_RECURSIVE_MUTEX_IMPL_INIT(mutex)
+# define CAIRO_RECURSIVE_MUTEX_IMPL_NIL_INITIALIZER 0
+
 #elif defined(_WIN32) /******************************************************/
 
 #define WIN32_LEAN_AND_MEAN
@@ -221,6 +228,7 @@
 # include <pthread.h>
 
   typedef pthread_mutex_t cairo_mutex_impl_t;
+  typedef pthread_mutex_t cairo_recursive_mutex_impl_t;
 
 # define CAIRO_MUTEX_IMPL_PTHREAD 1
 #if HAVE_LOCKDEP
@@ -239,11 +247,31 @@
 #endif
 # define CAIRO_MUTEX_IMPL_NIL_INITIALIZER PTHREAD_MUTEX_INITIALIZER
 
+# define CAIRO_MUTEX_HAS_RECURSIVE_IMPL 1
+# define CAIRO_RECURSIVE_MUTEX_IMPL_INIT(mutex) do { \
+    pthread_mutexattr_t attr; \
+    pthread_mutexattr_init (&attr); \
+    pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); \
+    pthread_mutex_init (&(mutex), &attr); \
+    pthread_mutexattr_destroy (&attr); \
+} while (0)
+# define CAIRO_RECURSIVE_MUTEX_IMPL_NIL_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 
 #else /**********************************************************************/
 
 # error "XXX: No mutex implementation found.  Cairo will not work with multiple threads.  Define CAIRO_NO_MUTEX to 1 to acknowledge and accept this limitation and compile cairo without thread-safety support."
 
+#endif
+
+/* By default mutex implementations are assumed to be recursive */
+#if ! CAIRO_MUTEX_HAS_RECURSIVE_IMPL
+
+# define CAIRO_MUTEX_HAS_RECURSIVE_IMPL 1
+
+  typedef cairo_mutex_impl_t cairo_recursive_mutex_impl_t;
+
+# define CAIRO_RECURSIVE_MUTEX_IMPL_INIT(mutex) CAIRO_MUTEX_IMPL_INIT(mutex)
+# define CAIRO_RECURSIVE_MUTEX_IMPL_NIL_INITIALIZER CAIRO_MUTEX_IMPL_NIL_INITIALIZER
 
 #endif
 
diff --git a/gfx/cairo/cairo/src/cairo-mutex-list-private.h b/gfx/cairo/cairo/src/cairo-mutex-list-private.h
index 2f483163a7d..5827667f4ad 100644
--- a/gfx/cairo/cairo/src/cairo-mutex-list-private.h
+++ b/gfx/cairo/cairo/src/cairo-mutex-list-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,9 @@
 
 CAIRO_MUTEX_DECLARE (_cairo_pattern_solid_surface_cache_lock)
 
+CAIRO_MUTEX_DECLARE (_cairo_image_solid_cache_mutex)
+
+CAIRO_MUTEX_DECLARE (_cairo_error_mutex)
 CAIRO_MUTEX_DECLARE (_cairo_toy_font_face_mutex)
 CAIRO_MUTEX_DECLARE (_cairo_intern_string_mutex)
 CAIRO_MUTEX_DECLARE (_cairo_scaled_font_map_mutex)
@@ -52,6 +55,10 @@ CAIRO_MUTEX_DECLARE (_cairo_ft_unscaled_font_map_mutex)
 CAIRO_MUTEX_DECLARE (_cairo_xlib_display_mutex)
 #endif
 
+#if CAIRO_HAS_XCB_SURFACE
+CAIRO_MUTEX_DECLARE (_cairo_xcb_connections_mutex)
+#endif
+
 #if CAIRO_HAS_GL_SURFACE
 CAIRO_MUTEX_DECLARE (_cairo_gl_context_mutex)
 #endif
diff --git a/gfx/cairo/cairo/src/cairo-mutex-private.h b/gfx/cairo/cairo/src/cairo-mutex-private.h
index a3a7271f2df..61a7160a066 100644
--- a/gfx/cairo/cairo/src/cairo-mutex-private.h
+++ b/gfx/cairo/cairo/src/cairo-mutex-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-mutex-type-private.h b/gfx/cairo/cairo/src/cairo-mutex-type-private.h
index adf17bbedc5..e8c493985c9 100644
--- a/gfx/cairo/cairo/src/cairo-mutex-type-private.h
+++ b/gfx/cairo/cairo/src/cairo-mutex-type-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,7 +44,7 @@
 #include "cairo-compiler-private.h"
 #include "cairo-mutex-impl-private.h"
 
-/* Only the following three are mandatory at this point */
+/* Only the following four are mandatory at this point */
 #ifndef CAIRO_MUTEX_IMPL_LOCK
 # error "CAIRO_MUTEX_IMPL_LOCK not defined.  Check cairo-mutex-impl-private.h."
 #endif
@@ -54,6 +54,9 @@
 #ifndef CAIRO_MUTEX_IMPL_NIL_INITIALIZER
 # error "CAIRO_MUTEX_IMPL_NIL_INITIALIZER not defined.  Check cairo-mutex-impl-private.h."
 #endif
+#ifndef CAIRO_RECURSIVE_MUTEX_IMPL_INIT
+# error "CAIRO_RECURSIVE_MUTEX_IMPL_INIT not defined.  Check cairo-mutex-impl-private.h."
+#endif
 
 
 /* make sure implementations don't fool us: we decide these ourself */
@@ -156,6 +159,7 @@
 
 #ifndef CAIRO_MUTEX_DEBUG
 typedef cairo_mutex_impl_t cairo_mutex_t;
+typedef cairo_recursive_mutex_impl_t cairo_recursive_mutex_t;
 #else
 # define cairo_mutex_t			cairo_mutex_impl_t
 #endif
@@ -168,6 +172,9 @@ typedef cairo_mutex_impl_t cairo_mutex_t;
 #define CAIRO_MUTEX_FINI		CAIRO_MUTEX_IMPL_FINI
 #define CAIRO_MUTEX_NIL_INITIALIZER	CAIRO_MUTEX_IMPL_NIL_INITIALIZER
 
+#define CAIRO_RECURSIVE_MUTEX_INIT		CAIRO_RECURSIVE_MUTEX_IMPL_INIT
+#define CAIRO_RECURSIVE_MUTEX_NIL_INITIALIZER	CAIRO_RECURSIVE_MUTEX_IMPL_NIL_INITIALIZER
+
 #ifndef CAIRO_MUTEX_IS_LOCKED
 # define CAIRO_MUTEX_IS_LOCKED(name) 1
 #endif
diff --git a/gfx/cairo/cairo/src/cairo-mutex.c b/gfx/cairo/cairo/src/cairo-mutex.c
index 5b6a6e15028..0a31dced3e1 100644
--- a/gfx/cairo/cairo/src/cairo-mutex.c
+++ b/gfx/cairo/cairo/src/cairo-mutex.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-observer.c b/gfx/cairo/cairo/src/cairo-observer.c
new file mode 100644
index 00000000000..7c7b69c91f0
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-observer.c
@@ -0,0 +1,50 @@
+/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2010 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+void
+_cairo_observers_notify (cairo_list_t *observers, void *arg)
+{
+    cairo_observer_t *obs, *next;
+
+    cairo_list_foreach_entry_safe (obs, next,
+				   cairo_observer_t,
+				   observers, link)
+    {
+	obs->callback (obs, arg);
+    }
+}
diff --git a/gfx/cairo/cairo/src/cairo-os2-private.h b/gfx/cairo/cairo/src/cairo-os2-private.h
index 6c8e8f48b05..829dd3c8d41 100644
--- a/gfx/cairo/cairo/src/cairo-os2-private.h
+++ b/gfx/cairo/cairo/src/cairo-os2-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-os2-surface.c b/gfx/cairo/cairo/src/cairo-os2-surface.c
index 379cb25592b..b9758281dca 100644
--- a/gfx/cairo/cairo/src/cairo-os2-surface.c
+++ b/gfx/cairo/cairo/src/cairo-os2-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,7 @@
 #include "cairoint.h"
 
 #include "cairo-os2-private.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FC_FONT
 #include <fontconfig/fontconfig.h>
@@ -782,7 +783,7 @@ cairo_os2_surface_create (HPS hps_client_window,
                            0,
                            FALSE))
     {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR);
         goto error_exit;
     }
 
@@ -791,7 +792,7 @@ cairo_os2_surface_create (HPS hps_client_window,
                            0,
                            FALSE))
     {
-        status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        status = _cairo_error (CAIRO_STATUS_DEVICE_ERROR);
         goto error_exit;
     }
 
@@ -829,6 +830,7 @@ cairo_os2_surface_create (HPS hps_client_window,
     /* Initialize base surface */
     _cairo_surface_init (&local_os2_surface->base,
                          &cairo_os2_surface_backend,
+                         NULL, /* device */
                          _cairo_content_from_format (CAIRO_FORMAT_ARGB32));
 
     /* Successful exit */
diff --git a/gfx/cairo/cairo/src/cairo-os2.h b/gfx/cairo/cairo/src/cairo-os2.h
index cbb342b09ec..d23f2dec42a 100644
--- a/gfx/cairo/cairo/src/cairo-os2.h
+++ b/gfx/cairo/cairo/src/cairo-os2.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-output-stream-private.h b/gfx/cairo/cairo/src/cairo-output-stream-private.h
index 5243d21806b..edaabbe78e5 100644
--- a/gfx/cairo/cairo/src/cairo-output-stream-private.h
+++ b/gfx/cairo/cairo/src/cairo-output-stream-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -175,7 +175,7 @@ _cairo_memory_stream_length (cairo_output_stream_t *stream);
 cairo_private cairo_status_t
 _cairo_memory_stream_destroy (cairo_output_stream_t *abstract_stream,
 			      unsigned char **data_out,
-			      unsigned int *length_out);
+			      unsigned long *length_out);
 
 cairo_private cairo_output_stream_t *
 _cairo_null_stream_create (void);
diff --git a/gfx/cairo/cairo/src/cairo-output-stream.c b/gfx/cairo/cairo/src/cairo-output-stream.c
index 8616e4c2b1b..1aabe821afa 100644
--- a/gfx/cairo/cairo/src/cairo-output-stream.c
+++ b/gfx/cairo/cairo/src/cairo-output-stream.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,7 @@
 #include "cairoint.h"
 
 #include "cairo-output-stream-private.h"
+#include "cairo-error-private.h"
 #include "cairo-compiler-private.h"
 
 #include <stdio.h>
@@ -694,7 +695,7 @@ _cairo_memory_stream_create (void)
 cairo_status_t
 _cairo_memory_stream_destroy (cairo_output_stream_t *abstract_stream,
 			      unsigned char **data_out,
-			      unsigned int *length_out)
+			      unsigned long *length_out)
 {
     memory_stream_t *stream;
     cairo_status_t status;
diff --git a/gfx/cairo/cairo/src/cairo-paginated-private.h b/gfx/cairo/cairo/src/cairo-paginated-private.h
index 33358b98ea3..42badbfdfe1 100644
--- a/gfx/cairo/cairo/src/cairo-paginated-private.h
+++ b/gfx/cairo/cairo/src/cairo-paginated-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-paginated-surface-private.h b/gfx/cairo/cairo/src/cairo-paginated-surface-private.h
index a494e581d16..ebf4b342492 100644
--- a/gfx/cairo/cairo/src/cairo-paginated-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-paginated-surface-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -57,7 +57,6 @@ typedef struct _cairo_paginated_surface {
     cairo_surface_t *recording_surface;
 
     int page_num;
-    cairo_bool_t page_is_blank;
 } cairo_paginated_surface_t;
 
 #endif /* CAIRO_PAGINATED_SURFACE_H */
diff --git a/gfx/cairo/cairo/src/cairo-paginated-surface.c b/gfx/cairo/cairo/src/cairo-paginated-surface.c
index dff5e831350..af4790e7ea9 100644
--- a/gfx/cairo/cairo/src/cairo-paginated-surface.c
+++ b/gfx/cairo/cairo/src/cairo-paginated-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -48,6 +48,7 @@
 #include "cairo-paginated-surface-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-analysis-surface-private.h"
+#include "cairo-error-private.h"
 
 static const cairo_surface_backend_t cairo_paginated_surface_backend;
 
@@ -101,7 +102,9 @@ _cairo_paginated_surface_create (cairo_surface_t				*target,
 	goto FAIL;
     }
 
-    _cairo_surface_init (&surface->base, &cairo_paginated_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_paginated_surface_backend,
+			 NULL, /* device */
 			 content);
 
     /* Override surface->base.type with target's type so we don't leak
@@ -119,7 +122,7 @@ _cairo_paginated_surface_create (cairo_surface_t				*target,
 	goto FAIL_CLEANUP_SURFACE;
 
     surface->page_num = 1;
-    surface->page_is_blank = TRUE;
+    surface->base.is_clear = TRUE;
 
     return &surface->base;
 
@@ -154,9 +157,11 @@ _cairo_paginated_surface_finish (void *abstract_surface)
     cairo_paginated_surface_t *surface = abstract_surface;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
-    if (surface->page_is_blank == FALSE || surface->page_num == 1) {
-	cairo_surface_show_page (abstract_surface);
-	status = cairo_surface_status (abstract_surface);
+    if (! surface->base.is_clear || surface->page_num == 1) {
+	/* Bypass some of the sanity checking in cairo-surface.c, as we
+	 * know that the surface is finished...
+	 */
+	status = _cairo_paginated_surface_show_page (surface);
     }
 
      /* XXX We want to propagate any errors from destroy(), but those are not
@@ -164,11 +169,10 @@ _cairo_paginated_surface_finish (void *abstract_surface)
       * and check the status afterwards. However, we can only call finish()
       * on the target, if we own it.
       */
-    if (CAIRO_REFERENCE_COUNT_GET_VALUE (&surface->target->ref_count) == 1) {
+    if (CAIRO_REFERENCE_COUNT_GET_VALUE (&surface->target->ref_count) == 1)
 	cairo_surface_finish (surface->target);
-	if (status == CAIRO_STATUS_SUCCESS)
-	    status = cairo_surface_status (surface->target);
-    }
+    if (status == CAIRO_STATUS_SUCCESS)
+	status = cairo_surface_status (surface->target);
     cairo_surface_destroy (surface->target);
 
     cairo_surface_finish (surface->recording_surface);
@@ -272,17 +276,17 @@ _paint_fallback_image (cairo_paginated_surface_t *surface,
      * filtering (if possible) to avoid introducing potential artifacts. */
     pattern.base.filter = CAIRO_FILTER_NEAREST;
 
-    status = _cairo_clip_init_rectangle (&clip, rect);
-    if (unlikely (status))
-	goto CLEANUP_IMAGE;
-
-    status = _cairo_surface_paint (surface->target,
-				   CAIRO_OPERATOR_SOURCE,
-				   &pattern.base, &clip);
-
-    _cairo_clip_reset (&clip);
+    _cairo_clip_init (&clip);
+    status = _cairo_clip_rectangle (&clip, rect);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	status = _cairo_surface_paint (surface->target,
+				       CAIRO_OPERATOR_SOURCE,
+				       &pattern.base, &clip);
+    }
 
+    _cairo_clip_fini (&clip);
     _cairo_pattern_fini (&pattern.base);
+
 CLEANUP_IMAGE:
     cairo_surface_destroy (image);
 
@@ -357,6 +361,7 @@ _paint_page (cairo_paginated_surface_t *surface)
 		                              CAIRO_PAGINATED_MODE_RENDER);
 
 	status = _cairo_recording_surface_replay_region (surface->recording_surface,
+							 NULL,
 							 surface->target,
 							 CAIRO_RECORDING_REGION_NATIVE);
 	assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
@@ -471,16 +476,18 @@ _cairo_paginated_surface_show_page (void *abstract_surface)
     if (unlikely (status))
 	return status;
 
-    cairo_surface_destroy (surface->recording_surface);
+    if (! surface->base.finished) {
+	cairo_surface_destroy (surface->recording_surface);
 
-    surface->recording_surface = _create_recording_surface_for_target (surface->target,
-								       surface->content);
-    status = surface->recording_surface->status;
-    if (unlikely (status))
-	return status;
+	surface->recording_surface = _create_recording_surface_for_target (surface->target,
+									   surface->content);
+	status = surface->recording_surface->status;
+	if (unlikely (status))
+	    return status;
 
-    surface->page_num++;
-    surface->page_is_blank = TRUE;
+	surface->page_num++;
+	surface->base.is_clear = TRUE;
+    }
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -511,12 +518,6 @@ _cairo_paginated_surface_paint (void			*abstract_surface,
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
-    /* Optimize away erasing of nothing. */
-    if (surface->page_is_blank && op == CAIRO_OPERATOR_CLEAR)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->page_is_blank = FALSE;
-
     return _cairo_surface_paint (surface->recording_surface, op, source, clip);
 }
 
@@ -529,12 +530,6 @@ _cairo_paginated_surface_mask (void		*abstract_surface,
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
-    /* Optimize away erasing of nothing. */
-    if (surface->page_is_blank && op == CAIRO_OPERATOR_CLEAR)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->page_is_blank = FALSE;
-
     return _cairo_surface_mask (surface->recording_surface, op, source, mask, clip);
 }
 
@@ -543,21 +538,15 @@ _cairo_paginated_surface_stroke (void			*abstract_surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 cairo_path_fixed_t	*path,
-				 cairo_stroke_style_t	*style,
-				 cairo_matrix_t		*ctm,
-				 cairo_matrix_t		*ctm_inverse,
+				 const cairo_stroke_style_t	*style,
+				 const cairo_matrix_t		*ctm,
+				 const cairo_matrix_t		*ctm_inverse,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
 				 cairo_clip_t		*clip)
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
-    /* Optimize away erasing of nothing. */
-    if (surface->page_is_blank && op == CAIRO_OPERATOR_CLEAR)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->page_is_blank = FALSE;
-
     return _cairo_surface_stroke (surface->recording_surface, op, source,
 				  path, style,
 				  ctm, ctm_inverse,
@@ -577,12 +566,6 @@ _cairo_paginated_surface_fill (void			*abstract_surface,
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
-    /* Optimize away erasing of nothing. */
-    if (surface->page_is_blank && op == CAIRO_OPERATOR_CLEAR)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->page_is_blank = FALSE;
-
     return _cairo_surface_fill (surface->recording_surface, op, source,
 				path, fill_rule,
 				tolerance, antialias,
@@ -613,12 +596,6 @@ _cairo_paginated_surface_show_text_glyphs (void			      *abstract_surface,
 {
     cairo_paginated_surface_t *surface = abstract_surface;
 
-    /* Optimize away erasing of nothing. */
-    if (surface->page_is_blank && op == CAIRO_OPERATOR_CLEAR)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->page_is_blank = FALSE;
-
     return _cairo_surface_show_text_glyphs (surface->recording_surface, op, source,
 					    utf8, utf8_len,
 					    glyphs, num_glyphs,
diff --git a/gfx/cairo/cairo/src/cairo-path-bounds.c b/gfx/cairo/cairo/src/cairo-path-bounds.c
index d3bc449a984..b7766494e31 100644
--- a/gfx/cairo/cairo/src/cairo-path-bounds.c
+++ b/gfx/cairo/cairo/src/cairo-path-bounds.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-path-fixed-private.h"
 
 typedef struct cairo_path_bounder {
     cairo_point_t current_point;
@@ -134,26 +135,6 @@ _cairo_path_bounder_curve_to (void *closure,
     }
 }
 
-static cairo_status_t
-_cairo_path_bounder_curve_to_cp (void *closure,
-				 const cairo_point_t *b,
-				 const cairo_point_t *c,
-				 const cairo_point_t *d)
-{
-    cairo_path_bounder_t *bounder = closure;
-
-    if (bounder->has_initial_point) {
-	_cairo_path_bounder_add_point (bounder, &bounder->current_point);
-	bounder->has_initial_point = FALSE;
-    }
-
-    _cairo_path_bounder_add_point (bounder, b);
-    _cairo_path_bounder_add_point (bounder, c);
-    _cairo_path_bounder_add_point (bounder, d);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 static cairo_status_t
 _cairo_path_bounder_close_path (void *closure)
 {
@@ -168,21 +149,8 @@ void
 _cairo_path_fixed_approximate_clip_extents (const cairo_path_fixed_t *path,
 					    cairo_rectangle_int_t *extents)
 {
-    cairo_path_bounder_t bounder;
-    cairo_status_t status;
-
-    _cairo_path_bounder_init (&bounder);
-
-    status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
-					  _cairo_path_bounder_move_to,
-					  _cairo_path_bounder_line_to,
-					  _cairo_path_bounder_curve_to_cp,
-					  _cairo_path_bounder_close_path,
-					  &bounder);
-    assert (status == CAIRO_STATUS_SUCCESS);
-
-    if (bounder.has_point) {
-	_cairo_box_round_to_rectangle (&bounder.extents, extents);
+    if (path->extents.p1.x < path->extents.p2.x) {
+	_cairo_box_round_to_rectangle (&path->extents, extents);
     } else {
 	extents->x = extents->y = 0;
 	extents->width = extents->height = 0;
@@ -199,15 +167,20 @@ _cairo_path_fixed_approximate_fill_extents (const cairo_path_fixed_t *path,
     cairo_path_bounder_t bounder;
     cairo_status_t status;
 
-    _cairo_path_bounder_init (&bounder);
+    if (! path->has_curve_to) {
+	bounder.extents = path->extents;
+	bounder.has_point = path->extents.p1.x < path->extents.p2.x;
+    } else {
+	_cairo_path_bounder_init (&bounder);
 
-    status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
-					  _cairo_path_bounder_move_to,
-					  _cairo_path_bounder_line_to,
-					  _cairo_path_bounder_curve_to,
-					  _cairo_path_bounder_close_path,
-					  &bounder);
-    assert (status == CAIRO_STATUS_SUCCESS);
+	status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
+					      _cairo_path_bounder_move_to,
+					      _cairo_path_bounder_line_to,
+					      _cairo_path_bounder_curve_to,
+					      _cairo_path_bounder_close_path,
+					      &bounder);
+	assert (status == CAIRO_STATUS_SUCCESS);
+    }
 
     if (bounder.has_point) {
 	_cairo_box_round_to_rectangle (&bounder.extents, extents);
@@ -226,14 +199,19 @@ _cairo_path_fixed_fill_extents (const cairo_path_fixed_t	*path,
     cairo_path_bounder_t bounder;
     cairo_status_t status;
 
-    _cairo_path_bounder_init (&bounder);
+    if (! path->has_curve_to) {
+	bounder.extents = path->extents;
+	bounder.has_point = path->extents.p1.x < path->extents.p2.x;
+    } else {
+	_cairo_path_bounder_init (&bounder);
 
-    status = _cairo_path_fixed_interpret_flat (path, CAIRO_DIRECTION_FORWARD,
-					       _cairo_path_bounder_move_to,
-					       _cairo_path_bounder_line_to,
-					       _cairo_path_bounder_close_path,
-					       &bounder, tolerance);
-    assert (status == CAIRO_STATUS_SUCCESS);
+	status = _cairo_path_fixed_interpret_flat (path, CAIRO_DIRECTION_FORWARD,
+						   _cairo_path_bounder_move_to,
+						   _cairo_path_bounder_line_to,
+						   _cairo_path_bounder_close_path,
+						   &bounder, tolerance);
+	assert (status == CAIRO_STATUS_SUCCESS);
+    }
 
     if (bounder.has_point) {
 	_cairo_box_round_to_rectangle (&bounder.extents, extents);
@@ -246,22 +224,44 @@ _cairo_path_fixed_fill_extents (const cairo_path_fixed_t	*path,
 /* Adjusts the fill extents (above) by the device-space pen.  */
 void
 _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path,
-					      cairo_stroke_style_t *style,
+					      const cairo_stroke_style_t *style,
 					      const cairo_matrix_t *ctm,
 					      cairo_rectangle_int_t *extents)
 {
     cairo_path_bounder_t bounder;
     cairo_status_t status;
 
-    _cairo_path_bounder_init (&bounder);
+    if (! path->has_curve_to) {
+	bounder.extents = path->extents;
 
-    status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
-					  _cairo_path_bounder_move_to,
-					  _cairo_path_bounder_line_to,
-					  _cairo_path_bounder_curve_to,
-					  _cairo_path_bounder_close_path,
-					  &bounder);
-    assert (status == CAIRO_STATUS_SUCCESS);
+	/* include trailing move-to for degenerate segments */
+	if (path->has_last_move_point) {
+	    const cairo_point_t *point = &path->last_move_point;
+
+	    if (point->x < bounder.extents.p1.x)
+		bounder.extents.p1.x = point->x;
+	    if (point->y < bounder.extents.p1.y)
+		bounder.extents.p1.y = point->y;
+
+	    if (point->x > bounder.extents.p2.x)
+		bounder.extents.p2.x = point->x;
+	    if (point->y > bounder.extents.p2.y)
+		bounder.extents.p2.y = point->y;
+	}
+
+	bounder.has_point = bounder.extents.p1.x <= bounder.extents.p2.x;
+	bounder.has_initial_point = FALSE;
+    } else {
+	_cairo_path_bounder_init (&bounder);
+
+	status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
+					      _cairo_path_bounder_move_to,
+					      _cairo_path_bounder_line_to,
+					      _cairo_path_bounder_curve_to,
+					      _cairo_path_bounder_close_path,
+					      &bounder);
+	assert (status == CAIRO_STATUS_SUCCESS);
+    }
 
     if (bounder.has_point) {
 	double dx, dy;
@@ -294,12 +294,12 @@ _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path,
 }
 
 cairo_status_t
-_cairo_path_fixed_stroke_extents (const cairo_path_fixed_t *path,
-				  cairo_stroke_style_t *stroke_style,
-				  const cairo_matrix_t *ctm,
-				  const cairo_matrix_t *ctm_inverse,
-				  double tolerance,
-				  cairo_rectangle_int_t *extents)
+_cairo_path_fixed_stroke_extents (const cairo_path_fixed_t	*path,
+				  const cairo_stroke_style_t	*stroke_style,
+				  const cairo_matrix_t		*ctm,
+				  const cairo_matrix_t		*ctm_inverse,
+				  double			 tolerance,
+				  cairo_rectangle_int_t		*extents)
 {
     cairo_traps_t traps;
     cairo_box_t bbox;
@@ -322,14 +322,18 @@ _cairo_path_fixed_stroke_extents (const cairo_path_fixed_t *path,
     return status;
 }
 
-void
-_cairo_path_fixed_bounds (const cairo_path_fixed_t *path,
-			  double *x1, double *y1,
-			  double *x2, double *y2)
+cairo_bool_t
+_cairo_path_fixed_extents (const cairo_path_fixed_t *path,
+			   cairo_box_t *box)
 {
     cairo_path_bounder_t bounder;
     cairo_status_t status;
 
+    if (! path->has_curve_to) {
+	*box = path->extents;
+	return path->extents.p1.x <= path->extents.p2.x;
+    }
+
     _cairo_path_bounder_init (&bounder);
 
     status = _cairo_path_fixed_interpret (path, CAIRO_DIRECTION_FORWARD,
@@ -340,15 +344,6 @@ _cairo_path_fixed_bounds (const cairo_path_fixed_t *path,
 					  &bounder);
     assert (status == CAIRO_STATUS_SUCCESS);
 
-    if (bounder.has_point) {
-	*x1 = _cairo_fixed_to_double (bounder.extents.p1.x);
-	*y1 = _cairo_fixed_to_double (bounder.extents.p1.y);
-	*x2 = _cairo_fixed_to_double (bounder.extents.p2.x);
-	*y2 = _cairo_fixed_to_double (bounder.extents.p2.y);
-    } else {
-	*x1 = 0.0;
-	*y1 = 0.0;
-	*x2 = 0.0;
-	*y2 = 0.0;
-    }
+    *box = bounder.extents;
+    return bounder.has_point;
 }
diff --git a/gfx/cairo/cairo/src/cairo-path-fill.c b/gfx/cairo/cairo/src/cairo-path-fill.c
index 037b8078ea0..24aaa3969c5 100644
--- a/gfx/cairo/cairo/src/cairo-path-fill.c
+++ b/gfx/cairo/cairo/src/cairo-path-fill.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,8 @@
  */
 
 #include "cairoint.h"
+#include "cairo-boxes-private.h"
+#include "cairo-error-private.h"
 #include "cairo-path-fixed-private.h"
 #include "cairo-region-private.h"
 
@@ -141,7 +143,8 @@ _cairo_path_fixed_fill_to_traps (const cairo_path_fixed_t *path,
 	return CAIRO_STATUS_SUCCESS;
 
     _cairo_polygon_init (&polygon);
-    _cairo_polygon_limit (&polygon, traps->limits, traps->num_limits);
+    if (traps->num_limits)
+	_cairo_polygon_limit (&polygon, traps->limits, traps->num_limits);
 
     status = _cairo_path_fixed_fill_to_polygon (path,
 						tolerance,
@@ -217,11 +220,8 @@ _cairo_path_fixed_fill_rectilinear_tessellate_to_region (const cairo_path_fixed_
   CLEANUP_TRAPS:
     _cairo_traps_fini (&traps);
 
-    if (unlikely (status)) { /* XXX _cairo_region_create_in_error() */
-	region = cairo_region_create ();
-	if (likely (region->status) == CAIRO_STATUS_SUCCESS)
-	    region->status = status;
-    }
+    if (unlikely (status))
+	region = _cairo_region_create_in_error (status);
 
     return region;
 }
@@ -391,3 +391,75 @@ _cairo_path_fixed_fill_rectilinear_to_traps (const cairo_path_fixed_t *path,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
 }
+
+static cairo_status_t
+_cairo_path_fixed_fill_rectilinear_tessellate_to_boxes (const cairo_path_fixed_t *path,
+							cairo_fill_rule_t fill_rule,
+							cairo_boxes_t *boxes)
+{
+    cairo_polygon_t polygon;
+    cairo_status_t status;
+
+    _cairo_polygon_init (&polygon);
+    if (boxes->num_limits) {
+	_cairo_polygon_limit (&polygon, boxes->limits, boxes->num_limits);
+	boxes->num_limits = 0;
+    }
+
+    /* tolerance will be ignored as the path is rectilinear */
+    status = _cairo_path_fixed_fill_to_polygon (path, 0., &polygon);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	status =
+	    _cairo_bentley_ottmann_tessellate_rectilinear_polygon_to_boxes (&polygon,
+									    fill_rule,
+									    boxes);
+    }
+
+    _cairo_polygon_fini (&polygon);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_path_fixed_fill_rectilinear_to_boxes (const cairo_path_fixed_t *path,
+					     cairo_fill_rule_t fill_rule,
+					     cairo_boxes_t *boxes)
+{
+    cairo_path_fixed_iter_t iter;
+    cairo_status_t status;
+    cairo_box_t box;
+
+    if (_cairo_path_fixed_is_box (path, &box))
+	return _cairo_boxes_add (boxes, &box);
+
+    _cairo_path_fixed_iter_init (&iter, path);
+    while (_cairo_path_fixed_iter_is_fill_box (&iter, &box)) {
+	if (box.p1.y == box.p2.y || box.p1.x == box.p2.x)
+	    continue;
+
+	if (box.p1.y > box.p2.y) {
+	    cairo_fixed_t t;
+
+	    t = box.p1.y;
+	    box.p1.y = box.p2.y;
+	    box.p2.y = t;
+
+	    t = box.p1.x;
+	    box.p1.x = box.p2.x;
+	    box.p2.x = t;
+	}
+
+	status = _cairo_boxes_add (boxes, &box);
+	if (unlikely (status))
+	    return status;
+    }
+
+    if (_cairo_path_fixed_iter_at_end (&iter))
+	return _cairo_bentley_ottmann_tessellate_boxes (boxes, fill_rule, boxes);
+
+    /* path is not rectangular, try extracting clipped rectilinear edges */
+    _cairo_boxes_clear (boxes);
+    return _cairo_path_fixed_fill_rectilinear_tessellate_to_boxes (path,
+								   fill_rule,
+								   boxes);
+}
diff --git a/gfx/cairo/cairo/src/cairo-path-fixed-private.h b/gfx/cairo/cairo/src/cairo-path-fixed-private.h
index 08b7a062325..42e64eda35c 100644
--- a/gfx/cairo/cairo/src/cairo-path-fixed-private.h
+++ b/gfx/cairo/cairo/src/cairo-path-fixed-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -61,9 +61,10 @@ typedef char cairo_path_op_t;
 
 typedef struct _cairo_path_buf {
     cairo_list_t link;
-    unsigned int buf_size;
     unsigned int num_ops;
+    unsigned int size_ops;
     unsigned int num_points;
+    unsigned int size_points;
 
     cairo_path_op_t *op;
     cairo_point_t *points;
@@ -80,15 +81,17 @@ struct _cairo_path_fixed {
     cairo_point_t last_move_point;
     cairo_point_t current_point;
     unsigned int has_current_point	: 1;
+    unsigned int has_last_move_point	: 1;
     unsigned int has_curve_to		: 1;
     unsigned int is_rectilinear		: 1;
     unsigned int maybe_fill_region	: 1;
     unsigned int is_empty_fill		: 1;
 
+    cairo_box_t extents;
+
     cairo_path_buf_fixed_t  buf;
 };
 
-
 cairo_private void
 _cairo_path_fixed_translate (cairo_path_fixed_t *path,
 			     cairo_fixed_t offx,
diff --git a/gfx/cairo/cairo/src/cairo-path-fixed.c b/gfx/cairo/cairo/src/cairo-path-fixed.c
index 34de6a37bd7..eea8630bd44 100644
--- a/gfx/cairo/cairo/src/cairo-path-fixed.c
+++ b/gfx/cairo/cairo/src/cairo-path-fixed.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-path-fixed-private.h"
 #include "cairo-slope-private.h"
 
@@ -52,7 +53,7 @@ _cairo_path_fixed_add_buf (cairo_path_fixed_t *path,
 			   cairo_path_buf_t   *buf);
 
 static cairo_path_buf_t *
-_cairo_path_buf_create (int buf_size);
+_cairo_path_buf_create (int size_ops, int size_points);
 
 static void
 _cairo_path_buf_destroy (cairo_path_buf_t *buf);
@@ -88,18 +89,23 @@ _cairo_path_fixed_init (cairo_path_fixed_t *path)
 
     path->buf.base.num_ops = 0;
     path->buf.base.num_points = 0;
-    path->buf.base.buf_size = CAIRO_PATH_BUF_SIZE;
+    path->buf.base.size_ops = ARRAY_LENGTH (path->buf.op);
+    path->buf.base.size_points = ARRAY_LENGTH (path->buf.points);
     path->buf.base.op = path->buf.op;
     path->buf.base.points = path->buf.points;
 
     path->current_point.x = 0;
     path->current_point.y = 0;
     path->last_move_point = path->current_point;
+    path->has_last_move_point = FALSE;
     path->has_current_point = FALSE;
     path->has_curve_to = FALSE;
     path->is_rectilinear = TRUE;
     path->maybe_fill_region = TRUE;
     path->is_empty_fill = TRUE;
+
+    path->extents.p1.x = path->extents.p1.y = INT_MAX;
+    path->extents.p2.x = path->extents.p2.y = INT_MIN;
 }
 
 cairo_status_t
@@ -107,7 +113,7 @@ _cairo_path_fixed_init_copy (cairo_path_fixed_t *path,
 			     const cairo_path_fixed_t *other)
 {
     cairo_path_buf_t *buf, *other_buf;
-    unsigned int num_points, num_ops, buf_size;
+    unsigned int num_points, num_ops;
 
     VG (VALGRIND_MAKE_MEM_UNDEFINED (path, sizeof (cairo_path_fixed_t)));
 
@@ -115,18 +121,22 @@ _cairo_path_fixed_init_copy (cairo_path_fixed_t *path,
 
     path->buf.base.op = path->buf.op;
     path->buf.base.points = path->buf.points;
+    path->buf.base.size_ops = ARRAY_LENGTH (path->buf.op);
+    path->buf.base.size_points = ARRAY_LENGTH (path->buf.points);
 
     path->current_point = other->current_point;
     path->last_move_point = other->last_move_point;
+    path->has_last_move_point = other->has_last_move_point;
     path->has_current_point = other->has_current_point;
     path->has_curve_to = other->has_curve_to;
     path->is_rectilinear = other->is_rectilinear;
     path->maybe_fill_region = other->maybe_fill_region;
     path->is_empty_fill = other->is_empty_fill;
 
+    path->extents = other->extents;
+
     path->buf.base.num_ops = other->buf.base.num_ops;
     path->buf.base.num_points = other->buf.base.num_points;
-    path->buf.base.buf_size = other->buf.base.buf_size;
     memcpy (path->buf.op, other->buf.base.op,
 	    other->buf.base.num_ops * sizeof (other->buf.op[0]));
     memcpy (path->buf.points, other->buf.points,
@@ -141,9 +151,8 @@ _cairo_path_fixed_init_copy (cairo_path_fixed_t *path,
 	num_points += other_buf->num_points;
     }
 
-    buf_size = MAX (num_ops, (num_points + 1) / 2);
-    if (buf_size) {
-	buf = _cairo_path_buf_create (buf_size);
+    if (num_ops) {
+	buf = _cairo_path_buf_create (num_ops, num_points);
 	if (unlikely (buf == NULL)) {
 	    _cairo_path_fixed_fini (path);
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -175,6 +184,8 @@ _cairo_path_fixed_hash (const cairo_path_fixed_t *path)
     const cairo_path_buf_t *buf;
     int num_points, num_ops;
 
+    hash = _cairo_hash_bytes (hash, &path->extents, sizeof (path->extents));
+
     num_ops = num_points = 0;
     cairo_path_foreach_buf_start (buf, path) {
 	hash = _cairo_hash_bytes (hash, buf->op,
@@ -230,21 +241,25 @@ _cairo_path_fixed_equal (const cairo_path_fixed_t *a,
 	return FALSE;
     }
 
-    num_ops_a = num_points_a = 0;
-    if (a != NULL) {
-	cairo_path_foreach_buf_start (buf_a, a) {
-	    num_ops_a    += buf_a->num_ops;
-	    num_points_a += buf_a->num_points;
-	} cairo_path_foreach_buf_end (buf_a, a);
+    if (a->extents.p1.x != b->extents.p1.x ||
+	a->extents.p1.y != b->extents.p1.y ||
+	a->extents.p2.x != b->extents.p2.x ||
+	a->extents.p2.y != b->extents.p2.y)
+    {
+	return FALSE;
     }
 
+    num_ops_a = num_points_a = 0;
+    cairo_path_foreach_buf_start (buf_a, a) {
+	num_ops_a    += buf_a->num_ops;
+	num_points_a += buf_a->num_points;
+    } cairo_path_foreach_buf_end (buf_a, a);
+
     num_ops_b = num_points_b = 0;
-    if (b != NULL) {
-	cairo_path_foreach_buf_start (buf_b, b) {
-	    num_ops_b    += buf_b->num_ops;
-	    num_points_b += buf_b->num_points;
-	} cairo_path_foreach_buf_end (buf_b, b);
-    }
+    cairo_path_foreach_buf_start (buf_b, b) {
+	num_ops_b    += buf_b->num_ops;
+	num_points_b += buf_b->num_points;
+    } cairo_path_foreach_buf_end (buf_b, b);
 
     if (num_ops_a == 0 && num_ops_b == 0)
 	return TRUE;
@@ -252,8 +267,6 @@ _cairo_path_fixed_equal (const cairo_path_fixed_t *a,
     if (num_ops_a != num_ops_b || num_points_a != num_points_b)
 	return FALSE;
 
-    assert (a != NULL && b != NULL);
-
     buf_a = cairo_path_head (a);
     num_points_a = buf_a->num_points;
     num_ops_a = buf_a->num_ops;
@@ -364,6 +377,21 @@ _cairo_path_last_op (cairo_path_fixed_t *path)
     return buf->op[buf->num_ops - 1];
 }
 
+static inline void
+_cairo_path_fixed_extents_add (cairo_path_fixed_t *path,
+			       const cairo_point_t *point)
+{
+    if (point->x < path->extents.p1.x)
+	path->extents.p1.x = point->x;
+    if (point->y < path->extents.p1.y)
+	path->extents.p1.y = point->y;
+
+    if (point->x > path->extents.p2.x)
+	path->extents.p2.x = point->x;
+    if (point->y > path->extents.p2.y)
+	path->extents.p2.y = point->y;
+}
+
 cairo_status_t
 _cairo_path_fixed_move_to (cairo_path_fixed_t  *path,
 			   cairo_fixed_t	x,
@@ -402,6 +430,7 @@ _cairo_path_fixed_move_to (cairo_path_fixed_t  *path,
 
     path->current_point = point;
     path->last_move_point = point;
+    path->has_last_move_point = TRUE;
     path->has_current_point = TRUE;
 
     return CAIRO_STATUS_SUCCESS;
@@ -510,6 +539,11 @@ _cairo_path_fixed_line_to (cairo_path_fixed_t *path,
     }
 
     path->current_point = point;
+    if (path->has_last_move_point) {
+	_cairo_path_fixed_extents_add (path, &path->last_move_point);
+	path->has_last_move_point = FALSE;
+    }
+    _cairo_path_fixed_extents_add (path, &point);
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -556,6 +590,15 @@ _cairo_path_fixed_curve_to (cairo_path_fixed_t	*path,
     path->is_rectilinear = FALSE;
     path->maybe_fill_region = FALSE;
 
+    /* coarse bounds */
+    if (path->has_last_move_point) {
+	_cairo_path_fixed_extents_add (path, &path->last_move_point);
+	path->has_last_move_point = FALSE;
+    }
+    _cairo_path_fixed_extents_add (path, &point[0]);
+    _cairo_path_fixed_extents_add (path, &point[1]);
+    _cairo_path_fixed_extents_add (path, &point[2]);
+
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -640,10 +683,10 @@ _cairo_path_fixed_add (cairo_path_fixed_t   *path,
 {
     cairo_path_buf_t *buf = cairo_path_tail (path);
 
-    if (buf->num_ops + 1 > buf->buf_size ||
-	buf->num_points + num_points > 2 * buf->buf_size)
+    if (buf->num_ops + 1 > buf->size_ops ||
+	buf->num_points + num_points > buf->size_points)
     {
-	buf = _cairo_path_buf_create (buf->buf_size * 2);
+	buf = _cairo_path_buf_create (buf->num_ops * 2, buf->num_points * 2);
 	if (unlikely (buf == NULL))
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
@@ -689,25 +732,23 @@ _cairo_path_fixed_add_buf (cairo_path_fixed_t *path,
     cairo_list_add_tail (&buf->link, &cairo_path_head (path)->link);
 }
 
+COMPILE_TIME_ASSERT (sizeof (cairo_path_op_t) == 1);
 static cairo_path_buf_t *
-_cairo_path_buf_create (int buf_size)
+_cairo_path_buf_create (int size_ops, int size_points)
 {
     cairo_path_buf_t *buf;
 
-    /* adjust buf_size to ensure that buf->points is naturally aligned */
-    buf_size += sizeof (double)
-	       - ((buf_size + sizeof (cairo_path_buf_t)) & (sizeof (double)-1));
-    buf = _cairo_malloc_ab_plus_c (buf_size,
-	                           sizeof (cairo_path_op_t) +
-				   2 * sizeof (cairo_point_t),
-				   sizeof (cairo_path_buf_t));
+    /* adjust size_ops to ensure that buf->points is naturally aligned */
+    size_ops += sizeof (double) - ((sizeof (cairo_path_buf_t) + size_ops) % sizeof (double));
+    buf = _cairo_malloc_ab_plus_c (size_points, sizeof (cairo_point_t), size_ops + sizeof (cairo_path_buf_t));
     if (buf) {
 	buf->num_ops = 0;
 	buf->num_points = 0;
-	buf->buf_size = buf_size;
+	buf->size_ops = size_ops;
+	buf->size_points = size_points;
 
 	buf->op = (cairo_path_op_t *) (buf + 1);
-	buf->points = (cairo_point_t *) (buf->op + buf_size);
+	buf->points = (cairo_point_t *) (buf->op + size_ops);
     }
 
     return buf;
@@ -906,6 +947,12 @@ _cairo_path_fixed_offset_and_scale (cairo_path_fixed_t *path,
 	     buf->points[i].y += offy;
 	 }
     } cairo_path_foreach_buf_end (buf, path);
+
+    path->extents.p1.x = _cairo_fixed_mul (scalex, path->extents.p1.x) + offx;
+    path->extents.p2.x = _cairo_fixed_mul (scalex, path->extents.p2.x) + offx;
+
+    path->extents.p1.y = _cairo_fixed_mul (scaley, path->extents.p1.y) + offy;
+    path->extents.p2.y = _cairo_fixed_mul (scaley, path->extents.p2.y) + offy;
 }
 
 void
@@ -926,9 +973,9 @@ _cairo_path_fixed_translate (cairo_path_fixed_t *path,
     }
 
     path->last_move_point.x += offx;
-    path->last_move_point.y += offx;
+    path->last_move_point.y += offy;
     path->current_point.x += offx;
-    path->current_point.y += offx;
+    path->current_point.y += offy;
 
     cairo_path_foreach_buf_start (buf, path) {
 	 for (i = 0; i < buf->num_points; i++) {
@@ -936,6 +983,11 @@ _cairo_path_fixed_translate (cairo_path_fixed_t *path,
 	     buf->points[i].y += offy;
 	 }
     } cairo_path_foreach_buf_end (buf, path);
+
+    path->extents.p1.x += offx;
+    path->extents.p1.y += offy;
+    path->extents.p2.x += offx;
+    path->extents.p2.y += offy;
 }
 
 /**
@@ -959,14 +1011,22 @@ _cairo_path_fixed_transform (cairo_path_fixed_t	*path,
 
     if (matrix->yx == 0.0 && matrix->xy == 0.0) {
 	/* Fast path for the common case of scale+transform */
-	_cairo_path_fixed_offset_and_scale (path,
-					    _cairo_fixed_from_double (matrix->x0),
-					    _cairo_fixed_from_double (matrix->y0),
-					    _cairo_fixed_from_double (matrix->xx),
-					    _cairo_fixed_from_double (matrix->yy));
+	 if (matrix->xx == 1. && matrix->yy == 1.) {
+	     _cairo_path_fixed_translate (path,
+					  _cairo_fixed_from_double (matrix->x0),
+					  _cairo_fixed_from_double (matrix->y0));
+	 } else {
+	     _cairo_path_fixed_offset_and_scale (path,
+						 _cairo_fixed_from_double (matrix->x0),
+						 _cairo_fixed_from_double (matrix->y0),
+						 _cairo_fixed_from_double (matrix->xx),
+						 _cairo_fixed_from_double (matrix->yy));
+	 }
 	return;
     }
 
+    path->extents.p1.x = path->extents.p1.y = INT_MAX;
+    path->extents.p2.x = path->extents.p2.y = INT_MIN;
     path->maybe_fill_region = FALSE;
     cairo_path_foreach_buf_start (buf, path) {
 	 for (i = 0; i < buf->num_points; i++) {
@@ -977,6 +1037,9 @@ _cairo_path_fixed_transform (cairo_path_fixed_t	*path,
 
 	    buf->points[i].x = _cairo_fixed_from_double (dx);
 	    buf->points[i].y = _cairo_fixed_from_double (dy);
+
+	    /* XXX need to eliminate surplus move-to's? */
+	    _cairo_path_fixed_extents_add (path, &buf->points[i]);
 	 }
     } cairo_path_foreach_buf_end (buf, path);
 }
diff --git a/gfx/cairo/cairo/src/cairo-path-in-fill.c b/gfx/cairo/cairo/src/cairo-path-in-fill.c
index 2fa865054d5..b344f529da3 100644
--- a/gfx/cairo/cairo/src/cairo-path-in-fill.c
+++ b/gfx/cairo/cairo/src/cairo-path-in-fill.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-path-private.h b/gfx/cairo/cairo/src/cairo-path-private.h
index a24eaa4927f..61b4060fa86 100644
--- a/gfx/cairo/cairo/src/cairo-path-private.h
+++ b/gfx/cairo/cairo/src/cairo-path-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-path-stroke.c b/gfx/cairo/cairo/src/cairo-path-stroke.c
index 6e1986a9751..505b6ab6a51 100644
--- a/gfx/cairo/cairo/src/cairo-path-stroke.c
+++ b/gfx/cairo/cairo/src/cairo-path-stroke.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,8 @@
 #define _BSD_SOURCE /* for hypot() */
 #include "cairoint.h"
 
+#include "cairo-boxes-private.h"
+#include "cairo-error-private.h"
 #include "cairo-path-fixed-private.h"
 #include "cairo-slope-private.h"
 
@@ -51,12 +53,11 @@ typedef struct _cairo_stroker_dash {
 
     double dash_offset;
     const double *dashes;
-    double approximate_dashes[2];
     unsigned int num_dashes;
 } cairo_stroker_dash_t;
 
 typedef struct cairo_stroker {
-    cairo_stroke_style_t *style;
+    cairo_stroke_style_t style;
 
     const cairo_matrix_t *ctm;
     const cairo_matrix_t *ctm_inverse;
@@ -138,39 +139,29 @@ _cairo_stroker_dash_step (cairo_stroker_dash_t *dash, double step)
 
 static void
 _cairo_stroker_dash_init (cairo_stroker_dash_t *dash,
-			  const cairo_stroke_style_t *style,
-			  const cairo_matrix_t *ctm,
-			  double tolerance)
+			  const cairo_stroke_style_t *style)
 {
     dash->dashed = style->dash != NULL;
     if (! dash->dashed)
 	return;
 
-    if (_cairo_stroke_style_dash_can_approximate (style, ctm, tolerance)) {
-	_cairo_stroke_style_dash_approximate (style, ctm, tolerance,
-					      &dash->dash_offset,
-					      dash->approximate_dashes,
-					      &dash->num_dashes);
-	dash->dashes = dash->approximate_dashes;
-    } else {
-	dash->dashes = style->dash;
-	dash->num_dashes = style->num_dashes;
-	dash->dash_offset = style->dash_offset;
-    }
+    dash->dashes = style->dash;
+    dash->num_dashes = style->num_dashes;
+    dash->dash_offset = style->dash_offset;
 
     _cairo_stroker_dash_start (dash);
 }
 
 static cairo_status_t
 _cairo_stroker_init (cairo_stroker_t		*stroker,
-		     cairo_stroke_style_t	*stroke_style,
+		     const cairo_stroke_style_t	*stroke_style,
 		     const cairo_matrix_t	*ctm,
 		     const cairo_matrix_t	*ctm_inverse,
 		     double			 tolerance)
 {
     cairo_status_t status;
 
-    stroker->style = stroke_style;
+    stroker->style = *stroke_style;
     stroker->ctm = ctm;
     stroker->ctm_inverse = ctm_inverse;
     stroker->tolerance = tolerance;
@@ -190,7 +181,7 @@ _cairo_stroker_init (cairo_stroker_t		*stroker,
     stroker->has_first_face = FALSE;
     stroker->has_initial_sub_path = FALSE;
 
-    _cairo_stroker_dash_init (&stroker->dash, stroke_style, ctm, tolerance);
+    _cairo_stroker_dash_init (&stroker->dash, stroke_style);
 
     stroker->add_external_edge = NULL;
 
@@ -213,7 +204,7 @@ _cairo_stroker_limit (cairo_stroker_t *stroker,
      * of the bounds but which might generate rendering that's within bounds.
      */
 
-    _cairo_stroke_style_max_distance_from_path (stroker->style, stroker->ctm,
+    _cairo_stroke_style_max_distance_from_path (&stroker->style, stroker->ctm,
 						&dx, &dy);
 
     fdx = _cairo_fixed_from_double (dx);
@@ -456,7 +447,7 @@ _cairo_stroker_join (cairo_stroker_t *stroker,
 	outpt = &out->cw;
     }
 
-    switch (stroker->style->line_join) {
+    switch (stroker->style.line_join) {
     case CAIRO_LINE_JOIN_ROUND:
 	/* construct a fan around the common midpoint */
 	return _tessellate_fan (stroker,
@@ -470,7 +461,7 @@ _cairo_stroker_join (cairo_stroker_t *stroker,
 	/* dot product of incoming slope vector with outgoing slope vector */
 	double	in_dot_out = -in->usr_vector.x * out->usr_vector.x +
 			     -in->usr_vector.y * out->usr_vector.y;
-	double	ml = stroker->style->miter_limit;
+	double	ml = stroker->style.miter_limit;
 
 	/* Check the miter limit -- lines meeting at an acute angle
 	 * can generate long miters, the limit converts them to bevel
@@ -665,7 +656,7 @@ static cairo_status_t
 _cairo_stroker_add_cap (cairo_stroker_t *stroker,
 			const cairo_stroke_face_t *f)
 {
-    switch (stroker->style->line_cap) {
+    switch (stroker->style.line_cap) {
     case CAIRO_LINE_CAP_ROUND: {
 	cairo_slope_t slope;
 
@@ -687,8 +678,8 @@ _cairo_stroker_add_cap (cairo_stroker_t *stroker,
 
 	dx = f->usr_vector.x;
 	dy = f->usr_vector.y;
-	dx *= stroker->style->line_width / 2.0;
-	dy *= stroker->style->line_width / 2.0;
+	dx *= stroker->style.line_width / 2.0;
+	dy *= stroker->style.line_width / 2.0;
 	cairo_matrix_transform_distance (stroker->ctm, &dx, &dy);
 	fvector.dx = _cairo_fixed_from_double (dx);
 	fvector.dy = _cairo_fixed_from_double (dy);
@@ -826,13 +817,13 @@ _compute_face (const cairo_point_t *point, cairo_slope_t *dev_slope,
      */
     if (stroker->ctm_det_positive)
     {
-	face_dx = - slope_dy * (stroker->style->line_width / 2.0);
-	face_dy = slope_dx * (stroker->style->line_width / 2.0);
+	face_dx = - slope_dy * (stroker->style.line_width / 2.0);
+	face_dy = slope_dx * (stroker->style.line_width / 2.0);
     }
     else
     {
-	face_dx = slope_dy * (stroker->style->line_width / 2.0);
-	face_dy = - slope_dx * (stroker->style->line_width / 2.0);
+	face_dx = slope_dy * (stroker->style.line_width / 2.0);
+	face_dy = - slope_dx * (stroker->style.line_width / 2.0);
     }
 
     /* back to device space */
@@ -866,7 +857,7 @@ _cairo_stroker_add_caps (cairo_stroker_t *stroker)
     if (stroker->has_initial_sub_path
 	&& ! stroker->has_first_face
 	&& ! stroker->has_current_face
-	&& stroker->style->line_cap == CAIRO_LINE_JOIN_ROUND)
+	&& stroker->style.line_cap == CAIRO_LINE_JOIN_ROUND)
     {
 	/* pick an arbitrary slope to use */
 	double dx = 1.0, dy = 0.0;
@@ -1231,8 +1222,8 @@ _cairo_stroker_curve_to (void *closure,
 
     /* Temporarily modify the stroker to use round joins to guarantee
      * smooth stroked curves. */
-    line_join_save = stroker->style->line_join;
-    stroker->style->line_join = CAIRO_LINE_JOIN_ROUND;
+    line_join_save = stroker->style.line_join;
+    stroker->style.line_join = CAIRO_LINE_JOIN_ROUND;
 
     status = _cairo_spline_decompose (&spline, stroker->tolerance);
     if (unlikely (status))
@@ -1258,7 +1249,7 @@ _cairo_stroker_curve_to (void *closure,
 	stroker->current_face = face;
     }
 
-    stroker->style->line_join = line_join_save;
+    stroker->style.line_join = line_join_save;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1299,9 +1290,9 @@ _cairo_stroker_close_path (void *closure)
 
 cairo_status_t
 _cairo_path_fixed_stroke_to_shaper (cairo_path_fixed_t	*path,
-				    cairo_stroke_style_t	*stroke_style,
-				    cairo_matrix_t	*ctm,
-				    cairo_matrix_t	*ctm_inverse,
+				    const cairo_stroke_style_t	*stroke_style,
+				    const cairo_matrix_t	*ctm,
+				    const cairo_matrix_t	*ctm_inverse,
 				    double		 tolerance,
 				    cairo_status_t (*add_triangle) (void *closure,
 								    const cairo_point_t triangle[3]),
@@ -1350,7 +1341,7 @@ BAIL:
 
 cairo_status_t
 _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t	*path,
-				     cairo_stroke_style_t	*stroke_style,
+				     const cairo_stroke_style_t	*stroke_style,
 				     const cairo_matrix_t	*ctm,
 				     const cairo_matrix_t	*ctm_inverse,
 				     double		 tolerance,
@@ -1394,7 +1385,7 @@ BAIL:
 
 cairo_status_t
 _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t	*path,
-				   cairo_stroke_style_t	*stroke_style,
+				   const cairo_stroke_style_t	*stroke_style,
 				   const cairo_matrix_t	*ctm,
 				   const cairo_matrix_t	*ctm_inverse,
 				   double		 tolerance,
@@ -1418,14 +1409,15 @@ _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t	*path,
     }
 
     _cairo_polygon_init (&polygon);
-    _cairo_polygon_limit (&polygon, traps->limits, traps->num_limits);
+    if (traps->num_limits)
+	_cairo_polygon_limit (&polygon, traps->limits, traps->num_limits);
 
     status = _cairo_path_fixed_stroke_to_polygon (path,
-						 stroke_style,
-						 ctm,
-						 ctm_inverse,
-						 tolerance,
-						 &polygon);
+						  stroke_style,
+						  ctm,
+						  ctm_inverse,
+						  tolerance,
+						  &polygon);
     if (unlikely (status))
 	goto BAIL;
 
@@ -1449,11 +1441,12 @@ typedef struct _segment_t {
 } segment_t;
 
 typedef struct _cairo_rectilinear_stroker {
-    cairo_stroke_style_t *stroke_style;
+    const cairo_stroke_style_t *stroke_style;
     const cairo_matrix_t *ctm;
 
     cairo_fixed_t half_line_width;
-    cairo_traps_t *traps;
+    cairo_bool_t do_traps;
+    void *container;
     cairo_point_t current_point;
     cairo_point_t first_point;
     cairo_bool_t open_sub_path;
@@ -1484,27 +1477,60 @@ _cairo_rectilinear_stroker_limit (cairo_rectilinear_stroker_t *stroker,
     stroker->bounds.p2.y += stroker->half_line_width;
 }
 
-static void
+static cairo_bool_t
 _cairo_rectilinear_stroker_init (cairo_rectilinear_stroker_t	*stroker,
-				 cairo_stroke_style_t		*stroke_style,
+				 const cairo_stroke_style_t	*stroke_style,
 				 const cairo_matrix_t		*ctm,
-				 cairo_traps_t			*traps)
+				 cairo_bool_t			 do_traps,
+				 void				*container)
 {
+    /* This special-case rectilinear stroker only supports
+     * miter-joined lines (not curves) and a translation-only matrix
+     * (though it could probably be extended to support a matrix with
+     * uniform, integer scaling).
+     *
+     * It also only supports horizontal and vertical line_to
+     * elements. But we don't catch that here, but instead return
+     * UNSUPPORTED from _cairo_rectilinear_stroker_line_to if any
+     * non-rectilinear line_to is encountered.
+     */
+    if (stroke_style->line_join	!= CAIRO_LINE_JOIN_MITER)
+	return FALSE;
+
+    /* If the miter limit turns right angles into bevels, then we
+     * can't use this optimization. Remember, the ratio is
+     * 1/sin(ɸ/2). So the cutoff is 1/sin(π/4.0) or ⎷2,
+     * which we round for safety. */
+    if (stroke_style->miter_limit < M_SQRT2)
+	return FALSE;
+
+    if (! (stroke_style->line_cap == CAIRO_LINE_CAP_BUTT ||
+	   stroke_style->line_cap == CAIRO_LINE_CAP_SQUARE))
+    {
+	return FALSE;
+    }
+
+    if (! _cairo_matrix_has_unity_scale (ctm))
+	return FALSE;
+
     stroker->stroke_style = stroke_style;
     stroker->ctm = ctm;
 
     stroker->half_line_width =
 	_cairo_fixed_from_double (stroke_style->line_width / 2.0);
-    stroker->traps = traps;
     stroker->open_sub_path = FALSE;
     stroker->segments = stroker->segments_embedded;
     stroker->segments_size = ARRAY_LENGTH (stroker->segments_embedded);
     stroker->num_segments = 0;
 
-    /* Assume 2*EPSILON tolerance */
-    _cairo_stroker_dash_init (&stroker->dash, stroke_style, ctm, _cairo_fixed_to_double (2 * CAIRO_FIXED_EPSILON));
+    _cairo_stroker_dash_init (&stroker->dash, stroke_style);
 
     stroker->has_bounds = FALSE;
+
+    stroker->do_traps = do_traps;
+    stroker->container = container;
+
+    return TRUE;
 }
 
 static void
@@ -1663,7 +1689,16 @@ _cairo_rectilinear_stroker_emit_segments (cairo_rectilinear_stroker_t *stroker)
 	    b->x += half_line_width;
 	}
 
-	status = _cairo_traps_tessellate_rectangle (stroker->traps, a, b);
+	if (stroker->do_traps) {
+	    status = _cairo_traps_tessellate_rectangle (stroker->container, a, b);
+	} else {
+	    cairo_box_t box;
+
+	    box.p1 = *a;
+	    box.p2 = *b;
+
+	    status = _cairo_boxes_add (stroker->container, &box);
+	}
 	if (unlikely (status))
 	    return status;
     }
@@ -1729,8 +1764,16 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
 		    p2.x += half_line_width;
 	    }
 
-	    status = _cairo_traps_tessellate_rectangle (stroker->traps,
-							&p1, &p2);
+	    if (stroker->do_traps) {
+		status = _cairo_traps_tessellate_rectangle (stroker->container, &p1, &p2);
+	    } else {
+		cairo_box_t box;
+
+		box.p1 = p1;
+		box.p2 = p2;
+
+		status = _cairo_boxes_add (stroker->container, &box);
+	    }
 	    if (unlikely (status))
 		return status;
 	}
@@ -1783,7 +1826,16 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
 	if (a->x == b->x && a->y == b->y)
 	    continue;
 
-	status = _cairo_traps_tessellate_rectangle (stroker->traps, a, b);
+	if (stroker->do_traps) {
+	    status = _cairo_traps_tessellate_rectangle (stroker->container, a, b);
+	} else {
+	    cairo_box_t box;
+
+	    box.p1 = *a;
+	    box.p2 = *b;
+
+	    status = _cairo_boxes_add (stroker->container, &box);
+	}
 	if (unlikely (status))
 	    return status;
     }
@@ -1978,45 +2030,22 @@ _cairo_rectilinear_stroker_close_path (void *closure)
 
 cairo_int_status_t
 _cairo_path_fixed_stroke_rectilinear_to_traps (const cairo_path_fixed_t	*path,
-					       cairo_stroke_style_t	*stroke_style,
+					       const cairo_stroke_style_t	*stroke_style,
 					       const cairo_matrix_t	*ctm,
 					       cairo_traps_t		*traps)
 {
     cairo_rectilinear_stroker_t rectilinear_stroker;
     cairo_int_status_t status;
 
-    /* This special-case rectilinear stroker only supports
-     * miter-joined lines (not curves) and a translation-only matrix
-     * (though it could probably be extended to support a matrix with
-     * uniform, integer scaling).
-     *
-     * It also only supports horizontal and vertical line_to
-     * elements. But we don't catch that here, but instead return
-     * UNSUPPORTED from _cairo_rectilinear_stroker_line_to if any
-     * non-rectilinear line_to is encountered.
-     */
     assert (path->is_rectilinear);
 
-    if (stroke_style->line_join	!= CAIRO_LINE_JOIN_MITER)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    /* If the miter limit turns right angles into bevels, then we
-     * can't use this optimization. Remember, the ratio is
-     * 1/sin(ɸ/2). So the cutoff is 1/sin(π/4.0) or ⎷2,
-     * which we round for safety. */
-    if (stroke_style->miter_limit < M_SQRT2)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    if (! (stroke_style->line_cap == CAIRO_LINE_CAP_BUTT ||
-	   stroke_style->line_cap == CAIRO_LINE_CAP_SQUARE))
+    if (! _cairo_rectilinear_stroker_init (&rectilinear_stroker,
+					   stroke_style, ctm,
+					   TRUE, traps))
     {
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
-    if (! _cairo_matrix_has_unity_scale (ctm))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
 
-    _cairo_rectilinear_stroker_init (&rectilinear_stroker,
-				     stroke_style,
-				     ctm,
-				     traps);
     if (traps->num_limits) {
 	_cairo_rectilinear_stroker_limit (&rectilinear_stroker,
 					  traps->limits,
@@ -2052,3 +2081,63 @@ BAIL:
 
     return status;
 }
+
+cairo_int_status_t
+_cairo_path_fixed_stroke_rectilinear_to_boxes (const cairo_path_fixed_t	*path,
+					       const cairo_stroke_style_t	*stroke_style,
+					       const cairo_matrix_t	*ctm,
+					       cairo_boxes_t		*boxes)
+{
+    cairo_rectilinear_stroker_t rectilinear_stroker;
+    cairo_int_status_t status;
+
+    assert (path->is_rectilinear);
+
+    if (! _cairo_rectilinear_stroker_init (&rectilinear_stroker,
+					   stroke_style, ctm,
+					   FALSE, boxes))
+    {
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    if (boxes->num_limits) {
+	_cairo_rectilinear_stroker_limit (&rectilinear_stroker,
+					  boxes->limits,
+					  boxes->num_limits);
+    }
+
+    status = _cairo_path_fixed_interpret (path,
+					  CAIRO_DIRECTION_FORWARD,
+					  _cairo_rectilinear_stroker_move_to,
+					  rectilinear_stroker.dash.dashed ?
+					  _cairo_rectilinear_stroker_line_to_dashed :
+					  _cairo_rectilinear_stroker_line_to,
+					  NULL,
+					  _cairo_rectilinear_stroker_close_path,
+					  &rectilinear_stroker);
+    if (unlikely (status))
+	goto BAIL;
+
+    if (rectilinear_stroker.dash.dashed)
+	status = _cairo_rectilinear_stroker_emit_segments_dashed (&rectilinear_stroker);
+    else
+	status = _cairo_rectilinear_stroker_emit_segments (&rectilinear_stroker);
+    if (unlikely (status))
+	goto BAIL;
+
+    /* As we incrementally tessellate, we do not eliminate self-intersections */
+    status = _cairo_bentley_ottmann_tessellate_boxes (boxes,
+						      CAIRO_FILL_RULE_WINDING,
+						      boxes);
+    if (unlikely (status))
+	goto BAIL;
+
+    _cairo_rectilinear_stroker_fini (&rectilinear_stroker);
+
+    return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    _cairo_rectilinear_stroker_fini (&rectilinear_stroker);
+    _cairo_boxes_clear (boxes);
+    return status;
+}
diff --git a/gfx/cairo/cairo/src/cairo-path.c b/gfx/cairo/cairo/src/cairo-path.c
index 054450544d8..28182c0e400 100644
--- a/gfx/cairo/cairo/src/cairo-path.c
+++ b/gfx/cairo/cairo/src/cairo-path.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,9 +37,19 @@
 #include "cairoint.h"
 
 #include "cairo-private.h"
+#include "cairo-error-private.h"
 #include "cairo-path-private.h"
 #include "cairo-path-fixed-private.h"
 
+/**
+ * SECTION:cairo-paths
+ * @Title: Paths
+ * @Short_Description: Creating paths and manipulating path data
+ *
+ * Paths are the most basic drawing tools and are primarily used to implicitly
+ * generate simple masks.
+ */
+
 static const cairo_path_t _cairo_path_nil = { CAIRO_STATUS_NO_MEMORY, NULL, 0 };
 
 /* Closure for path interpretation. */
diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c
index 048ad667ff9..1e83bf4c92d 100644
--- a/gfx/cairo/cairo/src/cairo-pattern.c
+++ b/gfx/cairo/cairo/src/cairo-pattern.c
@@ -29,6 +29,29 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
+#include "cairo-freed-pool-private.h"
+
+/**
+ * SECTION:cairo-pattern
+ * @Title: cairo_pattern_t
+ * @Short_Description: Sources for drawing
+ * @See_Also: #cairo_t, #cairo_surface_t
+ *
+ * #cairo_pattern_t is the paint with which cairo draws.
+ * The primary use of patterns is as the source for all cairo drawing 
+ * operations, although they can also be used as masks, that is, as the 
+ * brush too.
+ *
+ * A cairo pattern is created by using one of the many constructors,
+ * of the form cairo_pattern_create_<emphasis>type</emphasis>()
+ * or implicitly through
+ * cairo_set_source_<emphasis>type</emphasis>() functions.
+ */
+
+#if HAS_FREED_POOL
+static freed_pool_t freed_pattern_pool[4];
+#endif
 
 static const cairo_solid_pattern_t _cairo_pattern_nil = {
     { CAIRO_PATTERN_TYPE_SOLID,		/* type */
@@ -59,7 +82,28 @@ const cairo_solid_pattern_t _cairo_pattern_black = {
       CAIRO_FILTER_DEFAULT,		/* filter */
       CAIRO_EXTEND_GRADIENT_DEFAULT},	/* extend */
     { 0., 0., 0., 1., 0, 0, 0, 0xffff },/* color (double rgba, short rgba) */
-    CAIRO_CONTENT_COLOR,                /* content */
+};
+
+const cairo_solid_pattern_t _cairo_pattern_clear = {
+    { CAIRO_PATTERN_TYPE_SOLID,		/* type */
+      CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
+      CAIRO_STATUS_SUCCESS,		/* status */
+      { 0, 0, 0, NULL },		/* user_data */
+      { 1., 0., 0., 1., 0., 0., },	/* matrix */
+      CAIRO_FILTER_DEFAULT,		/* filter */
+      CAIRO_EXTEND_GRADIENT_DEFAULT},	/* extend */
+    { 0., 0., 0., 0., 0, 0, 0, 0 },/* color (double rgba, short rgba) */
+};
+
+const cairo_solid_pattern_t _cairo_pattern_white = {
+    { CAIRO_PATTERN_TYPE_SOLID,		/* type */
+      CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
+      CAIRO_STATUS_SUCCESS,		/* status */
+      { 0, 0, 0, NULL },		/* user_data */
+      { 1., 0., 0., 1., 0., 0., },	/* matrix */
+      CAIRO_FILTER_DEFAULT,		/* filter */
+      CAIRO_EXTEND_GRADIENT_DEFAULT},	/* extend */
+    { 1., 1., 1., 1., 0xffff, 0xffff, 0xffff, 0xffff },/* color (double rgba, short rgba) */
 };
 
 /**
@@ -329,23 +373,6 @@ _cairo_pattern_fini (cairo_pattern_t *pattern)
 #endif
 }
 
-void
-_cairo_pattern_fini_snapshot (cairo_pattern_t *pattern)
-{
-    /* XXX this is quite ugly, but currently necessary to break the circular
-     * references with snapshot-cow and the recording-surface.
-     * This operation remains safe only whilst _cairo_surface_snapshot() is
-     * not public...
-     */
-    if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE) {
-	cairo_surface_pattern_t *spat = (cairo_surface_pattern_t *) pattern;
-
-	cairo_surface_finish (spat->surface);
-    }
-
-    _cairo_pattern_fini (pattern);
-}
-
 cairo_status_t
 _cairo_pattern_create_copy (cairo_pattern_t	  **pattern_out,
 			    const cairo_pattern_t  *other)
@@ -390,15 +417,10 @@ _cairo_pattern_create_copy (cairo_pattern_t	  **pattern_out,
 
 void
 _cairo_pattern_init_solid (cairo_solid_pattern_t *pattern,
-			   const cairo_color_t	 *color,
-			   cairo_content_t	  content)
+			   const cairo_color_t	 *color)
 {
-    if (content == CAIRO_CONTENT_COLOR_ALPHA && CAIRO_COLOR_IS_OPAQUE (color))
-	content = CAIRO_CONTENT_COLOR;
-
     _cairo_pattern_init (&pattern->base, CAIRO_PATTERN_TYPE_SOLID);
     pattern->color = *color;
-    pattern->content = content;
 }
 
 void
@@ -455,106 +477,13 @@ _cairo_pattern_init_radial (cairo_radial_pattern_t *pattern,
     pattern->r2   = _cairo_fixed_from_double (fabs (radius1));
 }
 
-/* We use a small freed pattern cache here, because we don't want to
- * constantly reallocate simple colors. */
-#define MAX_PATTERN_CACHE_SIZE 4
-typedef struct {
-    void *pool[MAX_PATTERN_CACHE_SIZE];
-    int top;
-} freed_pool_t;
-
-static freed_pool_t freed_pattern_pool[4];
-
-static void *
-_atomic_fetch (void **slot)
-{
-    return _cairo_atomic_ptr_cmpxchg (slot, *slot, NULL);
-}
-
-static cairo_bool_t
-_atomic_store (void **slot, void *pattern)
-{
-    return _cairo_atomic_ptr_cmpxchg (slot, NULL, pattern) == NULL;
-}
-
-static void *
-_freed_pattern_get (freed_pool_t *pool)
-{
-    cairo_pattern_t *pattern;
-    int i;
-
-    i = pool->top - 1;
-    if (i < 0)
-	i = 0;
-
-    pattern = _atomic_fetch (&pool->pool[i]);
-    if (likely (pattern != NULL)) {
-	pool->top = i;
-	return pattern;
-    }
-
-    /* either empty or contended */
-    for (i = ARRAY_LENGTH (pool->pool); i--;) {
-	pattern = _atomic_fetch (&pool->pool[i]);
-	if (pattern != NULL) {
-	    pool->top = i;
-	    return pattern;
-	}
-    }
-
-    /* empty */
-    pool->top = 0;
-    return NULL;
-}
-
-static void
-_freed_pattern_put (freed_pool_t *pool,
-		   cairo_pattern_t *pattern)
-{
-    int i = pool->top;
-
-    if (likely (i < ARRAY_LENGTH (pool->pool) &&
-		_atomic_store (&pool->pool[i], pattern)))
-    {
-	pool->top = i + 1;
-	return;
-    }
-
-    /* either full or contended */
-    for (i = 0; i < ARRAY_LENGTH (pool->pool); i++) {
-	if (_atomic_store (&pool->pool[i], pattern)) {
-	    pool->top = i + 1;
-	    return;
-	}
-    }
-
-    /* full */
-    pool->top = ARRAY_LENGTH (pool->pool);
-    free (pattern);
-}
-
-static void
-_freed_patterns_reset (void)
-{
-    int i, j;
-
-    for (i = 0; i < ARRAY_LENGTH (freed_pattern_pool); i++) {
-	freed_pool_t *pool = &freed_pattern_pool[i];
-	for (j = 0; j < ARRAY_LENGTH (pool->pool); j++) {
-	    free (pool->pool[j]);
-	    pool->pool[j] = NULL;
-	}
-    }
-}
-
 cairo_pattern_t *
-_cairo_pattern_create_solid (const cairo_color_t *color,
-			     cairo_content_t	  content)
+_cairo_pattern_create_solid (const cairo_color_t *color)
 {
     cairo_solid_pattern_t *pattern;
 
     pattern =
-	_freed_pattern_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_SOLID]);
+	_freed_pool_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_SOLID]);
     if (unlikely (pattern == NULL)) {
 	/* None cached, need to create a new pattern. */
 	pattern = malloc (sizeof (cairo_solid_pattern_t));
@@ -564,7 +493,7 @@ _cairo_pattern_create_solid (const cairo_color_t *color,
 	}
     }
 
-    _cairo_pattern_init_solid (pattern, color, content);
+    _cairo_pattern_init_solid (pattern, color);
     CAIRO_REFERENCE_COUNT_INIT (&pattern->base.ref_count, 1);
 
     return &pattern->base;
@@ -580,7 +509,7 @@ _cairo_pattern_create_in_error (cairo_status_t status)
 
     CAIRO_MUTEX_INITIALIZE ();
 
-    pattern = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK, CAIRO_CONTENT_COLOR);
+    pattern = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK);
     if (pattern->status == CAIRO_STATUS_SUCCESS)
 	status = _cairo_pattern_set_error (pattern, status);
 
@@ -620,7 +549,7 @@ cairo_pattern_create_rgb (double red, double green, double blue)
 
     CAIRO_MUTEX_INITIALIZE ();
 
-    return _cairo_pattern_create_solid (&color, CAIRO_CONTENT_COLOR);
+    return _cairo_pattern_create_solid (&color);
 }
 slim_hidden_def (cairo_pattern_create_rgb);
 
@@ -660,7 +589,7 @@ cairo_pattern_create_rgba (double red, double green, double blue,
 
     CAIRO_MUTEX_INITIALIZE ();
 
-    return _cairo_pattern_create_solid (&color, CAIRO_CONTENT_COLOR_ALPHA);
+    return _cairo_pattern_create_solid (&color);
 }
 slim_hidden_def (cairo_pattern_create_rgba);
 
@@ -693,7 +622,7 @@ cairo_pattern_create_for_surface (cairo_surface_t *surface)
 	return _cairo_pattern_create_in_error (surface->status);
 
     pattern =
-	_freed_pattern_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_SURFACE]);
+	_freed_pool_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_SURFACE]);
     if (unlikely (pattern == NULL)) {
 	pattern = malloc (sizeof (cairo_surface_pattern_t));
 	if (unlikely (pattern == NULL)) {
@@ -743,7 +672,7 @@ cairo_pattern_create_linear (double x0, double y0, double x1, double y1)
     cairo_linear_pattern_t *pattern;
 
     pattern =
-	_freed_pattern_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_LINEAR]);
+	_freed_pool_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_LINEAR]);
     if (unlikely (pattern == NULL)) {
 	pattern = malloc (sizeof (cairo_linear_pattern_t));
 	if (unlikely (pattern == NULL)) {
@@ -795,7 +724,7 @@ cairo_pattern_create_radial (double cx0, double cy0, double radius0,
     cairo_radial_pattern_t *pattern;
 
     pattern =
-	_freed_pattern_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_RADIAL]);
+	_freed_pool_get (&freed_pattern_pool[CAIRO_PATTERN_TYPE_RADIAL]);
     if (unlikely (pattern == NULL)) {
 	pattern = malloc (sizeof (cairo_radial_pattern_t));
 	if (unlikely (pattern == NULL)) {
@@ -899,7 +828,7 @@ cairo_pattern_destroy (cairo_pattern_t *pattern)
     _cairo_pattern_fini (pattern);
 
     /* maintain a small cache of freed patterns */
-    _freed_pattern_put (&freed_pattern_pool[type], pattern);
+    _freed_pool_put (&freed_pattern_pool[type], pattern);
 }
 slim_hidden_def (cairo_pattern_destroy);
 
@@ -1592,14 +1521,14 @@ _cairo_pattern_acquire_surface_for_gradient (const cairo_gradient_pattern_t *pat
 	break;
     }
 
-    pixman_image_composite (PIXMAN_OP_SRC,
-			    pixman_image,
-			    NULL,
-			    image->pixman_image,
-			    x, y,
-			    0, 0,
-			    0, 0,
-			    width, height);
+    pixman_image_composite32 (PIXMAN_OP_SRC,
+                              pixman_image,
+                              NULL,
+                              image->pixman_image,
+                              x, y,
+                              0, 0,
+                              0, 0,
+                              width, height);
 
     pixman_image_unref (pixman_image);
 
@@ -1628,7 +1557,6 @@ _cairo_pattern_acquire_surface_for_gradient (const cairo_gradient_pattern_t *pat
 #define MAX_SURFACE_CACHE_SIZE 16
 static struct {
     struct _cairo_pattern_solid_surface_cache{
-	cairo_content_t  content;
 	cairo_color_t    color;
 	cairo_surface_t *surface;
     } cache[MAX_SURFACE_CACHE_SIZE];
@@ -1641,13 +1569,13 @@ _cairo_pattern_solid_surface_matches (
 	const cairo_solid_pattern_t			    *pattern,
 	cairo_surface_t					    *dst)
 {
-    if (cache->content != pattern->content)
+    if (cairo_surface_get_content (cache->surface) != _cairo_color_get_content (&pattern->color))
 	return FALSE;
 
     if (CAIRO_REFERENCE_COUNT_GET_VALUE (&cache->surface->ref_count) != 1)
 	return FALSE;
 
-    if (! _cairo_surface_is_similar (cache->surface, dst, pattern->content))
+    if (! _cairo_surface_is_similar (cache->surface, dst))
 	return FALSE;
 
     return TRUE;
@@ -1736,8 +1664,7 @@ _cairo_pattern_acquire_surface_for_solid (const cairo_solid_pattern_t	     *patt
 	    goto UNLOCK;
 	}
 
-	if (unlikely (! _cairo_surface_is_similar (surface,
-						   dst, pattern->content)))
+	if (unlikely (! _cairo_surface_is_similar (surface, dst)))
 	{
 	    /* In the rare event of a substitute surface being returned,
 	     * don't cache the fallback.
@@ -1753,7 +1680,6 @@ _cairo_pattern_acquire_surface_for_solid (const cairo_solid_pattern_t	     *patt
     to_destroy = solid_surface_cache.cache[i].surface;
     solid_surface_cache.cache[i].surface = surface;
     solid_surface_cache.cache[i].color   = pattern->color;
-    solid_surface_cache.cache[i].content = pattern->content;
 
 DONE:
     *out = cairo_surface_reference (solid_surface_cache.cache[i].surface);
@@ -1800,6 +1726,151 @@ _cairo_pattern_reset_solid_surface_cache (void)
     CAIRO_MUTEX_UNLOCK (_cairo_pattern_solid_surface_cache_lock);
 }
 
+static void
+_extents_to_linear_parameter (const cairo_linear_pattern_t *linear,
+			      const cairo_rectangle_int_t *extents,
+			      double t[2])
+{
+    double t0, tdx, tdy;
+    double p1x, p1y, pdx, pdy, invsqnorm;
+
+    p1x = _cairo_fixed_to_double (linear->p1.x);
+    p1y = _cairo_fixed_to_double (linear->p1.y);
+    pdx = _cairo_fixed_to_double (linear->p2.x) - p1x;
+    pdy = _cairo_fixed_to_double (linear->p2.y) - p1y;
+    invsqnorm = 1.0 / (pdx * pdx + pdy * pdy);
+    pdx *= invsqnorm;
+    pdy *= invsqnorm;
+
+    t0 = (extents->x - p1x) * pdx + (extents->y - p1y) * pdy;
+    tdx = extents->width * pdx;
+    tdy = extents->height * pdy;
+
+    t[0] = t[1] = t0;
+    if (tdx < 0)
+	t[0] += tdx;
+    else
+	t[1] += tdx;
+
+    if (tdy < 0)
+	t[0] += tdy;
+    else
+	t[1] += tdy;
+}
+
+static cairo_bool_t
+_linear_pattern_is_degenerate (const cairo_linear_pattern_t *linear)
+{
+    return linear->p1.x == linear->p2.x && linear->p1.y == linear->p2.y;
+}
+
+static cairo_bool_t
+_radial_pattern_is_degenerate (const cairo_radial_pattern_t *radial)
+{
+    return radial->r1 == radial->r2 &&
+	(radial->r1 == 0 /* && radial->r2 == 0 */ ||
+	 (radial->c1.x == radial->c2.x && radial->c1.y == radial->c2.y));
+}
+
+static cairo_bool_t
+_gradient_is_clear (const cairo_gradient_pattern_t *gradient,
+		    const cairo_rectangle_int_t *extents)
+{
+    unsigned int i;
+
+    assert (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR ||
+	    gradient->base.type == CAIRO_PATTERN_TYPE_RADIAL);
+
+    if (gradient->n_stops == 0 ||
+	(gradient->base.extend == CAIRO_EXTEND_NONE &&
+	 gradient->stops[0].offset == gradient->stops[gradient->n_stops - 1].offset))
+	return TRUE;
+
+    /* Check if the extents intersect the drawn part of the pattern. */
+    if (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR) {
+	if (gradient->base.extend == CAIRO_EXTEND_NONE) {
+	    cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient;
+	    /* EXTEND_NONE degenerate linear gradients are clear */
+	    if (_linear_pattern_is_degenerate (linear))
+		return TRUE;
+
+	    if (extents != NULL) {
+		double t[2];
+		_extents_to_linear_parameter (linear, extents, t);
+		if ((t[0] <= 0.0 && t[1] <= 0.0) || (t[0] >= 1.0 && t[1] >= 1.0))
+		    return TRUE;
+	    }
+	}
+    } else {
+	cairo_radial_pattern_t *radial = (cairo_radial_pattern_t *) gradient;
+	/* degenerate radial gradients are clear */
+	if (_radial_pattern_is_degenerate (radial) && FALSE)
+	    return TRUE;
+	/* TODO: check actual intersection */
+    }
+
+    for (i = 0; i < gradient->n_stops; i++)
+	if (! CAIRO_COLOR_IS_CLEAR (&gradient->stops[i].color))
+	    return FALSE;
+
+    return TRUE;
+}
+
+/**
+ * _cairo_gradient_pattern_is_solid
+ *
+ * Convenience function to determine whether a gradient pattern is
+ * a solid color within the given extents. In this case the color
+ * argument is initialized to the color the pattern represents.
+ * This functions doesn't handle completely transparent gradients,
+ * thus it should be called only after _cairo_pattern_is_clear has
+ * returned FALSE.
+ *
+ * Return value: %TRUE if the pattern is a solid color.
+ **/
+cairo_bool_t
+_cairo_gradient_pattern_is_solid (const cairo_gradient_pattern_t *gradient,
+				  const cairo_rectangle_int_t *extents,
+				  cairo_color_t *color)
+{
+    unsigned int i;
+
+    assert (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR ||
+	    gradient->base.type == CAIRO_PATTERN_TYPE_RADIAL);
+
+    /* TODO: radial, degenerate linear */
+    if (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR) {
+	if (gradient->base.extend == CAIRO_EXTEND_NONE) {
+	    cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient;
+	    double t[2];
+
+	    /* We already know that the pattern is not clear, thus if some
+	     * part of it is clear, the whole is not solid.
+	     */
+
+	    if (extents == NULL)
+		return FALSE;
+
+	    _extents_to_linear_parameter (linear, extents, t);
+	    if (t[0] < 0.0 || t[1] > 1.0)
+		return FALSE;
+	}
+    }
+
+    for (i = 1; i < gradient->n_stops; i++)
+	if (! _cairo_color_stop_equal (&gradient->stops[0].color,
+				       &gradient->stops[i].color))
+	    return FALSE;
+
+    _cairo_color_init_rgba (color,
+			    gradient->stops[0].color.red,
+			    gradient->stops[0].color.green,
+			    gradient->stops[0].color.blue,
+			    gradient->stops[0].color.alpha);
+
+    return TRUE;
+}
+
 /**
  * _cairo_pattern_is_opaque_solid
  *
@@ -1825,10 +1896,78 @@ _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern)
 }
 
 static cairo_bool_t
-_gradient_is_opaque (const cairo_gradient_pattern_t *gradient)
+_surface_is_opaque (const cairo_surface_pattern_t *pattern,
+		    const cairo_rectangle_int_t *r)
+{
+    if (pattern->surface->content & CAIRO_CONTENT_ALPHA)
+	return FALSE;
+
+    if (pattern->base.extend != CAIRO_EXTEND_NONE)
+	return TRUE;
+
+    if (r != NULL) {
+	cairo_rectangle_int_t extents;
+
+	if (! _cairo_surface_get_extents (pattern->surface, &extents))
+	    return TRUE;
+
+	if (r->x >= extents.x &&
+	    r->y >= extents.y &&
+	    r->x + r->width <= extents.x + extents.width &&
+	    r->y + r->height <= extents.y + extents.height)
+	{
+	    return TRUE;
+	}
+    }
+
+    return FALSE;
+}
+
+static cairo_bool_t
+_surface_is_clear (const cairo_surface_pattern_t *pattern)
+{
+    cairo_rectangle_int_t extents;
+
+    if (_cairo_surface_get_extents (pattern->surface, &extents) &&
+	(extents.width == 0 || extents.height == 0))
+	return TRUE;
+
+    return pattern->surface->is_clear &&
+	pattern->surface->content & CAIRO_CONTENT_ALPHA;
+}
+
+static cairo_bool_t
+_gradient_is_opaque (const cairo_gradient_pattern_t *gradient,
+		     const cairo_rectangle_int_t *extents)
 {
     unsigned int i;
 
+    assert (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR ||
+	    gradient->base.type == CAIRO_PATTERN_TYPE_RADIAL);
+
+    if (gradient->n_stops == 0 ||
+	(gradient->base.extend == CAIRO_EXTEND_NONE &&
+	 gradient->stops[0].offset == gradient->stops[gradient->n_stops - 1].offset))
+	return FALSE;
+
+    if (gradient->base.type == CAIRO_PATTERN_TYPE_LINEAR) {
+	if (gradient->base.extend == CAIRO_EXTEND_NONE) {
+	    double t[2];
+	    cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) gradient;
+
+	    /* EXTEND_NONE degenerate radial gradients are clear */
+	    if (_linear_pattern_is_degenerate (linear))
+		return FALSE;
+
+	    if (extents == NULL)
+		return FALSE;
+
+	    _extents_to_linear_parameter (linear, extents, t);
+	    if (t[0] < 0.0 || t[1] > 1.0)
+		return FALSE;
+	}
+    }
+
     for (i = 0; i < gradient->n_stops; i++)
 	if (! CAIRO_COLOR_IS_OPAQUE (&gradient->stops[i].color))
 	    return FALSE;
@@ -1846,7 +1985,8 @@ _gradient_is_opaque (const cairo_gradient_pattern_t *gradient)
  * Return value: %TRUE if the pattern is a opaque.
  **/
 cairo_bool_t
-_cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern)
+_cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern,
+			  const cairo_rectangle_int_t *extents)
 {
     const cairo_pattern_union_t *pattern;
 
@@ -1858,10 +1998,33 @@ _cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern)
     case CAIRO_PATTERN_TYPE_SOLID:
 	return _cairo_pattern_is_opaque_solid (abstract_pattern);
     case CAIRO_PATTERN_TYPE_SURFACE:
-	return cairo_surface_get_content (pattern->surface.surface) == CAIRO_CONTENT_COLOR;
+	return _surface_is_opaque (&pattern->surface, extents);
     case CAIRO_PATTERN_TYPE_LINEAR:
     case CAIRO_PATTERN_TYPE_RADIAL:
-	return _gradient_is_opaque (&pattern->gradient.base);
+	return _gradient_is_opaque (&pattern->gradient.base, extents);
+    }
+
+    ASSERT_NOT_REACHED;
+    return FALSE;
+}
+
+cairo_bool_t
+_cairo_pattern_is_clear (const cairo_pattern_t *abstract_pattern)
+{
+    const cairo_pattern_union_t *pattern;
+
+    if (abstract_pattern->has_component_alpha)
+	return FALSE;
+
+    pattern = (cairo_pattern_union_t *) abstract_pattern;
+    switch (pattern->type) {
+    case CAIRO_PATTERN_TYPE_SOLID:
+	return CAIRO_COLOR_IS_CLEAR (&pattern->solid.color);
+    case CAIRO_PATTERN_TYPE_SURFACE:
+	return _surface_is_clear (&pattern->surface);
+    case CAIRO_PATTERN_TYPE_LINEAR:
+    case CAIRO_PATTERN_TYPE_RADIAL:
+	return _gradient_is_clear (&pattern->gradient.base, NULL);
     }
 
     ASSERT_NOT_REACHED;
@@ -1882,7 +2045,7 @@ _cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern)
  *      the filter radius, so we just guess base on what we know that
  *      backends do currently (see bug #10508)
  */
-static cairo_filter_t
+cairo_filter_t
 _cairo_pattern_analyze_filter (const cairo_pattern_t	*pattern,
 			       double			*pad_out)
 {
@@ -2206,21 +2369,6 @@ _cairo_pattern_acquire_surface_for_surface (const cairo_surface_pattern_t   *pat
     return status;
 }
 
-static void
-_init_solid_for_color_stop (cairo_solid_pattern_t *solid,
-			    const cairo_color_t *color)
-{
-    cairo_color_t premult;
-
-    /* Color stops aren't premultiplied, so fix that here */
-    _cairo_color_init_rgba (&premult,
-			    color->red,
-			    color->green,
-			    color->blue,
-			    color->alpha);
-    _cairo_pattern_init_solid (solid, &premult, CAIRO_CONTENT_COLOR_ALPHA);
-}
-
 /**
  * _cairo_pattern_acquire_surface:
  * @pattern: a #cairo_pattern_t
@@ -2252,98 +2400,36 @@ _cairo_pattern_acquire_surface (const cairo_pattern_t	   *pattern,
 				cairo_surface_t		   **surface_out,
 				cairo_surface_attributes_t *attributes)
 {
-    cairo_status_t status;
-
     if (unlikely (pattern->status)) {
 	*surface_out = NULL;
 	return pattern->status;
     }
 
     switch (pattern->type) {
-    case CAIRO_PATTERN_TYPE_SOLID: {
-	cairo_solid_pattern_t *src = (cairo_solid_pattern_t *) pattern;
+    case CAIRO_PATTERN_TYPE_SOLID:
+	return _cairo_pattern_acquire_surface_for_solid ((cairo_solid_pattern_t *) pattern,
+							 dst, x, y, width, height,
+							 surface_out,
+							 attributes);
 
-	status = _cairo_pattern_acquire_surface_for_solid (src, dst,
-							   x, y, width, height,
+    case CAIRO_PATTERN_TYPE_LINEAR:
+    case CAIRO_PATTERN_TYPE_RADIAL:
+	return _cairo_pattern_acquire_surface_for_gradient ((cairo_gradient_pattern_t *) pattern,
+							    dst, x, y, width, height,
+							    surface_out,
+							    attributes);
+
+    case CAIRO_PATTERN_TYPE_SURFACE:
+	return _cairo_pattern_acquire_surface_for_surface ((cairo_surface_pattern_t *) pattern,
+							   dst, x, y, width, height,
+							   flags,
 							   surface_out,
 							   attributes);
-	} break;
-    case CAIRO_PATTERN_TYPE_LINEAR:
-    case CAIRO_PATTERN_TYPE_RADIAL: {
-	cairo_gradient_pattern_t *src = (cairo_gradient_pattern_t *) pattern;
 
-	/* XXX The gradient->solid conversion code should now be redundant. */
-
-	/* fast path for gradients with less than 2 color stops */
-	if (src->n_stops < 2)
-	{
-	    cairo_solid_pattern_t solid;
-
-	    if (src->n_stops) {
-		_init_solid_for_color_stop (&solid, &src->stops->color);
-	    } else {
-		_cairo_pattern_init_solid (&solid,
-					   CAIRO_COLOR_TRANSPARENT,
-					   CAIRO_CONTENT_ALPHA);
-	    }
-
-	    status = _cairo_pattern_acquire_surface_for_solid (&solid, dst,
-							       x, y,
-							       width, height,
-							       surface_out,
-							       attributes);
-	}
-	else
-	{
-	    unsigned int i;
-
-	    /* Is the gradient a uniform colour?
-	     * Happens more often than you would believe.
-	     */
-	    for (i = 1; i < src->n_stops; i++) {
-		if (! _cairo_color_equal (&src->stops[0].color,
-					  &src->stops[i].color))
-		{
-		    break;
-		}
-	    }
-	    if (i == src->n_stops) {
-		cairo_solid_pattern_t solid;
-
-		_init_solid_for_color_stop (&solid, &src->stops->color);
-
-		status =
-		    _cairo_pattern_acquire_surface_for_solid (&solid, dst,
-							      x, y,
-							      width, height,
-							      surface_out,
-							      attributes);
-	    } else {
-		status =
-		    _cairo_pattern_acquire_surface_for_gradient (src, dst,
-								 x, y,
-								 width, height,
-								 surface_out,
-								 attributes);
-	    }
-	}
-    } break;
-    case CAIRO_PATTERN_TYPE_SURFACE: {
-	cairo_surface_pattern_t *src = (cairo_surface_pattern_t *) pattern;
-
-	status = _cairo_pattern_acquire_surface_for_surface (src, dst,
-							     x, y,
-							     width, height,
-							     flags,
-							     surface_out,
-							     attributes);
-    } break;
     default:
 	ASSERT_NOT_REACHED;
-	status = _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
+	return _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
     }
-
-    return status;
 }
 
 /**
@@ -2401,8 +2487,7 @@ _cairo_pattern_acquire_surfaces (const cairo_pattern_t	    *src,
 	combined = src_solid->color;
 	_cairo_color_multiply_alpha (&combined, mask_solid->color.alpha);
 
-	_cairo_pattern_init_solid (&src_tmp.solid, &combined,
-				   src_solid->content | mask_solid->content);
+	_cairo_pattern_init_solid (&src_tmp.solid, &combined);
 
 	src = &src_tmp.base;
 	mask = NULL;
@@ -2452,7 +2537,6 @@ void
 _cairo_pattern_get_extents (const cairo_pattern_t         *pattern,
 			    cairo_rectangle_int_t         *extents)
 {
-    cairo_matrix_t imatrix;
     double x1, y1, x2, y2;
     cairo_status_t status;
 
@@ -2539,6 +2623,9 @@ _cairo_pattern_get_extents (const cairo_pattern_t         *pattern,
 	    if (pattern->extend != CAIRO_EXTEND_NONE)
 		goto UNBOUNDED;
 
+	    if (linear->p1.x == linear->p2.x && linear->p1.y == linear->p2.y)
+		goto EMPTY;
+
 	    if (pattern->matrix.xy != 0. || pattern->matrix.yx != 0.)
 		goto UNBOUNDED;
 
@@ -2562,14 +2649,21 @@ _cairo_pattern_get_extents (const cairo_pattern_t         *pattern,
 	ASSERT_NOT_REACHED;
     }
 
-    imatrix = pattern->matrix;
-    status = cairo_matrix_invert (&imatrix);
-    /* cairo_pattern_set_matrix ensures the matrix is invertible */
-    assert (status == CAIRO_STATUS_SUCCESS);
+    if (_cairo_matrix_is_translation (&pattern->matrix)) {
+	x1 -= pattern->matrix.x0; x2 -= pattern->matrix.x0;
+	y1 -= pattern->matrix.y0; y2 -= pattern->matrix.y0;
+    } else {
+	cairo_matrix_t imatrix;
 
-    _cairo_matrix_transform_bounding_box (&imatrix,
-					  &x1, &y1, &x2, &y2,
-					  NULL);
+	imatrix = pattern->matrix;
+	status = cairo_matrix_invert (&imatrix);
+	/* cairo_pattern_set_matrix ensures the matrix is invertible */
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	_cairo_matrix_transform_bounding_box (&imatrix,
+					      &x1, &y1, &x2, &y2,
+					      NULL);
+    }
 
     x1 = floor (x1);
     if (x1 < CAIRO_RECT_INT_MIN)
@@ -2607,7 +2701,6 @@ _cairo_solid_pattern_hash (unsigned long hash,
 {
     const cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) pattern;
 
-    hash = _cairo_hash_bytes (hash, &solid->content, sizeof (solid->content));
     hash = _cairo_hash_bytes (hash, &solid->color, sizeof (solid->color));
 
     return hash;
@@ -2635,23 +2728,20 @@ _cairo_gradient_color_stops_hash (unsigned long hash,
     return hash;
 }
 
-static unsigned long
+unsigned long
 _cairo_linear_pattern_hash (unsigned long hash,
-			    const cairo_pattern_t *pattern)
+			    const cairo_linear_pattern_t *linear)
 {
-    const cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) pattern;
-
     hash = _cairo_hash_bytes (hash, &linear->p1, sizeof (linear->p1));
     hash = _cairo_hash_bytes (hash, &linear->p2, sizeof (linear->p2));
 
     return _cairo_gradient_color_stops_hash (hash, &linear->base);
 }
 
-static unsigned long
-_cairo_radial_pattern_hash (unsigned long hash, const cairo_pattern_t *pattern)
+unsigned long
+_cairo_radial_pattern_hash (unsigned long hash,
+			    const cairo_radial_pattern_t *radial)
 {
-    const cairo_radial_pattern_t *radial = (cairo_radial_pattern_t *) pattern;
-
     hash = _cairo_hash_bytes (hash, &radial->c1, sizeof (radial->c1));
     hash = _cairo_hash_bytes (hash, &radial->r1, sizeof (radial->r1));
     hash = _cairo_hash_bytes (hash, &radial->c2, sizeof (radial->c2));
@@ -2696,9 +2786,9 @@ _cairo_pattern_hash (const cairo_pattern_t *pattern)
     case CAIRO_PATTERN_TYPE_SOLID:
 	return _cairo_solid_pattern_hash (hash, pattern);
     case CAIRO_PATTERN_TYPE_LINEAR:
-	return _cairo_linear_pattern_hash (hash, pattern);
+	return _cairo_linear_pattern_hash (hash, (cairo_linear_pattern_t *) pattern);
     case CAIRO_PATTERN_TYPE_RADIAL:
-	return _cairo_radial_pattern_hash (hash, pattern);
+	return _cairo_radial_pattern_hash (hash, (cairo_radial_pattern_t *) pattern);
     case CAIRO_PATTERN_TYPE_SURFACE:
 	return _cairo_surface_pattern_hash (hash, pattern);
     default:
@@ -2750,9 +2840,6 @@ _cairo_solid_pattern_equal (const cairo_pattern_t *A,
     const cairo_solid_pattern_t *a = (cairo_solid_pattern_t *) A;
     const cairo_solid_pattern_t *b = (cairo_solid_pattern_t *) B;
 
-    if (a->content != b->content)
-	return FALSE;
-
     return _cairo_color_equal (&a->color, &b->color);
 }
 
@@ -2768,20 +2855,17 @@ _cairo_gradient_color_stops_equal (const cairo_gradient_pattern_t *a,
     for (n = 0; n < a->n_stops; n++) {
 	if (a->stops[n].offset != b->stops[n].offset)
 	    return FALSE;
-	if (! _cairo_color_equal (&a->stops[n].color, &b->stops[n].color))
+	if (! _cairo_color_stop_equal (&a->stops[n].color, &b->stops[n].color))
 	    return FALSE;
     }
 
     return TRUE;
 }
 
-static cairo_bool_t
-_cairo_linear_pattern_equal (const cairo_pattern_t *A,
-			     const cairo_pattern_t *B)
+cairo_bool_t
+_cairo_linear_pattern_equal (const cairo_linear_pattern_t *a,
+			     const cairo_linear_pattern_t *b)
 {
-    const cairo_linear_pattern_t *a = (cairo_linear_pattern_t *) A;
-    const cairo_linear_pattern_t *b = (cairo_linear_pattern_t *) B;
-
     if (a->p1.x != b->p1.x)
 	return FALSE;
 
@@ -2797,13 +2881,10 @@ _cairo_linear_pattern_equal (const cairo_pattern_t *A,
     return _cairo_gradient_color_stops_equal (&a->base, &b->base);
 }
 
-static cairo_bool_t
-_cairo_radial_pattern_equal (const cairo_pattern_t *A,
-			     const cairo_pattern_t *B)
+cairo_bool_t
+_cairo_radial_pattern_equal (const cairo_radial_pattern_t *a,
+			     const cairo_radial_pattern_t *b)
 {
-    const cairo_radial_pattern_t *a = (cairo_radial_pattern_t *) A;
-    const cairo_radial_pattern_t *b = (cairo_radial_pattern_t *) B;
-
     if (a->c1.x != b->c1.x)
 	return FALSE;
 
@@ -2865,9 +2946,11 @@ _cairo_pattern_equal (const cairo_pattern_t *a, const cairo_pattern_t *b)
     case CAIRO_PATTERN_TYPE_SOLID:
 	return _cairo_solid_pattern_equal (a, b);
     case CAIRO_PATTERN_TYPE_LINEAR:
-	return _cairo_linear_pattern_equal (a, b);
+	return _cairo_linear_pattern_equal ((cairo_linear_pattern_t *) a,
+					    (cairo_linear_pattern_t *) b);
     case CAIRO_PATTERN_TYPE_RADIAL:
-	return _cairo_radial_pattern_equal (a, b);
+	return _cairo_radial_pattern_equal ((cairo_radial_pattern_t *) a,
+					    (cairo_radial_pattern_t *) b);
     case CAIRO_PATTERN_TYPE_SURFACE:
 	return _cairo_surface_pattern_equal (a, b);
     default:
@@ -3131,6 +3214,12 @@ cairo_pattern_get_radial_circles (cairo_pattern_t *pattern,
 void
 _cairo_pattern_reset_static_data (void)
 {
-    _freed_patterns_reset ();
+#if HAS_FREED_POOL
+    int i;
+
+    for (i = 0; i < ARRAY_LENGTH (freed_pattern_pool); i++)
+	_freed_pool_reset (&freed_pattern_pool[i]);
+#endif
+
     _cairo_pattern_reset_solid_surface_cache ();
 }
diff --git a/gfx/cairo/cairo/src/cairo-pdf-operators-private.h b/gfx/cairo/cairo/src/cairo-pdf-operators-private.h
index 4ef0fcaeba4..67d1cc2331b 100644
--- a/gfx/cairo/cairo/src/cairo-pdf-operators-private.h
+++ b/gfx/cairo/cairo/src/cairo-pdf-operators-private.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -82,6 +82,7 @@ typedef struct _cairo_pdf_operators {
     double cur_y;
     int hex_width;
     int num_glyphs;
+    double glyph_buf_x_pos;
     cairo_pdf_glyph_t glyphs[PDF_GLYPH_BUFFER_SIZE];
 
     /* PDF line style */
@@ -132,16 +133,16 @@ _cairo_pdf_operators_clip (cairo_pdf_operators_t 	*pdf_operators,
 			   cairo_fill_rule_t		 fill_rule);
 
 cairo_private cairo_int_status_t
-_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t	*pdf_operators,
-					cairo_stroke_style_t	*style,
-					double			 scale);
+_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t		*pdf_operators,
+					const cairo_stroke_style_t	*style,
+					double				 scale);
 
 cairo_private cairo_int_status_t
-_cairo_pdf_operators_stroke (cairo_pdf_operators_t 	*pdf_operators,
+_cairo_pdf_operators_stroke (cairo_pdf_operators_t	*pdf_operators,
 			     cairo_path_fixed_t		*path,
-			     cairo_stroke_style_t	*style,
-			     cairo_matrix_t		*ctm,
-			     cairo_matrix_t		*ctm_inverse);
+			     const cairo_stroke_style_t	*style,
+			     const cairo_matrix_t	*ctm,
+			     const cairo_matrix_t	*ctm_inverse);
 
 cairo_private cairo_int_status_t
 _cairo_pdf_operators_fill (cairo_pdf_operators_t 	*pdf_operators,
@@ -149,12 +150,12 @@ _cairo_pdf_operators_fill (cairo_pdf_operators_t 	*pdf_operators,
 			   cairo_fill_rule_t	 	fill_rule);
 
 cairo_private cairo_int_status_t
-_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t 	*pdf_operators,
+_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t		*pdf_operators,
 				  cairo_path_fixed_t		*path,
-				  cairo_fill_rule_t	 	 fill_rule,
-				  cairo_stroke_style_t	        *style,
-				  cairo_matrix_t		*ctm,
-				  cairo_matrix_t		*ctm_inverse);
+				  cairo_fill_rule_t		 fill_rule,
+				  const cairo_stroke_style_t	*style,
+				  const cairo_matrix_t		*ctm,
+				  const cairo_matrix_t		*ctm_inverse);
 
 cairo_private cairo_int_status_t
 _cairo_pdf_operators_show_text_glyphs (cairo_pdf_operators_t	  *pdf_operators,
diff --git a/gfx/cairo/cairo/src/cairo-pdf-operators.c b/gfx/cairo/cairo/src/cairo-pdf-operators.c
index 2bfb5f44c9e..f60fbef3064 100644
--- a/gfx/cairo/cairo/src/cairo-pdf-operators.c
+++ b/gfx/cairo/cairo/src/cairo-pdf-operators.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -43,6 +43,7 @@
 
 #if CAIRO_HAS_PDF_OPERATORS
 
+#include "cairo-error-private.h"
 #include "cairo-pdf-operators-private.h"
 #include "cairo-path-fixed-private.h"
 #include "cairo-output-stream-private.h"
@@ -499,14 +500,14 @@ _cairo_pdf_operators_clip (cairo_pdf_operators_t	*pdf_operators,
     }
 
     switch (fill_rule) {
+    default:
+	ASSERT_NOT_REACHED;
     case CAIRO_FILL_RULE_WINDING:
 	pdf_operator = "W";
 	break;
     case CAIRO_FILL_RULE_EVEN_ODD:
 	pdf_operator = "W*";
 	break;
-    default:
-	ASSERT_NOT_REACHED;
     }
 
     _cairo_output_stream_printf (pdf_operators->stream,
@@ -549,9 +550,9 @@ _cairo_pdf_line_join (cairo_line_join_t join)
 }
 
 cairo_int_status_t
-_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t	*pdf_operators,
-					cairo_stroke_style_t	*style,
-					double			 scale)
+_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t		*pdf_operators,
+					const cairo_stroke_style_t	*style,
+					double				 scale)
 {
     double *dash = style->dash;
     int num_dashes = style->num_dashes;
@@ -706,12 +707,12 @@ _cairo_matrix_factor_out_scale (cairo_matrix_t *m, double *scale)
 }
 
 static cairo_int_status_t
-_cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t	*pdf_operators,
-				  cairo_path_fixed_t	*path,
-				  cairo_stroke_style_t	*style,
-				  cairo_matrix_t	*ctm,
-				  cairo_matrix_t	*ctm_inverse,
-				  const char		*pdf_operator)
+_cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t		*pdf_operators,
+				  cairo_path_fixed_t		*path,
+				  const cairo_stroke_style_t	*style,
+				  const cairo_matrix_t		*ctm,
+				  const cairo_matrix_t		*ctm_inverse,
+				  const char			*pdf_operator)
 {
     cairo_status_t status;
     cairo_matrix_t m, path_transform;
@@ -797,11 +798,11 @@ _cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t	*pdf_operators,
 }
 
 cairo_int_status_t
-_cairo_pdf_operators_stroke (cairo_pdf_operators_t	*pdf_operators,
-			     cairo_path_fixed_t		*path,
-			     cairo_stroke_style_t	*style,
-			     cairo_matrix_t		*ctm,
-			     cairo_matrix_t		*ctm_inverse)
+_cairo_pdf_operators_stroke (cairo_pdf_operators_t		*pdf_operators,
+			     cairo_path_fixed_t			*path,
+			     const cairo_stroke_style_t		*style,
+			     const cairo_matrix_t		*ctm,
+			     const cairo_matrix_t		*ctm_inverse)
 {
     return _cairo_pdf_operators_emit_stroke (pdf_operators,
 					     path,
@@ -833,14 +834,14 @@ _cairo_pdf_operators_fill (cairo_pdf_operators_t	*pdf_operators,
 	return status;
 
     switch (fill_rule) {
+    default:
+	ASSERT_NOT_REACHED;
     case CAIRO_FILL_RULE_WINDING:
 	pdf_operator = "f";
 	break;
     case CAIRO_FILL_RULE_EVEN_ODD:
 	pdf_operator = "f*";
 	break;
-    default:
-	ASSERT_NOT_REACHED;
     }
 
     _cairo_output_stream_printf (pdf_operators->stream,
@@ -851,24 +852,24 @@ _cairo_pdf_operators_fill (cairo_pdf_operators_t	*pdf_operators,
 }
 
 cairo_int_status_t
-_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t 	*pdf_operators,
+_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t		*pdf_operators,
 				  cairo_path_fixed_t		*path,
-				  cairo_fill_rule_t	 	 fill_rule,
-				  cairo_stroke_style_t	        *style,
-				  cairo_matrix_t		*ctm,
-				  cairo_matrix_t		*ctm_inverse)
+				  cairo_fill_rule_t		 fill_rule,
+				  const cairo_stroke_style_t	*style,
+				  const cairo_matrix_t		*ctm,
+				  const cairo_matrix_t		*ctm_inverse)
 {
     const char *operator;
 
     switch (fill_rule) {
+    default:
+	ASSERT_NOT_REACHED;
     case CAIRO_FILL_RULE_WINDING:
 	operator = "B";
 	break;
     case CAIRO_FILL_RULE_EVEN_ODD:
 	operator = "B*";
 	break;
-    default:
-	ASSERT_NOT_REACHED;
     }
 
     return _cairo_pdf_operators_emit_stroke (pdf_operators,
@@ -989,6 +990,7 @@ _cairo_pdf_operators_flush_glyphs (cairo_pdf_operators_t    *pdf_operators)
     }
 
     pdf_operators->num_glyphs = 0;
+    pdf_operators->glyph_buf_x_pos = pdf_operators->cur_x;
     status2 = _cairo_output_stream_destroy (word_wrap_stream);
     if (status == CAIRO_STATUS_SUCCESS)
 	status = status2;
@@ -1011,6 +1013,7 @@ _cairo_pdf_operators_add_glyph (cairo_pdf_operators_t             *pdf_operators
     pdf_operators->glyphs[pdf_operators->num_glyphs].x_position = x_position;
     pdf_operators->glyphs[pdf_operators->num_glyphs].glyph_index = glyph->subset_glyph_index;
     pdf_operators->glyphs[pdf_operators->num_glyphs].x_advance = x;
+    pdf_operators->glyph_buf_x_pos += x;
     pdf_operators->num_glyphs++;
     if (pdf_operators->num_glyphs == PDF_GLYPH_BUFFER_SIZE)
 	return _cairo_pdf_operators_flush_glyphs (pdf_operators);
@@ -1035,6 +1038,7 @@ _cairo_pdf_operators_set_text_matrix (cairo_pdf_operators_t  *pdf_operators,
     pdf_operators->text_matrix = *matrix;
     pdf_operators->cur_x = 0;
     pdf_operators->cur_y = 0;
+    pdf_operators->glyph_buf_x_pos = 0;
     _cairo_output_stream_printf (pdf_operators->stream,
 				 "%f %f %f %f %f %f Tm\n",
 				 pdf_operators->text_matrix.xx,
@@ -1090,6 +1094,7 @@ _cairo_pdf_operators_set_text_position (cairo_pdf_operators_t  *pdf_operators,
 				 translate.y0);
     pdf_operators->cur_x = 0;
     pdf_operators->cur_y = 0;
+    pdf_operators->glyph_buf_x_pos = 0;
 
     pdf_operators->cairo_to_pdftext = pdf_operators->text_matrix;
     status = cairo_matrix_invert (&pdf_operators->cairo_to_pdftext);
@@ -1139,6 +1144,7 @@ _cairo_pdf_operators_begin_text (cairo_pdf_operators_t    *pdf_operators)
 
     pdf_operators->in_text_object = TRUE;
     pdf_operators->num_glyphs = 0;
+    pdf_operators->glyph_buf_x_pos = 0;
 
     return _cairo_output_stream_get_status (pdf_operators->stream);
 }
@@ -1243,7 +1249,7 @@ _cairo_pdf_operators_emit_glyph (cairo_pdf_operators_t             *pdf_operator
      * PDF consumers that do not handle very large position
      * adjustments in TJ.
      */
-    if (fabs(x - pdf_operators->cur_x) > 10 ||
+    if (fabs(x - pdf_operators->glyph_buf_x_pos) > 10 ||
 	fabs(y - pdf_operators->cur_y) > GLYPH_POSITION_TOLERANCE)
     {
 	status = _cairo_pdf_operators_flush_glyphs (pdf_operators);
@@ -1380,8 +1386,7 @@ _cairo_pdf_operators_show_text_glyphs (cairo_pdf_operators_t	  *pdf_operators,
     status = cairo_matrix_invert (&pdf_operators->font_matrix_inverse);
     if (status == CAIRO_STATUS_INVALID_MATRIX)
 	return CAIRO_STATUS_SUCCESS;
-    if (unlikely (status))
-	return status;
+    assert (status == CAIRO_STATUS_SUCCESS);
 
     pdf_operators->is_new_text_object = FALSE;
     if (pdf_operators->in_text_object == FALSE) {
diff --git a/gfx/cairo/cairo/src/cairo-pdf-surface-private.h b/gfx/cairo/cairo/src/cairo-pdf-surface-private.h
index 5c28f70ca95..221418ec9ba 100644
--- a/gfx/cairo/cairo/src/cairo-pdf-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-pdf-surface-private.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -95,10 +95,9 @@ typedef enum _cairo_pdf_operation {
     PDF_SHOW_GLYPHS
 } cairo_pdf_operation_t;
 
-typedef struct _cairo_pdf_smask_group
-{
-    double 		  width;
-    double 		  height;
+typedef struct _cairo_pdf_smask_group {
+    double		  width;
+    double		  height;
     cairo_pdf_resource_t  group_res;
     cairo_pdf_operation_t operation;
     cairo_pattern_t	 *source;
@@ -106,10 +105,10 @@ typedef struct _cairo_pdf_smask_group
     cairo_pattern_t	 *mask;
     cairo_path_fixed_t	  path;
     cairo_fill_rule_t	  fill_rule;
-    cairo_stroke_style_t *style;
+    cairo_stroke_style_t  style;
     cairo_matrix_t	  ctm;
     cairo_matrix_t	  ctm_inverse;
-    char           	 *utf8;
+    char		 *utf8;
     int                   utf8_len;
     cairo_glyph_t	 *glyphs;
     int			  num_glyphs;
diff --git a/gfx/cairo/cairo/src/cairo-pdf-surface.c b/gfx/cairo/cairo/src/cairo-pdf-surface.c
index a1be10a08db..09bd42ea0d7 100644
--- a/gfx/cairo/cairo/src/cairo-pdf-surface.c
+++ b/gfx/cairo/cairo/src/cairo-pdf-surface.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -45,12 +45,15 @@
 #include "cairo-pdf-surface-private.h"
 #include "cairo-pdf-operators-private.h"
 #include "cairo-analysis-surface-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-image-info-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-output-stream-private.h"
 #include "cairo-paginated-private.h"
 #include "cairo-scaled-font-subsets-private.h"
 #include "cairo-surface-clipper-private.h"
+#include "cairo-surface-subsurface-private.h"
 #include "cairo-type3-glyph-surface-private.h"
 
 #include <time.h>
@@ -112,6 +115,23 @@
  *   XObject instead of using an indirect object.
  */
 
+/**
+ * SECTION:cairo-pdf
+ * @Title: PDF Surfaces
+ * @Short_Description: Rendering PDF documents
+ * @See_Also: #cairo_surface_t
+ *
+ * The PDF surface is used to render cairo graphics to Adobe
+ * PDF files and is a multi-page vector surface backend.
+ */
+
+/**
+ * CAIRO_HAS_PDF_SURFACE:
+ *
+ * Defined if the PDF surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 static const cairo_pdf_version_t _cairo_pdf_versions[] =
 {
     CAIRO_PDF_VERSION_1_4,
@@ -303,7 +323,9 @@ _cairo_pdf_surface_create_for_stream_internal (cairo_output_stream_t	*output,
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
     }
 
-    _cairo_surface_init (&surface->base, &cairo_pdf_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_pdf_surface_backend,
+			 NULL, /* device */
 			 CAIRO_CONTENT_COLOR_ALPHA);
 
     surface->output = output;
@@ -482,30 +504,49 @@ _cairo_surface_is_pdf (cairo_surface_t *surface)
 
 /* If the abstract_surface is a paginated surface, and that paginated
  * surface's target is a pdf_surface, then set pdf_surface to that
- * target. Otherwise return %CAIRO_STATUS_SURFACE_TYPE_MISMATCH.
+ * target. Otherwise return FALSE.
  */
-static cairo_status_t
+static cairo_bool_t
 _extract_pdf_surface (cairo_surface_t		 *surface,
 		      cairo_pdf_surface_t	**pdf_surface)
 {
     cairo_surface_t *target;
+    cairo_status_t status_ignored;
 
     if (surface->status)
-	return surface->status;
+	return FALSE;
+    if (surface->finished) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+        return FALSE;
+    }
 
-    if (! _cairo_surface_is_paginated (surface))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_paginated (surface)) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     target = _cairo_paginated_surface_get_target (surface);
-    if (target->status)
-	return target->status;
+    if (target->status) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   target->status);
+	return FALSE;
+    }
+    if (target->finished) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return FALSE;
+    }
 
-    if (! _cairo_surface_is_pdf (target))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_pdf (target)) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     *pdf_surface = (cairo_pdf_surface_t *) target;
-
-    return CAIRO_STATUS_SUCCESS;
+    return TRUE;
 }
 
 /**
@@ -528,13 +569,9 @@ cairo_pdf_surface_restrict_to_version (cairo_surface_t 		*abstract_surface,
 				       cairo_pdf_version_t  	 version)
 {
     cairo_pdf_surface_t *surface = NULL; /* hide compiler warning */
-    cairo_status_t status;
 
-    status = _extract_pdf_surface (abstract_surface, &surface);
-    if (status) {
-	status = _cairo_surface_set_error (abstract_surface, status);
+    if (! _extract_pdf_surface (abstract_surface, &surface))
 	return;
-    }
 
     if (version < CAIRO_PDF_VERSION_LAST)
 	surface->pdf_version = version;
@@ -608,13 +645,9 @@ cairo_pdf_surface_set_size (cairo_surface_t	*surface,
 			    double		 height_in_points)
 {
     cairo_pdf_surface_t *pdf_surface = NULL; /* hide compiler warning */
-    cairo_status_t status;
 
-    status = _extract_pdf_surface (surface, &pdf_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_pdf_surface (surface, &pdf_surface))
 	return;
-    }
 
     _cairo_pdf_surface_set_size_internal (pdf_surface,
 					  width_in_points,
@@ -1008,10 +1041,10 @@ _cairo_pdf_source_surface_init_key (cairo_pdf_source_surface_entry_t *key)
 }
 
 static cairo_int_status_t
-_get_jpx_image_info (cairo_surface_t	 	 *source,
-		     cairo_image_info_t 	 *info,
-		     const unsigned char 	**mime_data,
-		     unsigned int 		 *mime_data_length)
+_get_jpx_image_info (cairo_surface_t		 *source,
+		     cairo_image_info_t		*info,
+		     const unsigned char	**mime_data,
+		     unsigned long		 *mime_data_length)
 {
     cairo_surface_get_mime_data (source, CAIRO_MIME_TYPE_JP2,
 				 mime_data, mime_data_length);
@@ -1022,10 +1055,10 @@ _get_jpx_image_info (cairo_surface_t	 	 *source,
 }
 
 static cairo_int_status_t
-_get_jpeg_image_info (cairo_surface_t	 *source,
+_get_jpeg_image_info (cairo_surface_t		 *source,
 		      cairo_image_info_t	 *info,
 		      const unsigned char	**mime_data,
-		      unsigned int		 *mime_data_length)
+		      unsigned long		 *mime_data_length)
 {
     cairo_surface_get_mime_data (source, CAIRO_MIME_TYPE_JPEG,
 				 mime_data, mime_data_length);
@@ -1044,20 +1077,28 @@ _get_source_surface_size (cairo_surface_t         *source,
     cairo_rectangle_int_t extents;
     cairo_image_info_t info;
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
 
-    if (_cairo_surface_is_recording (source)) {
-	cairo_recording_surface_t *recording_surface = (cairo_recording_surface_t *) source;
-	cairo_box_t bbox;
+    if (source->type == CAIRO_SURFACE_TYPE_RECORDING) {
+	if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	     cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source;
 
-	status = _cairo_recording_surface_get_bbox (recording_surface, &bbox, NULL);
-	if (unlikely (status))
-	    return status;
+	    *width  = sub->extents.width;
+	    *height = sub->extents.height;
 
-	_cairo_box_round_to_rectangle (&bbox, &extents);
+	} else {
+	    cairo_recording_surface_t *recording_surface = (cairo_recording_surface_t *) source;
+	    cairo_box_t bbox;
 
-	*width = extents.width;
-	*height = extents.height;
+	    status = _cairo_recording_surface_get_bbox (recording_surface, &bbox, NULL);
+	    if (unlikely (status))
+		return status;
+
+	    _cairo_box_round_to_rectangle (&bbox, &extents);
+
+	    *width = extents.width;
+	    *height = extents.height;
+	}
 	return CAIRO_STATUS_SUCCESS;
     }
 
@@ -1136,6 +1177,7 @@ _cairo_pdf_surface_add_source_surface (cairo_pdf_surface_t	*surface,
     src_surface.surface = cairo_surface_reference (source);
     surface_entry->surface_res = _cairo_pdf_surface_new_object (surface);
     if (surface_entry->surface_res.id == 0) {
+	cairo_surface_destroy (source);
 	free (surface_entry);
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
@@ -1145,6 +1187,7 @@ _cairo_pdf_surface_add_source_surface (cairo_pdf_surface_t	*surface,
 
     status = _cairo_array_append (&surface->page_surfaces, &src_surface);
     if (unlikely (status)) {
+	cairo_surface_destroy (source);
 	free (surface_entry);
 	return status;
     }
@@ -1176,25 +1219,6 @@ _cairo_pdf_surface_add_pdf_pattern (cairo_pdf_surface_t		*surface,
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    if (pattern->type == CAIRO_PATTERN_TYPE_LINEAR ||
-        pattern->type == CAIRO_PATTERN_TYPE_RADIAL)
-    {
-	cairo_gradient_pattern_t *gradient;
-
-	gradient = (cairo_gradient_pattern_t *) pattern;
-
-	/* Gradients with zero stops do not produce any output */
-	if (gradient->n_stops == 0)
-	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-
-	/* Gradients with one stop are the same as solid colors */
-	if (gradient->n_stops == 1) {
-	    pattern_res->id = 0;
-	    gstate_res->id = 0;
-	    return CAIRO_STATUS_SUCCESS;
-	}
-    }
-
     status = _cairo_pattern_create_copy (&pdf_pattern.pattern, pattern);
     if (unlikely (status))
 	return status;
@@ -1209,8 +1233,9 @@ _cairo_pdf_surface_add_pdf_pattern (cairo_pdf_surface_t		*surface,
 
     /* gradient patterns require an smask object to implement transparency */
     if (pattern->type == CAIRO_PATTERN_TYPE_LINEAR ||
-        pattern->type == CAIRO_PATTERN_TYPE_RADIAL) {
-        if (_cairo_pattern_is_opaque (pattern) == FALSE) {
+        pattern->type == CAIRO_PATTERN_TYPE_RADIAL)
+    {
+        if (_cairo_pattern_is_opaque (pattern, extents) == FALSE) {
             pdf_pattern.gstate_res = _cairo_pdf_surface_new_object (surface);
 	    if (pdf_pattern.gstate_res.id == 0) {
 		cairo_pattern_destroy (pdf_pattern.pattern);
@@ -1219,14 +1244,14 @@ _cairo_pdf_surface_add_pdf_pattern (cairo_pdf_surface_t		*surface,
         }
     }
 
-    pdf_pattern.width = surface->width;
+    pdf_pattern.width  = surface->width;
     pdf_pattern.height = surface->height;
     if (extents != NULL) {
 	pdf_pattern.extents = *extents;
     } else {
 	pdf_pattern.extents.x = 0;
 	pdf_pattern.extents.y = 0;
-	pdf_pattern.extents.width = surface->width;
+	pdf_pattern.extents.width  = surface->width;
 	pdf_pattern.extents.height = surface->height;
     }
 
@@ -1979,7 +2004,7 @@ _cairo_pdf_surface_emit_jpx_image (cairo_pdf_surface_t   *surface,
 {
     cairo_status_t status;
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     cairo_image_info_t info;
 
     if (surface->pdf_version < CAIRO_PDF_VERSION_1_5)
@@ -2020,7 +2045,7 @@ _cairo_pdf_surface_emit_jpeg_image (cairo_pdf_surface_t   *surface,
 {
     cairo_status_t status;
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     cairo_image_info_t info;
 
     cairo_surface_get_mime_data (source, CAIRO_MIME_TYPE_JPEG,
@@ -2237,7 +2262,67 @@ _cairo_pdf_surface_emit_recording_surface (cairo_pdf_surface_t  *surface,
 				     surface->height);
     }
 
-    status = _cairo_recording_surface_replay_region (recording_surface, &surface->base,
+    status = _cairo_recording_surface_replay_region (recording_surface,
+						     NULL,
+						     &surface->base,
+						     CAIRO_RECORDING_REGION_NATIVE);
+    assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
+    if (unlikely (status))
+	return status;
+
+    status = _cairo_pdf_surface_close_content_stream (surface);
+
+    _cairo_pdf_surface_set_size_internal (surface,
+					  old_width,
+					  old_height);
+    surface->paginated_mode = old_paginated_mode;
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_pdf_surface_emit_recording_subsurface (cairo_pdf_surface_t  *surface,
+					      cairo_surface_t      *recording_surface,
+					      const cairo_rectangle_int_t *extents,
+					      cairo_pdf_resource_t  resource)
+{
+    double old_width, old_height;
+    cairo_paginated_mode_t old_paginated_mode;
+    cairo_status_t status;
+    int alpha = 0;
+
+    old_width = surface->width;
+    old_height = surface->height;
+    old_paginated_mode = surface->paginated_mode;
+
+    _cairo_pdf_surface_set_size_internal (surface,
+					  extents->width,
+					  extents->height);
+    /* Patterns are emitted after fallback images. The paginated mode
+     * needs to be set to _RENDER while the recording surface is replayed
+     * back to this surface.
+     */
+    surface->paginated_mode = CAIRO_PAGINATED_MODE_RENDER;
+    _cairo_pdf_group_resources_clear (&surface->resources);
+    status = _cairo_pdf_surface_open_content_stream (surface, &resource, TRUE);
+    if (unlikely (status))
+	return status;
+
+    if (cairo_surface_get_content (recording_surface) == CAIRO_CONTENT_COLOR) {
+	status = _cairo_pdf_surface_add_alpha (surface, 1.0, &alpha);
+	if (unlikely (status))
+	    return status;
+
+	_cairo_output_stream_printf (surface->output,
+				     "q /a%d gs 0 0 0 rg 0 0 %f %f re f Q\n",
+				     alpha,
+				     surface->width,
+				     surface->height);
+    }
+
+    status = _cairo_recording_surface_replay_region (recording_surface,
+						     extents,
+						     &surface->base,
 						     CAIRO_RECORDING_REGION_NATIVE);
     assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
     if (unlikely (status))
@@ -2257,10 +2342,18 @@ static cairo_status_t
 _cairo_pdf_surface_emit_surface (cairo_pdf_surface_t        *surface,
 				 cairo_pdf_source_surface_t *src_surface)
 {
-    if (_cairo_surface_is_recording (src_surface->surface)) {
-	return _cairo_pdf_surface_emit_recording_surface (surface,
-						     src_surface->surface,
-						     src_surface->hash_entry->surface_res);
+    if (src_surface->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
+	if (src_surface->surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	    cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) src_surface->surface;
+	    return _cairo_pdf_surface_emit_recording_subsurface (surface,
+								 sub->target,
+								 &sub->extents,
+								 src_surface->hash_entry->surface_res);
+	} else {
+	    return _cairo_pdf_surface_emit_recording_surface (surface,
+							      src_surface->surface,
+							      src_surface->hash_entry->surface_res);
+	}
     } else {
 	return _cairo_pdf_surface_emit_image_surface (surface,
 						      src_surface->surface,
@@ -2287,7 +2380,7 @@ _cairo_pdf_surface_emit_surface_pattern (cairo_pdf_surface_t	*surface,
     char draw_surface[200];
 
     if (pattern->base.extend == CAIRO_EXTEND_PAD &&
-	 ! _cairo_surface_is_recording (pattern->surface))
+	pattern->surface->type != CAIRO_SURFACE_TYPE_RECORDING)
     {
 	status = _cairo_pdf_surface_emit_padded_image_surface (surface,
 							       pdf_pattern,
@@ -2418,7 +2511,7 @@ _cairo_pdf_surface_emit_surface_pattern (cairo_pdf_surface_t	*surface,
     if (unlikely (status))
 	return status;
 
-    if (_cairo_surface_is_recording (pattern->surface)) {
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
 	snprintf(draw_surface,
 		 sizeof (draw_surface),
 		 "/x%d Do\n",
@@ -2715,11 +2808,11 @@ _cairo_pdf_surface_emit_pattern_stops (cairo_pdf_surface_t      *surface,
 	stops[n_stops-1].offset = 1.0;
     }
 
-    if (n_stops == 2) {
+    if (n_stops <= 2) {
         /* no need for stitched function */
         status = cairo_pdf_surface_emit_rgb_linear_function (surface,
                                                              &stops[0],
-                                                             &stops[1],
+                                                             &stops[n_stops - 1],
                                                              color_function);
         if (unlikely (status))
             goto BAIL;
@@ -2727,7 +2820,7 @@ _cairo_pdf_surface_emit_pattern_stops (cairo_pdf_surface_t      *surface,
         if (emit_alpha) {
             status = cairo_pdf_surface_emit_alpha_linear_function (surface,
                                                                    &stops[0],
-                                                                   &stops[1],
+                                                                   &stops[n_stops - 1],
                                                                    alpha_function);
             if (unlikely (status))
                 goto BAIL;
@@ -3289,7 +3382,7 @@ _cairo_pdf_surface_paint_surface_pattern (cairo_pdf_surface_t     *surface,
     cairo_matrix_multiply (&pdf_p2d, &cairo_p2d, &pdf_p2d);
     cairo_matrix_translate (&pdf_p2d, 0.0, height);
     cairo_matrix_scale (&pdf_p2d, 1.0, -1.0);
-    if (! _cairo_surface_is_recording (source->surface))
+    if (source->surface->type != CAIRO_SURFACE_TYPE_RECORDING)
 	cairo_matrix_scale (&pdf_p2d, width, height);
 
     status = _cairo_pdf_operators_flush (&surface->pdf_operators);
@@ -3353,15 +3446,6 @@ _cairo_pdf_surface_select_pattern (cairo_pdf_surface_t *surface,
 	solid_color = &solid->color;
     }
 
-    if (pattern->type == CAIRO_PATTERN_TYPE_LINEAR ||
-	pattern->type == CAIRO_PATTERN_TYPE_RADIAL)
-    {
-	cairo_gradient_pattern_t *gradient = (cairo_gradient_pattern_t *) pattern;
-
-	if (gradient->n_stops == 1)
-	    solid_color = &gradient->stops[0].color;
-    }
-
     if (solid_color != NULL) {
 	if (surface->current_pattern_is_solid_color == FALSE ||
 	    surface->current_color_red != solid_color->red ||
@@ -3792,6 +3876,8 @@ _cairo_pdf_surface_emit_to_unicode_stream (cairo_pdf_surface_t		*surface,
     return _cairo_pdf_surface_close_stream (surface);
 }
 
+#define PDF_UNITS_PER_EM 1000
+
 static cairo_status_t
 _cairo_pdf_surface_emit_cff_font (cairo_pdf_surface_t		*surface,
                                   cairo_scaled_font_subset_t	*font_subset,
@@ -3856,18 +3942,19 @@ _cairo_pdf_surface_emit_cff_font (cairo_pdf_surface_t		*surface,
 				 "   /ItalicAngle 0\n"
 				 "   /Ascent %ld\n"
 				 "   /Descent %ld\n"
-				 "   /CapHeight 500\n"
+				 "   /CapHeight %ld\n"
 				 "   /StemV 80\n"
 				 "   /StemH 80\n"
 				 "   /FontFile3 %u 0 R\n"
 				 ">>\n"
 				 "endobj\n",
-				 subset->x_min,
-				 subset->y_min,
-				 subset->x_max,
-				 subset->y_max,
-				 subset->ascent,
-				 subset->descent,
+				 (long)(subset->x_min*PDF_UNITS_PER_EM),
+				 (long)(subset->y_min*PDF_UNITS_PER_EM),
+				 (long)(subset->x_max*PDF_UNITS_PER_EM),
+				 (long)(subset->y_max*PDF_UNITS_PER_EM),
+				 (long)(subset->ascent*PDF_UNITS_PER_EM),
+				 (long)(subset->descent*PDF_UNITS_PER_EM),
+				 (long)(subset->y_max*PDF_UNITS_PER_EM),
 				 stream.id);
 
     cidfont_dict = _cairo_pdf_surface_new_object (surface);
@@ -3893,8 +3980,8 @@ _cairo_pdf_surface_emit_cff_font (cairo_pdf_surface_t		*surface,
 
     for (i = 0; i < font_subset->num_glyphs; i++)
 	_cairo_output_stream_printf (surface->output,
-				     " %d",
-				     subset->widths[i]);
+				     " %ld",
+                                     (long)(subset->widths[i]*PDF_UNITS_PER_EM));
 
     _cairo_output_stream_printf (surface->output,
                                  " ]]\n"
@@ -4031,7 +4118,7 @@ _cairo_pdf_surface_emit_type1_font (cairo_pdf_surface_t		*surface,
 				 "   /ItalicAngle 0\n"
 				 "   /Ascent %ld\n"
 				 "   /Descent %ld\n"
-				 "   /CapHeight 500\n"
+				 "   /CapHeight %ld\n"
 				 "   /StemV 80\n"
 				 "   /StemH 80\n"
 				 "   /FontFile %u 0 R\n"
@@ -4040,12 +4127,13 @@ _cairo_pdf_surface_emit_type1_font (cairo_pdf_surface_t		*surface,
 				 descriptor.id,
 				 tag,
 				 subset->base_font,
-				 subset->x_min,
-				 subset->y_min,
-				 subset->x_max,
-				 subset->y_max,
-				 subset->ascent,
-				 subset->descent,
+				 (long)(subset->x_min*PDF_UNITS_PER_EM),
+				 (long)(subset->y_min*PDF_UNITS_PER_EM),
+				 (long)(subset->x_max*PDF_UNITS_PER_EM),
+				 (long)(subset->y_max*PDF_UNITS_PER_EM),
+				 (long)(subset->ascent*PDF_UNITS_PER_EM),
+				 (long)(subset->descent*PDF_UNITS_PER_EM),
+				 (long)(subset->y_max*PDF_UNITS_PER_EM),
 				 stream.id);
 
     _cairo_pdf_surface_update_object (surface, subset_resource);
@@ -4066,8 +4154,8 @@ _cairo_pdf_surface_emit_type1_font (cairo_pdf_surface_t		*surface,
 
     for (i = 0; i < font_subset->num_glyphs; i++)
 	_cairo_output_stream_printf (surface->output,
-				     " %d",
-				     subset->widths[i]);
+				     " %ld",
+                                     (long)(subset->widths[i]*PDF_UNITS_PER_EM));
 
     _cairo_output_stream_printf (surface->output,
 				 " ]\n");
@@ -4129,8 +4217,6 @@ _cairo_pdf_surface_emit_type1_fallback_font (cairo_pdf_surface_t	*surface,
     return status;
 }
 
-#define PDF_UNITS_PER_EM 1000
-
 static cairo_status_t
 _cairo_pdf_surface_emit_truetype_font_subset (cairo_pdf_surface_t		*surface,
 					      cairo_scaled_font_subset_t	*font_subset)
@@ -4888,7 +4974,7 @@ _cairo_pdf_surface_write_smask_group (cairo_pdf_surface_t     *surface,
     case PDF_STROKE:
 	status = _cairo_pdf_operators_stroke (&surface->pdf_operators,
 					      &group->path,
-					      group->style,
+					      &group->style,
 					      &group->ctm,
 					      &group->ctm_inverse);
 	break;
@@ -5087,7 +5173,7 @@ _surface_pattern_supported (cairo_surface_pattern_t *pattern)
 {
     cairo_extend_t extend;
 
-    if (_cairo_surface_is_recording (pattern->surface))
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING)
 	return TRUE;
 
     if (pattern->surface->backend->acquire_source_image == NULL)
@@ -5211,7 +5297,8 @@ _pdf_operator_supported (cairo_operator_t op)
 static cairo_int_status_t
 _cairo_pdf_surface_analyze_operation (cairo_pdf_surface_t  *surface,
 				      cairo_operator_t      op,
-				      const cairo_pattern_t      *pattern)
+				      const cairo_pattern_t      *pattern,
+				      const cairo_rectangle_int_t	 *extents)
 {
     if (surface->force_fallbacks &&
 	surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
@@ -5226,7 +5313,7 @@ _cairo_pdf_surface_analyze_operation (cairo_pdf_surface_t  *surface,
 	if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE) {
 	    cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) pattern;
 
-	    if ( _cairo_surface_is_recording (surface_pattern->surface)) {
+	    if (surface_pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
 		if (pattern->extend == CAIRO_EXTEND_PAD)
 		    return CAIRO_INT_STATUS_UNSUPPORTED;
 		else
@@ -5244,8 +5331,8 @@ _cairo_pdf_surface_analyze_operation (cairo_pdf_surface_t  *surface,
 	if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE) {
 	    cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) pattern;
 
-	    if (_cairo_surface_is_recording (surface_pattern->surface)) {
-		if (_cairo_pattern_is_opaque (pattern)) {
+	    if (surface_pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
+		if (_cairo_pattern_is_opaque (pattern, extents)) {
 		    return CAIRO_INT_STATUS_ANALYZE_RECORDING_SURFACE_PATTERN;
 		} else {
 		    /* FIXME: The analysis surface does not yet have
@@ -5264,7 +5351,7 @@ _cairo_pdf_surface_analyze_operation (cairo_pdf_surface_t  *surface,
 	    }
 	}
 
-	if (_cairo_pattern_is_opaque (pattern))
+	if (_cairo_pattern_is_opaque (pattern, extents))
 	    return CAIRO_STATUS_SUCCESS;
 	else
 	    return CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY;
@@ -5276,12 +5363,10 @@ _cairo_pdf_surface_analyze_operation (cairo_pdf_surface_t  *surface,
 static cairo_bool_t
 _cairo_pdf_surface_operation_supported (cairo_pdf_surface_t  *surface,
 					cairo_operator_t      op,
-					const cairo_pattern_t      *pattern)
+					const cairo_pattern_t      *pattern,
+					const cairo_rectangle_int_t *extents)
 {
-    if (_cairo_pdf_surface_analyze_operation (surface, op, pattern) != CAIRO_INT_STATUS_UNSUPPORTED)
-	return TRUE;
-    else
-	return FALSE;
+    return _cairo_pdf_surface_analyze_operation (surface, op, pattern, extents) != CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
 static cairo_int_status_t
@@ -5311,17 +5396,32 @@ _cairo_pdf_surface_paint (void			*abstract_surface,
     cairo_status_t status;
     cairo_pdf_smask_group_t *group;
     cairo_pdf_resource_t pattern_res, gstate_res;
-    cairo_rectangle_int_t extents;
+    cairo_composite_rectangles_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_paint (&extents,
+							 &rect,
+							 op, source, clip);
+    if (unlikely (status)) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    return CAIRO_STATUS_SUCCESS;
+
+	return status;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
-	return _cairo_pdf_surface_analyze_operation (surface, op, source);
+	return _cairo_pdf_surface_analyze_operation (surface, op, source, &extents.bounded);
     } else if (surface->paginated_mode == CAIRO_PAGINATED_MODE_FALLBACK) {
 	status = _cairo_pdf_surface_start_fallback (surface);
 	if (unlikely (status))
 	    return status;
     }
 
-    assert (_cairo_pdf_surface_operation_supported (surface, op, source));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, source, &extents.bounded));
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
@@ -5336,8 +5436,8 @@ _cairo_pdf_surface_paint (void			*abstract_surface,
 	return status;
 
     if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
-	  source->extend == CAIRO_EXTEND_NONE) {
-
+	source->extend == CAIRO_EXTEND_NONE)
+    {
 	_cairo_output_stream_printf (surface->output, "q\n");
 	status = _cairo_pdf_surface_paint_surface_pattern (surface,
 							   (cairo_surface_pattern_t *) source);
@@ -5348,15 +5448,10 @@ _cairo_pdf_surface_paint (void			*abstract_surface,
 	return _cairo_output_stream_get_status (surface->output);
     }
 
-    status = _cairo_surface_paint_extents (&surface->base,
-					   op, source, clip,
-					   &extents);
-    if (unlikely (status))
-	return status;
-
     pattern_res.id = 0;
     gstate_res.id = 0;
-    status = _cairo_pdf_surface_add_pdf_pattern (surface, source, &extents,
+    status = _cairo_pdf_surface_add_pdf_pattern (surface, source,
+						 &extents.bounded,
 						 &pattern_res, &gstate_res);
     if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
 	return CAIRO_STATUS_SUCCESS;
@@ -5421,18 +5516,34 @@ _cairo_pdf_surface_mask	(void			*abstract_surface,
     cairo_pdf_surface_t *surface = abstract_surface;
     cairo_pdf_smask_group_t *group;
     cairo_status_t status;
+    cairo_composite_rectangles_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_mask (&extents,
+							&rect,
+							op, source, mask, clip);
+    if (unlikely (status)) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    return CAIRO_STATUS_SUCCESS;
+
+	return status;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
 	cairo_status_t source_status, mask_status;
 
-	source_status = _cairo_pdf_surface_analyze_operation (surface, op, source);
+	source_status = _cairo_pdf_surface_analyze_operation (surface, op, source, &extents.bounded);
 	if (_cairo_status_is_error (source_status))
 	    return source_status;
 
 	if (mask->has_component_alpha) {
 	    mask_status = CAIRO_INT_STATUS_UNSUPPORTED;
 	} else {
-	    mask_status = _cairo_pdf_surface_analyze_operation (surface, op, mask);
+	    mask_status = _cairo_pdf_surface_analyze_operation (surface, op, mask, &extents.bounded);
 	    if (_cairo_status_is_error (mask_status))
 		return mask_status;
 	}
@@ -5445,8 +5556,8 @@ _cairo_pdf_surface_mask	(void			*abstract_surface,
 	    return status;
     }
 
-    assert (_cairo_pdf_surface_operation_supported (surface, op, source));
-    assert (_cairo_pdf_surface_operation_supported (surface, op, mask));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, source, &extents.bounded));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, mask, &extents.bounded));
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
@@ -5508,39 +5619,62 @@ _cairo_pdf_surface_stroke (void			*abstract_surface,
 			   cairo_operator_t	 op,
 			   const cairo_pattern_t *source,
 			   cairo_path_fixed_t	*path,
-			   cairo_stroke_style_t	*style,
-			   cairo_matrix_t	*ctm,
-			   cairo_matrix_t	*ctm_inverse,
+			   const cairo_stroke_style_t	*style,
+			   const cairo_matrix_t	*ctm,
+			   const cairo_matrix_t	*ctm_inverse,
 			   double		 tolerance,
 			   cairo_antialias_t	 antialias,
 			   cairo_clip_t		*clip)
 {
     cairo_pdf_surface_t *surface = abstract_surface;
-    cairo_status_t status;
     cairo_pdf_smask_group_t *group;
     cairo_pdf_resource_t pattern_res, gstate_res;
-    cairo_rectangle_int_t extents;
+    cairo_composite_rectangles_t extents;
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  &rect,
+							  op, source,
+							  path, style, ctm,
+							  clip);
+    if (unlikely (status)) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    return CAIRO_STATUS_SUCCESS;
+
+	return status;
+    }
+
+    /* use the more accurate extents */
+    if (extents.is_bounded) {
+	status = _cairo_path_fixed_stroke_extents (path, style,
+						   ctm, ctm_inverse,
+						   tolerance,
+						   &extents.mask);
+	if (unlikely (status))
+	    return status;
+
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    return CAIRO_STATUS_SUCCESS;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_pdf_surface_analyze_operation (surface, op, source);
+	return _cairo_pdf_surface_analyze_operation (surface, op, source, &extents.bounded);
 
-    assert (_cairo_pdf_surface_operation_supported (surface, op, source));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, source, &extents.bounded));
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
 
-    status = _cairo_surface_stroke_extents (&surface->base,
-					    op, source, path,
-					    style, ctm, ctm_inverse,
-					    tolerance, antialias,
-					    clip, &extents);
-    if (unlikely (status))
-	return status;
-
     pattern_res.id = 0;
     gstate_res.id = 0;
-    status = _cairo_pdf_surface_add_pdf_pattern (surface, source, &extents,
+    status = _cairo_pdf_surface_add_pdf_pattern (surface, source,
+						 &extents.bounded,
 						 &pattern_res, &gstate_res);
     if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
 	return CAIRO_STATUS_SUCCESS;
@@ -5569,7 +5703,7 @@ _cairo_pdf_surface_stroke (void			*abstract_surface,
 	    return status;
 	}
 
-	group->style = style;
+	group->style = *style;
 	group->ctm = *ctm;
 	group->ctm_inverse = *ctm_inverse;
 	status = _cairo_pdf_surface_add_smask_group (surface, group);
@@ -5629,17 +5763,44 @@ _cairo_pdf_surface_fill (void			*abstract_surface,
     cairo_status_t status;
     cairo_pdf_smask_group_t *group;
     cairo_pdf_resource_t pattern_res, gstate_res;
-    cairo_rectangle_int_t extents;
+    cairo_composite_rectangles_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							&rect,
+							op, source, path,
+							clip);
+    if (unlikely (status)) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    return CAIRO_STATUS_SUCCESS;
+
+	return status;
+    }
+
+    /* use the more accurate extents */
+    if (extents.is_bounded) {
+	_cairo_path_fixed_fill_extents (path,
+					fill_rule,
+					tolerance,
+					&extents.mask);
+
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    return CAIRO_STATUS_SUCCESS;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
-	return _cairo_pdf_surface_analyze_operation (surface, op, source);
+	return _cairo_pdf_surface_analyze_operation (surface, op, source, &extents.bounded);
     } else if (surface->paginated_mode == CAIRO_PAGINATED_MODE_FALLBACK) {
 	status = _cairo_pdf_surface_start_fallback (surface);
 	if (unlikely (status))
 	    return status;
     }
 
-    assert (_cairo_pdf_surface_operation_supported (surface, op, source));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, source, &extents.bounded));
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
@@ -5650,8 +5811,8 @@ _cairo_pdf_surface_fill (void			*abstract_surface,
 	return status;
 
     if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
-	  source->extend == CAIRO_EXTEND_NONE) {
-
+	source->extend == CAIRO_EXTEND_NONE)
+    {
 	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
 	if (unlikely (status))
 	    return status;
@@ -5672,16 +5833,10 @@ _cairo_pdf_surface_fill (void			*abstract_surface,
 	return _cairo_output_stream_get_status (surface->output);
     }
 
-    status = _cairo_surface_fill_extents (&surface->base,
-					  op, source, path, fill_rule,
-					  tolerance, antialias,
-					  clip, &extents);
-    if (unlikely (status))
-	return status;
-
     pattern_res.id = 0;
     gstate_res.id = 0;
-    status = _cairo_pdf_surface_add_pdf_pattern (surface, source, &extents,
+    status = _cairo_pdf_surface_add_pdf_pattern (surface, source,
+						 &extents.bounded,
 						 &pattern_res, &gstate_res);
     if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
 	return CAIRO_STATUS_SUCCESS;
@@ -5749,21 +5904,21 @@ _cairo_pdf_surface_fill (void			*abstract_surface,
 }
 
 static cairo_int_status_t
-_cairo_pdf_surface_fill_stroke (void		     *abstract_surface,
-				cairo_operator_t      fill_op,
-				const cairo_pattern_t *fill_source,
-				cairo_fill_rule_t     fill_rule,
-				double		      fill_tolerance,
-				cairo_antialias_t     fill_antialias,
-				cairo_path_fixed_t   *path,
-				cairo_operator_t      stroke_op,
-				const cairo_pattern_t *stroke_source,
-				cairo_stroke_style_t *stroke_style,
-				cairo_matrix_t	     *stroke_ctm,
-				cairo_matrix_t	     *stroke_ctm_inverse,
-				double		      stroke_tolerance,
-				cairo_antialias_t     stroke_antialias,
-				cairo_clip_t	     *clip)
+_cairo_pdf_surface_fill_stroke (void			*abstract_surface,
+				cairo_operator_t	 fill_op,
+				const cairo_pattern_t	*fill_source,
+				cairo_fill_rule_t	 fill_rule,
+				double			 fill_tolerance,
+				cairo_antialias_t	 fill_antialias,
+				cairo_path_fixed_t	*path,
+				cairo_operator_t	 stroke_op,
+				const cairo_pattern_t	*stroke_source,
+				const cairo_stroke_style_t *stroke_style,
+				const cairo_matrix_t	*stroke_ctm,
+				const cairo_matrix_t	*stroke_ctm_inverse,
+				double			 stroke_tolerance,
+				cairo_antialias_t	 stroke_antialias,
+				cairo_clip_t		*clip)
 {
     cairo_pdf_surface_t *surface = abstract_surface;
     cairo_status_t status;
@@ -5783,8 +5938,8 @@ _cairo_pdf_surface_fill_stroke (void		     *abstract_surface,
     /* PDF rendering of fill-stroke is not the same as cairo when
      * either the fill or stroke is not opaque.
      */
-    if ( !_cairo_pattern_is_opaque (fill_source) ||
-	 !_cairo_pattern_is_opaque (stroke_source))
+    if ( !_cairo_pattern_is_opaque (fill_source, NULL) ||
+	 !_cairo_pattern_is_opaque (stroke_source, NULL))
     {
 	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
@@ -5888,30 +6043,44 @@ _cairo_pdf_surface_show_text_glyphs (void			*abstract_surface,
 				     cairo_clip_t		*clip)
 {
     cairo_pdf_surface_t *surface = abstract_surface;
-    cairo_status_t status;
     cairo_pdf_smask_group_t *group;
     cairo_pdf_resource_t pattern_res, gstate_res;
-    cairo_rectangle_int_t extents;
+    cairo_composite_rectangles_t extents;
+    cairo_bool_t overlap;
+    cairo_status_t status;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_glyphs (&extents,
+							  &rect,
+							  op, source,
+							  scaled_font,
+							  glyphs, num_glyphs,
+							  clip,
+							  &overlap);
+    if (unlikely (status)) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    return CAIRO_STATUS_SUCCESS;
+
+	return status;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_pdf_surface_analyze_operation (surface, op, source);
+	return _cairo_pdf_surface_analyze_operation (surface, op, source, &extents.bounded);
 
-    assert (_cairo_pdf_surface_operation_supported (surface, op, source));
+    assert (_cairo_pdf_surface_operation_supported (surface, op, source, &extents.bounded));
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
 
-    status = _cairo_surface_glyphs_extents (&surface->base, op, source,
-					    glyphs, num_glyphs,
-					    scaled_font,
-					    clip, &extents);
-    if (unlikely (status))
-	return status;
-
     pattern_res.id = 0;
     gstate_res.id = 0;
-    status = _cairo_pdf_surface_add_pdf_pattern (surface, source, &extents,
+    status = _cairo_pdf_surface_add_pdf_pattern (surface, source,
+						 &extents.bounded,
 						 &pattern_res, &gstate_res);
     if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
 	return CAIRO_STATUS_SUCCESS;
@@ -5997,7 +6166,7 @@ _cairo_pdf_surface_show_text_glyphs (void			*abstract_surface,
 	 * be in a separate text object otherwise overlapping text
 	 * from separate calls to show_glyphs will not composite with
 	 * each other. */
-	if (! _cairo_pattern_is_opaque (source)) {
+	if (! _cairo_pattern_is_opaque (source, &extents.bounded)) {
 	    status = _cairo_pdf_operators_flush (&surface->pdf_operators);
 	    if (unlikely (status))
 		return status;
diff --git a/gfx/cairo/cairo/src/cairo-pdf.h b/gfx/cairo/cairo/src/cairo-pdf.h
index c0de5386fb0..50460ccdfbd 100644
--- a/gfx/cairo/cairo/src/cairo-pdf.h
+++ b/gfx/cairo/cairo/src/cairo-pdf.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-pen.c b/gfx/cairo/cairo/src/cairo-pen.c
index cfb67cae467..e71f7b561b4 100644
--- a/gfx/cairo/cairo/src/cairo-pen.c
+++ b/gfx/cairo/cairo/src/cairo-pen.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-slope-private.h"
 
 static int
diff --git a/gfx/cairo/cairo/src/cairo-png.c b/gfx/cairo/cairo/src/cairo-png.c
index d4f04760baa..41a33d75338 100644
--- a/gfx/cairo/cairo/src/cairo-png.c
+++ b/gfx/cairo/cairo/src/cairo-png.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,12 +37,32 @@
  */
 
 #include "cairoint.h"
+
+#include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 
 #include <stdio.h>
 #include <errno.h>
 #include <png.h>
 
+/**
+ * SECTION:cairo-png
+ * @Title: PNG Support
+ * @Short_Description: Reading and writing PNG images
+ * @See_Also: #cairo_surface_t
+ *
+ * The PNG functions allow reading PNG images into image surfaces, and writing
+ * any surface to a PNG file.
+ */
+
+/**
+ * CAIRO_HAS_PNG_FUNCTIONS:
+ *
+ * Defined if the PNG functions are available.
+ * This macro can be used to conditionally compile code using the cairo
+ * PNG functions.
+ */
+
 struct png_read_closure_t {
     cairo_read_func_t		 read_func;
     void			*closure;
@@ -170,14 +190,10 @@ write_png (cairo_surface_t	*surface,
     /* Handle the various fallback formats (e.g. low bit-depth XServers)
      * by coercing them to a simpler format using pixman.
      */
-    if (image->format == CAIRO_FORMAT_INVALID) {
-	clone = _cairo_image_surface_coerce (image,
-					     _cairo_format_from_content (image->base.content));
-	status = clone->base.status;
-	if (unlikely (status))
-	    goto BAIL1;
-    } else
-	clone = image;
+    clone = _cairo_image_surface_coerce (image);
+    status = clone->base.status;
+    if (unlikely (status))
+        goto BAIL1;
 
     rows = _cairo_malloc_ab (clone->height, sizeof (png_byte*));
     if (unlikely (rows == NULL)) {
@@ -232,6 +248,8 @@ write_png (cairo_surface_t	*surface,
 	png_set_packswap (png);
 #endif
 	break;
+    case CAIRO_FORMAT_INVALID:
+    case CAIRO_FORMAT_RGB16_565:
     default:
 	status = _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
 	goto BAIL4;
@@ -277,8 +295,7 @@ BAIL4:
 BAIL3:
     free (rows);
 BAIL2:
-    if (clone != image)
-	cairo_surface_destroy (&clone->base);
+    cairo_surface_destroy (&clone->base);
 BAIL1:
     _cairo_surface_release_source_image (surface, image, image_extra);
 
@@ -512,7 +529,7 @@ read_png (struct png_read_closure_t *png_closure)
     cairo_format_t format;
     cairo_status_t status;
     unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
 
     png_closure->png_data = _cairo_memory_stream_create ();
 
diff --git a/gfx/cairo/cairo/src/cairo-polygon.c b/gfx/cairo/cairo/src/cairo-polygon.c
index 9cb76e557bc..64fef47e1e4 100644
--- a/gfx/cairo/cairo/src/cairo-polygon.c
+++ b/gfx/cairo/cairo/src/cairo-polygon.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -36,6 +36,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-slope-private.h"
 
 void
@@ -139,7 +140,7 @@ _add_edge (cairo_polygon_t *polygon,
 
     assert (top < bottom);
 
-    if (polygon->num_edges == polygon->edges_size) {
+    if (unlikely (polygon->num_edges == polygon->edges_size)) {
 	if (! _cairo_polygon_grow (polygon))
 	    return;
     }
@@ -196,7 +197,20 @@ _add_clipped_edge (cairo_polygon_t *polygon,
 	if (bottom <= limits->p1.y)
 	    continue;
 
-	if (p1->x <= limits->p1.x && p2->x <= limits->p1.x)
+	if (p1->x >= limits->p1.x && p2->x >= limits->p1.x &&
+	    p1->x <= limits->p2.x && p2->x <= limits->p2.x)
+	{
+	    top_y = top;
+	    if (top_y < limits->p1.y)
+		top_y = limits->p1.y;
+
+	    bot_y = bottom;
+	    if (bot_y > limits->p2.y)
+		bot_y = limits->p2.y;
+
+	    _add_edge (polygon, p1, p2, top_y, bot_y, dir);
+	}
+	else if (p1->x <= limits->p1.x && p2->x <= limits->p1.x)
 	{
 	    p[0].x = limits->p1.x;
 	    p[0].y = limits->p1.y;
@@ -228,19 +242,6 @@ _add_clipped_edge (cairo_polygon_t *polygon,
 
 	    _add_edge (polygon, &p[0], &p[1], top_y, bot_y, dir);
 	}
-	else if (p1->x >= limits->p1.x && p2->x >= limits->p1.x &&
-		 p1->x <= limits->p2.x && p2->x <= limits->p2.x)
-	{
-	    top_y = top;
-	    if (top_y < limits->p1.y)
-		top_y = limits->p1.y;
-
-	    bot_y = bottom;
-	    if (bot_y > limits->p2.y)
-		bot_y = limits->p2.y;
-
-	    _add_edge (polygon, p1, p2, top_y, bot_y, dir);
-	}
 	else
 	{
 	    int left_y, right_y;
diff --git a/gfx/cairo/cairo/src/cairo-private.h b/gfx/cairo/cairo/src/cairo-private.h
index a60a6aa361d..901a69a3195 100644
--- a/gfx/cairo/cairo/src/cairo-private.h
+++ b/gfx/cairo/cairo/src/cairo-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-ps-surface-private.h b/gfx/cairo/cairo/src/cairo-ps-surface-private.h
index 3dc000802dc..a5a8cd0dae3 100644
--- a/gfx/cairo/cairo/src/cairo-ps-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-ps-surface-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-ps-surface.c b/gfx/cairo/cairo/src/cairo-ps-surface.c
index d0a26c5eb0e..4e7fb132ba1 100644
--- a/gfx/cairo/cairo/src/cairo-ps-surface.c
+++ b/gfx/cairo/cairo/src/cairo-ps-surface.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -58,10 +58,13 @@
 #include "cairo-ps.h"
 #include "cairo-ps-surface-private.h"
 #include "cairo-pdf-operators-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-scaled-font-subsets-private.h"
 #include "cairo-paginated-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-surface-clipper-private.h"
+#include "cairo-surface-subsurface-private.h"
 #include "cairo-output-stream-private.h"
 #include "cairo-type3-glyph-surface-private.h"
 #include "cairo-image-info-private.h"
@@ -85,6 +88,23 @@
 #define ctime_r(T, BUF) ctime (T)
 #endif
 
+/**
+ * SECTION:cairo-ps
+ * @Title: PostScript Surfaces
+ * @Short_Description: Rendering PostScript documents
+ * @See_Also: #cairo_surface_t
+ *
+ * The PostScript surface is used to render cairo graphics to Adobe
+ * PostScript files and is a multi-page vector surface backend.
+ */
+
+/**
+ * CAIRO_HAS_PS_SURFACE:
+ * 
+ * Defined if the PostScript surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 static const cairo_surface_backend_t cairo_ps_surface_backend;
 static const cairo_paginated_surface_backend_t cairo_ps_surface_paginated_backend;
 
@@ -254,8 +274,6 @@ _cairo_ps_surface_emit_header (cairo_ps_surface_t *surface)
 				 "/S { stroke } bind def\n"
 				 "/f { fill } bind def\n"
 				 "/f* { eofill } bind def\n"
-				 "/B { fill stroke } bind def\n"
-				 "/B* { eofill stroke } bind def\n"
 				 "/n { newpath } bind def\n"
 				 "/W { clip } bind def\n"
 				 "/W* { eoclip } bind def\n"
@@ -531,6 +549,7 @@ _cairo_ps_surface_analyze_user_font_subset (cairo_scaled_font_subset_t *font_sub
 	    break;
 
     }
+    cairo_surface_finish (type3_surface);
     cairo_surface_destroy (type3_surface);
 
     return status;
@@ -615,6 +634,7 @@ _cairo_ps_surface_emit_type3_font_subset (cairo_ps_surface_t		*surface,
                 font_bbox.p2.y = bbox.p2.y;
         }
     }
+    cairo_surface_finish (type3_surface);
     cairo_surface_destroy (type3_surface);
     if (unlikely (status))
 	return status;
@@ -703,28 +723,23 @@ _cairo_ps_surface_emit_font_subsets (cairo_ps_surface_t *surface)
 						      _cairo_ps_surface_analyze_user_font_subset,
 						      surface);
     if (unlikely (status))
-	goto BAIL;
+	return status;
 
     status = _cairo_scaled_font_subsets_foreach_unscaled (surface->font_subsets,
                                                           _cairo_ps_surface_emit_unscaled_font_subset,
                                                           surface);
     if (unlikely (status))
-	goto BAIL;
+	return status;
 
     status = _cairo_scaled_font_subsets_foreach_scaled (surface->font_subsets,
                                                         _cairo_ps_surface_emit_scaled_font_subset,
                                                         surface);
     if (unlikely (status))
-	goto BAIL;
+	return status;
 
-    status = _cairo_scaled_font_subsets_foreach_user (surface->font_subsets,
-						      _cairo_ps_surface_emit_scaled_font_subset,
-						      surface);
-BAIL:
-    _cairo_scaled_font_subsets_destroy (surface->font_subsets);
-    surface->font_subsets = NULL;
-
-    return status;
+    return _cairo_scaled_font_subsets_foreach_user (surface->font_subsets,
+						    _cairo_ps_surface_emit_scaled_font_subset,
+						    surface);
 }
 
 static cairo_status_t
@@ -878,12 +893,13 @@ _cairo_ps_surface_get_page_media (cairo_ps_surface_t     *surface)
 	page->name = strdup (page_name);
     } else {
 	snprintf (buf, sizeof (buf), "%dx%dmm",
-		  _cairo_lround (surface->width * 25.4/72),
-		  _cairo_lround (surface->height * 25.4/72));
+		  (int) _cairo_lround (surface->width * 25.4/72),
+		  (int) _cairo_lround (surface->height * 25.4/72));
 	page->name = strdup (buf);
     }
 
     if (unlikely (page->name == NULL)) {
+	free (page);
 	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
 	return NULL;
     }
@@ -909,7 +925,9 @@ _cairo_ps_surface_create_for_stream_internal (cairo_output_stream_t *stream,
 	goto CLEANUP;
     }
 
-    _cairo_surface_init (&surface->base, &cairo_ps_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_ps_surface_backend,
+			 NULL, /* device */
 			 CAIRO_CONTENT_COLOR_ALPHA);
 
     surface->final_stream = stream;
@@ -951,6 +969,11 @@ _cairo_ps_surface_create_for_stream_internal (cairo_output_stream_t *stream,
     surface->use_string_datasource = FALSE;
     surface->current_pattern_is_solid_color = FALSE;
 
+    surface->page_bbox.x = 0;
+    surface->page_bbox.y = 0;
+    surface->page_bbox.width  = width;
+    surface->page_bbox.height = height;
+
     _cairo_surface_clipper_init (&surface->clipper,
 				 _cairo_ps_surface_clipper_intersect_clip_path);
 
@@ -1087,30 +1110,54 @@ _cairo_surface_is_ps (cairo_surface_t *surface)
 
 /* If the abstract_surface is a paginated surface, and that paginated
  * surface's target is a ps_surface, then set ps_surface to that
- * target. Otherwise return %CAIRO_STATUS_SURFACE_TYPE_MISMATCH.
+ * target. Otherwise return FALSE.
  */
-static cairo_status_t
+static cairo_bool_t
 _extract_ps_surface (cairo_surface_t	 *surface,
+                     cairo_bool_t         set_error_on_failure,
 		     cairo_ps_surface_t **ps_surface)
 {
     cairo_surface_t *target;
+    cairo_status_t status_ignored;
 
     if (surface->status)
-	return surface->status;
+	return FALSE;
+    if (surface->finished) {
+        if (set_error_on_failure)
+            status_ignored = _cairo_surface_set_error (surface,
+                                                       _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return FALSE;
+    }
 
-    if (! _cairo_surface_is_paginated (surface))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_paginated (surface)) {
+        if (set_error_on_failure)
+            status_ignored = _cairo_surface_set_error (surface,
+                                                       _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     target = _cairo_paginated_surface_get_target (surface);
-    if (target->status)
-	return target->status;
+    if (target->status) {
+        if (set_error_on_failure)
+            status_ignored = _cairo_surface_set_error (surface, target->status);
+	return FALSE;
+    }
+    if (target->finished) {
+        if (set_error_on_failure)
+            status_ignored = _cairo_surface_set_error (surface,
+                                                       _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return FALSE;
+    }
 
-    if (! _cairo_surface_is_ps (target))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_ps (target)) {
+        if (set_error_on_failure)
+            status_ignored = _cairo_surface_set_error (surface,
+                                                       _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     *ps_surface = (cairo_ps_surface_t *) target;
-
-    return CAIRO_STATUS_SUCCESS;
+    return TRUE;
 }
 
 /**
@@ -1134,13 +1181,9 @@ cairo_ps_surface_restrict_to_level (cairo_surface_t  *surface,
                                     cairo_ps_level_t  level)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     if (level < CAIRO_PS_LEVEL_LAST)
 	ps_surface->ps_level = level;
@@ -1209,13 +1252,9 @@ cairo_ps_surface_set_eps (cairo_surface_t	*surface,
 			  cairo_bool_t           eps)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     ps_surface->eps = eps;
 }
@@ -1234,13 +1273,9 @@ cairo_public cairo_bool_t
 cairo_ps_surface_get_eps (cairo_surface_t	*surface)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, FALSE, &ps_surface))
 	return FALSE;
-    }
 
     return ps_surface->eps;
 }
@@ -1268,13 +1303,9 @@ cairo_ps_surface_set_size (cairo_surface_t	*surface,
 			   double		 height_in_points)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     ps_surface->width = width_in_points;
     ps_surface->height = height_in_points;
@@ -1379,11 +1410,8 @@ cairo_ps_surface_dsc_comment (cairo_surface_t	*surface,
     cairo_status_t status;
     char *comment_copy;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     /* A couple of sanity checks on the comment value. */
     if (comment == NULL) {
@@ -1431,18 +1459,12 @@ void
 cairo_ps_surface_dsc_begin_setup (cairo_surface_t *surface)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     if (ps_surface->dsc_comment_target == &ps_surface->dsc_header_comments)
-    {
 	ps_surface->dsc_comment_target = &ps_surface->dsc_setup_comments;
-    }
 }
 
 /**
@@ -1466,13 +1488,9 @@ void
 cairo_ps_surface_dsc_begin_page_setup (cairo_surface_t *surface)
 {
     cairo_ps_surface_t *ps_surface = NULL;
-    cairo_status_t status;
 
-    status = _extract_ps_surface (surface, &ps_surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (surface, status);
+    if (! _extract_ps_surface (surface, TRUE, &ps_surface))
 	return;
-    }
 
     if (ps_surface->dsc_comment_target == &ps_surface->dsc_header_comments ||
 	ps_surface->dsc_comment_target == &ps_surface->dsc_setup_comments)
@@ -1489,6 +1507,10 @@ _cairo_ps_surface_finish (void *abstract_surface)
     int i, num_comments;
     char **comments;
 
+    status = surface->base.status;
+    if (unlikely (status))
+	goto CLEANUP;
+
     _cairo_ps_surface_emit_header (surface);
 
     status = _cairo_ps_surface_emit_font_subsets (surface);
@@ -1502,6 +1524,8 @@ _cairo_ps_surface_finish (void *abstract_surface)
     _cairo_ps_surface_emit_footer (surface);
 
 CLEANUP:
+    _cairo_scaled_font_subsets_destroy (surface->font_subsets);
+
     status2 = _cairo_output_stream_destroy (surface->stream);
     if (status == CAIRO_STATUS_SUCCESS)
 	status = status2;
@@ -1648,7 +1672,7 @@ _cairo_ps_surface_analyze_surface_pattern_transparency (cairo_ps_surface_t
 static cairo_bool_t
 surface_pattern_supported (const cairo_surface_pattern_t *pattern)
 {
-    if (_cairo_surface_is_recording (pattern->surface))
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING)
 	return TRUE;
 
     if (pattern->surface->backend->acquire_source_image == NULL)
@@ -1658,7 +1682,7 @@ surface_pattern_supported (const cairo_surface_pattern_t *pattern)
      * don't think it's worth the extra code to support it. */
 
 /* XXX: Need to write this function here...
-    content = cairo_surface_get_content (pattern->surface);
+    content = pattern->surface->content;
     if (content == CAIRO_CONTENT_ALPHA)
 	return FALSE;
 */
@@ -1739,7 +1763,8 @@ pattern_supported (cairo_ps_surface_t *surface, const cairo_pattern_t *pattern)
 static cairo_int_status_t
 _cairo_ps_surface_analyze_operation (cairo_ps_surface_t    *surface,
 				     cairo_operator_t       op,
-				     const cairo_pattern_t       *pattern)
+				     const cairo_pattern_t       *pattern,
+				     const cairo_rectangle_int_t *extents)
 {
     if (surface->force_fallbacks &&
 	surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
@@ -1758,7 +1783,7 @@ _cairo_ps_surface_analyze_operation (cairo_ps_surface_t    *surface,
     if (pattern->type == CAIRO_PATTERN_TYPE_SURFACE) {
 	cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) pattern;
 
-	if ( _cairo_surface_is_recording (surface_pattern->surface)) {
+	if (surface_pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
 	    if (pattern->extend == CAIRO_EXTEND_PAD)
 		return CAIRO_INT_STATUS_UNSUPPORTED;
 	    else
@@ -1785,7 +1810,7 @@ _cairo_ps_surface_analyze_operation (cairo_ps_surface_t    *surface,
 								       surface_pattern);
     }
 
-    if (_cairo_pattern_is_opaque (pattern))
+    if (_cairo_pattern_is_opaque (pattern, extents))
 	return CAIRO_STATUS_SUCCESS;
 
     return CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY;
@@ -1794,12 +1819,10 @@ _cairo_ps_surface_analyze_operation (cairo_ps_surface_t    *surface,
 static cairo_bool_t
 _cairo_ps_surface_operation_supported (cairo_ps_surface_t    *surface,
 				       cairo_operator_t       op,
-				       const cairo_pattern_t       *pattern)
+				       const cairo_pattern_t       *pattern,
+				       const cairo_rectangle_int_t *extents)
 {
-    if (_cairo_ps_surface_analyze_operation (surface, op, pattern) != CAIRO_INT_STATUS_UNSUPPORTED)
-	return TRUE;
-    else
-	return FALSE;
+    return _cairo_ps_surface_analyze_operation (surface, op, pattern, extents) != CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
 /* The "standard" implementation limit for PostScript string sizes is
@@ -1971,55 +1994,38 @@ _cairo_ps_surface_flatten_image_transparency (cairo_ps_surface_t    *surface,
 					      cairo_image_surface_t *image,
 					      cairo_image_surface_t **opaque_image)
 {
-    const cairo_color_t *background_color;
     cairo_surface_t *opaque;
     cairo_surface_pattern_t pattern;
     cairo_status_t status;
 
-    if (surface->content == CAIRO_CONTENT_COLOR_ALPHA)
-	background_color = CAIRO_COLOR_WHITE;
-    else
-	background_color = CAIRO_COLOR_BLACK;
-
     opaque = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
 					 image->width,
 					 image->height);
-    if (opaque->status)
+    if (unlikely (opaque->status))
 	return opaque->status;
 
-    _cairo_pattern_init_for_surface (&pattern, &image->base);
-
-    status = _cairo_surface_fill_rectangle (opaque,
-					    CAIRO_OPERATOR_SOURCE,
-					    background_color,
-					    0, 0,
-					    image->width, image->height);
-    if (unlikely (status))
-	goto fail;
-
-    status = _cairo_surface_composite (CAIRO_OPERATOR_OVER,
-				       &pattern.base,
-				       NULL,
-				       opaque,
-				       0, 0,
-				       0, 0,
-				       0, 0,
-				       image->width,
-				       image->height,
+    if (surface->content == CAIRO_CONTENT_COLOR_ALPHA) {
+	status = _cairo_surface_paint (opaque,
+				       CAIRO_OPERATOR_SOURCE,
+				       &_cairo_pattern_white.base,
 				       NULL);
-    if (unlikely (status))
-	goto fail;
+	if (unlikely (status)) {
+	    cairo_surface_destroy (opaque);
+	    return status;
+	}
+    }
 
+    _cairo_pattern_init_for_surface (&pattern, &image->base);
+    pattern.base.filter = CAIRO_FILTER_NEAREST;
+    status = _cairo_surface_paint (opaque, CAIRO_OPERATOR_OVER, &pattern.base, NULL);
     _cairo_pattern_fini (&pattern.base);
+    if (unlikely (status)) {
+	cairo_surface_destroy (opaque);
+	return status;
+    }
+
     *opaque_image = (cairo_image_surface_t *) opaque;
-
     return CAIRO_STATUS_SUCCESS;
-
-fail:
-    _cairo_pattern_fini (&pattern.base);
-    cairo_surface_destroy (opaque);
-
-    return status;
 }
 
 static cairo_status_t
@@ -2321,7 +2327,7 @@ _cairo_ps_surface_emit_jpeg_image (cairo_ps_surface_t    *surface,
 {
     cairo_status_t status;
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     cairo_image_info_t info;
 
     cairo_surface_get_mime_data (source, CAIRO_MIME_TYPE_JPEG,
@@ -2445,7 +2451,7 @@ _cairo_ps_surface_emit_recording_surface (cairo_ps_surface_t *surface,
 						  &surface->cairo_to_ps);
     _cairo_output_stream_printf (surface->stream, "  q\n");
 
-    if (cairo_surface_get_content (recording_surface) == CAIRO_CONTENT_COLOR) {
+    if (recording_surface->content == CAIRO_CONTENT_COLOR) {
 	surface->content = CAIRO_CONTENT_COLOR;
 	_cairo_output_stream_printf (surface->stream,
 				     "  0 g %d %d %d %d rectfill\n",
@@ -2455,7 +2461,81 @@ _cairo_ps_surface_emit_recording_surface (cairo_ps_surface_t *surface,
 				     surface->page_bbox.height);
     }
 
-    status = _cairo_recording_surface_replay_region (recording_surface, &surface->base,
+    status = _cairo_recording_surface_replay_region (recording_surface,
+						     NULL,
+						     &surface->base,
+						     CAIRO_RECORDING_REGION_NATIVE);
+    assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
+    if (unlikely (status))
+	return status;
+
+    status = _cairo_pdf_operators_flush (&surface->pdf_operators);
+    if (unlikely (status))
+	return status;
+
+    _cairo_output_stream_printf (surface->stream, "  Q\n");
+    surface->content = old_content;
+    surface->width = old_width;
+    surface->height = old_height;
+    surface->page_bbox = old_page_bbox;
+    surface->current_pattern_is_solid_color = FALSE;
+    _cairo_pdf_operators_reset (&surface->pdf_operators);
+    surface->cairo_to_ps = old_cairo_to_ps;
+
+    _cairo_pdf_operators_set_cairo_to_pdf_matrix (&surface->pdf_operators,
+						  &surface->cairo_to_ps);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+_cairo_ps_surface_emit_recording_subsurface (cairo_ps_surface_t *surface,
+					     cairo_surface_t    *recording_surface,
+					     const cairo_rectangle_int_t *extents)
+{
+    double old_width, old_height;
+    cairo_matrix_t old_cairo_to_ps;
+    cairo_content_t old_content;
+    cairo_rectangle_int_t old_page_bbox;
+    cairo_status_t status;
+
+    old_content = surface->content;
+    old_width = surface->width;
+    old_height = surface->height;
+    old_page_bbox = surface->page_bbox;
+    old_cairo_to_ps = surface->cairo_to_ps;
+
+#if DEBUG_PS
+    _cairo_output_stream_printf (surface->stream,
+				 "%% _cairo_ps_surface_emit_recording_subsurface (%d, %d), (%d, %d)\n",
+				 extents->x, extents->y,
+				 extents->width, extents->height);
+#endif
+
+    surface->page_bbox.x = surface->page_bbox.y = 0;
+    surface->page_bbox.width = surface->width  = extents->width;
+    surface->page_bbox.height = surface->height = extents->height;
+
+    surface->current_pattern_is_solid_color = FALSE;
+    _cairo_pdf_operators_reset (&surface->pdf_operators);
+    cairo_matrix_init (&surface->cairo_to_ps, 1, 0, 0, -1, 0, surface->height);
+    _cairo_pdf_operators_set_cairo_to_pdf_matrix (&surface->pdf_operators,
+						  &surface->cairo_to_ps);
+    _cairo_output_stream_printf (surface->stream, "  q\n");
+
+    if (recording_surface->content == CAIRO_CONTENT_COLOR) {
+	surface->content = CAIRO_CONTENT_COLOR;
+	_cairo_output_stream_printf (surface->stream,
+				     "  0 g %d %d %d %d rectfill\n",
+				     surface->page_bbox.x,
+				     surface->page_bbox.y,
+				     surface->page_bbox.width,
+				     surface->page_bbox.height);
+    }
+
+    status = _cairo_recording_surface_replay_region (recording_surface,
+						     extents,
+						     &surface->base,
 						     CAIRO_RECORDING_REGION_NATIVE);
     assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
     if (unlikely (status))
@@ -2539,18 +2619,25 @@ _cairo_ps_surface_acquire_surface (cairo_ps_surface_t      *surface,
     surface->acquired_image = NULL;
     surface->image = NULL;
 
-    if (_cairo_surface_is_recording (pattern->surface)) {
-	cairo_recording_surface_t *recording_surface = (cairo_recording_surface_t *) pattern->surface;
-	cairo_box_t bbox;
-	cairo_rectangle_int_t extents;
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
+	if (pattern->surface->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	    cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) pattern->surface;
 
-	status = _cairo_recording_surface_get_bbox (recording_surface, &bbox, NULL);
-	if (unlikely (status))
-	    return status;
+	    *width  = sub->extents.width;
+	    *height = sub->extents.height;
+	} else {
+	    cairo_recording_surface_t *recording_surface = (cairo_recording_surface_t *) pattern->surface;
+	    cairo_box_t bbox;
+	    cairo_rectangle_int_t extents;
 
-	_cairo_box_round_to_rectangle (&bbox, &extents);
-	*width = extents.width;
-	*height =extents.height;
+	    status = _cairo_recording_surface_get_bbox (recording_surface, &bbox, NULL);
+	    if (unlikely (status))
+		return status;
+
+	    _cairo_box_round_to_rectangle (&bbox, &extents);
+	    *width  = extents.width;
+	    *height = extents.height;
+	}
 	return CAIRO_STATUS_SUCCESS;
     } else {
 	status = _cairo_surface_acquire_source_image (pattern->surface,
@@ -2572,9 +2659,11 @@ _cairo_ps_surface_acquire_surface (cairo_ps_surface_t      *surface,
 	    x = -rect.x;
 	    y = -rect.y;
 
-	    pad_image = _cairo_image_surface_create_with_content (pattern->surface->content,
-								  rect.width,
-								  rect.height);
+	    pad_image =
+		_cairo_image_surface_create_with_pixman_format (NULL,
+								surface->acquired_image->pixman_format,
+								rect.width, rect.height,
+								0);
 	    if (pad_image->status) {
 		status = pad_image->status;
 		goto BAIL;
@@ -2583,16 +2672,10 @@ _cairo_ps_surface_acquire_surface (cairo_ps_surface_t      *surface,
 	    _cairo_pattern_init_for_surface (&pad_pattern, &surface->acquired_image->base);
 	    cairo_matrix_init_translate (&pad_pattern.base.matrix, -x, -y);
 	    pad_pattern.base.extend = CAIRO_EXTEND_PAD;
-	    status = _cairo_surface_composite (CAIRO_OPERATOR_SOURCE,
-					       &pad_pattern.base,
-					       NULL,
-					       pad_image,
-					       0, 0,
-					       0, 0,
-					       0, 0,
-					       rect.width,
-					       rect.height,
-					       NULL);
+	    status = _cairo_surface_paint (pad_image,
+					   CAIRO_OPERATOR_SOURCE,
+					   &pad_pattern.base,
+					   NULL);
 	    _cairo_pattern_fini (&pad_pattern.base);
 	    if (unlikely (status)) {
 		if (pad_image != &surface->acquired_image->base)
@@ -2624,10 +2707,15 @@ _cairo_ps_surface_emit_surface (cairo_ps_surface_t      *surface,
 {
     cairo_status_t status;
 
-    if (_cairo_surface_is_recording (pattern->surface)) {
-	cairo_surface_t *recording_surface = pattern->surface;
+    if (pattern->surface->type == CAIRO_SURFACE_TYPE_RECORDING) {
+	cairo_surface_t *source = pattern->surface;
 
-	status = _cairo_ps_surface_emit_recording_surface (surface, recording_surface);
+	if (source->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	    cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) source;
+	    status = _cairo_ps_surface_emit_recording_subsurface (surface, sub->target, &sub->extents);
+	} else {
+	    status = _cairo_ps_surface_emit_recording_surface (surface, source);
+	}
     } else {
 	if (pattern->base.extend != CAIRO_EXTEND_PAD) {
 	    status = _cairo_ps_surface_emit_jpeg_image (surface, pattern->surface,
@@ -2650,7 +2738,7 @@ _cairo_ps_surface_release_surface (cairo_ps_surface_t      *surface,
     if (surface->image != surface->acquired_image)
 	cairo_surface_destroy (&surface->image->base);
 
-    if (! _cairo_surface_is_recording (pattern->surface)) {
+    if (pattern->surface->type != CAIRO_SURFACE_TYPE_RECORDING) {
 	_cairo_surface_release_source_image (pattern->surface,
 					     surface->acquired_image,
 					     surface->image_extra);
@@ -3058,7 +3146,10 @@ _cairo_ps_surface_emit_pattern_stops (cairo_ps_surface_t       *surface,
 
     _cairo_output_stream_printf (surface->stream,
 				 "/CairoFunction\n");
-    if (n_stops == 2) {
+    if (n_stops == 1) {
+	/* work around single stop gradients */
+	_cairo_ps_surface_emit_linear_colorgradient (surface, &stops[0], &stops[0]);
+    } else if (n_stops == 2) {
 	/* no need for stitched function */
 	_cairo_ps_surface_emit_linear_colorgradient (surface, &stops[0], &stops[1]);
     } else {
@@ -3120,22 +3211,6 @@ _cairo_ps_surface_emit_linear_pattern (cairo_ps_surface_t     *surface,
     double first_stop, last_stop;
     int repeat_begin = 0, repeat_end = 1;
 
-    if (pattern->base.n_stops == 0)
-        return CAIRO_INT_STATUS_NOTHING_TO_DO;
-
-    if (pattern->base.n_stops == 1) {
-	cairo_solid_pattern_t solid;
-
-	_cairo_pattern_init_solid (&solid,
-				   &pattern->base.stops[0].color,
-				   CAIRO_CONTENT_COLOR_ALPHA);
-	_cairo_ps_surface_emit_solid_pattern (surface,
-					      &solid);
-	_cairo_pattern_fini (&solid.base);
-
-	return CAIRO_STATUS_SUCCESS;
-    }
-
     extend = cairo_pattern_get_extend (&pattern->base.base);
 
     pat_to_ps = pattern->base.base.matrix;
@@ -3260,22 +3335,6 @@ _cairo_ps_surface_emit_radial_pattern (cairo_ps_surface_t     *surface,
     cairo_extend_t extend;
     cairo_status_t status;
 
-    if (pattern->base.n_stops == 0)
-        return CAIRO_INT_STATUS_NOTHING_TO_DO;
-
-    if (pattern->base.n_stops == 1) {
-	cairo_solid_pattern_t solid;
-
-	_cairo_pattern_init_solid (&solid,
-				   &pattern->base.stops[0].color,
-				   CAIRO_CONTENT_COLOR_ALPHA);
-	_cairo_ps_surface_emit_solid_pattern (surface,
-					      &solid);
-	_cairo_pattern_fini (&solid.base);
-
-	return CAIRO_STATUS_SUCCESS;
-    }
-
     extend = cairo_pattern_get_extend (&pattern->base.base);
 
     pat_to_ps = pattern->base.base.matrix;
@@ -3434,28 +3493,33 @@ _cairo_ps_surface_paint (void			*abstract_surface,
 {
     cairo_ps_surface_t *surface = abstract_surface;
     cairo_output_stream_t *stream = surface->stream;
-    cairo_rectangle_int_t extents;
+    cairo_composite_rectangles_t extents;
     cairo_status_t status;
 
-    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_ps_surface_analyze_operation (surface, op, source);
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
 
-    assert (_cairo_ps_surface_operation_supported (surface, op, source));
+    status = _cairo_composite_rectangles_init_for_paint (&extents,
+							 &rect,
+							 op, source, clip);
+    if (unlikely (status))
+	return status;
+
+    if (! _cairo_rectangle_intersect (&extents.bounded, &surface->page_bbox))
+	return CAIRO_STATUS_SUCCESS;
+
+    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
+	return _cairo_ps_surface_analyze_operation (surface, op, source, &extents.bounded);
+
+    assert (_cairo_ps_surface_operation_supported (surface, op, source, &extents.bounded));
 
 #if DEBUG_PS
     _cairo_output_stream_printf (stream,
 				 "%% _cairo_ps_surface_paint\n");
 #endif
 
-    status = _cairo_surface_paint_extents (&surface->base,
-					   op, source, clip,
-					   &extents);
-    if (unlikely (status))
-	return status;
-
-    if (! _cairo_rectangle_intersect (&extents, &surface->page_bbox))
-	return CAIRO_STATUS_SUCCESS;
-
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
@@ -3471,22 +3535,19 @@ _cairo_ps_surface_paint (void			*abstract_surface,
 	_cairo_output_stream_printf (stream, "q\n");
 	status = _cairo_ps_surface_paint_surface (surface,
 						 (cairo_surface_pattern_t *) source,
-						  &extents, op);
+						  &extents.bounded, op);
 	if (unlikely (status))
 	    return status;
 
 	_cairo_output_stream_printf (stream, "Q\n");
     } else {
-	status = _cairo_ps_surface_emit_pattern (surface, source, &extents, op);
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    return CAIRO_STATUS_SUCCESS;
-
+	status = _cairo_ps_surface_emit_pattern (surface, source, &extents.bounded, op);
 	if (unlikely (status))
 	    return status;
 
 	_cairo_output_stream_printf (stream, "%d %d %d %d rectfill\n",
-				     extents.x, extents.y,
-				     extents.width, extents.height);
+				     extents.bounded.x, extents.bounded.y,
+				     extents.bounded.width, extents.bounded.height);
     }
 
     return CAIRO_STATUS_SUCCESS;
@@ -3497,47 +3558,62 @@ _cairo_ps_surface_stroke (void			*abstract_surface,
 			  cairo_operator_t	 op,
 			  const cairo_pattern_t	*source,
 			  cairo_path_fixed_t	*path,
-			  cairo_stroke_style_t	*style,
-			  cairo_matrix_t	*ctm,
-			  cairo_matrix_t	*ctm_inverse,
+			  const cairo_stroke_style_t	*style,
+			  const cairo_matrix_t	*ctm,
+			  const cairo_matrix_t	*ctm_inverse,
 			  double		 tolerance,
 			  cairo_antialias_t	 antialias,
 			  cairo_clip_t		*clip)
 {
     cairo_ps_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
     cairo_int_status_t status;
-    cairo_rectangle_int_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  &rect,
+							  op, source,
+							  path, style, ctm,
+							  clip);
+    if (unlikely (status))
+	return status;
+
+    if (! _cairo_rectangle_intersect (&extents.bounded, &surface->page_bbox))
+	return CAIRO_STATUS_SUCCESS;
+
+    /* use the more accurate extents */
+    if (extents.is_bounded) {
+	status = _cairo_path_fixed_stroke_extents (path, style,
+						   ctm, ctm_inverse,
+						   tolerance,
+						   &extents.mask);
+	if (unlikely (status))
+	    return status;
+
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    return CAIRO_STATUS_SUCCESS;
+    }
+
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_ps_surface_analyze_operation (surface, op, source);
+	return _cairo_ps_surface_analyze_operation (surface, op, source, &extents.bounded);
 
-    assert (_cairo_ps_surface_operation_supported (surface, op, source));
+    assert (_cairo_ps_surface_operation_supported (surface, op, source, &extents.bounded));
 
 #if DEBUG_PS
     _cairo_output_stream_printf (surface->stream,
 				 "%% _cairo_ps_surface_stroke\n");
 #endif
 
-    status = _cairo_surface_stroke_extents (&surface->base,
-					    op, source,
-					    path, style,
-					    ctm, ctm_inverse,
-					    tolerance, antialias,
-					    clip, &extents);
-    if (unlikely (status))
-	return status;
-
-    if (! _cairo_rectangle_intersect (&extents, &surface->page_bbox))
-	return CAIRO_STATUS_SUCCESS;
-
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
 
-    status = _cairo_ps_surface_emit_pattern (surface, source, &extents, op);
-    if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-        return CAIRO_STATUS_SUCCESS;
-
+    status = _cairo_ps_surface_emit_pattern (surface, source, &extents.bounded, op);
     if (unlikely (status))
 	return status;
 
@@ -3559,13 +3635,39 @@ _cairo_ps_surface_fill (void		*abstract_surface,
 			cairo_clip_t		*clip)
 {
     cairo_ps_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
     cairo_int_status_t status;
-    cairo_rectangle_int_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							&rect,
+							op, source, path,
+							clip);
+    if (unlikely (status))
+	return status;
+
+    if (! _cairo_rectangle_intersect (&extents.bounded, &surface->page_bbox))
+	return CAIRO_STATUS_SUCCESS;
+
+    /* use the more accurate extents */
+    if (extents.is_bounded) {
+	_cairo_path_fixed_fill_extents (path,
+					fill_rule,
+					tolerance,
+					&extents.mask);
+
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    return CAIRO_STATUS_SUCCESS;
+    }
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_ps_surface_analyze_operation (surface, op, source);
+	return _cairo_ps_surface_analyze_operation (surface, op, source, &extents.bounded);
 
-    assert (_cairo_ps_surface_operation_supported (surface, op, source));
+    assert (_cairo_ps_surface_operation_supported (surface, op, source, &extents.bounded));
 
 #if DEBUG_PS
     _cairo_output_stream_printf (surface->stream,
@@ -3576,17 +3678,6 @@ _cairo_ps_surface_fill (void		*abstract_surface,
     if (unlikely (status))
 	return status;
 
-    status = _cairo_surface_fill_extents (&surface->base,
-					  op, source,
-					  path, fill_rule,
-					  tolerance, antialias,
-					  clip, &extents);
-    if (unlikely (status))
-	return status;
-
-    if (! _cairo_rectangle_intersect (&extents, &surface->page_bbox))
-	return CAIRO_STATUS_SUCCESS;
-
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
@@ -3605,17 +3696,14 @@ _cairo_ps_surface_fill (void		*abstract_surface,
 
 	status = _cairo_ps_surface_paint_surface (surface,
 						 (cairo_surface_pattern_t *) source,
-						  &extents, op);
+						  &extents.bounded, op);
 	if (unlikely (status))
 	    return status;
 
 	_cairo_output_stream_printf (surface->stream, "Q\n");
 	_cairo_pdf_operators_reset (&surface->pdf_operators);
     } else {
-	status = _cairo_ps_surface_emit_pattern (surface, source, &extents, op);
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    return CAIRO_STATUS_SUCCESS;
-
+	status = _cairo_ps_surface_emit_pattern (surface, source, &extents.bounded, op);
 	if (unlikely (status))
 	    return status;
 
@@ -3638,41 +3726,40 @@ _cairo_ps_surface_show_glyphs (void		     *abstract_surface,
 			       int		     *remaining_glyphs)
 {
     cairo_ps_surface_t *surface = abstract_surface;
+    cairo_composite_rectangles_t extents;
+    cairo_bool_t overlap;
     cairo_status_t status;
-    cairo_rectangle_int_t extents;
+
+    cairo_rectangle_int_t rect;
+    rect.x = rect.y = 0;
+    rect.width = surface->width;
+    rect.height = surface->height;
+
+    status = _cairo_composite_rectangles_init_for_glyphs (&extents,
+							  &rect,
+							  op, source,
+							  scaled_font,
+							  glyphs, num_glyphs,
+							  clip,
+							  &overlap);
+    if (unlikely (status))
+	return status;
 
     if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE)
-	return _cairo_ps_surface_analyze_operation (surface, op, source);
+	return _cairo_ps_surface_analyze_operation (surface, op, source, &extents.bounded);
 
-    assert (_cairo_ps_surface_operation_supported (surface, op, source));
+    assert (_cairo_ps_surface_operation_supported (surface, op, source, &extents.bounded));
 
 #if DEBUG_PS
     _cairo_output_stream_printf (surface->stream,
 				 "%% _cairo_ps_surface_show_glyphs\n");
 #endif
 
-    if (num_glyphs <= 0)
-        return CAIRO_STATUS_SUCCESS;
-
-    status = _cairo_surface_glyphs_extents (&surface->base,
-					    op, source,
-					    glyphs, num_glyphs,
-					    scaled_font,
-					    clip, &extents);
-    if (unlikely (status))
-	return status;
-
-    if (! _cairo_rectangle_intersect (&extents, &surface->page_bbox))
-	return CAIRO_STATUS_SUCCESS;
-
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
 
-    status = _cairo_ps_surface_emit_pattern (surface, source, &extents, op);
-    if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-        return CAIRO_STATUS_SUCCESS;
-
+    status = _cairo_ps_surface_emit_pattern (surface, source, &extents.bounded, op);
     if (unlikely (status))
 	return status;
 
@@ -3726,7 +3813,7 @@ _cairo_ps_surface_set_bounding_box (void		*abstract_surface,
 
     surface->page_bbox.x = x1;
     surface->page_bbox.y = y1;
-    surface->page_bbox.width = x2 - x1;
+    surface->page_bbox.width  = x2 - x1;
     surface->page_bbox.height = y2 - y1;
 
     _cairo_output_stream_printf (surface->stream,
diff --git a/gfx/cairo/cairo/src/cairo-ps.h b/gfx/cairo/cairo/src/cairo-ps.h
index 8a2cb58b1b2..fd1d21deba0 100644
--- a/gfx/cairo/cairo/src/cairo-ps.h
+++ b/gfx/cairo/cairo/src/cairo-ps.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-qt-surface.cpp b/gfx/cairo/cairo/src/cairo-qt-surface.cpp
index 7093dd9976d..81200033bae 100644
--- a/gfx/cairo/cairo/src/cairo-qt-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-qt-surface.cpp
@@ -45,6 +45,7 @@
 
 #include "cairo-ft.h"
 #include "cairo-qt.h"
+#include "cairo-error-private.h"
 
 #include <memory>
 
@@ -304,7 +305,7 @@ _qmatrix_from_cairo_matrix (const cairo_matrix_t& m)
 /** Path conversion **/
 typedef struct _qpainter_path_transform {
     QPainterPath path;
-    cairo_matrix_t *ctm_inverse;
+    const cairo_matrix_t *ctm_inverse;
 } qpainter_path_data;
 
 /* cairo path -> execute in context */
@@ -372,7 +373,7 @@ _cairo_path_to_qpainterpath_close_path (void *closure)
 
 static inline QPainterPath
 path_to_qt (cairo_path_fixed_t *path,
-	    cairo_matrix_t *ctm_inverse = NULL)
+	    const cairo_matrix_t *ctm_inverse = NULL)
 {
     qpainter_path_data data;
     cairo_status_t status;
@@ -1016,7 +1017,7 @@ struct PatternToBrushConverter {
 
 struct PatternToPenConverter {
     PatternToPenConverter (const cairo_pattern_t *source,
-                           cairo_stroke_style_t *style) :
+                           const cairo_stroke_style_t *style) :
         mBrushConverter(source)
     {
         Qt::PenJoinStyle join = Qt::MiterJoin;
@@ -1304,9 +1305,9 @@ _cairo_qt_surface_stroke (void *abstract_surface,
 			  cairo_operator_t op,
 			  const cairo_pattern_t *source,
 			  cairo_path_fixed_t *path,
-			  cairo_stroke_style_t *style,
-			  cairo_matrix_t *ctm,
-			  cairo_matrix_t *ctm_inverse,
+			  const cairo_stroke_style_t *style,
+			  const cairo_matrix_t *ctm,
+			  const cairo_matrix_t *ctm_inverse,
 			  double tolerance,
 			  cairo_antialias_t antialias,
 			  cairo_clip_t *clip)
@@ -1567,6 +1568,7 @@ cairo_qt_surface_create (QPainter *painter)
 
     _cairo_surface_init (&qs->base,
 			 &cairo_qt_surface_backend,
+			 NULL,
 			 CAIRO_CONTENT_COLOR_ALPHA);
 
     _cairo_surface_clipper_init (&qs->clipper,
@@ -1605,6 +1607,7 @@ cairo_qt_surface_create_with_qimage (cairo_format_t format,
 
     _cairo_surface_init (&qs->base,
 			 &cairo_qt_surface_backend,
+			 NULL,
 			 _cairo_content_from_format (format));
 
     _cairo_surface_clipper_init (&qs->clipper,
@@ -1672,7 +1675,7 @@ cairo_qt_surface_create_with_qpixmap (cairo_content_t content,
     if (content == CAIRO_CONTENT_COLOR_ALPHA)
 	pixmap->fill(Qt::transparent);
 
-    _cairo_surface_init (&qs->base, &cairo_qt_surface_backend, content);
+    _cairo_surface_init (&qs->base, &cairo_qt_surface_backend, NULL, content);
 
     _cairo_surface_clipper_init (&qs->clipper,
 				 _cairo_qt_surface_clipper_intersect_clip_path);
diff --git a/gfx/cairo/cairo/src/cairo-qt.h b/gfx/cairo/cairo/src/cairo-qt.h
index d16087dd7e5..c20bbb18d0b 100644
--- a/gfx/cairo/cairo/src/cairo-qt.h
+++ b/gfx/cairo/cairo/src/cairo-qt.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,10 +41,10 @@
 
 #if CAIRO_HAS_QT_SURFACE
 
-#if defined(__cplusplus)
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
 
-class QPainter;
-class QImage;
+CAIRO_BEGIN_DECLS
 
 cairo_public cairo_surface_t *
 cairo_qt_surface_create (QPainter *painter);
@@ -74,11 +74,7 @@ cairo_qt_surface_get_image (cairo_surface_t *surface);
 cairo_public QImage *
 cairo_qt_surface_get_qimage (cairo_surface_t *surface);
 
-#else /* ! __cplusplus */
-
-# warning cairo-qt only exports a C++ interface
-
-#endif /* __cplusplus */
+CAIRO_END_DECLS
 
 #else /* CAIRO_HAS_QT_SURFACE */
 
diff --git a/gfx/cairo/cairo/src/cairo-quartz-font.c b/gfx/cairo/cairo/src/cairo-quartz-font.c
index d342e38df52..2c7e017af03 100644
--- a/gfx/cairo/cairo/src/cairo-quartz-font.c
+++ b/gfx/cairo/cairo/src/cairo-quartz-font.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,26 @@
 #include "cairo-quartz.h"
 #include "cairo-quartz-private.h"
 
+#include "cairo-error-private.h"
+
+/**
+ * SECTION:cairo-quartz-fonts
+ * @Title: Quartz (CGFont) Fonts
+ * @Short_Description: Font support via CGFont on OS X
+ * @See_Also: #cairo_font_face_t
+ *
+ * The Quartz font backend is primarily used to render text on Apple
+ * MacOS X systems.  The CGFont API is used for the internal
+ * implementation of the font backend methods.
+ */
+
+/**
+ * CAIRO_HAS_QUARTZ_FONT:
+ *
+ * Defined if the Quartz font backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 /* CreateWithFontName exists in 10.5, but not in 10.4; CreateWithName isn't public in 10.4 */
 static CGFontRef (*CGFontCreateWithFontNamePtr) (CFStringRef) = NULL;
 static CGFontRef (*CGFontCreateWithNamePtr) (const char *) = NULL;
@@ -53,6 +73,8 @@ static CGRect (*CGFontGetFontBBoxPtr) (CGFontRef) = NULL;
 
 /* Not public, but present */
 static void (*CGFontGetGlyphsForUnicharsPtr) (CGFontRef, const UniChar[], const CGGlyph[], size_t) = NULL;
+static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
+static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
 
 /* Not public in the least bit */
 static CGPathRef (*CGFontGetGlyphPathPtr) (CGFontRef fontRef, CGAffineTransform *textTransform, int unknown, CGGlyph glyph) = NULL;
@@ -102,6 +124,9 @@ quartz_font_ensure_symbols(void)
     CGFontGetDescentPtr = dlsym(RTLD_DEFAULT, "CGFontGetDescent");
     CGFontGetLeadingPtr = dlsym(RTLD_DEFAULT, "CGFontGetLeading");
 
+    CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
+    CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
+
     if ((CGFontCreateWithFontNamePtr || CGFontCreateWithNamePtr) &&
 	CGFontGetGlyphBBoxesPtr &&
 	CGFontGetGlyphsForUnicharsPtr &&
@@ -326,7 +351,8 @@ cairo_quartz_font_face_create_for_cgfont (CGFontRef font)
 
     font_face = malloc (sizeof (cairo_quartz_font_face_t));
     if (!font_face) {
-	_cairo_error (CAIRO_STATUS_NO_MEMORY);
+	cairo_status_t ignore_status;
+	ignore_status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	return (cairo_font_face_t *)&_cairo_font_face_nil;
     }
 
@@ -365,36 +391,6 @@ _cairo_quartz_scaled_glyph_index (cairo_scaled_glyph_t *scaled_glyph) {
     return (CGGlyph) index;
 }
 
-static inline cairo_status_t
-_cairo_matrix_to_unit_quartz_matrix (const cairo_matrix_t *m, CGAffineTransform *txout,
-				     double *xout, double *yout)
-{
-    CGAffineTransform transform;
-    double xscale, yscale;
-    cairo_status_t status;
-
-    status = _cairo_matrix_compute_basis_scale_factors (m, &xscale, &yscale, 1);
-    if (status)
-	return status;
-
-    transform = CGAffineTransformMake (m->xx, - m->yx,
-				       - m->xy, m->yy,
-				       0.0f, 0.0f);
-    if (xout)
-	*xout = xscale;
-    if (yout)
-	*yout = yscale;
-
-    if (xscale)
-	xscale = 1.0 / xscale;
-    if (yscale)
-	yscale = 1.0 / yscale;
-
-    *txout = CGAffineTransformScale (transform, xscale, yscale);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 static cairo_int_status_t
 _cairo_quartz_init_glyph_metrics (cairo_quartz_scaled_font_t *font,
 				  cairo_scaled_glyph_t *scaled_glyph)
@@ -403,7 +399,6 @@ _cairo_quartz_init_glyph_metrics (cairo_quartz_scaled_font_t *font,
 
     cairo_quartz_font_face_t *font_face = _cairo_quartz_scaled_to_face(font);
     cairo_text_extents_t extents = {0, 0, 0, 0, 0, 0};
-    CGAffineTransform textMatrix;
     CGGlyph glyph = _cairo_quartz_scaled_glyph_index (scaled_glyph);
     int advance;
     CGRect bbox;
@@ -490,17 +485,20 @@ static void
 _cairo_quartz_path_apply_func (void *info, const CGPathElement *el)
 {
     cairo_path_fixed_t *path = (cairo_path_fixed_t *) info;
+    cairo_status_t status;
 
     switch (el->type) {
 	case kCGPathElementMoveToPoint:
-	    _cairo_path_fixed_move_to (path,
-				       _cairo_fixed_from_double(el->points[0].x),
-				       _cairo_fixed_from_double(el->points[0].y));
+	    status = _cairo_path_fixed_move_to (path,
+						_cairo_fixed_from_double(el->points[0].x),
+						_cairo_fixed_from_double(el->points[0].y));
+	    assert(!status);
 	    break;
 	case kCGPathElementAddLineToPoint:
-	    _cairo_path_fixed_line_to (path,
-				       _cairo_fixed_from_double(el->points[0].x),
-				       _cairo_fixed_from_double(el->points[0].y));
+	    status = _cairo_path_fixed_line_to (path,
+						_cairo_fixed_from_double(el->points[0].x),
+						_cairo_fixed_from_double(el->points[0].y));
+	    assert(!status);
 	    break;
 	case kCGPathElementAddQuadCurveToPoint: {
 	    cairo_fixed_t fx, fy;
@@ -510,26 +508,29 @@ _cairo_quartz_path_apply_func (void *info, const CGPathElement *el)
 	    x = _cairo_fixed_to_double (fx);
 	    y = _cairo_fixed_to_double (fy);
 
-	    _cairo_path_fixed_curve_to (path,
-					_cairo_fixed_from_double((x + el->points[0].x * 2.0) / 3.0),
-					_cairo_fixed_from_double((y + el->points[0].y * 2.0) / 3.0),
-					_cairo_fixed_from_double((el->points[0].x * 2.0 + el->points[1].x) / 3.0),
-					_cairo_fixed_from_double((el->points[0].y * 2.0 + el->points[1].y) / 3.0),
-					_cairo_fixed_from_double(el->points[1].x),
-					_cairo_fixed_from_double(el->points[1].y));
+	    status = _cairo_path_fixed_curve_to (path,
+						 _cairo_fixed_from_double((x + el->points[0].x * 2.0) / 3.0),
+						 _cairo_fixed_from_double((y + el->points[0].y * 2.0) / 3.0),
+						 _cairo_fixed_from_double((el->points[0].x * 2.0 + el->points[1].x) / 3.0),
+						 _cairo_fixed_from_double((el->points[0].y * 2.0 + el->points[1].y) / 3.0),
+						 _cairo_fixed_from_double(el->points[1].x),
+						 _cairo_fixed_from_double(el->points[1].y));
 	}
+	    assert(!status);
 	    break;
 	case kCGPathElementAddCurveToPoint:
-	    _cairo_path_fixed_curve_to (path,
-					_cairo_fixed_from_double(el->points[0].x),
-					_cairo_fixed_from_double(el->points[0].y),
-					_cairo_fixed_from_double(el->points[1].x),
-					_cairo_fixed_from_double(el->points[1].y),
-					_cairo_fixed_from_double(el->points[2].x),
-					_cairo_fixed_from_double(el->points[2].y));
+	    status = _cairo_path_fixed_curve_to (path,
+						 _cairo_fixed_from_double(el->points[0].x),
+						 _cairo_fixed_from_double(el->points[0].y),
+						 _cairo_fixed_from_double(el->points[1].x),
+						 _cairo_fixed_from_double(el->points[1].y),
+						 _cairo_fixed_from_double(el->points[2].x),
+						 _cairo_fixed_from_double(el->points[2].y));
+	    assert(!status);	    
 	    break;
 	case kCGPathElementCloseSubpath:
-	    _cairo_path_fixed_close_path (path);
+	    status = _cairo_path_fixed_close_path (path);
+	    assert(!status);
 	    break;
     }
 }
@@ -549,14 +550,12 @@ _cairo_quartz_init_glyph_path (cairo_quartz_scaled_font_t *font,
 	return CAIRO_STATUS_SUCCESS;
     }
 
+    /* scale(1,-1) * font->base.scale */
     textMatrix = CGAffineTransformMake (font->base.scale.xx,
-					-font->base.scale.yx,
+					font->base.scale.yx,
 					-font->base.scale.xy,
-					font->base.scale.yy,
-					font->base.scale.x0,
-					font->base.scale.y0);
-
-    textMatrix = CGAffineTransformConcat (textMatrix, CGAffineTransformMake (1.0, 0.0, 0.0, -1.0, 0.0, 0.0));
+					-font->base.scale.yy,
+					0, 0);
 
     glyphPath = CGFontGetGlyphPathPtr (font_face->cgFont, &textMatrix, 0, glyph);
     if (!glyphPath)
@@ -595,7 +594,6 @@ _cairo_quartz_init_glyph_surface (cairo_quartz_scaled_font_t *font,
     double xscale, yscale;
     double emscale = CGFontGetUnitsPerEmPtr (font_face->cgFont);
 
-    CGColorSpaceRef gray;
     CGContextRef cgContext = NULL;
     CGAffineTransform textMatrix;
     CGRect glyphRect, glyphRectInt;
@@ -630,11 +628,12 @@ _cairo_quartz_init_glyph_surface (cairo_quartz_scaled_font_t *font,
     if (status)
 	return status;
 
+    /* scale(1,-1) * font->base.scale * scale(1,-1) */
     textMatrix = CGAffineTransformMake (font->base.scale.xx,
 					-font->base.scale.yx,
 					-font->base.scale.xy,
 					font->base.scale.yy,
-					0.0f, 0.0f);
+					0, -0);
     glyphRect = CGRectMake (bbox.origin.x / emscale,
 			    bbox.origin.y / emscale,
 			    bbox.size.width / emscale,
@@ -667,29 +666,50 @@ _cairo_quartz_init_glyph_surface (cairo_quartz_scaled_font_t *font,
     if (surface->base.status)
 	return surface->base.status;
 
-    gray = CGColorSpaceCreateDeviceGray ();
-    cgContext = CGBitmapContextCreate (surface->data,
-				       surface->width,
-				       surface->height,
-				       8,
-				       surface->stride,
-				       gray,
-				       kCGImageAlphaNone);
-    CGColorSpaceRelease (gray);
+    if (surface->width != 0 && surface->height != 0) {
+	cgContext = CGBitmapContextCreate (surface->data,
+					   surface->width,
+					   surface->height,
+					   8,
+					   surface->stride,
+					   NULL,
+					   kCGImageAlphaOnly);
 
-    CGContextSetFont (cgContext, font_face->cgFont);
-    CGContextSetFontSize (cgContext, 1.0);
-    CGContextSetTextMatrix (cgContext, textMatrix);
+	if (cgContext == NULL) {
+	    cairo_surface_destroy (&surface->base);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
 
-    CGContextClearRect (cgContext, CGRectMake (0.0f, 0.0f, width, height));
+	CGContextSetFont (cgContext, font_face->cgFont);
+	CGContextSetFontSize (cgContext, 1.0);
+	CGContextSetTextMatrix (cgContext, textMatrix);
 
-    if (font->base.options.antialias == CAIRO_ANTIALIAS_NONE)
-	CGContextSetShouldAntialias (cgContext, false);
+	switch (font->base.options.antialias) {
+	case CAIRO_ANTIALIAS_SUBPIXEL:
+	    CGContextSetShouldAntialias (cgContext, TRUE);
+	    CGContextSetShouldSmoothFonts (cgContext, TRUE);
+	    if (CGContextSetAllowsFontSmoothingPtr &&
+		!CGContextGetAllowsFontSmoothingPtr (cgContext))
+		CGContextSetAllowsFontSmoothingPtr (cgContext, TRUE);
+	    break;
+	case CAIRO_ANTIALIAS_NONE:
+	    CGContextSetShouldAntialias (cgContext, FALSE);
+	    break;
+	case CAIRO_ANTIALIAS_GRAY:
+	    CGContextSetShouldAntialias (cgContext, TRUE);
+	    CGContextSetShouldSmoothFonts (cgContext, FALSE);
+	    break;
+	case CAIRO_ANTIALIAS_DEFAULT:
+	default:
+	    /* Don't do anything */
+	    break;
+	}
 
-    CGContextSetRGBFillColor (cgContext, 1.0, 1.0, 1.0, 1.0);
-    CGContextShowGlyphsAtPoint (cgContext, - glyphOrigin.x, - glyphOrigin.y, &glyph, 1);
+	CGContextSetAlpha (cgContext, 1.0);
+	CGContextShowGlyphsAtPoint (cgContext, - glyphOrigin.x, - glyphOrigin.y, &glyph, 1);
 
-    CGContextRelease (cgContext);
+	CGContextRelease (cgContext);
+    }
 
     cairo_surface_set_device_offset (&surface->base,
 				     - glyphOrigin.x,
diff --git a/gfx/cairo/cairo/src/cairo-quartz-image-surface.c b/gfx/cairo/cairo/src/cairo-quartz-image-surface.c
index b8809d503f5..9a18dd46e5d 100644
--- a/gfx/cairo/cairo/src/cairo-quartz-image-surface.c
+++ b/gfx/cairo/cairo/src/cairo-quartz-image-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,8 @@
 #include "cairo-quartz-image.h"
 #include "cairo-quartz-private.h"
 
+#include "cairo-error-private.h"
+
 #define SURFACE_ERROR_NO_MEMORY (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_NO_MEMORY)))
 #define SURFACE_ERROR_TYPE_MISMATCH (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_SURFACE_TYPE_MISMATCH)))
 #define SURFACE_ERROR_INVALID_SIZE (_cairo_surface_create_in_error(_cairo_error(CAIRO_STATUS_INVALID_SIZE)))
@@ -260,6 +262,7 @@ cairo_quartz_image_surface_create (cairo_surface_t *surface)
 
     _cairo_surface_init (&qisurf->base,
 			 &cairo_quartz_image_surface_backend,
+			 NULL, /* device */
 			 _cairo_content_from_format (format));
 
     qisurf->extents.x = qisurf->extents.y = 0;
diff --git a/gfx/cairo/cairo/src/cairo-quartz-image.h b/gfx/cairo/cairo/src/cairo-quartz-image.h
index 7b9c5de4477..dae234dacae 100644
--- a/gfx/cairo/cairo/src/cairo-quartz-image.h
+++ b/gfx/cairo/cairo/src/cairo-quartz-image.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-quartz-private.h b/gfx/cairo/cairo/src/cairo-quartz-private.h
index a7c25db736a..ca4b2170c33 100644
--- a/gfx/cairo/cairo/src/cairo-quartz-private.h
+++ b/gfx/cairo/cairo/src/cairo-quartz-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,6 +44,12 @@
 #include "cairo-quartz.h"
 #include "cairo-surface-clipper-private.h"
 
+#ifdef CGFLOAT_DEFINED
+typedef CGFloat cairo_quartz_float_t;
+#else
+typedef float cairo_quartz_float_t;
+#endif
+
 typedef struct cairo_quartz_surface {
     cairo_surface_t base;
 
diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
index 07d3e01e236..c1eedc266e4 100644
--- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
+++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,8 @@
 #include "cairoint.h"
 
 #include "cairo-quartz-private.h"
+
+#include "cairo-error-private.h"
 #include "cairo-surface-clipper-private.h"
 #include "cairo-gstate-private.h"
 #include "cairo-private.h"
@@ -48,14 +50,6 @@
 #define RTLD_DEFAULT ((void *) 0)
 #endif
 
-/* The 10.5 SDK includes a funky new definition of FloatToFixed which
- * causes all sorts of breakage; so reset to old-style definition
- */
-#ifdef FloatToFixed
-#undef FloatToFixed
-#define FloatToFixed(a)     ((Fixed)((float)(a) * fixed1))
-#endif
-
 #include <limits.h>
 
 #undef QUARTZ_DEBUG
@@ -68,6 +62,23 @@
 
 #define IS_EMPTY(s) ((s)->extents.width == 0 || (s)->extents.height == 0)
 
+/**
+ * SECTION:cairo-quartz
+ * @Title: Quartz Surfaces
+ * @Short_Description: Rendering to Quartz surfaces
+ * @See_Also: #cairo_surface_t
+ *
+ * The Quartz surface is used to render cairo graphics targeting the
+ * Apple OS X Quartz rendering system.
+ */
+
+/**
+ * CAIRO_HAS_QUARTZ_SURFACE:
+ *
+ * Defined if the Quartz surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 /* Here are some of the differences between cairo and CoreGraphics
    - cairo has only a single source active at once vs. CoreGraphics having
      separate sources for stroke and fill
@@ -93,10 +104,7 @@ enum PrivateCGCompositeMode {
 };
 typedef enum PrivateCGCompositeMode PrivateCGCompositeMode;
 CG_EXTERN void CGContextSetCompositeOperation (CGContextRef, PrivateCGCompositeMode);
-CG_EXTERN void CGContextResetCTM (CGContextRef);
 CG_EXTERN void CGContextSetCTM (CGContextRef, CGAffineTransform);
-CG_EXTERN void CGContextResetClip (CGContextRef);
-CG_EXTERN CGSize CGContextGetPatternPhase (CGContextRef);
 
 /* We need to work with the 10.3 SDK as well (and 10.3 machines; luckily, 10.3.9
  * has all the stuff we care about, just some of it isn't exported in the SDK.
@@ -115,22 +123,18 @@ CG_EXTERN CGImageRef CGBitmapContextCreateImage (CGContextRef);
 #endif
 
 /* Some of these are present in earlier versions of the OS than where
- * they are public; others are not public at all
- * (CGContextReplacePathWithClipPath, many of the getters, etc.)
+ * they are public; others are not public at all (CGContextCopyPath,
+ * CGContextReplacePathWithClipPath, many of the getters, etc.)
  */
 static void (*CGContextClipToMaskPtr) (CGContextRef, CGRect, CGImageRef) = NULL;
 static void (*CGContextDrawTiledImagePtr) (CGContextRef, CGRect, CGImageRef) = NULL;
 static unsigned int (*CGContextGetTypePtr) (CGContextRef) = NULL;
 static void (*CGContextSetShouldAntialiasFontsPtr) (CGContextRef, bool) = NULL;
-static bool (*CGContextGetShouldAntialiasFontsPtr) (CGContextRef) = NULL;
-static bool (*CGContextGetShouldSmoothFontsPtr) (CGContextRef) = NULL;
 static void (*CGContextSetAllowsFontSmoothingPtr) (CGContextRef, bool) = NULL;
 static bool (*CGContextGetAllowsFontSmoothingPtr) (CGContextRef) = NULL;
-static void (*CGContextReplacePathWithClipPathPtr) (CGContextRef) = NULL;
+static CGPathRef (*CGContextCopyPathPtr) (CGContextRef) = NULL;
 static CGFloat (*CGContextGetAlphaPtr) (CGContextRef) = NULL;
 
-static SInt32 _cairo_quartz_osx_version = 0x0;
-
 static cairo_bool_t _cairo_quartz_symbol_lookup_done = FALSE;
 
 /*
@@ -148,6 +152,9 @@ _cairo_quartz_surface_create_internal (CGContextRef cgContext,
 				       unsigned int width,
 				       unsigned int height);
 
+static cairo_bool_t
+_cairo_surface_is_quartz (const cairo_surface_t *surface);
+
 /* Load all extra symbols */
 static void quartz_ensure_symbols(void)
 {
@@ -158,18 +165,11 @@ static void quartz_ensure_symbols(void)
     CGContextDrawTiledImagePtr = dlsym(RTLD_DEFAULT, "CGContextDrawTiledImage");
     CGContextGetTypePtr = dlsym(RTLD_DEFAULT, "CGContextGetType");
     CGContextSetShouldAntialiasFontsPtr = dlsym(RTLD_DEFAULT, "CGContextSetShouldAntialiasFonts");
-    CGContextGetShouldAntialiasFontsPtr = dlsym(RTLD_DEFAULT, "CGContextGetShouldAntialiasFonts");
-    CGContextGetShouldSmoothFontsPtr = dlsym(RTLD_DEFAULT, "CGContextGetShouldSmoothFonts");
-    CGContextReplacePathWithClipPathPtr = dlsym(RTLD_DEFAULT, "CGContextReplacePathWithClipPath");
+    CGContextCopyPathPtr = dlsym(RTLD_DEFAULT, "CGContextCopyPath");
     CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
     CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
     CGContextGetAlphaPtr = dlsym(RTLD_DEFAULT, "CGContextGetAlpha");
 
-    if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
-	// assume 10.4
-	_cairo_quartz_osx_version = 0x1040;
-    }
-
     _cairo_quartz_symbol_lookup_done = TRUE;
 }
 
@@ -187,14 +187,14 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
     CGImageRef image = NULL;
     CGDataProviderRef dataProvider = NULL;
     CGColorSpaceRef colorSpace = colorSpaceOverride;
-    CGBitmapInfo bitinfo;
+    CGBitmapInfo bitinfo = kCGBitmapByteOrder32Host;
     int bitsPerComponent, bitsPerPixel;
 
     switch (format) {
 	case CAIRO_FORMAT_ARGB32:
 	    if (colorSpace == NULL)
 		colorSpace = CGColorSpaceCreateDeviceRGB();
-	    bitinfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host;
+	    bitinfo |= kCGImageAlphaPremultipliedFirst;
 	    bitsPerComponent = 8;
 	    bitsPerPixel = 32;
 	    break;
@@ -202,7 +202,7 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
 	case CAIRO_FORMAT_RGB24:
 	    if (colorSpace == NULL)
 		colorSpace = CGColorSpaceCreateDeviceRGB();
-	    bitinfo = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host;
+	    bitinfo |= kCGImageAlphaNoneSkipFirst;
 	    bitsPerComponent = 8;
 	    bitsPerPixel = 32;
 	    break;
@@ -213,10 +213,14 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
 	    break;
 
 	case CAIRO_FORMAT_A1:
+#ifdef WORDS_BIGENDIAN
 	    bitsPerComponent = 1;
 	    bitsPerPixel = 1;
 	    break;
+#endif
 
+        case CAIRO_FORMAT_RGB16_565:
+        case CAIRO_FORMAT_INVALID:
 	default:
 	    return NULL;
     }
@@ -234,7 +238,7 @@ _cairo_quartz_create_cgimage (cairo_format_t format,
     }
 
     if (format == CAIRO_FORMAT_A8 || format == CAIRO_FORMAT_A1) {
-	CGFloat decode[] = {1.0, 0.0};
+	cairo_quartz_float_t decode[] = {1.0, 0.0};
 	image = CGImageMaskCreate (width, height,
 				   bitsPerComponent,
 				   bitsPerPixel,
@@ -305,25 +309,16 @@ _cairo_quartz_verify_surface_size(int width, int height)
  * Cairo path -> Quartz path conversion helpers
  */
 
-typedef struct _quartz_stroke {
-    CGContextRef cgContext;
-    cairo_matrix_t *ctm_inverse;
-} quartz_stroke_t;
-
 /* cairo path -> execute in context */
 static cairo_status_t
 _cairo_path_to_quartz_context_move_to (void *closure,
 				       const cairo_point_t *point)
 {
     //ND((stderr, "moveto: %f %f\n", _cairo_fixed_to_double(point->x), _cairo_fixed_to_double(point->y)));
-    quartz_stroke_t *stroke = (quartz_stroke_t *)closure;
     double x = _cairo_fixed_to_double (point->x);
     double y = _cairo_fixed_to_double (point->y);
 
-    if (stroke->ctm_inverse)
-	cairo_matrix_transform_point (stroke->ctm_inverse, &x, &y);
-
-    CGContextMoveToPoint (stroke->cgContext, x, y);
+    CGContextMoveToPoint (closure, x, y);
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -332,17 +327,10 @@ _cairo_path_to_quartz_context_line_to (void *closure,
 				       const cairo_point_t *point)
 {
     //ND((stderr, "lineto: %f %f\n",  _cairo_fixed_to_double(point->x), _cairo_fixed_to_double(point->y)));
-    quartz_stroke_t *stroke = (quartz_stroke_t *)closure;
     double x = _cairo_fixed_to_double (point->x);
     double y = _cairo_fixed_to_double (point->y);
 
-    if (stroke->ctm_inverse)
-	cairo_matrix_transform_point (stroke->ctm_inverse, &x, &y);
-
-    if (CGContextIsPathEmpty (stroke->cgContext))
-	CGContextMoveToPoint (stroke->cgContext, x, y);
-    else
-	CGContextAddLineToPoint (stroke->cgContext, x, y);
+    CGContextAddLineToPoint (closure, x, y);
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -356,7 +344,6 @@ _cairo_path_to_quartz_context_curve_to (void *closure,
     //		   _cairo_fixed_to_double(p0->x), _cairo_fixed_to_double(p0->y),
     //		   _cairo_fixed_to_double(p1->x), _cairo_fixed_to_double(p1->y),
     //		   _cairo_fixed_to_double(p2->x), _cairo_fixed_to_double(p2->y)));
-    quartz_stroke_t *stroke = (quartz_stroke_t *)closure;
     double x0 = _cairo_fixed_to_double (p0->x);
     double y0 = _cairo_fixed_to_double (p0->y);
     double x1 = _cairo_fixed_to_double (p1->x);
@@ -364,13 +351,7 @@ _cairo_path_to_quartz_context_curve_to (void *closure,
     double x2 = _cairo_fixed_to_double (p2->x);
     double y2 = _cairo_fixed_to_double (p2->y);
 
-    if (stroke->ctm_inverse) {
-	cairo_matrix_transform_point (stroke->ctm_inverse, &x0, &y0);
-	cairo_matrix_transform_point (stroke->ctm_inverse, &x1, &y1);
-	cairo_matrix_transform_point (stroke->ctm_inverse, &x2, &y2);
-    }
-
-    CGContextAddCurveToPoint (stroke->cgContext,
+    CGContextAddCurveToPoint (closure,
 			      x0, y0, x1, y1, x2, y2);
     return CAIRO_STATUS_SUCCESS;
 }
@@ -379,22 +360,26 @@ static cairo_status_t
 _cairo_path_to_quartz_context_close_path (void *closure)
 {
     //ND((stderr, "closepath\n"));
-    quartz_stroke_t *stroke = (quartz_stroke_t *)closure;
-    CGContextClosePath (stroke->cgContext);
+    CGContextClosePath (closure);
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_status_t
+static void
 _cairo_quartz_cairo_path_to_quartz_context (cairo_path_fixed_t *path,
-					    quartz_stroke_t *stroke)
+					    CGContextRef closure)
 {
-    return _cairo_path_fixed_interpret (path,
-					CAIRO_DIRECTION_FORWARD,
-					_cairo_path_to_quartz_context_move_to,
-					_cairo_path_to_quartz_context_line_to,
-					_cairo_path_to_quartz_context_curve_to,
-					_cairo_path_to_quartz_context_close_path,
-					stroke);
+    cairo_status_t status;
+
+    CGContextBeginPath (closure);
+    status = _cairo_path_fixed_interpret (path,
+					  CAIRO_DIRECTION_FORWARD,
+					  _cairo_path_to_quartz_context_move_to,
+					  _cairo_path_to_quartz_context_line_to,
+					  _cairo_path_to_quartz_context_curve_to,
+					  _cairo_path_to_quartz_context_close_path,
+					  closure);
+
+    assert (status == CAIRO_STATUS_SUCCESS);
 }
 
 /*
@@ -614,12 +599,161 @@ _cairo_quartz_cairo_matrix_to_quartz (const cairo_matrix_t *src,
     dst->ty = src->y0;
 }
 
+typedef struct {
+    bool isClipping;
+    CGGlyph *cg_glyphs;
+    CGSize *cg_advances;
+    size_t nglyphs;
+    CGAffineTransform textTransform;
+    CGFontRef font;
+    CGPoint origin;
+} unbounded_show_glyphs_t;
+
+typedef struct {
+    CGPathRef cgPath;
+    cairo_fill_rule_t fill_rule;
+} unbounded_stroke_fill_t;
+
+typedef struct {
+    CGImageRef mask;
+    CGAffineTransform maskTransform;
+} unbounded_mask_t;
+
+typedef enum {
+    UNBOUNDED_STROKE_FILL,
+    UNBOUNDED_SHOW_GLYPHS,
+    UNBOUNDED_MASK
+} unbounded_op_t;
+
+typedef struct {
+    unbounded_op_t op;
+    union {
+	unbounded_stroke_fill_t stroke_fill;
+	unbounded_show_glyphs_t show_glyphs;
+	unbounded_mask_t mask;
+    } u;
+} unbounded_op_data_t;
+
+static void
+_cairo_quartz_fixup_unbounded_operation (cairo_quartz_surface_t *surface,
+					 unbounded_op_data_t *op,
+					 cairo_antialias_t antialias)
+{
+    CGRect clipBox, clipBoxRound;
+    CGContextRef cgc;
+    CGImageRef maskImage;
+
+    /* TODO: handle failure */
+    if (!CGContextClipToMaskPtr)
+	return;
+
+    clipBox = CGContextGetClipBoundingBox (surface->cgContext);
+    clipBoxRound = CGRectIntegral (clipBox);
+
+    cgc = CGBitmapContextCreate (NULL,
+				 clipBoxRound.size.width,
+				 clipBoxRound.size.height,
+				 8,
+				 (((size_t) clipBoxRound.size.width) + 15) & (~15),
+				 NULL,
+				 kCGImageAlphaOnly);
+
+    if (!cgc)
+	return;
+
+    CGContextSetCompositeOperation (cgc, kPrivateCGCompositeCopy);
+    /* We want to mask out whatever we just rendered, so we fill the
+     * surface opaque, and then we'll render transparent.
+     */
+    CGContextSetAlpha (cgc, 1.0f);
+    CGContextFillRect (cgc, CGRectMake (0, 0, clipBoxRound.size.width, clipBoxRound.size.height));
+
+    CGContextSetCompositeOperation (cgc, kPrivateCGCompositeClear);
+    CGContextSetShouldAntialias (cgc, (antialias != CAIRO_ANTIALIAS_NONE));
+
+    CGContextTranslateCTM (cgc, -clipBoxRound.origin.x, -clipBoxRound.origin.y);
+
+    /* We need to either render the path that was given to us, or the glyph op */
+    if (op->op == UNBOUNDED_STROKE_FILL) {
+	CGContextBeginPath (cgc);
+	CGContextAddPath (cgc, op->u.stroke_fill.cgPath);
+
+	if (op->u.stroke_fill.fill_rule == CAIRO_FILL_RULE_WINDING)
+	    CGContextFillPath (cgc);
+	else
+	    CGContextEOFillPath (cgc);
+    } else if (op->op == UNBOUNDED_SHOW_GLYPHS) {
+	CGContextSetFont (cgc, op->u.show_glyphs.font);
+	CGContextSetFontSize (cgc, 1.0);
+	CGContextSetTextMatrix (cgc, CGAffineTransformIdentity);
+	CGContextTranslateCTM (cgc, op->u.show_glyphs.origin.x, op->u.show_glyphs.origin.y);
+	CGContextConcatCTM (cgc, op->u.show_glyphs.textTransform);
+
+	if (op->u.show_glyphs.isClipping) {
+	    /* Note that the comment in show_glyphs about kCGTextClip
+	     * and the text transform still applies here; however, the
+	     * cg_advances we have were already transformed, so we
+	     * don't have to do anything. */
+	    CGContextSetTextDrawingMode (cgc, kCGTextClip);
+	    CGContextSaveGState (cgc);
+	}
+
+	CGContextShowGlyphsWithAdvances (cgc,
+					 op->u.show_glyphs.cg_glyphs,
+					 op->u.show_glyphs.cg_advances,
+					 op->u.show_glyphs.nglyphs);
+
+	if (op->u.show_glyphs.isClipping) {
+	    CGContextClearRect (cgc, clipBoxRound);
+	    CGContextRestoreGState (cgc);
+	}
+    } else if (op->op == UNBOUNDED_MASK) {
+	CGAffineTransform ctm = CGContextGetCTM (cgc);
+	CGContextSaveGState (cgc);
+	CGContextConcatCTM (cgc, op->u.mask.maskTransform);
+	CGContextClipToMask (cgc, CGRectMake (0.0f, 0.0f,
+					      CGImageGetWidth(op->u.mask.mask), CGImageGetHeight(op->u.mask.mask)),
+			     op->u.mask.mask);
+	CGContextSetCTM (cgc, ctm);
+	CGContextClearRect (cgc, clipBoxRound);
+	CGContextRestoreGState (cgc);
+    }
+
+    /* Also mask out the portion of the clipbox that we rounded out, if any */
+    if (!CGRectEqualToRect (clipBox, clipBoxRound)) {
+	CGContextBeginPath (cgc);
+	CGContextAddRect (cgc, clipBoxRound);
+	CGContextAddRect (cgc, clipBox);
+	CGContextEOFillPath (cgc);
+    }
+
+    maskImage = CGBitmapContextCreateImage (cgc);
+    CGContextRelease (cgc);
+
+    if (!maskImage)
+	return;
+
+    /* Then render with the mask */
+    CGContextSaveGState (surface->cgContext);
+
+    CGContextSetCompositeOperation (surface->cgContext, kPrivateCGCompositeCopy);
+    CGContextClipToMaskPtr (surface->cgContext, clipBoxRound, maskImage);
+    CGImageRelease (maskImage);
+
+    /* Finally, clear out the entire clipping region through our mask */
+    CGContextClearRect (surface->cgContext, clipBoxRound);
+
+    CGContextRestoreGState (surface->cgContext);
+}
+
 /*
  * Source -> Quartz setup and finish functions
  */
 
 static void
-ComputeGradientValue (void *info, const CGFloat *in, CGFloat *out)
+ComputeGradientValue (void *info,
+                      const cairo_quartz_float_t *in,
+                      cairo_quartz_float_t *out)
 {
     double fdist = *in;
     const cairo_gradient_pattern_t *grad = (cairo_gradient_pattern_t*) info;
@@ -650,10 +784,10 @@ ComputeGradientValue (void *info, const CGFloat *in, CGFloat *out)
 	out[2] = grad->stops[i].color.blue;
 	out[3] = grad->stops[i].color.alpha;
     } else {
-	float ax = grad->stops[i-1].offset;
-	float bx = grad->stops[i].offset - ax;
-	float bp = (fdist - ax)/bx;
-	float ap = 1.0 - bp;
+	cairo_quartz_float_t ax = grad->stops[i-1].offset;
+	cairo_quartz_float_t bx = grad->stops[i].offset - ax;
+	cairo_quartz_float_t bp = (fdist - ax)/bx;
+	cairo_quartz_float_t ap = 1.0 - bp;
 
 	out[0] =
 	    grad->stops[i-1].color.red * ap +
@@ -670,7 +804,7 @@ ComputeGradientValue (void *info, const CGFloat *in, CGFloat *out)
     }
 }
 
-static const CGFloat gradient_output_value_ranges[8] = {
+static const cairo_quartz_float_t gradient_output_value_ranges[8] = {
     0.f, 1.f, 0.f, 1.f, 0.f, 1.f, 0.f, 1.f
 };
 static const CGFunctionCallbacks gradient_callbacks = {
@@ -687,8 +821,8 @@ static const CGFunctionCallbacks gradient_callbacks = {
    on the gradient line will pass 0.0 to ComputeGradientValue, which will
    select the last color stop with position 0, although it should select
    the first color stop (this matters when there are multiple color stops with
-   position 0). 
-   
+   position 0).
+
    Therefore we pass a small negative number as the lower bound of the input
    range, so this value gets passed into ComputeGradientValue, which will
    return the color of the first stop. The number should be small because
@@ -696,7 +830,7 @@ static const CGFunctionCallbacks gradient_callbacks = {
    function into an array of fixed size, so if the input range is larger
    than needed, the resolution of the gradient will be unnecessarily low.
 */
-static const CGFloat nonrepeating_gradient_input_value_range[2] = { -0.001f, 1.f };
+static const cairo_quartz_float_t nonrepeating_gradient_input_value_range[2] = { -0.001f, 1.f };
 
 static CGFunctionRef
 CreateGradientFunction (const cairo_gradient_pattern_t *gpat)
@@ -758,7 +892,7 @@ CreateRepeatingLinearGradientFunction (cairo_quartz_surface_t *surface,
 				       cairo_rectangle_int_t *extents)
 {
     cairo_pattern_t *pat;
-    CGFloat input_value_range[2];
+    cairo_quartz_float_t input_value_range[2];
     double t_min = 0.;
     double t_max = 0.;
     double dx = end->x - start->x;
@@ -868,7 +1002,7 @@ CreateRepeatingRadialGradientFunction (cairo_quartz_surface_t *surface,
                                        cairo_rectangle_int_t *extents)
 {
     cairo_pattern_t *pat;
-    CGFloat input_value_range[2];
+    cairo_quartz_float_t input_value_range[2];
     CGPoint *inner;
     double *inner_radius;
     CGPoint *outer;
@@ -942,8 +1076,8 @@ CreateRepeatingRadialGradientFunction (cairo_quartz_surface_t *surface,
         input_value_range[0] = t_min;
         input_value_range[1] = t_max;
     } else {
-        input_value_range[0] = -t_max;
-        input_value_range[1] = -t_min;
+        input_value_range[0] = 1 - t_max;
+        input_value_range[1] = 1 - t_min;
     }
 
     if (_cairo_pattern_create_copy (&pat, &gpat->base))
@@ -961,30 +1095,34 @@ CreateRepeatingRadialGradientFunction (cairo_quartz_surface_t *surface,
 
 /* Obtain a CGImageRef from a #cairo_surface_t * */
 
+typedef struct {
+    cairo_surface_t *surface;
+    cairo_image_surface_t *image_out;
+    void *image_extra;
+} quartz_source_image_t;
+
 static void
 DataProviderReleaseCallback (void *info, const void *data, size_t size)
 {
-    cairo_surface_t *surface = (cairo_surface_t *) info;
-    cairo_surface_destroy (surface);
+    quartz_source_image_t *source_img = info;
+    _cairo_surface_release_source_image (source_img->surface, source_img->image_out, source_img->image_extra);
+    free (source_img);
 }
 
 static cairo_status_t
 _cairo_surface_to_cgimage (cairo_surface_t *source,
 			   CGImageRef *image_out)
 {
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
-    cairo_surface_type_t stype = cairo_surface_get_type (source);
-    cairo_image_surface_t *isurf;
-    CGImageRef image;
-    void *image_extra;
+    cairo_status_t status;
+    quartz_source_image_t *source_img;
 
-    if (stype == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) {
+    if (source->backend && source->backend->type == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) {
 	cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t *) source;
 	*image_out = CGImageRetain (surface->image);
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    if (stype == CAIRO_SURFACE_TYPE_QUARTZ) {
+    if (_cairo_surface_is_quartz (source)) {
 	cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) source;
 	if (IS_EMPTY(surface)) {
 	    *image_out = NULL;
@@ -1003,43 +1141,39 @@ _cairo_surface_to_cgimage (cairo_surface_t *source,
 	}
     }
 
-    if (stype != CAIRO_SURFACE_TYPE_IMAGE) {
-	status = _cairo_surface_acquire_source_image (source,
-						      &isurf, &image_extra);
-	if (status)
-	    return status;
-    } else {
-	isurf = (cairo_image_surface_t *) source;
+    source_img = malloc (sizeof (quartz_source_image_t));
+    if (source_img == NULL)
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    source_img->surface = source;
+
+    status = _cairo_surface_acquire_source_image (source_img->surface, &source_img->image_out, &source_img->image_extra);
+    if (status) {
+	free (source_img);
+	return status;
     }
 
-    if (isurf->width == 0 || isurf->height == 0) {
+    if (source_img->image_out->width == 0 || source_img->image_out->height == 0) {
 	*image_out = NULL;
+	DataProviderReleaseCallback (source_img,
+				     source_img->image_out->data,
+				     source_img->image_out->height * source_img->image_out->stride);
     } else {
-	cairo_image_surface_t *isurf_snap = NULL;
+	*image_out = _cairo_quartz_create_cgimage (source_img->image_out->format,
+						   source_img->image_out->width,
+						   source_img->image_out->height,
+						   source_img->image_out->stride,
+						   source_img->image_out->data,
+						   TRUE,
+						   NULL,
+						   DataProviderReleaseCallback,
+						   source_img);
 
-	isurf_snap = (cairo_image_surface_t*)
-	    _cairo_surface_snapshot (&isurf->base);
-	if (isurf_snap->base.status)
-	    return isurf_snap->base.status;
-
-	image = _cairo_quartz_create_cgimage (isurf_snap->format,
-					      isurf_snap->width,
-					      isurf_snap->height,
-					      isurf_snap->stride,
-					      isurf_snap->data,
-					      TRUE,
-					      NULL,
-					      DataProviderReleaseCallback,
-					      isurf_snap);
-
-	*image_out = image;
-	if (image == NULL)
+	/* TODO: differentiate memory error and unsupported surface type */
+	if (*image_out == NULL)
 	    status = CAIRO_INT_STATUS_UNSUPPORTED;
     }
 
-    if (&isurf->base != source)
-	_cairo_surface_release_source_image (source, isurf, image_extra);
-
     return status;
 }
 
@@ -1109,7 +1243,7 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t
 			      SurfacePatternDrawFunc,
 			      SurfacePatternReleaseInfoFunc };
     SurfacePatternDrawInfo *info;
-    float rw, rh;
+    cairo_quartz_float_t rw, rh;
     cairo_status_t status;
     cairo_bool_t is_bounded;
 
@@ -1225,11 +1359,6 @@ typedef struct {
 
     // Used with DO_PATTERN
     CGPatternRef pattern;
-
-    // Used for handling unbounded operators
-    CGLayerRef unboundedLayer;
-    CGPoint unboundedLayerOffset;
-    CGContextRef unboundedDestination;
 } cairo_quartz_drawing_state_t;
 
 static void
@@ -1365,7 +1494,7 @@ _cairo_quartz_setup_linear_source (cairo_quartz_surface_t *surface,
 		       _cairo_fixed_to_double (lpat->p2.y));
 
     if (abspat->extend == CAIRO_EXTEND_NONE ||
-        abspat->extend == CAIRO_EXTEND_PAD) 
+        abspat->extend == CAIRO_EXTEND_PAD)
     {
 	gradFunc = CreateGradientFunction (&lpat->base);
     } else {
@@ -1619,7 +1748,6 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
 {
     CGContextRef context = surface->cgContext;
     cairo_quartz_drawing_state_t state;
-    cairo_bool_t bounded_op = _cairo_operator_bounded_by_mask (op);
     cairo_status_t status;
 
     state.context = context;
@@ -1628,7 +1756,6 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
     state.layer = NULL;
     state.shading = NULL;
     state.pattern = NULL;
-    state.unboundedLayer = NULL;
 
     _cairo_quartz_surface_will_change (surface);
 
@@ -1637,6 +1764,8 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
     // pattern (which may be stack allocated)
     CGContextSaveGState(context);
 
+    CGContextSetInterpolationQuality (context, _cairo_quartz_filter_to_quartz (source->filter));
+
     status = _cairo_quartz_surface_set_cairo_operator (surface, op);
     if (status == CAIRO_INT_STATUS_NOTHING_TO_DO) {
         state.action = DO_NOTHING;
@@ -1647,33 +1776,6 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
         return state;
     }
 
-    if (!bounded_op) {
-        state.unboundedDestination = context;
-
-        CGRect clipBox = CGContextGetClipBoundingBox (context);
-        CGRect clipBoxRound = CGRectIntegral (CGRectInset (clipBox, -1, -1));
-        state.unboundedLayer = CGLayerCreateWithContext (context, clipBoxRound.size, NULL);
-        if (!state.unboundedLayer) {
-            state.action = DO_UNSUPPORTED;
-            return state;
-        }
-
-        context = CGLayerGetContext (state.unboundedLayer);
-        if (!context) {
-            state.action = DO_UNSUPPORTED;
-            return state;
-        }
-        state.context = context;
-        // No need to save state here, since this context won't be used later
-        CGContextTranslateCTM (context, -clipBoxRound.origin.x, -clipBoxRound.origin.y);
-
-        state.unboundedLayerOffset = clipBoxRound.origin;
-
-        CGContextSetCompositeOperation (context, kPrivateCGCompositeCopy);
-    }
-
-    CGContextSetInterpolationQuality (context, _cairo_quartz_filter_to_quartz (source->filter));
-
     if (source->type == CAIRO_PATTERN_TYPE_SOLID) {
 	cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) source;
 
@@ -1705,7 +1807,7 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
     }
 
     if (source->type == CAIRO_PATTERN_TYPE_SURFACE) {
-        if (op == CAIRO_OPERATOR_OVER && _cairo_pattern_is_opaque (source) &&
+        if (op == CAIRO_OPERATOR_OVER && _cairo_pattern_is_opaque (source, NULL) &&
             CGContextGetAlphaPtr &&
             CGContextGetAlphaPtr (surface->cgContext) == 1.0) {
             // Quartz won't touch pixels outside the bounds of the
@@ -1728,42 +1830,33 @@ _cairo_quartz_setup_state (cairo_quartz_surface_t *surface,
 
 /**
  * 1) Tears down internal state used to draw the source
- * 2) Does CGContextRestoreGState on the state saved by _cairo_quartz_setup_state
+ * 2) Does CGContextRestoreGState(state->context)
  */
 static void
 _cairo_quartz_teardown_state (cairo_quartz_drawing_state_t *state)
 {
     if (state->image) {
-	CGImageRelease (state->image);
+	CGImageRelease(state->image);
     }
 
     if (state->imageSurface) {
-	cairo_surface_destroy (state->imageSurface);
+	cairo_surface_destroy(state->imageSurface);
     }
 
     if (state->shading) {
-	CGShadingRelease (state->shading);
+	CGShadingRelease(state->shading);
     }
 
     if (state->pattern) {
-	CGPatternRelease (state->pattern);
+	CGPatternRelease(state->pattern);
     }
 
-    if (state->unboundedLayer) {
-        // Copy the layer back to the destination
-        CGContextDrawLayerAtPoint (state->unboundedDestination,
-                                   state->unboundedLayerOffset,
-                                   state->unboundedLayer);
-        CGContextRestoreGState (state->unboundedDestination);
-        CGLayerRelease (state->unboundedLayer);
-    } else {
-        CGContextRestoreGState (state->context);
-    }
+    CGContextRestoreGState(state->context);
 }
 
 
 static void
-_cairo_quartz_draw_image (cairo_quartz_drawing_state_t *state)
+_cairo_quartz_draw_image (cairo_quartz_drawing_state_t *state, cairo_operator_t op)
 {
     assert (state &&
             ((state->image && (state->action == DO_IMAGE || state->action == DO_TILED_IMAGE)) ||
@@ -1788,6 +1881,16 @@ _cairo_quartz_draw_image (cairo_quartz_drawing_state_t *state)
         } else {
             CGContextDrawImage (state->context, state->imageRect, state->image);
         }
+
+	/* disable this EXTEND_NONE correctness code because we use this path
+	 * for both EXTEND_NONE and EXTEND_PAD */
+	if (0 && !_cairo_operator_bounded_by_source (op)) {
+	    CGContextBeginPath (state->context);
+	    CGContextAddRect (state->context, state->imageRect);
+	    CGContextAddRect (state->context, CGContextGetClipBoundingBox (state->context));
+	    CGContextSetRGBFillColor (state->context, 0, 0, 0, 0);
+	    CGContextEOFillPath (state->context);
+	}
     }
 }
 
@@ -2115,7 +2218,7 @@ _cairo_quartz_surface_clone_similar (void *abstract_surface,
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    if (src->backend->type == CAIRO_SURFACE_TYPE_QUARTZ) {
+    if (_cairo_surface_is_quartz (src)) {
 	cairo_quartz_surface_t *qsurf = (cairo_quartz_surface_t *) src;
 
 	if (IS_EMPTY(qsurf)) {
@@ -2181,32 +2284,10 @@ _cairo_quartz_surface_get_extents (void *abstract_surface,
 }
 
 static cairo_int_status_t
-_cairo_quartz_surface_paint_internal (cairo_quartz_surface_t *surface,
-			              cairo_quartz_drawing_state_t *state)
-{
-    if (state->action == DO_SOLID || state->action == DO_PATTERN) {
-	CGContextFillRect (state->context, CGRectMake(surface->extents.x,
-						      surface->extents.y,
-						      surface->extents.width,
-						      surface->extents.height));
-    } else if (state->action == DO_SHADING) {
-	CGContextConcatCTM (state->context, state->transform);
-	CGContextDrawShading (state->context, state->shading);
-    } else if (state->action == DO_IMAGE || state->action == DO_TILED_IMAGE ||
-               state->action == DO_LAYER) {
-	_cairo_quartz_draw_image (state);
-    } else if (state->action != DO_NOTHING) {
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_int_status_t
-_cairo_quartz_surface_paint (void *abstract_surface,
-			     cairo_operator_t op,
-			     const cairo_pattern_t *source,
-			     cairo_clip_t *clip)
+_cairo_quartz_surface_paint_cg (void *abstract_surface,
+				cairo_operator_t op,
+				const cairo_pattern_t *source,
+				cairo_clip_t *clip)
 {
     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
@@ -2223,7 +2304,20 @@ _cairo_quartz_surface_paint (void *abstract_surface,
 
     state = _cairo_quartz_setup_state (surface, source, op, NULL);
 
-    rv = _cairo_quartz_surface_paint_internal (surface, &state);
+    if (state.action == DO_SOLID || state.action == DO_PATTERN) {
+	CGContextFillRect (state.context, CGRectMake(surface->extents.x,
+						     surface->extents.y,
+						     surface->extents.width,
+						     surface->extents.height));
+    } else if (state.action == DO_SHADING) {
+	CGContextConcatCTM (state.context, state.transform);
+	CGContextDrawShading (state.context, state.shading);
+    } else if (state.action == DO_IMAGE || state.action == DO_TILED_IMAGE ||
+               state.action == DO_LAYER) {
+	_cairo_quartz_draw_image (&state, op);
+    } else if (state.action != DO_NOTHING) {
+	rv = CAIRO_INT_STATUS_UNSUPPORTED;
+    }
 
     _cairo_quartz_teardown_state (&state);
 
@@ -2251,19 +2345,46 @@ _cairo_quartz_source_needs_extents (const cairo_pattern_t *source)
 }
 
 static cairo_int_status_t
-_cairo_quartz_surface_fill (void *abstract_surface,
+_cairo_quartz_surface_paint (void *abstract_surface,
 			     cairo_operator_t op,
 			     const cairo_pattern_t *source,
-			     cairo_path_fixed_t *path,
-			     cairo_fill_rule_t fill_rule,
-			     double tolerance,
-			     cairo_antialias_t antialias,
 			     cairo_clip_t *clip)
+{
+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
+    cairo_int_status_t rv;
+    cairo_image_surface_t *image;
+
+    rv = _cairo_quartz_surface_paint_cg (abstract_surface,
+					 op,
+					 source,
+					 clip);
+
+    if (likely (rv != CAIRO_INT_STATUS_UNSUPPORTED))
+	return rv;
+
+    rv = _cairo_quartz_get_image (surface, &image);
+    if (rv == CAIRO_STATUS_SUCCESS) {
+	rv = _cairo_surface_paint (&image->base, op, source, clip);
+	cairo_surface_destroy (&image->base);
+    }
+
+    return rv;
+}
+
+static cairo_int_status_t
+_cairo_quartz_surface_fill_cg (void *abstract_surface,
+			       cairo_operator_t op,
+			       const cairo_pattern_t *source,
+			       cairo_path_fixed_t *path,
+			       cairo_fill_rule_t fill_rule,
+			       double tolerance,
+			       cairo_antialias_t antialias,
+			       cairo_clip_t *clip)
 {
     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
     cairo_quartz_drawing_state_t state;
-    quartz_stroke_t stroke;
+    CGPathRef path_for_unbounded = NULL;
 
     ND((stderr, "%p _cairo_quartz_surface_fill op %d source->type %d\n", surface, op, source->type));
 
@@ -2288,13 +2409,10 @@ _cairo_quartz_surface_fill (void *abstract_surface,
 
     CGContextSetShouldAntialias (state.context, (antialias != CAIRO_ANTIALIAS_NONE));
 
-    CGContextBeginPath (state.context);
+    _cairo_quartz_cairo_path_to_quartz_context (path, state.context);
 
-    stroke.cgContext = state.context;
-    stroke.ctm_inverse = NULL;
-    rv = _cairo_quartz_cairo_path_to_quartz_context (path, &stroke);
-    if (rv)
-        goto BAIL;
+    if (!_cairo_operator_bounded_by_mask(op) && CGContextCopyPathPtr)
+	path_for_unbounded = CGContextCopyPathPtr (state.context);
 
     if (state.action == DO_SOLID || state.action == DO_PATTERN) {
 	if (fill_rule == CAIRO_FILL_RULE_WINDING)
@@ -2319,35 +2437,81 @@ _cairo_quartz_surface_fill (void *abstract_surface,
 	else
 	    CGContextEOClip (state.context);
 
-	_cairo_quartz_draw_image (&state);
+	_cairo_quartz_draw_image (&state, op);
     } else if (state.action != DO_NOTHING) {
 	rv = CAIRO_INT_STATUS_UNSUPPORTED;
     }
 
-  BAIL:
     _cairo_quartz_teardown_state (&state);
 
+    if (path_for_unbounded) {
+	unbounded_op_data_t ub;
+	ub.op = UNBOUNDED_STROKE_FILL;
+	ub.u.stroke_fill.cgPath = path_for_unbounded;
+	ub.u.stroke_fill.fill_rule = fill_rule;
+
+	_cairo_quartz_fixup_unbounded_operation (surface, &ub, antialias);
+	CGPathRelease (path_for_unbounded);
+    }
+
     ND((stderr, "-- fill\n"));
     return rv;
 }
 
 static cairo_int_status_t
-_cairo_quartz_surface_stroke (void *abstract_surface,
-			      cairo_operator_t op,
-			      const cairo_pattern_t *source,
-			      cairo_path_fixed_t *path,
-			      cairo_stroke_style_t *style,
-			      cairo_matrix_t *ctm,
-			      cairo_matrix_t *ctm_inverse,
-			      double tolerance,
-			      cairo_antialias_t antialias,
-			      cairo_clip_t *clip)
+_cairo_quartz_surface_fill (void *abstract_surface,
+			    cairo_operator_t op,
+			    const cairo_pattern_t *source,
+			    cairo_path_fixed_t *path,
+			    cairo_fill_rule_t fill_rule,
+			    double tolerance,
+			    cairo_antialias_t antialias,
+			    cairo_clip_t *clip)
+{
+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
+    cairo_int_status_t rv;
+    cairo_image_surface_t *image;
+
+    rv = _cairo_quartz_surface_fill_cg (abstract_surface,
+					op,
+					source,
+					path,
+					fill_rule,
+					tolerance,
+					antialias,
+					clip);
+
+    if (likely (rv != CAIRO_INT_STATUS_UNSUPPORTED))
+	return rv;
+
+    rv = _cairo_quartz_get_image (surface, &image);
+    if (rv == CAIRO_STATUS_SUCCESS) {
+	rv = _cairo_surface_fill (&image->base, op, source,
+				  path, fill_rule, tolerance, antialias,
+				  clip);
+	cairo_surface_destroy (&image->base);
+    }
+
+    return rv;
+}
+
+static cairo_int_status_t
+_cairo_quartz_surface_stroke_cg (void *abstract_surface,
+				 cairo_operator_t op,
+				 const cairo_pattern_t *source,
+				 cairo_path_fixed_t *path,
+				 const cairo_stroke_style_t *style,
+				 const cairo_matrix_t *ctm,
+				 const cairo_matrix_t *ctm_inverse,
+				 double tolerance,
+				 cairo_antialias_t antialias,
+				 cairo_clip_t *clip)
 {
     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
     cairo_quartz_drawing_state_t state;
-    quartz_stroke_t stroke;
     CGAffineTransform origCTM, strokeTransform;
+    CGPathRef path_for_unbounded = NULL;
 
     ND((stderr, "%p _cairo_quartz_surface_stroke op %d source->type %d\n", surface, op, source->type));
 
@@ -2358,13 +2522,17 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
     if (unlikely (rv))
 	return rv;
 
+    rv = _cairo_quartz_surface_set_cairo_operator (surface, op);
+    if (unlikely (rv))
+	return rv == CAIRO_INT_STATUS_NOTHING_TO_DO ? CAIRO_STATUS_SUCCESS : rv;
+
     if (_cairo_quartz_source_needs_extents (source))
     {
-        cairo_rectangle_int_t path_extents;
-        _cairo_path_fixed_approximate_stroke_extents (path, style, ctm, &path_extents);
-        state = _cairo_quartz_setup_state (surface, source, op, &path_extents);
+	cairo_rectangle_int_t path_extents;
+	_cairo_path_fixed_approximate_stroke_extents (path, style, ctm, &path_extents);
+	state = _cairo_quartz_setup_state (surface, source, op, &path_extents);
     } else {
-        state = _cairo_quartz_setup_state (surface, source, op, NULL);
+	state = _cairo_quartz_setup_state (surface, source, op, NULL);
     }
 
     // Turning antialiasing off used to cause misrendering with
@@ -2380,47 +2548,35 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
 
     if (style->dash && style->num_dashes) {
 #define STATIC_DASH 32
-	CGFloat sdash[STATIC_DASH];
-	CGFloat *fdash = sdash;
-	double offset = style->dash_offset;
+	cairo_quartz_float_t sdash[STATIC_DASH];
+	cairo_quartz_float_t *fdash = sdash;
 	unsigned int max_dashes = style->num_dashes;
 	unsigned int k;
 
-	if (_cairo_stroke_style_dash_can_approximate (style, ctm, tolerance)) {
-	    double approximate_dashes[2];
-	    _cairo_stroke_style_dash_approximate (style, ctm, tolerance,
-						  &offset,
-						  approximate_dashes,
-						  &max_dashes);
-	    sdash[0] = approximate_dashes[0];
-	    sdash[1] = approximate_dashes[1];
-	} else {
-	    if (style->num_dashes%2)
-		max_dashes *= 2;
-	    if (max_dashes > STATIC_DASH)
-		fdash = _cairo_malloc_ab (max_dashes, sizeof (CGFloat));
-	    if (fdash == NULL)
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	if (style->num_dashes%2)
+	    max_dashes *= 2;
+	if (max_dashes > STATIC_DASH)
+	    fdash = _cairo_malloc_ab (max_dashes, sizeof (cairo_quartz_float_t));
+	if (fdash == NULL)
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	    for (k = 0; k < max_dashes; k++)
-		fdash[k] = (CGFloat) style->dash[k % style->num_dashes];
-	}
-	CGContextSetLineDash (state.context, offset, fdash, max_dashes);
+	for (k = 0; k < max_dashes; k++)
+	    fdash[k] = (cairo_quartz_float_t) style->dash[k % style->num_dashes];
+
+	CGContextSetLineDash (surface->cgContext, style->dash_offset, fdash, max_dashes);
 	if (fdash != sdash)
 	    free (fdash);
     } else
 	CGContextSetLineDash (state.context, 0, NULL, 0);
 
+
+    _cairo_quartz_cairo_path_to_quartz_context (path, state.context);
+
     _cairo_quartz_cairo_matrix_to_quartz (ctm, &strokeTransform);
     CGContextConcatCTM (state.context, strokeTransform);
 
-    CGContextBeginPath (state.context);
-
-    stroke.cgContext = state.context;
-    stroke.ctm_inverse = ctm_inverse;
-    rv = _cairo_quartz_cairo_path_to_quartz_context (path, &stroke);
-    if (rv)
-	goto BAIL;
+    if (!_cairo_operator_bounded_by_mask (op) && CGContextCopyPathPtr)
+	path_for_unbounded = CGContextCopyPathPtr (state.context);
 
     if (state.action == DO_SOLID || state.action == DO_PATTERN) {
 	CGContextStrokePath (state.context);
@@ -2430,7 +2586,7 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
 	CGContextClip (state.context);
 
 	CGContextSetCTM (state.context, origCTM);
-	_cairo_quartz_draw_image (&state);
+	_cairo_quartz_draw_image (&state, op);
     } else if (state.action == DO_SHADING) {
 	CGContextReplacePathWithStrokedPath (state.context);
 	CGContextClip (state.context);
@@ -2444,6 +2600,26 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
 	goto BAIL;
     }
 
+    if (path_for_unbounded) {
+	unbounded_op_data_t ub;
+	ub.op = UNBOUNDED_STROKE_FILL;
+	ub.u.stroke_fill.fill_rule = CAIRO_FILL_RULE_WINDING;
+
+	CGContextBeginPath (state.context);
+	CGContextAddPath (state.context, path_for_unbounded);
+	CGPathRelease (path_for_unbounded);
+
+	CGContextSaveGState (state.context);
+	CGContextConcatCTM (state.context, strokeTransform);
+	CGContextReplacePathWithStrokedPath (state.context);
+	CGContextRestoreGState (state.context);
+
+	ub.u.stroke_fill.cgPath = CGContextCopyPathPtr (state.context);
+
+	_cairo_quartz_fixup_unbounded_operation (surface, &ub, antialias);
+	CGPathRelease (ub.u.stroke_fill.cgPath);
+    }
+
   BAIL:
     _cairo_quartz_teardown_state (&state);
 
@@ -2451,28 +2627,65 @@ _cairo_quartz_surface_stroke (void *abstract_surface,
     return rv;
 }
 
+static cairo_int_status_t
+_cairo_quartz_surface_stroke (void *abstract_surface,
+			      cairo_operator_t op,
+			      const cairo_pattern_t *source,
+			      cairo_path_fixed_t *path,
+			      const cairo_stroke_style_t *style,
+			      const cairo_matrix_t *ctm,
+			      const cairo_matrix_t *ctm_inverse,
+			      double tolerance,
+			      cairo_antialias_t antialias,
+			      cairo_clip_t *clip)
+{
+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
+    cairo_int_status_t rv;
+    cairo_image_surface_t *image;
+
+    rv = _cairo_quartz_surface_stroke_cg (abstract_surface, op, source,
+					  path, style, ctm, ctm_inverse,
+					  tolerance, antialias,
+					  clip);
+
+    if (likely (rv != CAIRO_INT_STATUS_UNSUPPORTED))
+	return rv;
+
+    rv = _cairo_quartz_get_image (surface, &image);
+    if (rv == CAIRO_STATUS_SUCCESS) {
+	rv = _cairo_surface_stroke (&image->base, op, source,
+				    path, style, ctm, ctm_inverse,
+				    tolerance, antialias,
+				    clip);
+	cairo_surface_destroy (&image->base);
+    }
+
+    return rv;
+}
+
 #if CAIRO_HAS_QUARTZ_FONT
 static cairo_int_status_t
-_cairo_quartz_surface_show_glyphs (void *abstract_surface,
-				   cairo_operator_t op,
-				   const cairo_pattern_t *source,
-				   cairo_glyph_t *glyphs,
-				   int num_glyphs,
-				   cairo_scaled_font_t *scaled_font,
-				   cairo_clip_t *clip,
-				   int *remaining_glyphs)
+_cairo_quartz_surface_show_glyphs_cg (void *abstract_surface,
+				      cairo_operator_t op,
+				      const cairo_pattern_t *source,
+				      cairo_glyph_t *glyphs,
+				      int num_glyphs,
+				      cairo_scaled_font_t *scaled_font,
+				      cairo_clip_t *clip,
+				      int *remaining_glyphs)
 {
-    CGAffineTransform textTransform, ctm;
+    CGAffineTransform textTransform, ctm, invTextTransform;
 #define STATIC_BUF_SIZE 64
     CGGlyph glyphs_static[STATIC_BUF_SIZE];
     CGSize cg_advances_static[STATIC_BUF_SIZE];
     CGGlyph *cg_glyphs = &glyphs_static[0];
     CGSize *cg_advances = &cg_advances_static[0];
 
+    cairo_rectangle_int_t glyph_extents;
     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
     cairo_quartz_drawing_state_t state;
-    float xprev, yprev;
+    cairo_quartz_float_t xprev, yprev;
     int i;
     CGFontRef cgfref = NULL;
 
@@ -2493,11 +2706,10 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
     if (unlikely (rv))
 	return rv;
 
-    if (_cairo_quartz_source_needs_extents (source))
+    if (_cairo_quartz_source_needs_extents (source) &&
+	!_cairo_scaled_font_glyph_device_extents (scaled_font, glyphs, num_glyphs,
+						  &glyph_extents, NULL))
     {
-        cairo_rectangle_int_t glyph_extents;
-        _cairo_scaled_font_glyph_device_extents (scaled_font, glyphs, num_glyphs,
-                                                 &glyph_extents, NULL);
         state = _cairo_quartz_setup_state (surface, source, op, &glyph_extents);
     } else {
         state = _cairo_quartz_setup_state (surface, source, op, NULL);
@@ -2563,20 +2775,21 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
 	}
     }
 
-    textTransform = CGAffineTransformMake (scaled_font->font_matrix.xx,
-					   scaled_font->font_matrix.yx,
-					   scaled_font->font_matrix.xy,
-					   scaled_font->font_matrix.yy,
-					   0., 0.);
-    textTransform = CGAffineTransformScale (textTransform, 1.0, -1.0);
-    textTransform = CGAffineTransformConcat (CGAffineTransformMake(scaled_font->ctm.xx,
-								   -scaled_font->ctm.yx,
-								   -scaled_font->ctm.xy,
-								   scaled_font->ctm.yy,
-								   0., 0.),
-					     textTransform);
+    /* scale(1,-1) * scaled_font->scale */
+    textTransform = CGAffineTransformMake (scaled_font->scale.xx,
+					   scaled_font->scale.yx,
+					   -scaled_font->scale.xy,
+					   -scaled_font->scale.yy,
+					   0, 0);
 
-    CGContextSetTextMatrix (state.context, textTransform);
+    /* scaled_font->scale_inverse * scale(1,-1) */
+    invTextTransform = CGAffineTransformMake (scaled_font->scale_inverse.xx,
+					      -scaled_font->scale_inverse.yx,
+					      scaled_font->scale_inverse.xy,
+					      -scaled_font->scale_inverse.yy,
+					      0.0, 0.0);
+
+    CGContextSetTextMatrix (state.context, CGAffineTransformIdentity);
 
     /* Convert our glyph positions to glyph advances.  We need n-1 advances,
      * since the advance at index 0 is applied after glyph 0. */
@@ -2586,35 +2799,18 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
     cg_glyphs[0] = glyphs[0].index;
 
     for (i = 1; i < num_glyphs; i++) {
-	float xf = glyphs[i].x;
-	float yf = glyphs[i].y;
+	cairo_quartz_float_t xf = glyphs[i].x;
+	cairo_quartz_float_t yf = glyphs[i].y;
 	cg_glyphs[i] = glyphs[i].index;
-	cg_advances[i-1].width = xf - xprev;
-	cg_advances[i-1].height = yf - yprev;
+	cg_advances[i - 1] = CGSizeApplyAffineTransform(CGSizeMake (xf - xprev, yf - yprev), invTextTransform);
 	xprev = xf;
 	yprev = yf;
     }
 
-    if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
-	/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
-	 * bug (apple bug ID #5834794) where the glyph
-	 * advances/positions are not transformed by the text matrix
-	 * if kCGTextClip is being used.  So, we pre-transform here.
-	 * 10.4 does not have this problem (as of 10.4.11).
-	 */
-	for (i = 0; i < num_glyphs - 1; i++)
-	    cg_advances[i] = CGSizeApplyAffineTransform(cg_advances[i], textTransform);
-    }
-
-#if 0
-    for (i = 0; i < num_glyphs; i++) {
-	ND((stderr, "[%d: %d %f,%f]\n", i, cg_glyphs[i], cg_advances[i].width, cg_advances[i].height));
-    }
-#endif
-
     /* Translate to the first glyph's position before drawing */
     ctm = CGContextGetCTM (state.context);
     CGContextTranslateCTM (state.context, glyphs[0].x, glyphs[0].y);
+    CGContextConcatCTM (state.context, textTransform);
 
     CGContextShowGlyphsWithAdvances (state.context,
 				     cg_glyphs,
@@ -2625,7 +2821,7 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface,
 
     if (state.action == DO_IMAGE || state.action == DO_TILED_IMAGE ||
         state.action == DO_LAYER) {
-	_cairo_quartz_draw_image (&state);
+	_cairo_quartz_draw_image (&state, op);
     } else if (state.action == DO_SHADING) {
 	CGContextConcatCTM (state.context, state.transform);
 	CGContextDrawShading (state.context, state.shading);
@@ -2637,6 +2833,25 @@ BAIL:
 
     _cairo_quartz_teardown_state (&state);
 
+    if (rv == CAIRO_STATUS_SUCCESS &&
+	cgfref &&
+	!_cairo_operator_bounded_by_mask (op))
+    {
+	unbounded_op_data_t ub;
+	ub.op = UNBOUNDED_SHOW_GLYPHS;
+
+	ub.u.show_glyphs.isClipping = isClipping;
+	ub.u.show_glyphs.cg_glyphs = cg_glyphs;
+	ub.u.show_glyphs.cg_advances = cg_advances;
+	ub.u.show_glyphs.nglyphs = num_glyphs;
+	ub.u.show_glyphs.textTransform = textTransform;
+	ub.u.show_glyphs.font = cgfref;
+	ub.u.show_glyphs.origin = CGPointMake (glyphs[0].x, glyphs[0].y);
+
+	_cairo_quartz_fixup_unbounded_operation (surface, &ub, scaled_font->options.antialias);
+    }
+
+
     if (cg_advances != &cg_advances_static[0]) {
 	free (cg_advances);
     }
@@ -2649,6 +2864,43 @@ BAIL:
 }
 #endif /* CAIRO_HAS_QUARTZ_FONT */
 
+static cairo_int_status_t
+_cairo_quartz_surface_show_glyphs (void *abstract_surface,
+				   cairo_operator_t op,
+				   const cairo_pattern_t *source,
+				   cairo_glyph_t *glyphs,
+				   int num_glyphs,
+				   cairo_scaled_font_t *scaled_font,
+				   cairo_clip_t *clip,
+				   int *remaining_glyphs)
+{
+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
+    cairo_int_status_t rv = CAIRO_INT_STATUS_UNSUPPORTED;
+    cairo_image_surface_t *image;
+
+#if CAIRO_HAS_QUARTZ_FONT
+    rv = _cairo_quartz_surface_show_glyphs_cg (abstract_surface, op, source,
+					       glyphs, num_glyphs,
+					       scaled_font, clip, remaining_glyphs);
+
+    if (likely (rv != CAIRO_INT_STATUS_UNSUPPORTED))
+	return rv;
+
+#endif
+
+    rv = _cairo_quartz_get_image (surface, &image);
+    if (rv == CAIRO_STATUS_SUCCESS) {
+	rv = _cairo_surface_show_text_glyphs (&image->base, op, source,
+					      NULL, 0,
+					      glyphs, num_glyphs,
+					      NULL, 0, 0,
+					      scaled_font, clip);
+	cairo_surface_destroy (&image->base);
+    }
+
+    return rv;
+}
+
 static cairo_int_status_t
 _cairo_quartz_surface_mask_with_surface (cairo_quartz_surface_t *surface,
                                          cairo_operator_t op,
@@ -2661,13 +2913,6 @@ _cairo_quartz_surface_mask_with_surface (cairo_quartz_surface_t *surface,
     cairo_surface_t *pat_surf = mask->surface;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
     CGAffineTransform ctm, mask_matrix;
-    cairo_quartz_drawing_state_t state;
-
-    if (IS_EMPTY(surface))
-	return CAIRO_STATUS_SUCCESS;
-
-    if (op == CAIRO_OPERATOR_DEST)
-	return CAIRO_STATUS_SUCCESS;
 
     status = _cairo_surface_to_cgimage (pat_surf, &img);
     if (status)
@@ -2680,25 +2925,33 @@ _cairo_quartz_surface_mask_with_surface (cairo_quartz_surface_t *surface,
 
     rect = CGRectMake (0.0f, 0.0f, CGImageGetWidth (img) , CGImageGetHeight (img));
 
-    state = _cairo_quartz_setup_state (surface, source, op, NULL);
+    CGContextSaveGState (surface->cgContext);
 
     /* ClipToMask is essentially drawing an image, so we need to flip the CTM
      * to get the image to appear oriented the right way */
-    ctm = CGContextGetCTM (state.context);
+    ctm = CGContextGetCTM (surface->cgContext);
 
     _cairo_quartz_cairo_matrix_to_quartz (&mask->base.matrix, &mask_matrix);
     mask_matrix = CGAffineTransformInvert(mask_matrix);
     mask_matrix = CGAffineTransformTranslate (mask_matrix, 0.0, CGImageGetHeight (img));
     mask_matrix = CGAffineTransformScale (mask_matrix, 1.0, -1.0);
 
-    CGContextConcatCTM (state.context, mask_matrix);
-    CGContextClipToMaskPtr (state.context, rect, img);
+    CGContextConcatCTM (surface->cgContext, mask_matrix);
+    CGContextClipToMaskPtr (surface->cgContext, rect, img);
 
-    CGContextSetCTM (state.context, ctm);
+    CGContextSetCTM (surface->cgContext, ctm);
 
-    status = _cairo_quartz_surface_paint_internal (surface, &state);
+    status = _cairo_quartz_surface_paint_cg (surface, op, source, clip);
 
-    _cairo_quartz_teardown_state (&state);
+    CGContextRestoreGState (surface->cgContext);
+
+    if (!_cairo_operator_bounded_by_mask (op)) {
+	unbounded_op_data_t ub;
+	ub.op = UNBOUNDED_MASK;
+	ub.u.mask.mask = img;
+	ub.u.mask.maskTransform = mask_matrix;
+	_cairo_quartz_fixup_unbounded_operation (surface, &ub, CAIRO_ANTIALIAS_NONE);
+    }
 
     CGImageRelease (img);
 
@@ -2746,11 +2999,11 @@ _cairo_quartz_surface_mask_with_generic (cairo_quartz_surface_t *surface,
 }
 
 static cairo_int_status_t
-_cairo_quartz_surface_mask (void *abstract_surface,
-			    cairo_operator_t op,
-			    const cairo_pattern_t *source,
-			    const cairo_pattern_t *mask,
-			    cairo_clip_t *clip)
+_cairo_quartz_surface_mask_cg (void *abstract_surface,
+			       cairo_operator_t op,
+			       const cairo_pattern_t *source,
+			       const cairo_pattern_t *mask,
+			       cairo_clip_t *clip)
 {
     cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
     cairo_int_status_t rv = CAIRO_STATUS_SUCCESS;
@@ -2771,7 +3024,7 @@ _cairo_quartz_surface_mask (void *abstract_surface,
 	cairo_solid_pattern_t *solid_mask = (cairo_solid_pattern_t *) mask;
 
 	CGContextSetAlpha (surface->cgContext, solid_mask->color.alpha);
-	rv = _cairo_quartz_surface_paint (surface, op, source, clip);
+	rv = _cairo_quartz_surface_paint_cg (surface, op, source, clip);
 	CGContextSetAlpha (surface->cgContext, 1.0);
 
 	return rv;
@@ -2796,6 +3049,35 @@ _cairo_quartz_surface_mask (void *abstract_surface,
     return CAIRO_STATUS_SUCCESS;
 }
 
+static cairo_int_status_t
+_cairo_quartz_surface_mask (void *abstract_surface,
+			    cairo_operator_t op,
+			    const cairo_pattern_t *source,
+			    const cairo_pattern_t *mask,
+			    cairo_clip_t *clip)
+{
+    cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface;
+    cairo_int_status_t rv;
+    cairo_image_surface_t *image;
+
+    rv = _cairo_quartz_surface_mask_cg (abstract_surface,
+					op,
+					source,
+					mask,
+					clip);
+
+    if (likely (rv != CAIRO_INT_STATUS_UNSUPPORTED))
+	return rv;
+
+    rv = _cairo_quartz_get_image (surface, &image);
+    if (rv == CAIRO_STATUS_SUCCESS) {
+	rv = _cairo_surface_mask (&image->base, op, source, mask, clip);
+	cairo_surface_destroy (&image->base);
+    }
+
+    return rv;
+}
+
 static cairo_status_t
 _cairo_quartz_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clipper,
 						   cairo_path_fixed_t *path,
@@ -2805,8 +3087,6 @@ _cairo_quartz_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
 {
     cairo_quartz_surface_t *surface =
 	cairo_container_of (clipper, cairo_quartz_surface_t, clipper);
-    quartz_stroke_t stroke;
-    cairo_status_t status;
 
     ND((stderr, "%p _cairo_quartz_surface_intersect_clip_path path: %p\n", surface, path));
 
@@ -2824,17 +3104,9 @@ _cairo_quartz_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
 	CGContextRestoreGState (surface->cgContext);
 	CGContextSaveGState (surface->cgContext);
     } else {
-	CGContextBeginPath (surface->cgContext);
-	stroke.cgContext = surface->cgContext;
-	stroke.ctm_inverse = NULL;
-
 	CGContextSetShouldAntialias (surface->cgContext, (antialias != CAIRO_ANTIALIAS_NONE));
 
-	/* path must not be empty. */
-	CGContextMoveToPoint (surface->cgContext, 0, 0);
-	status = _cairo_quartz_cairo_path_to_quartz_context (path, &stroke);
-	if (status)
-	    return status;
+	_cairo_quartz_cairo_path_to_quartz_context (path, surface->cgContext);
 
 	if (fill_rule == CAIRO_FILL_RULE_WINDING)
 	    CGContextClip (surface->cgContext);
@@ -2877,11 +3149,7 @@ static const struct _cairo_surface_backend cairo_quartz_surface_backend = {
     _cairo_quartz_surface_mask,
     _cairo_quartz_surface_stroke,
     _cairo_quartz_surface_fill,
-#if CAIRO_HAS_QUARTZ_FONT
     _cairo_quartz_surface_show_glyphs,
-#else
-    NULL, /* show_glyphs */
-#endif
 
     NULL, /* snapshot */
     NULL, /* is_similar */
@@ -2905,8 +3173,10 @@ _cairo_quartz_surface_create_internal (CGContextRef cgContext,
 
     memset(surface, 0, sizeof(cairo_quartz_surface_t));
 
-    _cairo_surface_init(&surface->base, &cairo_quartz_surface_backend,
-			content);
+    _cairo_surface_init (&surface->base,
+			 &cairo_quartz_surface_backend,
+			 NULL, /* device */
+			 content);
 
     _cairo_surface_clipper_init (&surface->clipper,
 				 _cairo_quartz_surface_clipper_intersect_clip_path);
@@ -3260,12 +3530,17 @@ cairo_quartz_surface_create_for_data (unsigned char *data,
 CGContextRef
 cairo_quartz_surface_get_cg_context (cairo_surface_t *surface)
 {
-    cairo_quartz_surface_t *quartz = (cairo_quartz_surface_t*)surface;
-
-    if (cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_QUARTZ)
+    if (surface && _cairo_surface_is_quartz (surface)) {
+	cairo_quartz_surface_t *quartz = (cairo_quartz_surface_t *) surface;
+	return quartz->cgContext;
+    } else
 	return NULL;
+}
 
-    return quartz->cgContext;
+static cairo_bool_t
+_cairo_surface_is_quartz (const cairo_surface_t *surface)
+{
+    return surface->backend == &cairo_quartz_surface_backend;
 }
 
 CGContextRef
@@ -3285,12 +3560,12 @@ cairo_quartz_get_cg_context_with_clip (cairo_t *cr)
 	if (clip->all_clipped) {
 	    /* Save the state before we set an empty clip rect so that
 	     * our previous clip will be restored */
-	    CGContextSaveGState (quartz->cgContext);
 
 	    /* _cairo_surface_clipper_set_clip doesn't deal with
 	     * clip->all_clipped because drawing is normally discarded earlier */
 	    CGRect empty = {{0,0}, {0,0}};
 	    CGContextClipToRect (quartz->cgContext, empty);
+	    CGContextSaveGState (quartz->cgContext);
 
 	    return quartz->cgContext;
 	}
diff --git a/gfx/cairo/cairo/src/cairo-quartz.h b/gfx/cairo/cairo/src/cairo-quartz.h
index 7d8996a493f..fef2724f819 100644
--- a/gfx/cairo/cairo/src/cairo-quartz.h
+++ b/gfx/cairo/cairo/src/cairo-quartz.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-recording-surface-private.h b/gfx/cairo/cairo/src/cairo-recording-surface-private.h
index f0824f50b48..4ec5f88b47b 100644
--- a/gfx/cairo/cairo/src/cairo-recording-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-recording-surface-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -132,7 +132,6 @@ typedef struct _cairo_recording_surface {
     cairo_clip_t clip;
 
     cairo_array_t commands;
-    cairo_surface_t *commands_owner;
 
     int replay_start_idx;
 } cairo_recording_surface_t;
@@ -157,6 +156,7 @@ _cairo_recording_surface_replay_and_create_regions (cairo_surface_t *surface,
 						    cairo_surface_t *target);
 cairo_private cairo_status_t
 _cairo_recording_surface_replay_region (cairo_surface_t			*surface,
+					const cairo_rectangle_int_t *surface_extents,
 					cairo_surface_t			*target,
 					cairo_recording_region_type_t	region);
 
diff --git a/gfx/cairo/cairo/src/cairo-recording-surface.c b/gfx/cairo/cairo/src/cairo-recording-surface.c
index c50b330eec9..79d51e8cc65 100644
--- a/gfx/cairo/cairo/src/cairo-recording-surface.c
+++ b/gfx/cairo/cairo/src/cairo-recording-surface.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,7 +37,13 @@
  *	Adrian Johnson <ajohnson@redneon.com>
  */
 
-/* A recording surface is a surface that records all drawing operations at
+/**
+ * SECTION:cairo-recording
+ * @Title: Recording Surfaces
+ * @Short_Description: Records all drawing operations
+ * @See_Also: #cairo_surface_t
+ *
+ * A recording surface is a surface that records all drawing operations at
  * the highest level of the surface backend interface, (that is, the
  * level of paint, mask, stroke, fill, and show_text_glyphs). The recording
  * surface can then be "replayed" against any target surface by using it
@@ -70,12 +76,11 @@
  * copy-on-write implementation for _cairo_surface_snapshot.
  */
 
-/* XXX Rename to recording surface */
-
 #include "cairoint.h"
 #include "cairo-analysis-surface-private.h"
-#include "cairo-recording-surface-private.h"
 #include "cairo-clip-private.h"
+#include "cairo-error-private.h"
+#include "cairo-recording-surface-private.h"
 #include "cairo-surface-wrapper-private.h"
 
 typedef enum {
@@ -85,6 +90,16 @@ typedef enum {
 
 static const cairo_surface_backend_t cairo_recording_surface_backend;
 
+/**
+ * CAIRO_HAS_RECORDING_SURFACE:
+ *
+ * Defined if the recording surface backend is available.
+ * The recording surface backend is always built in.
+ * This macro was added for completeness in cairo 1.10.
+ *
+ * Since: 1.10
+ */
+
 /* Currently all recording surfaces do have a size which should be passed
  * in as the maximum size of any target surface against which the
  * recording-surface will ever be replayed.
@@ -97,8 +112,8 @@ static const cairo_surface_backend_t cairo_recording_surface_backend;
 /**
  * cairo_recording_surface_create:
  * @content: the content of the recording surface
- * @extents_pixels: the extents to record in pixels, can be %NULL to record
- *                  unbounded operations.
+ * @extents: the extents to record in pixels, can be %NULL to record
+ *           unbounded operations.
  *
  * Creates a recording-surface which can be used to record all drawing operations
  * at the highest level (that is, the level of paint, mask, stroke, fill
@@ -109,7 +124,11 @@ static const cairo_surface_backend_t cairo_recording_surface_backend;
  * necessary objects (paths, patterns, etc.), in order to achieve
  * accurate replay.
  *
- * Since 1.10
+ * Return value: a pointer to the newly created surface. The caller
+ * owns the surface and should call cairo_surface_destroy() when done
+ * with it.
+ *
+ * Since: 1.10
  **/
 cairo_surface_t *
 cairo_recording_surface_create (cairo_content_t		 content,
@@ -122,10 +141,16 @@ cairo_recording_surface_create (cairo_content_t		 content,
     if (unlikely (recording_surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&recording_surface->base, &cairo_recording_surface_backend, content);
+    _cairo_surface_init (&recording_surface->base,
+			 &cairo_recording_surface_backend,
+			 NULL, /* device */
+			 content);
 
     recording_surface->content = content;
 
+    recording_surface->unbounded = TRUE;
+    _cairo_clip_init (&recording_surface->clip);
+
     /* unbounded -> 'infinite' extents */
     if (extents != NULL) {
 	recording_surface->extents_pixels = *extents;
@@ -136,22 +161,20 @@ cairo_recording_surface_create (cairo_content_t		 content,
 	recording_surface->extents.width = ceil (extents->x + extents->width) - recording_surface->extents.x;
 	recording_surface->extents.height = ceil (extents->y + extents->height) - recording_surface->extents.y;
 
-	status = _cairo_clip_init_rectangle (&recording_surface->clip, &recording_surface->extents);
+	status = _cairo_clip_rectangle (&recording_surface->clip,
+					&recording_surface->extents);
 	if (unlikely (status)) {
 	    free (recording_surface);
 	    return _cairo_surface_create_in_error (status);
 	}
 
 	recording_surface->unbounded = FALSE;
-    } else {
-	recording_surface->unbounded = TRUE;
-	_cairo_clip_init (&recording_surface->clip);
     }
 
     _cairo_array_init (&recording_surface->commands, sizeof (cairo_command_t *));
-    recording_surface->commands_owner = NULL;
 
     recording_surface->replay_start_idx = 0;
+    recording_surface->base.is_clear = TRUE;
 
     return &recording_surface->base;
 }
@@ -177,59 +200,50 @@ _cairo_recording_surface_finish (void *abstract_surface)
     cairo_command_t **elements;
     int i, num_elements;
 
-    if (recording_surface->commands_owner) {
-	cairo_surface_destroy (recording_surface->commands_owner);
-	return CAIRO_STATUS_SUCCESS;
-    }
-
     num_elements = recording_surface->commands.num_elements;
     elements = _cairo_array_index (&recording_surface->commands, 0);
     for (i = 0; i < num_elements; i++) {
 	cairo_command_t *command = elements[i];
 
-	_cairo_clip_reset (&command->header.clip);
-
 	switch (command->header.type) {
 	case CAIRO_COMMAND_PAINT:
-	    _cairo_pattern_fini_snapshot (&command->paint.source.base);
-	    free (command);
+	    _cairo_pattern_fini (&command->paint.source.base);
 	    break;
 
 	case CAIRO_COMMAND_MASK:
-	    _cairo_pattern_fini_snapshot (&command->mask.source.base);
-	    _cairo_pattern_fini_snapshot (&command->mask.mask.base);
-	    free (command);
+	    _cairo_pattern_fini (&command->mask.source.base);
+	    _cairo_pattern_fini (&command->mask.mask.base);
 	    break;
 
 	case CAIRO_COMMAND_STROKE:
-	    _cairo_pattern_fini_snapshot (&command->stroke.source.base);
+	    _cairo_pattern_fini (&command->stroke.source.base);
 	    _cairo_path_fixed_fini (&command->stroke.path);
 	    _cairo_stroke_style_fini (&command->stroke.style);
-	    free (command);
 	    break;
 
 	case CAIRO_COMMAND_FILL:
-	    _cairo_pattern_fini_snapshot (&command->fill.source.base);
+	    _cairo_pattern_fini (&command->fill.source.base);
 	    _cairo_path_fixed_fini (&command->fill.path);
-	    free (command);
 	    break;
 
 	case CAIRO_COMMAND_SHOW_TEXT_GLYPHS:
-	    _cairo_pattern_fini_snapshot (&command->show_text_glyphs.source.base);
+	    _cairo_pattern_fini (&command->show_text_glyphs.source.base);
 	    free (command->show_text_glyphs.utf8);
 	    free (command->show_text_glyphs.glyphs);
 	    free (command->show_text_glyphs.clusters);
 	    cairo_scaled_font_destroy (command->show_text_glyphs.scaled_font);
-	    free (command);
 	    break;
 
 	default:
 	    ASSERT_NOT_REACHED;
 	}
+
+	_cairo_clip_fini (&command->header.clip);
+	free (command);
     }
 
     _cairo_array_fini (&recording_surface->commands);
-    _cairo_clip_reset (&recording_surface->clip);
+    _cairo_clip_fini (&recording_surface->clip);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -244,8 +258,7 @@ _cairo_recording_surface_acquire_source_image (void			 *abstract_surface,
     cairo_surface_t *image;
 
     image = _cairo_surface_has_snapshot (&surface->base,
-					 &_cairo_image_surface_backend,
-					 surface->content);
+					 &_cairo_image_surface_backend);
     if (image != NULL) {
 	*image_out = (cairo_image_surface_t *) cairo_surface_reference (image);
 	*image_extra = NULL;
@@ -268,11 +281,7 @@ _cairo_recording_surface_acquire_source_image (void			 *abstract_surface,
 	return status;
     }
 
-    status = _cairo_surface_attach_snapshot (&surface->base, image, NULL);
-    if (unlikely (status)) {
-	cairo_surface_destroy (image);
-	return status;
-    }
+    _cairo_surface_attach_snapshot (&surface->base, image, NULL);
 
     *image_out = (cairo_image_surface_t *) image;
     *image_extra = NULL;
@@ -342,8 +351,9 @@ _cairo_recording_surface_paint (void			  *abstract_surface,
     return CAIRO_STATUS_SUCCESS;
 
   CLEANUP_SOURCE:
-    _cairo_pattern_fini_snapshot (&command->source.base);
+    _cairo_pattern_fini (&command->source.base);
   CLEANUP_COMMAND:
+    _cairo_clip_fini (&command->header.clip);
     free (command);
     return status;
 }
@@ -383,10 +393,11 @@ _cairo_recording_surface_mask (void			*abstract_surface,
     return CAIRO_STATUS_SUCCESS;
 
   CLEANUP_MASK:
-    _cairo_pattern_fini_snapshot (&command->mask.base);
+    _cairo_pattern_fini (&command->mask.base);
   CLEANUP_SOURCE:
-    _cairo_pattern_fini_snapshot (&command->source.base);
+    _cairo_pattern_fini (&command->source.base);
   CLEANUP_COMMAND:
+    _cairo_clip_fini (&command->header.clip);
     free (command);
     return status;
 }
@@ -396,9 +407,9 @@ _cairo_recording_surface_stroke (void			*abstract_surface,
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 cairo_path_fixed_t	*path,
-				 cairo_stroke_style_t	*style,
-				 cairo_matrix_t		*ctm,
-				 cairo_matrix_t		*ctm_inverse,
+				 const cairo_stroke_style_t	*style,
+				 const cairo_matrix_t		*ctm,
+				 const cairo_matrix_t		*ctm_inverse,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
 				 cairo_clip_t		*clip)
@@ -444,8 +455,9 @@ _cairo_recording_surface_stroke (void			*abstract_surface,
   CLEANUP_PATH:
     _cairo_path_fixed_fini (&command->path);
   CLEANUP_SOURCE:
-    _cairo_pattern_fini_snapshot (&command->source.base);
+    _cairo_pattern_fini (&command->source.base);
   CLEANUP_COMMAND:
+    _cairo_clip_fini (&command->header.clip);
     free (command);
     return status;
 }
@@ -494,8 +506,9 @@ _cairo_recording_surface_fill (void			*abstract_surface,
   CLEANUP_PATH:
     _cairo_path_fixed_fini (&command->path);
   CLEANUP_SOURCE:
-    _cairo_pattern_fini_snapshot (&command->source.base);
+    _cairo_pattern_fini (&command->source.base);
   CLEANUP_COMMAND:
+    _cairo_clip_fini (&command->header.clip);
     free (command);
     return status;
 }
@@ -587,8 +600,9 @@ _cairo_recording_surface_show_text_glyphs (void				*abstract_surface,
     free (command->glyphs);
     free (command->clusters);
 
-    _cairo_pattern_fini_snapshot (&command->source.base);
+    _cairo_pattern_fini (&command->source.base);
   CLEANUP_COMMAND:
+    _cairo_clip_fini (&command->header.clip);
     free (command);
     return status;
 }
@@ -611,25 +625,37 @@ _cairo_recording_surface_snapshot (void *abstract_other)
 {
     cairo_recording_surface_t *other = abstract_other;
     cairo_recording_surface_t *recording_surface;
+    cairo_status_t status;
 
     recording_surface = malloc (sizeof (cairo_recording_surface_t));
     if (unlikely (recording_surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&recording_surface->base, &cairo_recording_surface_backend,
+    _cairo_surface_init (&recording_surface->base,
+			 &cairo_recording_surface_backend,
+			 NULL, /* device */
 			 other->base.content);
 
     recording_surface->extents_pixels = other->extents_pixels;
     recording_surface->extents = other->extents;
     recording_surface->unbounded = other->unbounded;
-    recording_surface->replay_start_idx = other->replay_start_idx;
     recording_surface->content = other->content;
 
-    _cairo_array_init_snapshot (&recording_surface->commands, &other->commands);
-    recording_surface->commands_owner = cairo_surface_reference (&other->base);
-
     _cairo_clip_init_copy (&recording_surface->clip, &other->clip);
 
+    /* XXX We should in theory be able to reuse the original array, but we
+     * need to handle reference cycles during subsurface and self-copy.
+     */
+    recording_surface->replay_start_idx = 0;
+    recording_surface->base.is_clear = TRUE;
+
+    _cairo_array_init (&recording_surface->commands, sizeof (cairo_command_t *));
+    status = _cairo_recording_surface_replay (&other->base, &recording_surface->base);
+    if (unlikely (status)) {
+	cairo_surface_destroy (&recording_surface->base);
+	return _cairo_surface_create_in_error (status);
+    }
+
     return &recording_surface->base;
 }
 
@@ -782,6 +808,7 @@ _cairo_recording_surface_get_path (cairo_surface_t    *surface,
 #define _clip(c) ((c)->header.clip.path ? &(c)->header.clip : NULL)
 static cairo_status_t
 _cairo_recording_surface_replay_internal (cairo_surface_t	     *surface,
+					  const cairo_rectangle_int_t *surface_extents,
 					  cairo_surface_t	     *target,
 					  cairo_recording_replay_type_t type,
 					  cairo_recording_region_type_t region)
@@ -796,15 +823,25 @@ _cairo_recording_surface_replay_internal (cairo_surface_t	     *surface,
 	return surface->status;
 
     if (unlikely (target->status))
-	return _cairo_surface_set_error (surface, target->status);
+	return target->status;
+
+    if (unlikely (surface->finished))
+	return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED);
+
+    if (surface->is_clear)
+	return CAIRO_STATUS_SUCCESS;
+
+    assert (_cairo_surface_is_recording (surface));
 
     _cairo_surface_wrapper_init (&wrapper, target);
+    _cairo_surface_wrapper_set_extents (&wrapper, surface_extents);
 
     recording_surface = (cairo_recording_surface_t *) surface;
     status = CAIRO_STATUS_SUCCESS;
 
     num_elements = recording_surface->commands.num_elements;
     elements = _cairo_array_index (&recording_surface->commands, 0);
+
     for (i = recording_surface->replay_start_idx; i < num_elements; i++) {
 	cairo_command_t *command = elements[i];
 
@@ -971,7 +1008,7 @@ cairo_status_t
 _cairo_recording_surface_replay (cairo_surface_t *surface,
 				 cairo_surface_t *target)
 {
-    return _cairo_recording_surface_replay_internal (surface,
+    return _cairo_recording_surface_replay_internal (surface, NULL,
 						     target,
 						     CAIRO_RECORDING_REPLAY,
 						     CAIRO_RECORDING_REGION_ALL);
@@ -987,7 +1024,7 @@ cairo_status_t
 _cairo_recording_surface_replay_and_create_regions (cairo_surface_t *surface,
 						    cairo_surface_t *target)
 {
-    return _cairo_recording_surface_replay_internal (surface,
+    return _cairo_recording_surface_replay_internal (surface, NULL,
 						     target,
 						     CAIRO_RECORDING_CREATE_REGIONS,
 						     CAIRO_RECORDING_REGION_ALL);
@@ -995,10 +1032,11 @@ _cairo_recording_surface_replay_and_create_regions (cairo_surface_t *surface,
 
 cairo_status_t
 _cairo_recording_surface_replay_region (cairo_surface_t          *surface,
+					const cairo_rectangle_int_t *surface_extents,
 					cairo_surface_t          *target,
 					cairo_recording_region_type_t  region)
 {
-    return _cairo_recording_surface_replay_internal (surface,
+    return _cairo_recording_surface_replay_internal (surface, surface_extents,
 						     target,
 						     CAIRO_RECORDING_REPLAY,
 						     region);
diff --git a/gfx/cairo/cairo/src/cairo-rectangle.c b/gfx/cairo/cairo/src/cairo-rectangle.c
index 40a8bc95c4b..b94f7d511e1 100644
--- a/gfx/cairo/cairo/src/cairo-rectangle.c
+++ b/gfx/cairo/cairo/src/cairo-rectangle.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -266,24 +266,3 @@ _cairo_box_contains_point (cairo_box_t *box, const cairo_point_t *point)
 	return FALSE;
     return TRUE;
 }
-
-void
-_cairo_composite_rectangles_init(
-        cairo_composite_rectangles_t	*rects,
-        int				 all_x,
-        int				 all_y,
-        int				 width,
-        int				 height)
-{
-        rects->src.x = all_x;
-        rects->src.y = all_y;
-        rects->mask.x = all_x;
-        rects->mask.y = all_y;
-        rects->clip.x = all_x;
-        rects->clip.y = all_y;
-        rects->dst.x = all_x;
-        rects->dst.y = all_y;
-
-        rects->width = width;
-        rects->height = height;
-}
diff --git a/gfx/cairo/cairo/src/cairo-rectangular-scan-converter.c b/gfx/cairo/cairo/src/cairo-rectangular-scan-converter.c
new file mode 100644
index 00000000000..dab2c151f83
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-rectangular-scan-converter.c
@@ -0,0 +1,723 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-combsort-private.h"
+#include "cairo-error-private.h"
+#include "cairo-freelist-private.h"
+#include "cairo-list-private.h"
+#include "cairo-spans-private.h"
+
+#include <setjmp.h>
+
+typedef struct _rectangle {
+    struct _rectangle *next, *prev;
+    cairo_fixed_t left, right;
+    cairo_fixed_t top, bottom;
+    int32_t top_y, bottom_y;
+    int dir;
+} rectangle_t;
+
+#define UNROLL3(x) x x x
+
+/* the parent is always given by index/2 */
+#define PQ_PARENT_INDEX(i) ((i) >> 1)
+#define PQ_FIRST_ENTRY 1
+
+/* left and right children are index * 2 and (index * 2) +1 respectively */
+#define PQ_LEFT_CHILD_INDEX(i) ((i) << 1)
+
+typedef struct _pqueue {
+    int size, max_size;
+
+    rectangle_t **elements;
+    rectangle_t *elements_embedded[1024];
+} pqueue_t;
+
+typedef struct {
+    rectangle_t **start;
+    pqueue_t stop;
+    rectangle_t head, tail;
+    rectangle_t *insert_cursor;
+    int32_t current_y;
+    int32_t xmin, xmax;
+
+    struct coverage {
+	struct cell {
+	    struct cell *prev, *next;
+	    int x, covered, uncovered;
+	} head, tail, *cursor;
+	unsigned int count;
+	cairo_freepool_t pool;
+    } coverage;
+
+    cairo_half_open_span_t spans_stack[CAIRO_STACK_ARRAY_LENGTH (cairo_half_open_span_t)];
+    cairo_half_open_span_t *spans;
+    unsigned int num_spans;
+    unsigned int size_spans;
+
+    jmp_buf jmpbuf;
+} sweep_line_t;
+
+static inline int
+rectangle_compare_start (const rectangle_t *a,
+			 const rectangle_t *b)
+{
+    int cmp;
+
+    cmp = a->top_y - b->top_y;
+    if (cmp)
+	return cmp;
+
+    return a->left - b->left;
+}
+
+static inline int
+rectangle_compare_stop (const rectangle_t *a,
+			const rectangle_t *b)
+{
+    return a->bottom_y - b->bottom_y;
+}
+
+static inline void
+pqueue_init (pqueue_t *pq)
+{
+    pq->max_size = ARRAY_LENGTH (pq->elements_embedded);
+    pq->size = 0;
+
+    pq->elements = pq->elements_embedded;
+    pq->elements[PQ_FIRST_ENTRY] = NULL;
+}
+
+static inline void
+pqueue_fini (pqueue_t *pq)
+{
+    if (pq->elements != pq->elements_embedded)
+	free (pq->elements);
+}
+
+static cairo_bool_t
+pqueue_grow (pqueue_t *pq)
+{
+    rectangle_t **new_elements;
+    pq->max_size *= 2;
+
+    if (pq->elements == pq->elements_embedded) {
+	new_elements = _cairo_malloc_ab (pq->max_size,
+					 sizeof (rectangle_t *));
+	if (unlikely (new_elements == NULL))
+	    return FALSE;
+
+	memcpy (new_elements, pq->elements_embedded,
+		sizeof (pq->elements_embedded));
+    } else {
+	new_elements = _cairo_realloc_ab (pq->elements,
+					  pq->max_size,
+					  sizeof (rectangle_t *));
+	if (unlikely (new_elements == NULL))
+	    return FALSE;
+    }
+
+    pq->elements = new_elements;
+    return TRUE;
+}
+
+static inline void
+pqueue_push (sweep_line_t *sweep, rectangle_t *rectangle)
+{
+    rectangle_t **elements;
+    int i, parent;
+
+    if (unlikely (sweep->stop.size + 1 == sweep->stop.max_size)) {
+	if (unlikely (! pqueue_grow (&sweep->stop)))
+	    longjmp (sweep->jmpbuf,
+		     _cairo_error (CAIRO_STATUS_NO_MEMORY));
+    }
+
+    elements = sweep->stop.elements;
+    for (i = ++sweep->stop.size;
+	 i != PQ_FIRST_ENTRY &&
+	 rectangle_compare_stop (rectangle,
+				 elements[parent = PQ_PARENT_INDEX (i)]) < 0;
+	 i = parent)
+    {
+	elements[i] = elements[parent];
+    }
+
+    elements[i] = rectangle;
+}
+
+static inline void
+pqueue_pop (pqueue_t *pq)
+{
+    rectangle_t **elements = pq->elements;
+    rectangle_t *tail;
+    int child, i;
+
+    tail = elements[pq->size--];
+    if (pq->size == 0) {
+	elements[PQ_FIRST_ENTRY] = NULL;
+	return;
+    }
+
+    for (i = PQ_FIRST_ENTRY;
+	 (child = PQ_LEFT_CHILD_INDEX (i)) <= pq->size;
+	 i = child)
+    {
+	if (child != pq->size &&
+	    rectangle_compare_stop (elements[child+1],
+				    elements[child]) < 0)
+	{
+	    child++;
+	}
+
+	if (rectangle_compare_stop (elements[child], tail) >= 0)
+	    break;
+
+	elements[i] = elements[child];
+    }
+    elements[i] = tail;
+}
+
+static inline rectangle_t *
+peek_stop (sweep_line_t *sweep)
+{
+    return sweep->stop.elements[PQ_FIRST_ENTRY];
+}
+
+CAIRO_COMBSORT_DECLARE (rectangle_sort, rectangle_t *, rectangle_compare_start)
+
+static void
+sweep_line_init (sweep_line_t *sweep)
+{
+    sweep->head.left = INT_MIN;
+    sweep->head.next = &sweep->tail;
+    sweep->tail.left = INT_MAX;
+    sweep->tail.prev = &sweep->head;
+    sweep->insert_cursor = &sweep->tail;
+
+    _cairo_freepool_init (&sweep->coverage.pool, sizeof (struct cell));
+
+    sweep->spans = sweep->spans_stack;
+    sweep->size_spans = ARRAY_LENGTH (sweep->spans_stack);
+
+    sweep->coverage.head.prev = NULL;
+    sweep->coverage.head.x = INT_MIN;
+    sweep->coverage.tail.next = NULL;
+    sweep->coverage.tail.x = INT_MAX;
+
+    pqueue_init (&sweep->stop);
+}
+
+static void
+sweep_line_fini (sweep_line_t *sweep)
+{
+    _cairo_freepool_fini (&sweep->coverage.pool);
+    pqueue_fini (&sweep->stop);
+
+    if (sweep->spans != sweep->spans_stack)
+	free (sweep->spans);
+}
+
+static inline void
+add_cell (sweep_line_t *sweep, int x, int covered, int uncovered)
+{
+    struct cell *cell;
+
+    cell = sweep->coverage.cursor;
+    if (cell->x > x) {
+	do {
+	    UNROLL3({
+		if (cell->prev->x < x)
+		    break;
+		cell = cell->prev;
+	    })
+	} while (TRUE);
+    } else {
+	if (cell->x == x)
+	    goto found;
+
+	do {
+	    UNROLL3({
+		cell = cell->next;
+		if (cell->x >= x)
+		    break;
+	    })
+	} while (TRUE);
+    }
+
+    if (x != cell->x) {
+	struct cell *c;
+
+	sweep->coverage.count++;
+
+	c = _cairo_freepool_alloc (&sweep->coverage.pool);
+	if (unlikely (c == NULL)) {
+	    longjmp (sweep->jmpbuf,
+		     _cairo_error (CAIRO_STATUS_NO_MEMORY));
+	}
+
+	cell->prev->next = c;
+	c->prev = cell->prev;
+	c->next = cell;
+	cell->prev = c;
+
+	c->x = x;
+	c->covered = 0;
+	c->uncovered = 0;
+
+	cell = c;
+    }
+
+found:
+    cell->covered += covered;
+    cell->uncovered += uncovered;
+    sweep->coverage.cursor = cell;
+}
+
+static inline void
+_active_edges_to_spans (sweep_line_t	*sweep)
+{
+    int32_t y = sweep->current_y;
+    rectangle_t *rectangle;
+    int coverage, prev_coverage;
+    int prev_x;
+    struct cell *cell;
+
+    sweep->num_spans = 0;
+    if (sweep->head.next == &sweep->tail)
+	return;
+
+    sweep->coverage.head.next = &sweep->coverage.tail;
+    sweep->coverage.tail.prev = &sweep->coverage.head;
+    sweep->coverage.cursor = &sweep->coverage.tail;
+    sweep->coverage.count = 0;
+
+    /* XXX cell coverage only changes when a rectangle appears or
+     * disappears. Try only modifying coverage at such times.
+     */
+    for (rectangle = sweep->head.next;
+	 rectangle != &sweep->tail;
+	 rectangle = rectangle->next)
+    {
+	int height;
+	int frac, i;
+
+	if (y == rectangle->bottom_y) {
+	    height = rectangle->bottom & CAIRO_FIXED_FRAC_MASK;
+	    if (height == 0)
+		continue;
+	} else
+	    height = CAIRO_FIXED_ONE;
+	if (y == rectangle->top_y)
+	    height -= rectangle->top & CAIRO_FIXED_FRAC_MASK;
+	height *= rectangle->dir;
+
+	i = _cairo_fixed_integer_part (rectangle->left),
+	frac = _cairo_fixed_fractional_part (rectangle->left);
+	add_cell (sweep, i,
+		  (CAIRO_FIXED_ONE-frac) * height,
+		  frac * height);
+
+	i = _cairo_fixed_integer_part (rectangle->right),
+	frac = _cairo_fixed_fractional_part (rectangle->right);
+	add_cell (sweep, i,
+		  -(CAIRO_FIXED_ONE-frac) * height,
+		  -frac * height);
+    }
+
+    if (2*sweep->coverage.count >= sweep->size_spans) {
+	unsigned size;
+
+	size = sweep->size_spans;
+	while (size <= 2*sweep->coverage.count)
+	    size <<= 1;
+
+	if (sweep->spans != sweep->spans_stack)
+	    free (sweep->spans);
+
+	sweep->spans = _cairo_malloc_ab (size, sizeof (cairo_half_open_span_t));
+	if (unlikely (sweep->spans == NULL))
+	    longjmp (sweep->jmpbuf, _cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+	sweep->size_spans = size;
+    }
+
+    prev_coverage = coverage = 0;
+    prev_x = INT_MIN;
+    for (cell = sweep->coverage.head.next; cell != &sweep->coverage.tail; cell = cell->next) {
+	if (cell->x != prev_x && coverage != prev_coverage) {
+	    int n = sweep->num_spans++;
+	    sweep->spans[n].x = prev_x;
+	    sweep->spans[n].coverage = coverage >> (CAIRO_FIXED_FRAC_BITS * 2 - 8);
+	    sweep->spans[n].coverage -= sweep->spans[n].coverage >> 8;
+	    prev_coverage = coverage;
+	}
+
+	coverage += cell->covered;
+	if (coverage != prev_coverage) {
+	    int n = sweep->num_spans++;
+	    sweep->spans[n].x = cell->x;
+	    sweep->spans[n].coverage = coverage >> (CAIRO_FIXED_FRAC_BITS * 2 - 8);
+	    sweep->spans[n].coverage -= sweep->spans[n].coverage >> 8;
+	    prev_coverage = coverage;
+	}
+	coverage += cell->uncovered;
+	prev_x = cell->x + 1;
+    }
+    _cairo_freepool_reset (&sweep->coverage.pool);
+
+    if (sweep->num_spans) {
+	if (prev_x <= sweep->xmax) {
+	    int n = sweep->num_spans++;
+	    sweep->spans[n].x = prev_x;
+	    sweep->spans[n].coverage = coverage;
+	}
+
+	if (coverage && prev_x < sweep->xmax) {
+	    int n = sweep->num_spans++;
+	    sweep->spans[n].x = sweep->xmax;
+	    sweep->spans[n].coverage = 0;
+	}
+    }
+}
+
+static inline void
+sweep_line_delete (sweep_line_t	*sweep,
+			     rectangle_t	*rectangle)
+{
+    if (sweep->insert_cursor == rectangle)
+	sweep->insert_cursor = rectangle->next;
+
+    rectangle->prev->next = rectangle->next;
+    rectangle->next->prev = rectangle->prev;
+
+    pqueue_pop (&sweep->stop);
+}
+
+static inline void
+sweep_line_insert (sweep_line_t	*sweep,
+		   rectangle_t	*rectangle)
+{
+    rectangle_t *pos;
+
+    pos = sweep->insert_cursor;
+    if (pos->left != rectangle->left) {
+	if (pos->left > rectangle->left) {
+	    do {
+		UNROLL3({
+		    if (pos->prev->left < rectangle->left)
+			break;
+		    pos = pos->prev;
+		})
+	    } while (TRUE);
+	} else {
+	    do {
+		UNROLL3({
+		    pos = pos->next;
+		    if (pos->left >= rectangle->left)
+			break;
+		});
+	    } while (TRUE);
+	}
+    }
+
+    pos->prev->next = rectangle;
+    rectangle->prev = pos->prev;
+    rectangle->next = pos;
+    pos->prev = rectangle;
+    sweep->insert_cursor = rectangle;
+
+    pqueue_push (sweep, rectangle);
+}
+
+static void
+render_rows (sweep_line_t *sweep_line,
+	     cairo_span_renderer_t *renderer,
+	     int height)
+{
+    cairo_status_t status;
+
+    _active_edges_to_spans (sweep_line);
+
+    status = renderer->render_rows (renderer,
+				    sweep_line->current_y, height,
+				    sweep_line->spans,
+				    sweep_line->num_spans);
+    if (unlikely (status))
+	longjmp (sweep_line->jmpbuf, status);
+}
+
+static cairo_status_t
+generate (cairo_rectangular_scan_converter_t *self,
+	  cairo_span_renderer_t	*renderer,
+	  rectangle_t **rectangles)
+{
+    sweep_line_t sweep_line;
+    rectangle_t *start, *stop;
+    cairo_status_t status;
+
+    sweep_line_init (&sweep_line);
+    sweep_line.xmin = self->xmin;
+    sweep_line.xmax = self->xmax;
+    sweep_line.start = rectangles;
+    if ((status = setjmp (sweep_line.jmpbuf)))
+	goto BAIL;
+
+    sweep_line.current_y = self->ymin;
+    start = *sweep_line.start++;
+    do {
+	if (start->top_y != sweep_line.current_y) {
+	    render_rows (&sweep_line, renderer,
+			 start->top_y - sweep_line.current_y);
+	    sweep_line.current_y = start->top_y;
+	}
+
+	do {
+	    sweep_line_insert (&sweep_line, start);
+	    start = *sweep_line.start++;
+	    if (start == NULL)
+		goto end;
+	    if (start->top_y != sweep_line.current_y)
+		break;
+	} while (TRUE);
+
+	render_rows (&sweep_line, renderer, 1);
+
+	stop = peek_stop (&sweep_line);
+	while (stop->bottom_y == sweep_line.current_y) {
+	    sweep_line_delete (&sweep_line, stop);
+	    stop = peek_stop (&sweep_line);
+	    if (stop == NULL)
+		break;
+	}
+
+	sweep_line.current_y++;
+
+	while (stop != NULL && stop->bottom_y < start->top_y) {
+	    if (stop->bottom_y != sweep_line.current_y) {
+		render_rows (&sweep_line, renderer,
+			     stop->bottom_y - sweep_line.current_y);
+		sweep_line.current_y = stop->bottom_y;
+	    }
+
+	    render_rows (&sweep_line, renderer, 1);
+
+	    do {
+		sweep_line_delete (&sweep_line, stop);
+		stop = peek_stop (&sweep_line);
+	    } while (stop != NULL && stop->bottom_y == sweep_line.current_y);
+
+	    sweep_line.current_y++;
+	}
+    } while (TRUE);
+
+  end:
+    render_rows (&sweep_line, renderer, 1);
+
+    stop = peek_stop (&sweep_line);
+    while (stop->bottom_y == sweep_line.current_y) {
+	sweep_line_delete (&sweep_line, stop);
+	stop = peek_stop (&sweep_line);
+	if (stop == NULL)
+	    goto out;
+    }
+
+    sweep_line.current_y++;
+
+    do {
+	if (stop->bottom_y != sweep_line.current_y) {
+	    render_rows (&sweep_line, renderer,
+			 stop->bottom_y - sweep_line.current_y);
+	    sweep_line.current_y = stop->bottom_y;
+	}
+
+	render_rows (&sweep_line, renderer, 1);
+
+	do {
+	    sweep_line_delete (&sweep_line, stop);
+	    stop = peek_stop (&sweep_line);
+	    if (stop == NULL)
+		goto out;
+	} while (stop->bottom_y == sweep_line.current_y);
+
+	sweep_line.current_y++;
+    } while (TRUE);
+
+  out:
+    status =  renderer->render_rows (renderer,
+				     sweep_line.current_y,
+				     self->ymax - sweep_line.current_y,
+				     NULL, 0);
+
+  BAIL:
+    sweep_line_fini (&sweep_line);
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_rectangular_scan_converter_generate (void			*converter,
+					    cairo_span_renderer_t	*renderer)
+{
+    cairo_rectangular_scan_converter_t *self = converter;
+    rectangle_t *rectangles_stack[CAIRO_STACK_ARRAY_LENGTH (rectangle_t *)];
+    rectangle_t **rectangles;
+    struct _cairo_rectangular_scan_converter_chunk *chunk;
+    cairo_status_t status;
+    int i, j;
+
+    if (unlikely (self->num_rectangles == 0)) {
+	return renderer->render_rows (renderer,
+				      self->ymin, self->ymax - self->ymin,
+				      NULL, 0);
+    }
+
+    rectangles = rectangles_stack;
+    if (unlikely (self->num_rectangles >= ARRAY_LENGTH (rectangles_stack))) {
+	rectangles = _cairo_malloc_ab (self->num_rectangles + 1,
+				       sizeof (rectangle_t *));
+	if (unlikely (rectangles == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    j = 0;
+    for (chunk = &self->chunks; chunk != NULL; chunk = chunk->next) {
+	rectangle_t *rectangle;
+
+	rectangle = chunk->base;
+	for (i = 0; i < chunk->count; i++)
+	    rectangles[j++] = &rectangle[i];
+    }
+    rectangle_sort (rectangles, j);
+    rectangles[j] = NULL;
+
+    status = generate (self, renderer, rectangles);
+
+    if (rectangles != rectangles_stack)
+	free (rectangles);
+
+    return status;
+}
+
+static rectangle_t *
+_allocate_rectangle (cairo_rectangular_scan_converter_t *self)
+{
+    rectangle_t *rectangle;
+    struct _cairo_rectangular_scan_converter_chunk *chunk;
+
+    chunk = self->tail;
+    if (chunk->count == chunk->size) {
+	int size;
+
+	size = chunk->size * 2;
+	chunk->next = _cairo_malloc_ab_plus_c (size,
+					       sizeof (rectangle_t),
+					       sizeof (struct _cairo_rectangular_scan_converter_chunk));
+
+	if (unlikely (chunk->next == NULL))
+	    return NULL;
+
+	chunk = chunk->next;
+	chunk->next = NULL;
+	chunk->count = 0;
+	chunk->size = size;
+	chunk->base = chunk + 1;
+	self->tail = chunk;
+    }
+
+    rectangle = chunk->base;
+    return rectangle + chunk->count++;
+}
+
+cairo_status_t
+_cairo_rectangular_scan_converter_add_box (cairo_rectangular_scan_converter_t *self,
+					   const cairo_box_t *box,
+					   int dir)
+{
+    rectangle_t *rectangle;
+
+    rectangle = _allocate_rectangle (self);
+    if (unlikely (rectangle == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    rectangle->left  = box->p1.x;
+    rectangle->right = box->p2.x;
+    rectangle->dir = dir;
+
+    rectangle->top = box->p1.y;
+    rectangle->top_y  = _cairo_fixed_integer_floor (box->p1.y);
+    rectangle->bottom = box->p2.y;
+    rectangle->bottom_y = _cairo_fixed_integer_floor (box->p2.y);
+    assert (rectangle->bottom_y >= rectangle->top_y);
+
+    self->num_rectangles++;
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_cairo_rectangular_scan_converter_destroy (void *converter)
+{
+    cairo_rectangular_scan_converter_t *self = converter;
+    struct _cairo_rectangular_scan_converter_chunk *chunk, *next;
+
+    for (chunk = self->chunks.next; chunk != NULL; chunk = next) {
+	next = chunk->next;
+	free (chunk);
+    }
+}
+
+void
+_cairo_rectangular_scan_converter_init (cairo_rectangular_scan_converter_t *self,
+					const cairo_rectangle_int_t *extents)
+{
+    self->base.destroy = _cairo_rectangular_scan_converter_destroy;
+    self->base.add_edge = NULL;
+    self->base.add_polygon = NULL;
+    self->base.generate = _cairo_rectangular_scan_converter_generate;
+
+    self->xmin = extents->x;
+    self->xmax = extents->x + extents->width;
+    self->ymin = extents->y;
+    self->ymax = extents->y + extents->height;
+
+    self->chunks.base = self->buf;
+    self->chunks.next = NULL;
+    self->chunks.count = 0;
+    self->chunks.size = sizeof (self->buf) / sizeof (rectangle_t);
+    self->tail = &self->chunks;
+
+    self->num_rectangles = 0;
+}
diff --git a/gfx/cairo/cairo/src/cairo-reference-count-private.h b/gfx/cairo/cairo/src/cairo-reference-count-private.h
index d6adaad9683..0cb5695dd06 100644
--- a/gfx/cairo/cairo/src/cairo-reference-count-private.h
+++ b/gfx/cairo/cairo/src/cairo-reference-count-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -50,7 +50,6 @@ typedef struct {
 #define CAIRO_REFERENCE_COUNT_INIT(RC, VALUE) ((RC)->ref_count = (VALUE))
 
 #define CAIRO_REFERENCE_COUNT_GET_VALUE(RC) _cairo_atomic_int_get (&(RC)->ref_count)
-#define CAIRO_REFERENCE_COUNT_SET_VALUE(RC, VALUE) _cairo_atomic_int_set (&(RC)->ref_count, (VALUE))
 
 #define CAIRO_REFERENCE_COUNT_INVALID_VALUE ((cairo_atomic_int_t) -1)
 #define CAIRO_REFERENCE_COUNT_INVALID {CAIRO_REFERENCE_COUNT_INVALID_VALUE}
diff --git a/gfx/cairo/cairo/src/cairo-region-private.h b/gfx/cairo/cairo/src/cairo-region-private.h
index 507f72e842f..11070ba768e 100644
--- a/gfx/cairo/cairo/src/cairo-region-private.h
+++ b/gfx/cairo/cairo/src/cairo-region-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -53,6 +53,9 @@ struct _cairo_region {
     pixman_region32_t rgn;
 };
 
+cairo_private cairo_region_t *
+_cairo_region_create_in_error (cairo_status_t status);
+
 cairo_private void
 _cairo_region_init (cairo_region_t *region);
 
diff --git a/gfx/cairo/cairo/src/cairo-region.c b/gfx/cairo/cairo/src/cairo-region.c
index 2148fcabbc2..112b1d82423 100644
--- a/gfx/cairo/cairo/src/cairo-region.c
+++ b/gfx/cairo/cairo/src/cairo-region.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,16 +38,78 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-region-private.h"
 
 /* XXX need to update pixman headers to be const as appropriate */
 #define CONST_CAST (pixman_region32_t *)
 
+/**
+ * SECTION:cairo-region
+ * @Title: Regions
+ * @Short_Description: Representing a pixel-aligned area
+ *
+ * Regions are a simple graphical data type representing an area of 
+ * integer-aligned rectangles. They are often used on raster surfaces 
+ * to track areas of interest, such as change or clip areas.
+ */
+
 static const cairo_region_t _cairo_region_nil = {
     CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
     CAIRO_STATUS_NO_MEMORY,		/* status */
 };
 
+cairo_region_t *
+_cairo_region_create_in_error (cairo_status_t status)
+{
+    switch (status) {
+    case CAIRO_STATUS_NO_MEMORY:
+	return (cairo_region_t *) &_cairo_region_nil;
+
+    case CAIRO_STATUS_SUCCESS:
+    case CAIRO_STATUS_LAST_STATUS:
+	ASSERT_NOT_REACHED;
+	/* fall-through */
+    case CAIRO_STATUS_SURFACE_TYPE_MISMATCH:
+    case CAIRO_STATUS_INVALID_STATUS:
+    case CAIRO_STATUS_INVALID_CONTENT:
+    case CAIRO_STATUS_INVALID_FORMAT:
+    case CAIRO_STATUS_INVALID_VISUAL:
+    case CAIRO_STATUS_READ_ERROR:
+    case CAIRO_STATUS_WRITE_ERROR:
+    case CAIRO_STATUS_FILE_NOT_FOUND:
+    case CAIRO_STATUS_TEMP_FILE_ERROR:
+    case CAIRO_STATUS_INVALID_STRIDE:
+    case CAIRO_STATUS_INVALID_SIZE:
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH:
+    case CAIRO_STATUS_DEVICE_ERROR:
+    case CAIRO_STATUS_INVALID_RESTORE:
+    case CAIRO_STATUS_INVALID_POP_GROUP:
+    case CAIRO_STATUS_NO_CURRENT_POINT:
+    case CAIRO_STATUS_INVALID_MATRIX:
+    case CAIRO_STATUS_NULL_POINTER:
+    case CAIRO_STATUS_INVALID_STRING:
+    case CAIRO_STATUS_INVALID_PATH_DATA:
+    case CAIRO_STATUS_SURFACE_FINISHED:
+    case CAIRO_STATUS_PATTERN_TYPE_MISMATCH:
+    case CAIRO_STATUS_INVALID_DASH:
+    case CAIRO_STATUS_INVALID_DSC_COMMENT:
+    case CAIRO_STATUS_INVALID_INDEX:
+    case CAIRO_STATUS_CLIP_NOT_REPRESENTABLE:
+    case CAIRO_STATUS_FONT_TYPE_MISMATCH:
+    case CAIRO_STATUS_USER_FONT_IMMUTABLE:
+    case CAIRO_STATUS_USER_FONT_ERROR:
+    case CAIRO_STATUS_NEGATIVE_COUNT:
+    case CAIRO_STATUS_INVALID_CLUSTERS:
+    case CAIRO_STATUS_INVALID_SLANT:
+    case CAIRO_STATUS_INVALID_WEIGHT:
+    case CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED:
+    default:
+	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
+	return (cairo_region_t *) &_cairo_region_nil;
+    }
+}
+
 /**
  * _cairo_region_set_error:
  * @region: a region
@@ -144,6 +206,21 @@ cairo_region_create (void)
 }
 slim_hidden_def (cairo_region_create);
 
+/**
+ * cairo_region_create_rectangles:
+ * @rects: an array of @count rectangles
+ * @count: number of rectangles
+ *
+ * Allocates a new region object containing the union of all given @rects.
+ *
+ * Return value: A newly allocated #cairo_region_t. Free with
+ *   cairo_region_destroy(). This function always returns a
+ *   valid pointer; if memory cannot be allocated, then a special
+ *   error object is returned where all operations on the object do nothing.
+ *   You can check for this with cairo_region_status().
+ *
+ * Since: 1.10
+ **/
 cairo_region_t *
 cairo_region_create_rectangles (const cairo_rectangle_int_t *rects,
 				int count)
@@ -154,17 +231,14 @@ cairo_region_create_rectangles (const cairo_rectangle_int_t *rects,
     int i;
 
     region = _cairo_malloc (sizeof (cairo_region_t));
-    if (unlikely (region == NULL)) {
-	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-	return (cairo_region_t *) &_cairo_region_nil;
-    }
+    if (unlikely (region == NULL))
+	return _cairo_region_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
     if (count > ARRAY_LENGTH (stack_pboxes)) {
 	pboxes = _cairo_malloc_ab (count, sizeof (pixman_box32_t));
 	if (unlikely (pboxes == NULL)) {
 	    free (region);
-	    _cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-	    return (cairo_region_t *) &_cairo_region_nil;
+	    return _cairo_region_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 	}
     }
 
@@ -182,8 +256,7 @@ cairo_region_create_rectangles (const cairo_rectangle_int_t *rects,
 
     if (unlikely (i == 0)) {
 	free (region);
-	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-	return (cairo_region_t *) &_cairo_region_nil;
+	return _cairo_region_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
     }
 
     CAIRO_REFERENCE_COUNT_INIT (&region->ref_count, 1);
@@ -369,7 +442,7 @@ slim_hidden_def (cairo_region_get_rectangle);
 /**
  * cairo_region_get_extents:
  * @region: a #cairo_region_t
- * @rectangle: rectangle into which to store the extents
+ * @extents: rectangle into which to store the extents
  *
  * Gets the bounding rectangle of @region as a #cairo_rectangle_int_t
  *
@@ -491,7 +564,7 @@ slim_hidden_def (cairo_region_subtract_rectangle);
  * Since: 1.10
  **/
 cairo_status_t
-cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other)
+cairo_region_intersect (cairo_region_t *dst, const cairo_region_t *other)
 {
     if (dst->status)
 	return dst->status;
@@ -499,7 +572,7 @@ cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other)
     if (other->status)
 	return _cairo_region_set_error (dst, other->status);
 
-    if (! pixman_region32_intersect (&dst->rgn, &dst->rgn, &other->rgn))
+    if (! pixman_region32_intersect (&dst->rgn, &dst->rgn, CONST_CAST &other->rgn))
 	return _cairo_region_set_error (dst, CAIRO_STATUS_NO_MEMORY);
 
     return CAIRO_STATUS_SUCCESS;
@@ -554,7 +627,7 @@ slim_hidden_def (cairo_region_intersect_rectangle);
  **/
 cairo_status_t
 cairo_region_union (cairo_region_t *dst,
-		    cairo_region_t *other)
+		    const cairo_region_t *other)
 {
     if (dst->status)
 	return dst->status;
@@ -562,7 +635,7 @@ cairo_region_union (cairo_region_t *dst,
     if (other->status)
 	return _cairo_region_set_error (dst, other->status);
 
-    if (! pixman_region32_union (&dst->rgn, &dst->rgn, &other->rgn))
+    if (! pixman_region32_union (&dst->rgn, &dst->rgn, CONST_CAST &other->rgn))
 	return _cairo_region_set_error (dst, CAIRO_STATUS_NO_MEMORY);
 
     return CAIRO_STATUS_SUCCESS;
@@ -603,6 +676,86 @@ cairo_region_union_rectangle (cairo_region_t *dst,
 }
 slim_hidden_def (cairo_region_union_rectangle);
 
+/**
+ * cairo_region_xor:
+ * @dst: a #cairo_region_t
+ * @other: another #cairo_region_t
+ *
+ * Computes the exclusive difference of @dst with @other and places the
+ * result in @dst. That is, @dst will be set to contain all areas that
+ * are either in @dst or in @other, but not in both.
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY
+ *
+ * Since: 1.10
+ **/
+cairo_status_t
+cairo_region_xor (cairo_region_t *dst, const cairo_region_t *other)
+{
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    pixman_region32_t tmp;
+
+    if (dst->status)
+	return dst->status;
+
+    if (other->status)
+	return _cairo_region_set_error (dst, other->status);
+
+    pixman_region32_init (&tmp);
+
+    /* XXX: get an xor function into pixman */
+    if (! pixman_region32_subtract (&tmp, CONST_CAST &other->rgn, &dst->rgn) ||
+        ! pixman_region32_subtract (&dst->rgn, &dst->rgn, CONST_CAST &other->rgn) || 
+        ! pixman_region32_union (&dst->rgn, &dst->rgn, &tmp))
+	status = _cairo_region_set_error (dst, CAIRO_STATUS_NO_MEMORY);
+
+    pixman_region32_fini (&tmp);
+
+    return status;
+}
+slim_hidden_def (cairo_region_xor);
+
+/**
+ * cairo_region_xor_rectangle:
+ * @dst: a #cairo_region_t
+ * @rectangle: a #cairo_rectangle_int_t
+ *
+ * Computes the exclusive difference of @dst with @rectangle and places the
+ * result in @dst. That is, @dst will be set to contain all areas that are 
+ * either in @dst or in @rectangle, but not in both.
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY
+ *
+ * Since: 1.10
+ **/
+cairo_status_t
+cairo_region_xor_rectangle (cairo_region_t *dst,
+			    const cairo_rectangle_int_t *rectangle)
+{
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    pixman_region32_t region, tmp;
+
+    if (dst->status)
+	return dst->status;
+
+    pixman_region32_init_rect (&region,
+			       rectangle->x, rectangle->y,
+			       rectangle->width, rectangle->height);
+    pixman_region32_init (&tmp);
+
+    /* XXX: get an xor function into pixman */
+    if (! pixman_region32_subtract (&tmp, &region, &dst->rgn) ||
+        ! pixman_region32_subtract (&dst->rgn, &dst->rgn, &region) || 
+        ! pixman_region32_union (&dst->rgn, &dst->rgn, &tmp))
+	status = _cairo_region_set_error (dst, CAIRO_STATUS_NO_MEMORY);
+
+    pixman_region32_fini (&tmp);
+    pixman_region32_fini (&region);
+
+    return status;
+}
+slim_hidden_def (cairo_region_xor_rectangle);
+
 /**
  * cairo_region_is_empty:
  * @region: a #cairo_region_t
@@ -644,6 +797,16 @@ cairo_region_translate (cairo_region_t *region,
 }
 slim_hidden_def (cairo_region_translate);
 
+/**
+ * cairo_region_overlap_t:
+ * @CAIRO_REGION_OVERLAP_IN: The contents are entirely inside the region
+ * @CAIRO_REGION_OVERLAP_OUT: The contents are entirely outside the region
+ * @CAIRO_REGION_OVERLAP_PART: The contents are partially inside and
+ *     partially outside the region.
+ * 
+ * Used as the return value for cairo_region_contains_rectangle().
+ */
+
 /**
  * cairo_region_contains_rectangle:
  * @region: a #cairo_region_t
@@ -712,13 +875,14 @@ slim_hidden_def (cairo_region_contains_point);
 
 /**
  * cairo_region_equal:
- * @region_a: a #cairo_region_t
- * @region_b: a #cairo_region_t
+ * @a: a #cairo_region_t or %NULL
+ * @b: a #cairo_region_t or %NULL
  *
- * Compares whether region_a is equivalent to region_b.
+ * Compares whether region_a is equivalent to region_b. %NULL as an argument
+ * is equal to itself, but not to any non-%NULL region.
  *
  * Return value: %TRUE if both regions contained the same coverage,
- * %FALSE if it is not.
+ * %FALSE if it is not or any region is in an error status.
  *
  * Since: 1.10
  **/
diff --git a/gfx/cairo/cairo/src/cairo-rtree-private.h b/gfx/cairo/cairo/src/cairo-rtree-private.h
index edb7e3acb82..191c858713e 100644
--- a/gfx/cairo/cairo/src/cairo-rtree-private.h
+++ b/gfx/cairo/cairo/src/cairo-rtree-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -62,7 +62,6 @@ typedef struct _cairo_rtree_node {
 typedef struct _cairo_rtree {
     cairo_rtree_node_t root;
     int min_size;
-    void (*evict) (void *node);
     cairo_list_t pinned;
     cairo_list_t available;
     cairo_list_t evictable;
@@ -98,8 +97,7 @@ _cairo_rtree_init (cairo_rtree_t	*rtree,
 	           int			 width,
 		   int			 height,
 		   int			 min_size,
-		   int			 node_size,
-		   void			 (*evict) (void *node));
+		   int			 node_size);
 
 cairo_private cairo_int_status_t
 _cairo_rtree_insert (cairo_rtree_t	     *rtree,
@@ -113,8 +111,16 @@ _cairo_rtree_evict_random (cairo_rtree_t	 *rtree,
 		           int			  height,
 		           cairo_rtree_node_t	**out);
 
-cairo_private void *
-_cairo_rtree_pin (cairo_rtree_t *rtree, cairo_rtree_node_t *node);
+static inline void *
+_cairo_rtree_pin (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
+{
+    if (! node->pinned) {
+	cairo_list_move (&node->link, &rtree->pinned);
+	node->pinned = 1;
+    }
+
+    return node;
+}
 
 cairo_private void
 _cairo_rtree_unpin (cairo_rtree_t *rtree);
diff --git a/gfx/cairo/cairo/src/cairo-rtree.c b/gfx/cairo/cairo/src/cairo-rtree.c
index d4bdbd4bdaa..d6e57916ae6 100644
--- a/gfx/cairo/cairo/src/cairo-rtree.c
+++ b/gfx/cairo/cairo/src/cairo-rtree.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -36,6 +36,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-rtree-private.h"
 
 cairo_rtree_node_t *
@@ -79,8 +80,6 @@ _cairo_rtree_node_destroy (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
     if (node->state == CAIRO_RTREE_NODE_OCCUPIED) {
 	if (node->owner != NULL)
 	    *node->owner = NULL;
-	if (rtree->evict != NULL)
-	    rtree->evict (node);
     } else {
 	for (i = 0; i < 4 && node->children[i] != NULL; i++)
 	    _cairo_rtree_node_destroy (rtree, node->children[i]);
@@ -94,8 +93,6 @@ _cairo_rtree_node_collapse (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
 {
     int i;
 
-    assert (node->pinned == FALSE);
-
     do {
 	assert (node->state == CAIRO_RTREE_NODE_DIVIDED);
 
@@ -109,9 +106,7 @@ _cairo_rtree_node_collapse (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
 	node->children[0] = NULL;
 	node->state = CAIRO_RTREE_NODE_AVAILABLE;
 	cairo_list_move (&node->link, &rtree->available);
-
-	node = node->parent;
-    } while (node != NULL && ! node->pinned);
+    } while ((node = node->parent) != NULL);
 }
 
 cairo_status_t
@@ -194,8 +189,7 @@ _cairo_rtree_node_remove (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
     node->state = CAIRO_RTREE_NODE_AVAILABLE;
     cairo_list_move (&node->link, &rtree->available);
 
-    if (! node->parent->pinned)
-	_cairo_rtree_node_collapse (rtree, node->parent);
+    _cairo_rtree_node_collapse (rtree, node->parent);
 }
 
 cairo_int_status_t
@@ -231,9 +225,17 @@ _cairo_rtree_evict_random (cairo_rtree_t	 *rtree,
 		           int			  height,
 		           cairo_rtree_node_t		**out)
 {
-    cairo_rtree_node_t *node;
+    cairo_rtree_node_t *node, *next;
     int i, cnt;
 
+    /* propagate pinned from children to root */
+    cairo_list_foreach_entry_safe (node, next, cairo_rtree_node_t,
+				   &rtree->pinned, link)
+    {
+	if (node->parent != NULL)
+	    _cairo_rtree_pin (rtree, node->parent);
+    }
+
     cnt = 0;
     cairo_list_foreach_entry (node, cairo_rtree_node_t,
 			      &rtree->evictable, link)
@@ -253,8 +255,6 @@ _cairo_rtree_evict_random (cairo_rtree_t	 *rtree,
 	    if (node->state == CAIRO_RTREE_NODE_OCCUPIED) {
 		if (node->owner != NULL)
 		    *node->owner = NULL;
-		if (rtree->evict != NULL)
-		    rtree->evict (node);
 	    } else {
 		for (i = 0; i < 4 && node->children[i] != NULL; i++)
 		    _cairo_rtree_node_destroy (rtree, node->children[i]);
@@ -272,22 +272,6 @@ _cairo_rtree_evict_random (cairo_rtree_t	 *rtree,
     return CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
-void *
-_cairo_rtree_pin (cairo_rtree_t *rtree, cairo_rtree_node_t *node)
-{
-    void *ptr = node;
-
-    while (node->pinned == FALSE) {
-	cairo_list_move (&node->link, &rtree->pinned);
-	node->pinned = TRUE;
-	node = node->parent;
-	if (node == NULL)
-	    break;
-    }
-
-    return ptr;
-}
-
 void
 _cairo_rtree_unpin (cairo_rtree_t *rtree)
 {
@@ -343,11 +327,8 @@ _cairo_rtree_init (cairo_rtree_t	*rtree,
 	           int			 width,
 		   int			 height,
 		   int			 min_size,
-		   int			 node_size,
-		   void			 (*evict) (void *node))
+		   int			 node_size)
 {
-    rtree->evict = evict;
-
     assert (node_size >= (int) sizeof (cairo_rtree_node_t));
     _cairo_freepool_init (&rtree->node_freepool, node_size);
 
@@ -372,8 +353,6 @@ _cairo_rtree_reset (cairo_rtree_t *rtree)
     if (rtree->root.state == CAIRO_RTREE_NODE_OCCUPIED) {
 	if (rtree->root.owner != NULL)
 	    *rtree->root.owner = NULL;
-	if (rtree->evict != NULL)
-	    rtree->evict (&rtree->root);
     } else {
 	for (i = 0; i < 4 && rtree->root.children[i] != NULL; i++)
 	    _cairo_rtree_node_destroy (rtree, rtree->root.children[i]);
@@ -397,8 +376,6 @@ _cairo_rtree_fini (cairo_rtree_t *rtree)
     if (rtree->root.state == CAIRO_RTREE_NODE_OCCUPIED) {
 	if (rtree->root.owner != NULL)
 	    *rtree->root.owner = NULL;
-	if (rtree->evict != NULL)
-	    rtree->evict (&rtree->root);
     } else {
 	for (i = 0; i < 4 && rtree->root.children[i] != NULL; i++)
 	    _cairo_rtree_node_destroy (rtree, rtree->root.children[i]);
diff --git a/gfx/cairo/cairo/src/cairo-scaled-font-private.h b/gfx/cairo/cairo/src/cairo-scaled-font-private.h
index cdc3c73d227..029377b1788 100644
--- a/gfx/cairo/cairo/src/cairo-scaled-font-private.h
+++ b/gfx/cairo/cairo/src/cairo-scaled-font-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
 #include "cairo.h"
 
 #include "cairo-types-private.h"
+#include "cairo-list-private.h"
 #include "cairo-mutex-type-private.h"
 #include "cairo-reference-count-private.h"
 
@@ -107,7 +108,7 @@ struct _cairo_scaled_font {
     cairo_mutex_t mutex;
 
     cairo_hash_table_t *glyphs;
-    cairo_scaled_glyph_page_t *glyph_pages;
+    cairo_list_t glyph_pages;
     cairo_bool_t cache_frozen;
     cairo_bool_t global_cache_frozen;
 
@@ -121,6 +122,7 @@ struct _cairo_scaled_font {
 
     /* font backend managing this scaled font */
     const cairo_scaled_font_backend_t *backend;
+    cairo_list_t link;
 };
 
 cairo_private void
diff --git a/gfx/cairo/cairo/src/cairo-scaled-font-subsets-private.h b/gfx/cairo/cairo/src/cairo-scaled-font-subsets-private.h
index 6eb6ce0f083..b165d9acabe 100644
--- a/gfx/cairo/cairo/src/cairo-scaled-font-subsets-private.h
+++ b/gfx/cairo/cairo/src/cairo-scaled-font-subsets-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -334,9 +334,9 @@ _cairo_scaled_font_subset_create_glyph_names (cairo_scaled_font_subset_t *subset
 typedef struct _cairo_cff_subset {
     char *font_name;
     char *ps_name;
-    int *widths;
-    long x_min, y_min, x_max, y_max;
-    long ascent, descent;
+    double *widths;
+    double x_min, y_min, x_max, y_max;
+    double ascent, descent;
     char *data;
     unsigned long data_length;
 } cairo_cff_subset_t;
@@ -451,9 +451,9 @@ _cairo_truetype_subset_fini (cairo_truetype_subset_t *truetype_subset);
 
 typedef struct _cairo_type1_subset {
     char *base_font;
-    int *widths;
-    long x_min, y_min, x_max, y_max;
-    long ascent, descent;
+    double *widths;
+    double x_min, y_min, x_max, y_max;
+    double ascent, descent;
     char *data;
     unsigned long header_length;
     unsigned long data_length;
diff --git a/gfx/cairo/cairo/src/cairo-scaled-font-subsets.c b/gfx/cairo/cairo/src/cairo-scaled-font-subsets.c
index 05478295004..01bc05bfbcb 100644
--- a/gfx/cairo/cairo/src/cairo-scaled-font-subsets.c
+++ b/gfx/cairo/cairo/src/cairo-scaled-font-subsets.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,6 +42,7 @@
 
 #define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FONT_SUBSET
 
@@ -400,7 +401,7 @@ _cairo_sub_font_glyph_map_to_unicode (cairo_sub_font_glyph_t *sub_font_glyph,
 	    /* No existing mapping. Use the requested mapping */
 	    sub_font_glyph->utf8 = malloc (utf8_len + 1);
 	    if (unlikely (sub_font_glyph->utf8 == NULL))
-		return CAIRO_STATUS_NO_MEMORY;
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
 	    memcpy (sub_font_glyph->utf8, utf8, utf8_len);
 	    sub_font_glyph->utf8[utf8_len] = 0;
diff --git a/gfx/cairo/cairo/src/cairo-scaled-font.c b/gfx/cairo/cairo/src/cairo-scaled-font.c
index e1a89f8b0ba..edac25294a0 100644
--- a/gfx/cairo/cairo/src/cairo-scaled-font.c
+++ b/gfx/cairo/cairo/src/cairo-scaled-font.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,9 +38,8 @@
  *      Chris Wilson <chris@chris-wilson.co.uk>
  */
 
-#define _GNU_SOURCE
-
 #include "cairoint.h"
+#include "cairo-error-private.h"
 #include "cairo-scaled-font-private.h"
 
 #if _XOPEN_SOURCE >= 600 || defined (_ISOC99_SOURCE)
@@ -49,6 +48,16 @@
 #define ISFINITE(x) ((x) * (x) >= 0.) /* check for NaNs */
 #endif
 
+/**
+ * SECTION:cairo-scaled-font
+ * @Title: cairo_scaled_font_t
+ * @Short_Description: Font face at particular size and options
+ * @See_Also: #cairo_font_face_t, #cairo_matrix_t, #cairo_font_options_t
+ *
+ * #cairo_scaled_font_t represents a realization of a font face at a particular
+ * size and transformation and a certain set of font options.
+ */
+
 /* Global Glyph Cache
  *
  * We maintain a global pool of glyphs split between all active fonts. This
@@ -70,7 +79,7 @@ static cairo_cache_t cairo_scaled_glyph_page_cache;
 struct _cairo_scaled_glyph_page {
     cairo_cache_entry_t cache_entry;
 
-    struct _cairo_scaled_glyph_page *prev, *next;
+    cairo_list_t link;
 
     unsigned int num_glyphs;
     cairo_scaled_glyph_t glyphs[CAIRO_SCALED_GLYPH_PAGE_SIZE];
@@ -199,8 +208,10 @@ _cairo_scaled_glyph_fini (cairo_scaled_font_t *scaled_font,
     if (scaled_glyph->path != NULL)
 	_cairo_path_fixed_destroy (scaled_glyph->path);
 
-    if (scaled_glyph->recording_surface != NULL)
+    if (scaled_glyph->recording_surface != NULL) {
+	cairo_surface_finish (scaled_glyph->recording_surface);
 	cairo_surface_destroy (scaled_glyph->recording_surface);
+    }
 }
 
 #define ZOMBIE 0
@@ -227,7 +238,7 @@ static const cairo_scaled_font_t _cairo_scaled_font_nil = {
     { 0., 0., 0., 0., 0. },	/* fs_extents */
     CAIRO_MUTEX_NIL_INITIALIZER,/* mutex */
     NULL,			/* glyphs */
-    NULL,			/* pages */
+    { NULL, NULL },		/* pages */
     FALSE,			/* cache_frozen */
     FALSE,			/* global_cache_frozen */
     NULL,			/* surface_backend */
@@ -439,13 +450,7 @@ _cairo_scaled_glyph_page_destroy (void *closure)
 	_cairo_scaled_glyph_fini (scaled_font, &page->glyphs[n]);
     }
 
-    if (page->prev != NULL)
-	page->prev->next = page->next;
-    else
-	scaled_font->glyph_pages = page->next;
-
-    if (page->next != NULL)
-	page->next->prev = page->prev;
+    cairo_list_del (&page->link);
 
     free (page);
 }
@@ -709,13 +714,12 @@ _cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font,
 	 *
 	 * Also, the check for == 0. below may be too harsh...
 	 */
-        if (scaled_font->scale.xx == 0. && scaled_font->scale.xy == 0. &&
-	    scaled_font->scale.yx == 0. && scaled_font->scale.yy == 0.)
+        if (_cairo_matrix_is_scale_0 (&scaled_font->scale)) {
 	    cairo_matrix_init (&scaled_font->scale_inverse,
 			       0, 0, 0, 0,
 			       -scaled_font->scale.x0,
 			       -scaled_font->scale.y0);
-	else
+	} else
 	    return status;
     }
 
@@ -723,7 +727,7 @@ _cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font,
     if (unlikely (scaled_font->glyphs == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    scaled_font->glyph_pages = NULL;
+    cairo_list_init (&scaled_font->glyph_pages);
     scaled_font->cache_frozen = FALSE;
     scaled_font->global_cache_frozen = FALSE;
 
@@ -743,6 +747,7 @@ _cairo_scaled_font_init (cairo_scaled_font_t               *scaled_font,
     scaled_font->surface_private = NULL;
 
     scaled_font->backend = backend;
+    cairo_list_init (&scaled_font->link);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -779,9 +784,11 @@ _cairo_scaled_font_reset_cache (cairo_scaled_font_t *scaled_font)
     assert (! scaled_font->cache_frozen);
 
     CAIRO_MUTEX_LOCK (_cairo_scaled_glyph_page_cache_mutex);
-    while (scaled_font->glyph_pages != NULL) {
+    while (! cairo_list_is_empty (&scaled_font->glyph_pages)) {
 	_cairo_cache_remove (&cairo_scaled_glyph_page_cache,
-			     &scaled_font->glyph_pages->cache_entry);
+                             &cairo_list_first_entry (&scaled_font->glyph_pages,
+                                                      cairo_scaled_glyph_page_t,
+                                                      link)->cache_entry);
     }
     CAIRO_MUTEX_UNLOCK (_cairo_scaled_glyph_page_cache_mutex);
 }
@@ -893,7 +900,7 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
     cairo_status_t status;
     cairo_scaled_font_map_t *font_map;
     cairo_font_face_t *original_font_face = font_face;
-    cairo_scaled_font_t key, *old = NULL, *scaled_font = NULL;
+    cairo_scaled_font_t key, *old = NULL, *scaled_font = NULL, *dead = NULL;
     double det;
 
     status = font_face->status;
@@ -924,6 +931,7 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 	_cairo_scaled_font_matches (scaled_font,
 	                            font_face, font_matrix, ctm, options))
     {
+	assert (scaled_font->hash_entry.hash != ZOMBIE);
 	assert (! scaled_font->placeholder);
 
 	if (likely (scaled_font->status == CAIRO_STATUS_SUCCESS)) {
@@ -940,12 +948,19 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 	_cairo_hash_table_remove (font_map->hash_table,
 				  &scaled_font->hash_entry);
 	scaled_font->hash_entry.hash = ZOMBIE;
+	dead = scaled_font;
+	font_map->mru_scaled_font = NULL;
 
 	if (font_face->backend->get_implementation != NULL) {
 	    font_face = font_face->backend->get_implementation (font_face,
 								font_matrix,
 								ctm,
 								options);
+	    if (unlikely (font_face->status)) {
+		_cairo_scaled_font_map_unlock ();
+		cairo_scaled_font_destroy (scaled_font);
+		return _cairo_scaled_font_create_in_error (font_face->status);
+	    }
 	}
 
 	_cairo_scaled_font_init_key (&key, font_face,
@@ -958,6 +973,10 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 								font_matrix,
 								ctm,
 								options);
+	    if (unlikely (font_face->status)) {
+		_cairo_scaled_font_map_unlock ();
+		return _cairo_scaled_font_create_in_error (font_face->status);
+	    }
 	}
 
 	_cairo_scaled_font_init_key (&key, font_face,
@@ -1039,6 +1058,9 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 	if (font_face != original_font_face)
 	    cairo_font_face_destroy (font_face);
 
+	if (dead != NULL)
+	    cairo_scaled_font_destroy (dead);
+
 	status = _cairo_font_face_set_error (font_face, status);
 	return _cairo_scaled_font_create_in_error (status);
     }
@@ -1048,6 +1070,9 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
 	if (font_face != original_font_face)
 	    cairo_font_face_destroy (font_face);
 
+	if (dead != NULL)
+	    cairo_scaled_font_destroy (dead);
+
 	return scaled_font;
     }
 
@@ -1074,6 +1099,9 @@ cairo_scaled_font_create (cairo_font_face_t          *font_face,
     if (font_face != original_font_face)
 	cairo_font_face_destroy (font_face);
 
+    if (dead != NULL)
+	cairo_scaled_font_destroy (dead);
+
     if (unlikely (status)) {
 	/* We can't call _cairo_scaled_font_destroy here since it expects
 	 * that the font has already been successfully inserted into the
@@ -1551,6 +1579,134 @@ ZERO_EXTENTS:
 }
 slim_hidden_def (cairo_scaled_font_glyph_extents);
 
+#define GLYPH_LUT_SIZE 64
+static cairo_status_t
+cairo_scaled_font_text_to_glyphs_internal_cached (cairo_scaled_font_t		 *scaled_font,
+						    double			  x,
+						    double			  y,
+						    const char			 *utf8,
+						    cairo_glyph_t		 *glyphs,
+						    cairo_text_cluster_t	**clusters,
+						    int				  num_chars)
+{
+    struct glyph_lut_elt {
+	unsigned long index;
+	double x_advance;
+	double y_advance;
+    } glyph_lut[GLYPH_LUT_SIZE];
+    uint32_t glyph_lut_unicode[GLYPH_LUT_SIZE];
+    cairo_status_t status;
+    const char *p;
+    int i;
+
+    for (i = 0; i < GLYPH_LUT_SIZE; i++)
+	glyph_lut_unicode[i] = ~0U;
+
+    p = utf8;
+    for (i = 0; i < num_chars; i++) {
+	int idx, num_bytes;
+	uint32_t unicode;
+	cairo_scaled_glyph_t *scaled_glyph;
+	struct glyph_lut_elt *glyph_slot;
+
+	num_bytes = _cairo_utf8_get_char_validated (p, &unicode);
+	p += num_bytes;
+
+	glyphs[i].x = x;
+	glyphs[i].y = y;
+
+	idx = unicode % ARRAY_LENGTH (glyph_lut);
+	glyph_slot = &glyph_lut[idx];
+	if (glyph_lut_unicode[idx] == unicode) {
+	    glyphs[i].index = glyph_slot->index;
+	    x += glyph_slot->x_advance;
+	    y += glyph_slot->y_advance;
+	} else {
+	    unsigned long g;
+
+	    g = scaled_font->backend->ucs4_to_index (scaled_font, unicode);
+	    status = _cairo_scaled_glyph_lookup (scaled_font,
+						 g,
+						 CAIRO_SCALED_GLYPH_INFO_METRICS,
+						 &scaled_glyph);
+	    if (unlikely (status))
+		return status;
+
+	    x += scaled_glyph->metrics.x_advance;
+	    y += scaled_glyph->metrics.y_advance;
+
+	    glyph_lut_unicode[idx] = unicode;
+	    glyph_slot->index = g;
+	    glyph_slot->x_advance = scaled_glyph->metrics.x_advance;
+	    glyph_slot->y_advance = scaled_glyph->metrics.y_advance;
+
+	    glyphs[i].index = g;
+	}
+
+	if (clusters) {
+	    (*clusters)[i].num_bytes  = num_bytes;
+	    (*clusters)[i].num_glyphs = 1;
+	}
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_status_t
+cairo_scaled_font_text_to_glyphs_internal_uncached (cairo_scaled_font_t	 *scaled_font,
+						  double		  x,
+						  double		  y,
+						  const char		 *utf8,
+						  cairo_glyph_t		 *glyphs,
+						  cairo_text_cluster_t	**clusters,
+						  int			  num_chars)
+{
+    const char *p;
+    int i;
+
+    p = utf8;
+    for (i = 0; i < num_chars; i++) {
+	unsigned long g;
+	int num_bytes;
+	uint32_t unicode;
+	cairo_scaled_glyph_t *scaled_glyph;
+	cairo_status_t status;
+
+	num_bytes = _cairo_utf8_get_char_validated (p, &unicode);
+	p += num_bytes;
+
+	glyphs[i].x = x;
+	glyphs[i].y = y;
+
+	g = scaled_font->backend->ucs4_to_index (scaled_font, unicode);
+
+	/*
+	 * No advance needed for a single character string. So, let's speed up
+	 * one-character strings by skipping glyph lookup.
+	 */
+	if (num_chars > 1) {
+	    status = _cairo_scaled_glyph_lookup (scaled_font,
+					     g,
+					     CAIRO_SCALED_GLYPH_INFO_METRICS,
+					     &scaled_glyph);
+	    if (unlikely (status))
+		return status;
+
+	    x += scaled_glyph->metrics.x_advance;
+	    y += scaled_glyph->metrics.y_advance;
+	}
+
+	glyphs[i].index = g;
+
+	if (clusters) {
+	    (*clusters)[i].num_bytes  = num_bytes;
+	    (*clusters)[i].num_glyphs = 1;
+	}
+    }
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
 /**
  * cairo_scaled_font_text_to_glyphs:
  * @x: X position to place first glyph
@@ -1686,6 +1842,7 @@ slim_hidden_def (cairo_scaled_font_glyph_extents);
  *
  * Since: 1.8
  **/
+#define CACHING_THRESHOLD 16
 cairo_status_t
 cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t   *scaled_font,
 				  double		 x,
@@ -1698,18 +1855,10 @@ cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t   *scaled_font,
 				  int		        *num_clusters,
 				  cairo_text_cluster_flags_t *cluster_flags)
 {
-    int i;
     int num_chars = 0;
-    const char *p;
     cairo_status_t status;
     cairo_glyph_t *orig_glyphs;
     cairo_text_cluster_t *orig_clusters;
-    struct glyph_lut_elt {
-	uint32_t unicode;
-	unsigned long index;
-	double x_advance;
-	double y_advance;
-    } glyph_lut[256];
 
     status = scaled_font->status;
     if (unlikely (status))
@@ -1847,52 +1996,20 @@ cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t   *scaled_font,
 	*num_clusters = num_chars;
     }
 
-    for (i = 0; i < ARRAY_LENGTH (glyph_lut); i++)
-	glyph_lut[i].unicode = ~0U;
-
-    p = utf8;
-    for (i = 0; i < num_chars; i++) {
-	int num_bytes;
-	uint32_t unicode;
-	cairo_scaled_glyph_t *scaled_glyph;
-	struct glyph_lut_elt *glyph_slot;
-
-	num_bytes = _cairo_utf8_get_char_validated (p, &unicode);
-	p += num_bytes;
-
-	(*glyphs)[i].x = x;
-	(*glyphs)[i].y = y;
-
-	glyph_slot = &glyph_lut[unicode % ARRAY_LENGTH (glyph_lut)];
-	if (glyph_slot->unicode == unicode) {
-	    (*glyphs)[i].index = glyph_slot->index;
-	    x += glyph_slot->x_advance;
-	    y += glyph_slot->y_advance;
-	} else {
-	    (*glyphs)[i].index =
-		(*scaled_font->backend->ucs4_to_index) (scaled_font, unicode);
-
-	    status = _cairo_scaled_glyph_lookup (scaled_font,
-						 (*glyphs)[i].index,
-						 CAIRO_SCALED_GLYPH_INFO_METRICS,
-						 &scaled_glyph);
-	    if (unlikely (status))
-		goto DONE;
-
-	    x += scaled_glyph->metrics.x_advance;
-	    y += scaled_glyph->metrics.y_advance;
-
-	    glyph_slot->unicode = unicode;
-	    glyph_slot->index = (*glyphs)[i].index;
-	    glyph_slot->x_advance = scaled_glyph->metrics.x_advance;
-	    glyph_slot->y_advance = scaled_glyph->metrics.y_advance;
-	}
-
-	if (clusters) {
-	    (*clusters)[i].num_bytes  = num_bytes;
-	    (*clusters)[i].num_glyphs = 1;
-	}
-    }
+    if (num_chars > CACHING_THRESHOLD)
+	status = cairo_scaled_font_text_to_glyphs_internal_cached (scaled_font,
+								     x, y,
+								     utf8,
+								     *glyphs,
+								     clusters,
+								     num_chars);
+    else
+	status = cairo_scaled_font_text_to_glyphs_internal_uncached (scaled_font,
+								   x, y,
+								   utf8,
+								   *glyphs,
+								   clusters,
+								   num_chars);
 
  DONE: /* error that should be logged on scaled_font happened */
     _cairo_scaled_font_thaw_cache (scaled_font);
@@ -1928,12 +2045,16 @@ cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t   *scaled_font,
 slim_hidden_def (cairo_scaled_font_text_to_glyphs);
 
 static inline cairo_bool_t
-_range_contains_glyph (const cairo_point_int_t *min,
-		       const cairo_point_int_t *max,
-		       int left, int top,
-		       int right, int bottom)
+_range_contains_glyph (const cairo_box_t *extents,
+		       cairo_fixed_t left,
+		       cairo_fixed_t top,
+		       cairo_fixed_t right,
+		       cairo_fixed_t bottom)
 {
-    return right > min->x && left < max->x && bottom > min->y && top < max->y;
+    return right > extents->p1.x &&
+	   left < extents->p2.x &&
+	   bottom > extents->p1.y &&
+	   top < extents->p2.y;
 }
 
 /*
@@ -1947,10 +2068,10 @@ _cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t	 *scaled_font,
 					 cairo_bool_t *overlap_out)
 {
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
-    cairo_point_int_t min = { CAIRO_RECT_INT_MAX, CAIRO_RECT_INT_MAX };
-    cairo_point_int_t max = { CAIRO_RECT_INT_MIN, CAIRO_RECT_INT_MIN };
+    cairo_box_t box = { { INT_MAX, INT_MAX }, { INT_MIN, INT_MIN }};
     cairo_scaled_glyph_t *glyph_cache[64];
     cairo_bool_t overlap = overlap_out ? FALSE : TRUE;
+    cairo_round_glyph_positions_t round_glyph_positions = _cairo_font_options_get_round_glyph_positions (&scaled_font->options);
     int i;
 
     if (unlikely (scaled_font->status))
@@ -1962,9 +2083,7 @@ _cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t	 *scaled_font,
 
     for (i = 0; i < num_glyphs; i++) {
 	cairo_scaled_glyph_t	*scaled_glyph;
-	int			left, top;
-	int			right, bottom;
-	int			x, y;
+	cairo_fixed_t x, y, x1, y1, x2, y2;
 	int cache_index = glyphs[i].index % ARRAY_LENGTH (glyph_cache);
 
 	scaled_glyph = glyph_cache[cache_index];
@@ -1981,35 +2100,35 @@ _cairo_scaled_font_glyph_device_extents (cairo_scaled_font_t	 *scaled_font,
 	    glyph_cache[cache_index] = scaled_glyph;
 	}
 
-	/* XXX glyph images are snapped to pixel locations */
-	x = _cairo_lround (glyphs[i].x);
-	y = _cairo_lround (glyphs[i].y);
+	if (round_glyph_positions == CAIRO_ROUND_GLYPH_POS_ON)
+	    x = _cairo_fixed_from_int (_cairo_lround (glyphs[i].x));
+	else
+	    x = _cairo_fixed_from_double (glyphs[i].x);
+	x1 = x + scaled_glyph->bbox.p1.x;
+	x2 = x + scaled_glyph->bbox.p2.x;
 
-	left   = x + _cairo_fixed_integer_floor (scaled_glyph->bbox.p1.x);
-	top    = y + _cairo_fixed_integer_floor (scaled_glyph->bbox.p1.y);
-	right  = x + _cairo_fixed_integer_ceil (scaled_glyph->bbox.p2.x);
-	bottom = y + _cairo_fixed_integer_ceil (scaled_glyph->bbox.p2.y);
+	if (round_glyph_positions == CAIRO_ROUND_GLYPH_POS_ON)
+	    y = _cairo_fixed_from_int (_cairo_lround (glyphs[i].y));
+	else
+	    y = _cairo_fixed_from_double (glyphs[i].y);
+	y1 = y + scaled_glyph->bbox.p1.y;
+	y2 = y + scaled_glyph->bbox.p2.y;
 
-	if (overlap == FALSE) {
-	    overlap = _range_contains_glyph (&min, &max,
-		                             left, top, right, bottom);
-	}
+	if (overlap == FALSE)
+	    overlap = _range_contains_glyph (&box, x1, y1, x2, y2);
 
-	if (left   < min.x) min.x = left;
-	if (right  > max.x) max.x = right;
-	if (top    < min.y) min.y = top;
-	if (bottom > max.y) max.y = bottom;
+	if (x1 < box.p1.x) box.p1.x = x1;
+	if (x2 > box.p2.x) box.p2.x = x2;
+	if (y1 < box.p1.y) box.p1.y = y1;
+	if (y2 > box.p2.y) box.p2.y = y2;
     }
 
     _cairo_scaled_font_thaw_cache (scaled_font);
     if (unlikely (status))
 	return _cairo_scaled_font_set_error (scaled_font, status);
 
-    if (min.x < max.x && min.y < max.y) {
-	extents->x = min.x;
-	extents->width = max.x - min.x;
-	extents->y = min.y;
-	extents->height = max.y - min.y;
+    if (box.p1.x < box.p2.x) {
+	_cairo_box_round_to_rectangle (&box, extents);
     } else {
 	extents->x = extents->y = 0;
 	extents->width = extents->height = 0;
@@ -2076,7 +2195,6 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
     cairo_surface_t *mask = NULL;
     cairo_format_t mask_format = CAIRO_FORMAT_A1; /* shut gcc up */
     cairo_surface_pattern_t mask_pattern;
-    cairo_solid_pattern_t white_pattern;
     int i;
 
     /* These operators aren't interpreted the same way by the backends;
@@ -2111,8 +2229,6 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 
     /* Font display routine either does not exist or failed. */
 
-    _cairo_pattern_init_solid (&white_pattern, CAIRO_COLOR_WHITE, CAIRO_CONTENT_COLOR);
-
     _cairo_scaled_font_freeze_cache (scaled_font);
 
     for (i = 0; i < num_glyphs; i++) {
@@ -2154,7 +2270,9 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 	    case CAIRO_FORMAT_A1:
 		mask_format = glyph_surface->format;
 		break;
+	    case CAIRO_FORMAT_RGB16_565:
 	    case CAIRO_FORMAT_RGB24:
+	    case CAIRO_FORMAT_INVALID:
 	    default:
 		ASSERT_NOT_REACHED;
 		mask_format = CAIRO_FORMAT_ARGB32;
@@ -2172,8 +2290,8 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 	    /* Note that we only upgrade masks, i.e. A1 -> A8 -> ARGB32, so there is
 	     * never any component alpha here.
 	     */
-	    status = _cairo_surface_composite (CAIRO_OPERATOR_SOURCE,
-					       &white_pattern.base,
+	    status = _cairo_surface_composite (CAIRO_OPERATOR_ADD,
+					       &_cairo_pattern_white.base,
 					       &mask_pattern.base,
 					       new_mask,
 					       0, 0,
@@ -2209,7 +2327,7 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 		glyph_pattern.base.has_component_alpha = TRUE;
 
 	    status = _cairo_surface_composite (CAIRO_OPERATOR_ADD,
-					       &white_pattern.base,
+					       &_cairo_pattern_white.base,
 					       &glyph_pattern.base,
 					       mask,
 					       0, 0,
@@ -2243,8 +2361,6 @@ _cairo_scaled_font_show_glyphs (cairo_scaled_font_t	*scaled_font,
 CLEANUP_MASK:
     _cairo_scaled_font_thaw_cache (scaled_font);
 
-    _cairo_pattern_fini (&white_pattern.base);
-
     if (mask != NULL)
 	cairo_surface_destroy (mask);
     return _cairo_scaled_font_set_error (scaled_font, status);
@@ -2313,7 +2429,7 @@ _trace_mask_to_path (cairo_image_surface_t *mask,
     cairo_fixed_t px, py;
     cairo_status_t status;
 
-    mask = _cairo_image_surface_coerce (mask, CAIRO_FORMAT_A1);
+    mask = _cairo_image_surface_coerce_to_format (mask, CAIRO_FORMAT_A1);
     status = mask->base.status;
     if (unlikely (status))
 	return status;
@@ -2490,6 +2606,8 @@ _cairo_scaled_glyph_set_metrics (cairo_scaled_glyph_t *scaled_glyph,
 
     scaled_glyph->x_advance = _cairo_lround (device_x_advance);
     scaled_glyph->y_advance = _cairo_lround (device_y_advance);
+
+    scaled_glyph->has_info |= CAIRO_SCALED_GLYPH_INFO_METRICS;
 }
 
 void
@@ -2503,6 +2621,11 @@ _cairo_scaled_glyph_set_surface (cairo_scaled_glyph_t *scaled_glyph,
     /* sanity check the backend glyph contents */
     _cairo_debug_check_image_surface_is_defined (&surface->base);
     scaled_glyph->surface = surface;
+
+    if (surface != NULL)
+	scaled_glyph->has_info |= CAIRO_SCALED_GLYPH_INFO_SURFACE;
+    else
+	scaled_glyph->has_info &= ~CAIRO_SCALED_GLYPH_INFO_SURFACE;
 }
 
 void
@@ -2512,7 +2635,13 @@ _cairo_scaled_glyph_set_path (cairo_scaled_glyph_t *scaled_glyph,
 {
     if (scaled_glyph->path != NULL)
 	_cairo_path_fixed_destroy (scaled_glyph->path);
+
     scaled_glyph->path = path;
+
+    if (path != NULL)
+	scaled_glyph->has_info |= CAIRO_SCALED_GLYPH_INFO_PATH;
+    else
+	scaled_glyph->has_info &= ~CAIRO_SCALED_GLYPH_INFO_PATH;
 }
 
 void
@@ -2520,9 +2649,17 @@ _cairo_scaled_glyph_set_recording_surface (cairo_scaled_glyph_t *scaled_glyph,
 					   cairo_scaled_font_t *scaled_font,
 					   cairo_surface_t *recording_surface)
 {
-    if (scaled_glyph->recording_surface != NULL)
-	cairo_surface_destroy (recording_surface);
+    if (scaled_glyph->recording_surface != NULL) {
+	cairo_surface_finish (scaled_glyph->recording_surface);
+	cairo_surface_destroy (scaled_glyph->recording_surface);
+    }
+
     scaled_glyph->recording_surface = recording_surface;
+
+    if (recording_surface != NULL)
+	scaled_glyph->has_info |= CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE;
+    else
+	scaled_glyph->has_info &= ~CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE;
 }
 
 static cairo_bool_t
@@ -2543,10 +2680,14 @@ _cairo_scaled_font_allocate_glyph (cairo_scaled_font_t *scaled_font,
     cairo_status_t status;
 
     /* only the first page in the list may contain available slots */
-    page = scaled_font->glyph_pages;
-    if (page != NULL && page->num_glyphs < CAIRO_SCALED_GLYPH_PAGE_SIZE) {
-	*scaled_glyph = &page->glyphs[page->num_glyphs++];
-	return CAIRO_STATUS_SUCCESS;
+    if (! cairo_list_is_empty (&scaled_font->glyph_pages)) {
+        page = cairo_list_last_entry (&scaled_font->glyph_pages,
+                                      cairo_scaled_glyph_page_t,
+                                      link);
+        if (page->num_glyphs < CAIRO_SCALED_GLYPH_PAGE_SIZE) {
+            *scaled_glyph = &page->glyphs[page->num_glyphs++];
+            return CAIRO_STATUS_SUCCESS;
+        }
     }
 
     page = malloc (sizeof (cairo_scaled_glyph_page_t));
@@ -2584,11 +2725,7 @@ _cairo_scaled_font_allocate_glyph (cairo_scaled_font_t *scaled_font,
 	return status;
     }
 
-    page->next = scaled_font->glyph_pages;
-    page->prev = NULL;
-    if (scaled_font->glyph_pages != NULL)
-	scaled_font->glyph_pages->prev = page;
-    scaled_font->glyph_pages = page;
+    cairo_list_add_tail (&page->link, &scaled_font->glyph_pages);
 
     *scaled_glyph = &page->glyphs[page->num_glyphs++];
     return CAIRO_STATUS_SUCCESS;
@@ -2600,15 +2737,17 @@ _cairo_scaled_font_free_last_glyph (cairo_scaled_font_t *scaled_font,
 {
     cairo_scaled_glyph_page_t *page;
 
-    page = scaled_font->glyph_pages;
-    assert (page != NULL && scaled_glyph == &page->glyphs[page->num_glyphs-1]);
+    assert (! cairo_list_is_empty (&scaled_font->glyph_pages));
+    page = cairo_list_last_entry (&scaled_font->glyph_pages,
+                                  cairo_scaled_glyph_page_t,
+                                  link);
+    assert (scaled_glyph == &page->glyphs[page->num_glyphs-1]);
 
     _cairo_scaled_glyph_fini (scaled_font, scaled_glyph);
 
     if (--page->num_glyphs == 0) {
 	_cairo_cache_remove (&cairo_scaled_glyph_page_cache,
 		             &page->cache_entry);
-	assert (scaled_font->glyph_pages != page);
     }
 }
 
@@ -2649,6 +2788,8 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
     cairo_scaled_glyph_t	*scaled_glyph;
     cairo_scaled_glyph_info_t	 need_info;
 
+    *scaled_glyph_ret = NULL;
+
     if (unlikely (scaled_font->status))
 	return scaled_font->status;
 
@@ -2663,7 +2804,7 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
     if (scaled_glyph == NULL) {
 	status = _cairo_scaled_font_allocate_glyph (scaled_font, &scaled_glyph);
 	if (unlikely (status))
-	    goto CLEANUP;
+	    goto err;
 
 	memset (scaled_glyph, 0, sizeof (cairo_scaled_glyph_t));
 	_cairo_scaled_glyph_set_index (scaled_glyph, index);
@@ -2675,14 +2816,14 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
 						     info | CAIRO_SCALED_GLYPH_INFO_METRICS);
 	if (unlikely (status)) {
 	    _cairo_scaled_font_free_last_glyph (scaled_font, scaled_glyph);
-	    goto CLEANUP;
+	    goto err;
 	}
 
 	status = _cairo_hash_table_insert (scaled_font->glyphs,
 					   &scaled_glyph->hash_entry);
 	if (unlikely (status)) {
 	    _cairo_scaled_font_free_last_glyph (scaled_font, scaled_glyph);
-	    goto CLEANUP;
+	    goto err;
 	}
     }
 
@@ -2690,69 +2831,29 @@ _cairo_scaled_glyph_lookup (cairo_scaled_font_t *scaled_font,
      * Check and see if the glyph, as provided,
      * already has the requested data and amend it if not
      */
-    need_info = 0;
-    if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0 &&
-	scaled_glyph->surface == NULL)
-    {
-	need_info |= CAIRO_SCALED_GLYPH_INFO_SURFACE;
-    }
-
-    if ((info & CAIRO_SCALED_GLYPH_INFO_PATH) != 0 &&
-	scaled_glyph->path == NULL)
-    {
-	need_info |= CAIRO_SCALED_GLYPH_INFO_PATH;
-    }
-
-    if ((info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE) != 0 &&
-	scaled_glyph->recording_surface == NULL)
-    {
-	need_info |= CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE;
-    }
-
+    need_info = info & ~scaled_glyph->has_info;
     if (need_info) {
 	status = scaled_font->backend->scaled_glyph_init (scaled_font,
 							  scaled_glyph,
 							  need_info);
 	if (unlikely (status))
-	    goto CLEANUP;
+	    goto err;
 
 	/* Don't trust the scaled_glyph_init() return value, the font
 	 * backend may not even know about some of the info.  For example,
 	 * no backend other than the user-fonts knows about recording-surface
 	 * glyph info. */
-
-	if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0 &&
-	    scaled_glyph->surface == NULL)
-	{
-	    status = CAIRO_INT_STATUS_UNSUPPORTED;
-	    goto CLEANUP;
-	}
-
-	if ((info & CAIRO_SCALED_GLYPH_INFO_PATH) != 0 &&
-	    scaled_glyph->path == NULL)
-	{
-	    status = CAIRO_INT_STATUS_UNSUPPORTED;
-	    goto CLEANUP;
-	}
-
-	if ((info & CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE) != 0 &&
-	    scaled_glyph->recording_surface == NULL)
-	{
-	    status = CAIRO_INT_STATUS_UNSUPPORTED;
-	    goto CLEANUP;
-	}
+	if (info & ~scaled_glyph->has_info)
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
     }
 
-  CLEANUP:
-    if (unlikely (status)) {
-	/* It's not an error for the backend to not support the info we want. */
-	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	    status = _cairo_scaled_font_set_error (scaled_font, status);
-	*scaled_glyph_ret = NULL;
-    } else {
-	*scaled_glyph_ret = scaled_glyph;
-    }
+    *scaled_glyph_ret = scaled_glyph;
+    return CAIRO_STATUS_SUCCESS;
 
+err:
+    /* It's not an error for the backend to not support the info we want. */
+    if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	status = _cairo_scaled_font_set_error (scaled_font, status);
     return status;
 }
 
diff --git a/gfx/cairo/cairo/src/cairo-script-surface.c b/gfx/cairo/cairo/src/cairo-script-surface.c
index ec06364b338..0f0446d6a21 100644
--- a/gfx/cairo/cairo/src/cairo-script-surface.c
+++ b/gfx/cairo/cairo/src/cairo-script-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -47,21 +47,35 @@
 #include "cairo-script.h"
 
 #include "cairo-analysis-surface-private.h"
-#include "cairo-ft-private.h"
+#include "cairo-device-private.h"
+#include "cairo-error-private.h"
 #include "cairo-list-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-output-stream-private.h"
 #include "cairo-scaled-font-private.h"
 #include "cairo-surface-clipper-private.h"
+#include "cairo-surface-snapshot-private.h"
+#include "cairo-surface-subsurface-private.h"
 #include "cairo-surface-wrapper-private.h"
 
+#if CAIRO_HAS_FT_FONT
+#include "cairo-ft-private.h"
+#endif
+
 #include <ctype.h>
 
+#ifdef WORDS_BIGENDIAN
+#define to_be32(x) x
+#else
+#define to_be32(x) bswap_32(x)
+#endif
+
 #define _cairo_output_stream_puts(S, STR) \
     _cairo_output_stream_write ((S), (STR), strlen (STR))
 
 #define static cairo_warn static
 
+typedef struct _cairo_script_context cairo_script_context_t;
 typedef struct _cairo_script_surface cairo_script_surface_t;
 typedef struct _cairo_script_implicit_context cairo_script_implicit_context_t;
 typedef struct _cairo_script_surface_font_private cairo_script_surface_font_private_t;
@@ -81,9 +95,8 @@ struct deferred_finish {
 };
 
 struct _cairo_script_context {
-    cairo_status_t status;
+    cairo_device_t base;
 
-    int ref;
     int active;
 
     cairo_output_stream_t *stream;
@@ -133,13 +146,11 @@ struct _cairo_script_surface {
 
     cairo_surface_wrapper_t wrapper;
 
-    cairo_script_context_t *ctx;
     cairo_surface_clipper_t clipper;
 
     operand_t operand;
     cairo_bool_t emitted;
     cairo_bool_t defined;
-    cairo_bool_t is_clear;
     cairo_bool_t active;
 
     double width, height;
@@ -157,9 +168,6 @@ _cairo_script_surface_create_internal (cairo_script_context_t *ctx,
 				       double height,
 				       cairo_surface_t *passthrough);
 
-static cairo_status_t
-_context_destroy (cairo_script_context_t *ctx);
-
 static void
 _cairo_script_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font);
 
@@ -241,6 +249,16 @@ _bitmap_next_id (struct _bitmap *b,
     return CAIRO_STATUS_SUCCESS;
 }
 
+static void
+_bitmap_fini (struct _bitmap *b)
+{
+    while (b != NULL) {
+	struct _bitmap *next = b->next;
+	free (b);
+	b = next;
+    }
+}
+
 static const char *
 _direction_to_string (cairo_bool_t backward)
 {
@@ -370,17 +388,23 @@ _line_join_to_string (cairo_line_join_t line_join)
     return names[line_join];
 }
 
+static inline cairo_script_context_t *
+to_context (cairo_script_surface_t *surface)
+{
+    return (cairo_script_context_t *) surface->base.device;
+}
+
 static cairo_bool_t
 target_is_active (cairo_script_surface_t *surface)
 {
     return cairo_list_is_first (&surface->operand.link,
-				&surface->ctx->operands);
+				&to_context (surface)->operands);
 }
 
 static void
 target_push (cairo_script_surface_t *surface)
 {
-    cairo_list_move (&surface->operand.link, &surface->ctx->operands);
+    cairo_list_move (&surface->operand.link, &to_context (surface)->operands);
 }
 
 static int
@@ -389,7 +413,7 @@ target_depth (cairo_script_surface_t *surface)
     cairo_list_t *link;
     int depth = 0;
 
-    cairo_list_foreach (link, &surface->ctx->operands) {
+    cairo_list_foreach (link, &to_context (surface)->operands) {
 	if (link == &surface->operand.link)
 	    break;
 	depth++;
@@ -401,7 +425,7 @@ target_depth (cairo_script_surface_t *surface)
 static void
 _get_target (cairo_script_surface_t *surface)
 {
-    cairo_script_context_t *ctx = surface->ctx;
+    cairo_script_context_t *ctx = to_context (surface);
 
     if (surface->defined) {
 	_cairo_output_stream_printf (ctx->stream, "s%u ",
@@ -415,15 +439,14 @@ _get_target (cairo_script_surface_t *surface)
 		_cairo_output_stream_puts (ctx->stream, "/target get exch pop ");
 	    } else {
 		if (depth == 1) {
-		    _cairo_output_stream_puts (surface->ctx->stream,
+		    _cairo_output_stream_puts (ctx->stream,
 					       "exch\n");
 		} else {
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 "%d -1 roll\n",
 						 depth);
 		}
 		_cairo_output_stream_puts (ctx->stream, "/target get ");
-		target_push (surface);
 	    }
 	} else {
 	    _cairo_output_stream_puts (ctx->stream, "/target get ");
@@ -445,11 +468,13 @@ _content_to_string (cairo_content_t content)
 static cairo_status_t
 _emit_surface (cairo_script_surface_t *surface)
 {
-    _cairo_output_stream_printf (surface->ctx->stream,
+    cairo_script_context_t *ctx = to_context (surface);
+
+    _cairo_output_stream_printf (ctx->stream,
 				 "<< /content //%s",
 				 _content_to_string (surface->base.content));
     if (surface->width != -1 && surface->height != -1) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /width %f /height %f",
 				     surface->width,
 				     surface->height);
@@ -460,7 +485,7 @@ _emit_surface (cairo_script_surface_t *surface)
 	surface->base.y_fallback_resolution !=
 	CAIRO_SURFACE_FALLBACK_RESOLUTION_DEFAULT)
     {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /fallback-resolution [%f %f]",
 				     surface->base.x_fallback_resolution,
 				     surface->base.y_fallback_resolution);
@@ -471,14 +496,14 @@ _emit_surface (cairo_script_surface_t *surface)
     {
 	/* XXX device offset is encoded into the pattern matrices etc. */
 	if (0) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /device-offset [%f %f]",
 				     surface->base.device_transform.x0,
 				     surface->base.device_transform.y0);
 	}
     }
 
-    _cairo_output_stream_puts (surface->ctx->stream, " >> surface context\n");
+    _cairo_output_stream_puts (ctx->stream, " >> surface context\n");
     surface->emitted = TRUE;
     return CAIRO_STATUS_SUCCESS;
 }
@@ -486,7 +511,7 @@ _emit_surface (cairo_script_surface_t *surface)
 static cairo_status_t
 _emit_context (cairo_script_surface_t *surface)
 {
-    cairo_script_context_t *ctx = surface->ctx;
+    cairo_script_context_t *ctx = to_context (surface);
 
     if (target_is_active (surface))
 	return CAIRO_STATUS_SUCCESS;
@@ -562,7 +587,7 @@ _emit_operator (cairo_script_surface_t *surface,
 
     surface->cr.current_operator = op;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "//%s set-operator\n",
 				 _operator_to_string (op));
     return CAIRO_STATUS_SUCCESS;
@@ -579,7 +604,7 @@ _emit_fill_rule (cairo_script_surface_t *surface,
 
     surface->cr.current_fill_rule = fill_rule;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "//%s set-fill-rule\n",
 				 _fill_rule_to_string (fill_rule));
     return CAIRO_STATUS_SUCCESS;
@@ -601,7 +626,7 @@ _emit_tolerance (cairo_script_surface_t *surface,
 
     surface->cr.current_tolerance = tolerance;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "%f set-tolerance\n",
 				 tolerance);
     return CAIRO_STATUS_SUCCESS;
@@ -618,7 +643,7 @@ _emit_antialias (cairo_script_surface_t *surface,
 
     surface->cr.current_antialias = antialias;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "//%s set-antialias\n",
 				 _antialias_to_string (antialias));
 
@@ -641,7 +666,7 @@ _emit_line_width (cairo_script_surface_t *surface,
 
     surface->cr.current_style.line_width = line_width;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "%f set-line-width\n",
 				 line_width);
     return CAIRO_STATUS_SUCCESS;
@@ -658,7 +683,7 @@ _emit_line_cap (cairo_script_surface_t *surface,
 
     surface->cr.current_style.line_cap = line_cap;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "//%s set-line-cap\n",
 				 _line_cap_to_string (line_cap));
     return CAIRO_STATUS_SUCCESS;
@@ -675,7 +700,7 @@ _emit_line_join (cairo_script_surface_t *surface,
 
     surface->cr.current_style.line_join = line_join;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "//%s set-line-join\n",
 				 _line_join_to_string (line_join));
     return CAIRO_STATUS_SUCCESS;
@@ -697,7 +722,7 @@ _emit_miter_limit (cairo_script_surface_t *surface,
 
     surface->cr.current_style.miter_limit = miter_limit;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "%f set-miter-limit\n",
 				 miter_limit);
     return CAIRO_STATUS_SUCCESS;
@@ -761,13 +786,13 @@ _emit_dash (cairo_script_surface_t *surface,
     surface->cr.current_style.num_dashes = num_dashes;
     surface->cr.current_style.dash_offset = offset;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "[");
+    _cairo_output_stream_puts (to_context (surface)->stream, "[");
     for (n = 0; n < num_dashes; n++) {
-	_cairo_output_stream_printf (surface->ctx->stream, "%f", dash[n]);
+	_cairo_output_stream_printf (to_context (surface)->stream, "%f", dash[n]);
 	if (n < num_dashes-1)
-	    _cairo_output_stream_puts (surface->ctx->stream, " ");
+	    _cairo_output_stream_puts (to_context (surface)->stream, " ");
     }
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "] %f set-dash\n",
 				 offset);
 
@@ -811,14 +836,16 @@ _emit_stroke_style (cairo_script_surface_t *surface,
 static const char *
 _format_to_string (cairo_format_t format)
 {
-    static const char *names[] = {
-	"ARGB32",	/* CAIRO_FORMAT_ARGB32 */
-	"RGB24",	/* CAIRO_FORMAT_RGB24 */
-	"A8",		/* CAIRO_FORMAT_A8 */
-	"A1"		/* CAIRO_FORMAT_A1 */
-    };
-    assert (format < ARRAY_LENGTH (names));
-    return names[format];
+    switch (format) {
+    case CAIRO_FORMAT_ARGB32:  return "ARGB32";
+    case CAIRO_FORMAT_RGB24:   return "RGB24";
+    case CAIRO_FORMAT_RGB16_565: return "RGB16_565";
+    case CAIRO_FORMAT_A8:      return "A8";
+    case CAIRO_FORMAT_A1:      return "A1";
+    case CAIRO_FORMAT_INVALID: return "INVALID";
+    }
+    ASSERT_NOT_REACHED;
+    return "INVALID";
 }
 
 static cairo_status_t
@@ -826,23 +853,22 @@ _emit_solid_pattern (cairo_script_surface_t *surface,
 		     const cairo_pattern_t *pattern)
 {
     cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) pattern;
+    cairo_script_context_t *ctx = to_context (surface);
 
-    if (solid->content & CAIRO_CONTENT_ALPHA &&
-	! CAIRO_COLOR_IS_OPAQUE (&solid->color))
+    if (! CAIRO_COLOR_IS_OPAQUE (&solid->color))
     {
-	if (! (solid->content & CAIRO_CONTENT_COLOR) ||
-	    ! (surface->base.content & CAIRO_CONTENT_COLOR) ||
+	if (! (surface->base.content & CAIRO_CONTENT_COLOR) ||
 	    ((solid->color.red_short   == 0 || solid->color.red_short   == 0xffff) &&
 	     (solid->color.green_short == 0 || solid->color.green_short == 0xffff) &&
 	     (solid->color.blue_short  == 0 || solid->color.blue_short  == 0xffff) ))
 	{
-	    _cairo_output_stream_printf (surface->ctx->stream,
+	    _cairo_output_stream_printf (ctx->stream,
 					 "%f a",
 					 solid->color.alpha);
 	}
 	else
 	{
-	    _cairo_output_stream_printf (surface->ctx->stream,
+	    _cairo_output_stream_printf (ctx->stream,
 					 "%f %f %f %f rgba",
 					 solid->color.red,
 					 solid->color.green,
@@ -855,13 +881,13 @@ _emit_solid_pattern (cairo_script_surface_t *surface,
 	if (solid->color.red_short == solid->color.green_short &&
 	    solid->color.red_short == solid->color.blue_short)
 	{
-	    _cairo_output_stream_printf (surface->ctx->stream,
+	    _cairo_output_stream_printf (ctx->stream,
 					 "%f g",
 					 solid->color.red);
 	}
 	else
 	{
-	    _cairo_output_stream_printf (surface->ctx->stream,
+	    _cairo_output_stream_printf (ctx->stream,
 					 "%f %f %f rgb",
 					 solid->color.red,
 					 solid->color.green,
@@ -896,28 +922,30 @@ static cairo_status_t
 _emit_linear_pattern (cairo_script_surface_t *surface,
 		      const cairo_pattern_t *pattern)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_linear_pattern_t *linear;
 
     linear = (cairo_linear_pattern_t *) pattern;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "%f %f %f %f linear",
 				 _cairo_fixed_to_double (linear->p1.x),
 				 _cairo_fixed_to_double (linear->p1.y),
 				 _cairo_fixed_to_double (linear->p2.x),
 				 _cairo_fixed_to_double (linear->p2.y));
-    return _emit_gradient_color_stops (&linear->base, surface->ctx->stream);
+    return _emit_gradient_color_stops (&linear->base, ctx->stream);
 }
 
 static cairo_status_t
 _emit_radial_pattern (cairo_script_surface_t *surface,
 		      const cairo_pattern_t *pattern)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_radial_pattern_t *radial;
 
     radial = (cairo_radial_pattern_t *) pattern;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "%f %f %f %f %f %f radial",
 				 _cairo_fixed_to_double (radial->c1.x),
 				 _cairo_fixed_to_double (radial->c1.y),
@@ -925,24 +953,19 @@ _emit_radial_pattern (cairo_script_surface_t *surface,
 				 _cairo_fixed_to_double (radial->c2.x),
 				 _cairo_fixed_to_double (radial->c2.y),
 				 _cairo_fixed_to_double (radial->r2));
-    return _emit_gradient_color_stops (&radial->base, surface->ctx->stream);
+    return _emit_gradient_color_stops (&radial->base, ctx->stream);
 }
 
 static cairo_status_t
 _emit_recording_surface_pattern (cairo_script_surface_t *surface,
-				 const cairo_pattern_t *pattern)
+				 cairo_recording_surface_t *source)
 {
     cairo_script_implicit_context_t old_cr;
-    cairo_surface_pattern_t *surface_pattern;
-    cairo_recording_surface_t *source;
     cairo_script_surface_t *similar;
     cairo_status_t status;
     cairo_box_t bbox;
     cairo_rectangle_int_t rect;
 
-    surface_pattern = (cairo_surface_pattern_t *) pattern;
-    source = (cairo_recording_surface_t *) surface_pattern->surface;
-
     /* first measure the extents */
     status = _cairo_recording_surface_get_bbox (source, &bbox, NULL);
     if (unlikely (status))
@@ -951,7 +974,7 @@ _emit_recording_surface_pattern (cairo_script_surface_t *surface,
     /* convert to extents so that it matches the public api */
     _cairo_box_round_to_rectangle (&bbox, &rect);
 
-    similar = _cairo_script_surface_create_internal (surface->ctx,
+    similar = _cairo_script_surface_create_internal (to_context (surface),
 						     source->content,
 						     rect.width,
 						     rect.height,
@@ -960,10 +983,10 @@ _emit_recording_surface_pattern (cairo_script_surface_t *surface,
 	return similar->base.status;
 
     cairo_surface_set_device_offset (&similar->base, -rect.x, -rect.y);
-    surface->is_clear = TRUE;
+    similar->base.is_clear = TRUE;
 
     _get_target (surface);
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "%d %d //%s similar dup context\n",
 				 rect.width, rect.height,
 				 _content_to_string (source->content));
@@ -983,7 +1006,7 @@ _emit_recording_surface_pattern (cairo_script_surface_t *surface,
     cairo_list_del (&similar->operand.link);
     assert (target_is_active (surface));
 
-    _cairo_output_stream_puts (surface->ctx->stream, "pop pattern");
+    _cairo_output_stream_puts (to_context (surface)->stream, "pop ");
     cairo_surface_destroy (&similar->base);
 
     return CAIRO_STATUS_SUCCESS;
@@ -991,16 +1014,9 @@ _emit_recording_surface_pattern (cairo_script_surface_t *surface,
 
 static cairo_status_t
 _emit_script_surface_pattern (cairo_script_surface_t *surface,
-			      const cairo_pattern_t *pattern)
+			      cairo_script_surface_t *source)
 {
-    cairo_surface_pattern_t *surface_pattern;
-    cairo_script_surface_t *source;
-
-    surface_pattern = (cairo_surface_pattern_t *) pattern;
-    source = (cairo_script_surface_t *) surface_pattern->surface;
-
     _get_target (source);
-    _cairo_output_stream_puts (surface->ctx->stream, "pattern");
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1031,6 +1047,12 @@ _write_image_surface (cairo_output_stream_t *output,
 	    data += stride;
 	}
 	break;
+    case CAIRO_FORMAT_RGB16_565:
+	for (row = image->height; row--; ) {
+	    _cairo_output_stream_write (output, data, 2*width);
+	    data += stride;
+	}
+	break;
     case CAIRO_FORMAT_RGB24:
 	for (row = image->height; row--; ) {
 	    int col;
@@ -1048,6 +1070,7 @@ _write_image_surface (cairo_output_stream_t *output,
 	    data += stride;
 	}
 	break;
+    case CAIRO_FORMAT_INVALID:
     default:
 	ASSERT_NOT_REACHED;
 	break;
@@ -1076,6 +1099,17 @@ _write_image_surface (cairo_output_stream_t *output,
 	    data += stride;
 	}
 	break;
+    case CAIRO_FORMAT_RGB16_565:
+	for (row = image->height; row--; ) {
+	    uint16_t *src = (uint16_t *) data;
+	    uint16_t *dst = (uint16_t *) rowdata;
+	    int col;
+	    for (col = 0; col < width; col++)
+		dst[col] = bswap_16 (src[col]);
+	    _cairo_output_stream_write (output, rowdata, 2*width);
+	    data += stride;
+	}
+	break;
     case CAIRO_FORMAT_RGB24:
 	for (row = image->height; row--; ) {
 	    uint8_t *src = data;
@@ -1101,6 +1135,7 @@ _write_image_surface (cairo_output_stream_t *output,
 	    data += stride;
 	}
 	break;
+    case CAIRO_FORMAT_INVALID:
     default:
 	ASSERT_NOT_REACHED;
 	break;
@@ -1114,19 +1149,20 @@ _write_image_surface (cairo_output_stream_t *output,
 
 static cairo_int_status_t
 _emit_png_surface (cairo_script_surface_t *surface,
-		     cairo_image_surface_t *image)
+		   cairo_image_surface_t *image)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_output_stream_t *base85_stream;
     cairo_status_t status;
     const uint8_t *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
 
     cairo_surface_get_mime_data (&image->base, CAIRO_MIME_TYPE_PNG,
 				 &mime_data, &mime_data_length);
     if (mime_data == NULL)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "<< "
 				 "/width %d "
 				 "/height %d "
@@ -1136,13 +1172,13 @@ _emit_png_surface (cairo_script_surface_t *surface,
 				 image->width, image->height,
 				 _format_to_string (image->format));
 
-    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+    base85_stream = _cairo_base85_stream_create (ctx->stream);
     _cairo_output_stream_write (base85_stream, mime_data, mime_data_length);
     status = _cairo_output_stream_destroy (base85_stream);
     if (unlikely (status))
 	return status;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "~> >> image ");
+    _cairo_output_stream_puts (ctx->stream, "~> >> image ");
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -1167,18 +1203,19 @@ static cairo_status_t
 _emit_image_surface (cairo_script_surface_t *surface,
 		     cairo_image_surface_t *image)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_output_stream_t *base85_stream;
     cairo_output_stream_t *zlib_stream;
     cairo_status_t status, status2;
     const uint8_t *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     struct def *tag;
 
     if (_cairo_user_data_array_get_data (&image->base.user_data,
-					 (cairo_user_data_key_t *) surface->ctx))
+					 (cairo_user_data_key_t *) ctx))
     {
-	_cairo_output_stream_printf (surface->ctx->stream,
-				     "s%u pattern ",
+	_cairo_output_stream_printf (ctx->stream,
+				     "s%u ",
 				     image->base.unique_id);
 	return CAIRO_STATUS_SUCCESS;
     }
@@ -1191,15 +1228,13 @@ _emit_image_surface (cairo_script_surface_t *surface,
 	uint32_t len;
 
 	if (image->format == CAIRO_FORMAT_INVALID) {
-	    clone =
-		_cairo_image_surface_coerce (image,
-					     _cairo_format_from_content (image->base.content));
+	    clone = _cairo_image_surface_coerce (image);
 	} else {
 	    clone = (cairo_image_surface_t *)
 		cairo_surface_reference (&image->base);
 	}
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "<< "
 				     "/width %d "
 				     "/height %d "
@@ -1215,20 +1250,27 @@ _emit_image_surface (cairo_script_surface_t *surface,
 	case CAIRO_FORMAT_A8:
 	    len = clone->width;
 	    break;
+	case CAIRO_FORMAT_RGB16_565:
+	    len = clone->width * 2;
+	    break;
 	case CAIRO_FORMAT_RGB24:
 	    len = clone->width * 3;
 	    break;
 	case CAIRO_FORMAT_ARGB32:
 	    len = clone->width * 4;
 	    break;
+	case CAIRO_FORMAT_INVALID:
+	    ASSERT_NOT_REACHED;
+	    break;
 	}
 	len *= clone->height;
 
 	if (len > 24) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "<|");
+	    _cairo_output_stream_puts (ctx->stream, "<|");
 
-	    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	    base85_stream = _cairo_base85_stream_create (ctx->stream);
 
+	    len = to_be32 (len);
 	    _cairo_output_stream_write (base85_stream, &len, sizeof (len));
 
 	    zlib_stream = _cairo_deflate_stream_create (base85_stream);
@@ -1243,9 +1285,9 @@ _emit_image_surface (cairo_script_surface_t *surface,
 	    if (unlikely (status))
 		return status;
 	} else {
-	    _cairo_output_stream_puts (surface->ctx->stream, "<~");
+	    _cairo_output_stream_puts (ctx->stream, "<~");
 
-	    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	    base85_stream = _cairo_base85_stream_create (ctx->stream);
 	    status = _write_image_surface (base85_stream, clone);
 	    status2 = _cairo_output_stream_destroy (base85_stream);
 	    if (status == CAIRO_STATUS_SUCCESS)
@@ -1253,7 +1295,7 @@ _emit_image_surface (cairo_script_surface_t *surface,
 	    if (unlikely (status))
 		return status;
 	}
-	_cairo_output_stream_puts (surface->ctx->stream, "~> >> image ");
+	_cairo_output_stream_puts (ctx->stream, "~> >> image ");
 
 	cairo_surface_destroy (&clone->base);
     }
@@ -1262,103 +1304,150 @@ _emit_image_surface (cairo_script_surface_t *surface,
     if (unlikely (tag == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    tag->ctx = surface->ctx;
+    tag->ctx = ctx;
     tag->tag = image->base.unique_id;
     tag->user_data = &image->base.user_data;
-    cairo_list_add (&tag->link, &surface->ctx->defines);
+    cairo_list_add (&tag->link, &ctx->defines);
     status = _cairo_user_data_array_set_data (&image->base.user_data,
-					(cairo_user_data_key_t *) surface->ctx,
-					tag, _undef);
+					      (cairo_user_data_key_t *) ctx,
+					      tag, _undef);
     if (unlikely (status)) {
 	free (tag);
 	return status;
     }
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "dup /s%u exch def ",
 				 image->base.unique_id);
 
     cairo_surface_get_mime_data (&image->base, CAIRO_MIME_TYPE_JPEG,
 				 &mime_data, &mime_data_length);
     if (mime_data != NULL) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "\n  (%s) <~",
 				     CAIRO_MIME_TYPE_JPEG);
 
-	base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	base85_stream = _cairo_base85_stream_create (ctx->stream);
 	_cairo_output_stream_write (base85_stream, mime_data, mime_data_length);
 	status = _cairo_output_stream_destroy (base85_stream);
 	if (unlikely (status))
 	    return status;
 
-	_cairo_output_stream_puts (surface->ctx->stream, "~> set-mime-data\n");
+	_cairo_output_stream_puts (ctx->stream, "~> set-mime-data\n");
     }
 
     cairo_surface_get_mime_data (&image->base, CAIRO_MIME_TYPE_JP2,
 				 &mime_data, &mime_data_length);
     if (mime_data != NULL) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "\n  (%s) <~",
 				     CAIRO_MIME_TYPE_JP2);
 
-	base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	base85_stream = _cairo_base85_stream_create (ctx->stream);
 	_cairo_output_stream_write (base85_stream, mime_data, mime_data_length);
 	status = _cairo_output_stream_destroy (base85_stream);
 	if (unlikely (status))
 	    return status;
 
-	_cairo_output_stream_puts (surface->ctx->stream, "~> set-mime-data\n");
+	_cairo_output_stream_puts (ctx->stream, "~> set-mime-data\n");
     }
 
-    _cairo_output_stream_puts (surface->ctx->stream, "pattern");
-
     return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_status_t
 _emit_image_surface_pattern (cairo_script_surface_t *surface,
-			     const cairo_pattern_t *pattern)
+			     cairo_surface_t *source)
 {
-    cairo_surface_pattern_t *surface_pattern;
+    cairo_surface_t *snapshot;
     cairo_image_surface_t *image;
     cairo_status_t status;
+    void *extra;
 
     /* XXX keeping a copy is nasty, but we want to hook into the surface's
      * lifetime. Using a snapshot is a convenient method.
      */
-    surface_pattern = (cairo_surface_pattern_t *) pattern;
-    image = (cairo_image_surface_t *)
-	_cairo_surface_snapshot (surface_pattern->surface);
-    status = _emit_image_surface (surface, image);
-    cairo_surface_destroy (&image->base);
+    snapshot = _cairo_surface_snapshot (source);
+    status = _cairo_surface_acquire_source_image (snapshot, &image, &extra);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	status = _emit_image_surface (surface, image);
+	_cairo_surface_release_source_image (snapshot, image, extra);
+    }
+    cairo_surface_destroy (snapshot);
 
     return status;
 }
 
+static cairo_status_t
+_emit_subsurface_pattern (cairo_script_surface_t *surface,
+			  cairo_surface_subsurface_t *sub)
+{
+    cairo_surface_t *source = sub->target;
+    cairo_status_t status;
+
+    switch ((int) source->backend->type) {
+    case CAIRO_SURFACE_TYPE_RECORDING:
+	status = _emit_recording_surface_pattern (surface, (cairo_recording_surface_t *) source);
+	break;
+    case CAIRO_SURFACE_TYPE_SCRIPT:
+	status = _emit_script_surface_pattern (surface, (cairo_script_surface_t *) source);
+	break;
+    default:
+	status = _emit_image_surface_pattern (surface, source);
+	break;
+    }
+    if (unlikely (status))
+	return status;
+
+    _cairo_output_stream_printf (to_context (surface)->stream,
+				 "%d %d %d %d subsurface ",
+				 sub->extents.x,
+				 sub->extents.y,
+				 sub->extents.width,
+				 sub->extents.height);
+    return CAIRO_STATUS_SUCCESS;
+}
+
 static cairo_status_t
 _emit_surface_pattern (cairo_script_surface_t *surface,
 		       const cairo_pattern_t *pattern)
 {
     cairo_surface_pattern_t *surface_pattern;
     cairo_surface_t *source;
+    cairo_status_t status;
 
     surface_pattern = (cairo_surface_pattern_t *) pattern;
     source = surface_pattern->surface;
 
-    switch ((int) source->type) {
+    if (source->backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT)
+	source = ((cairo_surface_snapshot_t *) source)->target;
+
+    switch ((int) source->backend->type) {
     case CAIRO_SURFACE_TYPE_RECORDING:
-	return _emit_recording_surface_pattern (surface, pattern);
+	status = _emit_recording_surface_pattern (surface, (cairo_recording_surface_t *) source);
+	break;
     case CAIRO_SURFACE_TYPE_SCRIPT:
-	return _emit_script_surface_pattern (surface, pattern);
+	status = _emit_script_surface_pattern (surface, (cairo_script_surface_t *) source);
+	break;
+    case CAIRO_SURFACE_TYPE_SUBSURFACE:
+	status = _emit_subsurface_pattern (surface, (cairo_surface_subsurface_t *) source);
+	break;
     default:
-	return _emit_image_surface_pattern (surface, pattern);
+	status = _emit_image_surface_pattern (surface, source);
+	break;
     }
+    if (unlikely (status))
+	return status;
+
+    _cairo_output_stream_puts (to_context (surface)->stream, "pattern");
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_status_t
 _emit_pattern (cairo_script_surface_t *surface,
 	       const cairo_pattern_t *pattern)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_status_t status;
     cairo_bool_t is_default_extend;
     cairo_bool_t need_newline = TRUE;
@@ -1390,11 +1479,11 @@ _emit_pattern (cairo_script_surface_t *surface,
 
     if (! _cairo_matrix_is_identity (&pattern->matrix)) {
 	if (need_newline) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "\n ");
+	    _cairo_output_stream_puts (ctx->stream, "\n ");
 	    need_newline = FALSE;
 	}
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " [%f %f %f %f %f %f] set-matrix\n ",
 				     pattern->matrix.xx, pattern->matrix.yx,
 				     pattern->matrix.xy, pattern->matrix.yy,
@@ -1404,27 +1493,27 @@ _emit_pattern (cairo_script_surface_t *surface,
     /* XXX need to discriminate the user explicitly setting the default */
     if (pattern->filter != CAIRO_FILTER_DEFAULT) {
 	if (need_newline) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "\n ");
+	    _cairo_output_stream_puts (ctx->stream, "\n ");
 	    need_newline = FALSE;
 	}
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " //%s set-filter\n ",
 				     _filter_to_string (pattern->filter));
     }
     if (! is_default_extend ){
 	if (need_newline) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "\n ");
+	    _cairo_output_stream_puts (ctx->stream, "\n ");
 	    need_newline = FALSE;
 	}
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " //%s set-extend\n ",
 				     _extend_to_string (pattern->extend));
     }
 
     if (need_newline)
-	_cairo_output_stream_puts (surface->ctx->stream, "\n ");
+	_cairo_output_stream_puts (ctx->stream, "\n ");
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1438,7 +1527,7 @@ _emit_identity (cairo_script_surface_t *surface,
     if (_cairo_matrix_is_identity (&surface->cr.current_ctm))
 	return CAIRO_STATUS_SUCCESS;
 
-    _cairo_output_stream_puts (surface->ctx->stream,
+    _cairo_output_stream_puts (to_context (surface)->stream,
 			       "identity set-matrix\n");
 
     *matrix_updated = TRUE;
@@ -1479,7 +1568,8 @@ _emit_source (cairo_script_surface_t *surface,
     if (unlikely (status))
 	return status;
 
-    _cairo_output_stream_puts (surface->ctx->stream,
+    assert (target_is_active (surface));
+    _cairo_output_stream_puts (to_context (surface)->stream,
 			       " set-source\n");
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1539,6 +1629,7 @@ static cairo_status_t
 _emit_path (cairo_script_surface_t *surface,
 	    cairo_path_fixed_t *path)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_box_t box;
     cairo_status_t status;
 
@@ -1550,7 +1641,7 @@ _emit_path (cairo_script_surface_t *surface,
 
     _cairo_path_fixed_fini (&surface->cr.current_path);
 
-    _cairo_output_stream_puts (surface->ctx->stream, "n");
+    _cairo_output_stream_puts (ctx->stream, "n");
 
     if (path == NULL) {
 	_cairo_path_fixed_init (&surface->cr.current_path);
@@ -1564,7 +1655,7 @@ _emit_path (cairo_script_surface_t *surface,
 	if (unlikely (status))
 	    return status;
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " %f %f %f %f rectangle",
 				     x1, y1, x2 - x1, y2 - y1);
     } else {
@@ -1580,12 +1671,12 @@ _emit_path (cairo_script_surface_t *surface,
 					      _path_line_to,
 					      _path_curve_to,
 					      _path_close,
-					      surface->ctx->stream);
+					      ctx->stream);
 	if (unlikely (status))
 	    return status;
     }
 
-    _cairo_output_stream_puts (surface->ctx->stream, "\n");
+    _cairo_output_stream_puts (ctx->stream, "\n");
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1604,6 +1695,7 @@ _emit_scaling_matrix (cairo_script_surface_t *surface,
 		      const cairo_matrix_t *ctm,
 		      cairo_bool_t *matrix_updated)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_bool_t was_identity;
     assert (target_is_active (surface));
 
@@ -1618,17 +1710,17 @@ _emit_scaling_matrix (cairo_script_surface_t *surface,
     surface->cr.current_ctm.y0 = 0.;
 
     if (_cairo_matrix_is_identity (&surface->cr.current_ctm)) {
-	_cairo_output_stream_puts (surface->ctx->stream,
+	_cairo_output_stream_puts (ctx->stream,
 				   "identity set-matrix\n");
     } else if (was_identity && fabs (ctm->yx) < 1e-5 && fabs (ctm->xy) < 1e-5) {
-	_cairo_output_stream_printf (surface->ctx->stream,
-				   "%f %f scale\n",
-				   ctm->xx, ctm->yy);
+	_cairo_output_stream_printf (ctx->stream,
+				     "%f %f scale\n",
+				     ctm->xx, ctm->yy);
     } else {
-	_cairo_output_stream_printf (surface->ctx->stream,
-				   "[%f %f %f %f 0 0] set-matrix\n",
-				   ctm->xx, ctm->yx,
-				   ctm->xy, ctm->yy);
+	_cairo_output_stream_printf (ctx->stream,
+				     "[%f %f %f %f 0 0] set-matrix\n",
+				     ctm->xx, ctm->yx,
+				     ctm->xy, ctm->yy);
     }
 
     return CAIRO_STATUS_SUCCESS;
@@ -1638,6 +1730,7 @@ static cairo_status_t
 _emit_font_matrix (cairo_script_surface_t *surface,
 		   const cairo_matrix_t *font_matrix)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     assert (target_is_active (surface));
 
     if (memcmp (&surface->cr.current_font_matrix,
@@ -1650,14 +1743,14 @@ _emit_font_matrix (cairo_script_surface_t *surface,
     surface->cr.current_font_matrix = *font_matrix;
 
     if (_cairo_matrix_is_identity (font_matrix)) {
-	_cairo_output_stream_puts (surface->ctx->stream,
+	_cairo_output_stream_puts (ctx->stream,
 				   "identity set-font-matrix\n");
     } else {
-	_cairo_output_stream_printf (surface->ctx->stream,
-				   "[%f %f %f %f %f %f] set-font-matrix\n",
-				   font_matrix->xx, font_matrix->yx,
-				   font_matrix->xy, font_matrix->yy,
-				   font_matrix->x0, font_matrix->y0);
+	_cairo_output_stream_printf (ctx->stream,
+				     "[%f %f %f %f %f %f] set-font-matrix\n",
+				     font_matrix->xx, font_matrix->yx,
+				     font_matrix->xy, font_matrix->yy,
+				     font_matrix->x0, font_matrix->y0);
     }
 
     return CAIRO_STATUS_SUCCESS;
@@ -1674,12 +1767,18 @@ _cairo_script_surface_create_similar (void	       *abstract_surface,
     cairo_script_context_t *ctx;
     cairo_status_t status;
 
-    ctx = other->ctx;
+    ctx = to_context (other);
+
+    status = cairo_device_acquire (&ctx->base);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
 
     if (! other->emitted) {
 	status = _emit_surface (other);
-	if (unlikely (status))
+	if (unlikely (status)) {
+	    cairo_device_release (&ctx->base);
 	    return _cairo_surface_create_in_error (status);
+	}
 
 	target_push (other);
     }
@@ -1688,8 +1787,10 @@ _cairo_script_surface_create_similar (void	       *abstract_surface,
 	passthrough =
 	    _cairo_surface_wrapper_create_similar (&other->wrapper,
 						   content, width, height);
-	if (unlikely (passthrough->status))
+	if (unlikely (passthrough->status)) {
+	    cairo_device_release (&ctx->base);
 	    return passthrough;
+	}
     }
 
     surface = _cairo_script_surface_create_internal (ctx,
@@ -1698,8 +1799,10 @@ _cairo_script_surface_create_similar (void	       *abstract_surface,
 						     passthrough);
     cairo_surface_destroy (passthrough);
 
-    if (unlikely (surface->base.status))
+    if (unlikely (surface->base.status)) {
+	cairo_device_release (&ctx->base);
 	return &surface->base;
+    }
 
     _get_target (other);
     _cairo_output_stream_printf (ctx->stream,
@@ -1709,20 +1812,27 @@ _cairo_script_surface_create_similar (void	       *abstract_surface,
 				 surface->base.unique_id);
     surface->emitted = TRUE;
     surface->defined = TRUE;
-    surface->is_clear = TRUE;
+    surface->base.is_clear = TRUE;
     target_push (surface);
 
+    cairo_device_release (&ctx->base);
     return &surface->base;
 }
 
-static cairo_status_t
-_context_destroy (cairo_script_context_t *ctx)
+static void
+_device_flush (void *abstract_device)
 {
+    cairo_script_context_t *ctx = abstract_device;
     cairo_status_t status;
 
-    assert (ctx->ref > 0);
-    if (--ctx->ref)
-	return _cairo_output_stream_flush (ctx->stream);
+    status = _cairo_output_stream_flush (ctx->stream);
+}
+
+static void
+_device_destroy (void *abstract_device)
+{
+    cairo_script_context_t *ctx = abstract_device;
+    cairo_status_t status;
 
     while (! cairo_list_is_empty (&ctx->fonts)) {
 	cairo_script_surface_font_private_t *font;
@@ -1731,7 +1841,9 @@ _context_destroy (cairo_script_context_t *ctx)
 				       cairo_script_surface_font_private_t,
 				       link);
 	cairo_list_del (&font->link);
-	_cairo_script_surface_scaled_font_fini (font->parent);
+	if (font->parent->surface_private == font)
+	    font->parent->surface_private = NULL;
+	free (font);
     }
 
     while (! cairo_list_is_empty (&ctx->defines)) {
@@ -1744,11 +1856,12 @@ _context_destroy (cairo_script_context_t *ctx)
 	assert (status == CAIRO_STATUS_SUCCESS);
     }
 
+    _bitmap_fini (ctx->surface_id.next);
+    _bitmap_fini (ctx->font_id.next);
+
     status = _cairo_output_stream_destroy (ctx->stream);
 
     free (ctx);
-
-    return status;
 }
 
 static cairo_status_t
@@ -1784,6 +1897,7 @@ static cairo_status_t
 _cairo_script_surface_finish (void *abstract_surface)
 {
     cairo_script_surface_t *surface = abstract_surface;
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_status_t status = CAIRO_STATUS_SUCCESS, status2;
 
     _cairo_surface_wrapper_fini (&surface->wrapper);
@@ -1796,21 +1910,25 @@ _cairo_script_surface_finish (void *abstract_surface)
     _cairo_path_fixed_fini (&surface->cr.current_path);
     _cairo_surface_clipper_reset (&surface->clipper);
 
+    status = cairo_device_acquire (&ctx->base);
+    if (unlikely (status))
+	return status;
+
     if (surface->emitted) {
 	assert (! surface->active);
 
 	if (! cairo_list_is_empty (&surface->operand.link)) {
-	    if (! surface->ctx->active) {
+	    if (! ctx->active) {
 		if (target_is_active (surface)) {
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 "pop\n");
 		} else {
 		    int depth = target_depth (surface);
 		    if (depth == 1) {
-			_cairo_output_stream_printf (surface->ctx->stream,
+			_cairo_output_stream_printf (ctx->stream,
 						     "exch pop\n");
 		    } else {
-			_cairo_output_stream_printf (surface->ctx->stream,
+			_cairo_output_stream_printf (ctx->stream,
 						     "%d -1 roll pop\n",
 						     depth);
 		    }
@@ -1827,21 +1945,22 @@ _cairo_script_surface_finish (void *abstract_surface)
 		    link->operand.type = DEFERRED;
 		    cairo_list_swap (&link->operand.link,
 				     &surface->operand.link);
-		    cairo_list_add (&link->link, &surface->ctx->deferred);
+		    cairo_list_add (&link->link, &ctx->deferred);
 		}
 	    }
 	}
 
 	if (surface->defined) {
-	    _cairo_output_stream_printf (surface->ctx->stream,
+	    _cairo_output_stream_printf (ctx->stream,
 					 "/s%u undef\n",
 					 surface->base.unique_id);
 	}
     }
 
-    status2 = _context_destroy (surface->ctx);
     if (status == CAIRO_STATUS_SUCCESS)
-	status = status2;
+	status = _cairo_output_stream_flush (to_context (surface)->stream);
+
+    cairo_device_release (&ctx->base);
 
     return status;
 }
@@ -1852,13 +1971,19 @@ _cairo_script_surface_copy_page (void *abstract_surface)
     cairo_script_surface_t *surface = abstract_surface;
     cairo_status_t status;
 
-    status = _emit_context (surface);
+    status = cairo_device_acquire (surface->base.device);
     if (unlikely (status))
 	return status;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "copy-page\n");
+    status = _emit_context (surface);
+    if (unlikely (status))
+	goto BAIL;
 
-    return CAIRO_STATUS_SUCCESS;
+    _cairo_output_stream_puts (to_context (surface)->stream, "copy-page\n");
+
+BAIL:
+    cairo_device_release (surface->base.device);
+    return status;
 }
 
 static cairo_int_status_t
@@ -1867,13 +1992,19 @@ _cairo_script_surface_show_page (void *abstract_surface)
     cairo_script_surface_t *surface = abstract_surface;
     cairo_status_t status;
 
-    status = _emit_context (surface);
+    status = cairo_device_acquire (surface->base.device);
     if (unlikely (status))
 	return status;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "show-page\n");
+    status = _emit_context (surface);
+    if (unlikely (status))
+	goto BAIL;
 
-    return CAIRO_STATUS_SUCCESS;
+    _cairo_output_stream_puts (to_context (surface)->stream, "show-page\n");
+
+BAIL:
+    cairo_device_release (surface->base.device);
+    return status;
 }
 
 static cairo_status_t
@@ -1886,6 +2017,7 @@ _cairo_script_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
     cairo_script_surface_t *surface = cairo_container_of (clipper,
 							  cairo_script_surface_t,
 							  clipper);
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_bool_t matrix_updated = FALSE;
     cairo_status_t status;
     cairo_box_t box;
@@ -1896,7 +2028,7 @@ _cairo_script_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
 
     if (path == NULL) {
 	if (surface->cr.has_clip) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "reset-clip\n");
+	    _cairo_output_stream_puts (ctx->stream, "reset-clip\n");
 	    surface->cr.has_clip = FALSE;
 	}
 	return CAIRO_STATUS_SUCCESS;
@@ -1938,30 +2070,40 @@ _cairo_script_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clip
     if (unlikely (status))
 	return status;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "clip+\n");
+    _cairo_output_stream_puts (ctx->stream, "clip+\n");
     surface->cr.has_clip = TRUE;
 
     return CAIRO_STATUS_SUCCESS;
 }
 
-static void
+static cairo_status_t
 active (cairo_script_surface_t *surface)
 {
+    cairo_status_t status;
+
+    status = cairo_device_acquire (surface->base.device);
+    if (unlikely (status))
+	return status;
+
     if (surface->active++ == 0)
-	surface->ctx->active++;
+	to_context (surface)->active++;
+
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static void
 inactive (cairo_script_surface_t *surface)
 {
-    cairo_script_context_t *ctx = surface->ctx;
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_list_t sorted;
 
+    assert (surface->active > 0);
     if (--surface->active)
-	return;
+	goto DONE;
 
+    assert (ctx->active > 0);
     if (--ctx->active)
-	return;
+	goto DONE;
 
     cairo_list_init (&sorted);
     while (! cairo_list_is_empty (&ctx->deferred)) {
@@ -2030,6 +2172,9 @@ inactive (cairo_script_surface_t *surface)
 	cairo_list_del (&df->link);
 	free (df);
     }
+
+DONE:
+    cairo_device_release (surface->base.device);
 }
 
 static cairo_int_status_t
@@ -2041,43 +2186,41 @@ _cairo_script_surface_paint (void			*abstract_surface,
     cairo_script_surface_t *surface = abstract_surface;
     cairo_status_t status;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    goto DONE;
-    }
-
-    active (surface);
+    status = active (surface);
+    if (unlikely (status))
+	return status;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_context (surface);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_source (surface, op, source);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_operator (surface, op);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
-    _cairo_output_stream_puts (surface->ctx->stream,
+    _cairo_output_stream_puts (to_context (surface)->stream,
 			       "paint\n");
 
-    surface->is_clear = op == CAIRO_OPERATOR_CLEAR && clip == NULL;
-
     inactive (surface);
 
-  DONE:
     if (_cairo_surface_wrapper_is_active (&surface->wrapper)) {
 	return _cairo_surface_wrapper_paint (&surface->wrapper,
 					     op, source, clip);
     }
 
     return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    inactive (surface);
+    return status;
 }
 
 static cairo_int_status_t
@@ -2090,53 +2233,51 @@ _cairo_script_surface_mask (void			*abstract_surface,
     cairo_script_surface_t *surface = abstract_surface;
     cairo_status_t status;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    goto DONE;
-    }
-
-    active (surface);
+    status = active (surface);
+    if (unlikely (status))
+	return status;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_context (surface);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_source (surface, op, source);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_operator (surface, op);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     if (_cairo_pattern_equal (source, mask)) {
-	_cairo_output_stream_puts (surface->ctx->stream, "/source get");
+	_cairo_output_stream_puts (to_context (surface)->stream, "/source get");
     } else {
 	status = _emit_pattern (surface, mask);
 	if (unlikely (status))
-	    return status;
+	    goto BAIL;
     }
 
     assert (surface->cr.current_operator == op);
 
-    _cairo_output_stream_puts (surface->ctx->stream,
+    _cairo_output_stream_puts (to_context (surface)->stream,
 			       " mask\n");
 
-    surface->is_clear = FALSE;
-
     inactive (surface);
 
-  DONE:
     if (_cairo_surface_wrapper_is_active (&surface->wrapper)) {
 	return _cairo_surface_wrapper_mask (&surface->wrapper,
 					    op, source, mask, clip);
     }
 
     return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    inactive (surface);
+    return status;
 }
 
 static cairo_int_status_t
@@ -2144,9 +2285,9 @@ _cairo_script_surface_stroke (void				*abstract_surface,
 			      cairo_operator_t			 op,
 			      const cairo_pattern_t		*source,
 			      cairo_path_fixed_t		*path,
-			      cairo_stroke_style_t		*style,
-			      cairo_matrix_t			*ctm,
-			      cairo_matrix_t			*ctm_inverse,
+			      const cairo_stroke_style_t	*style,
+			      const cairo_matrix_t		*ctm,
+			      const cairo_matrix_t		*ctm_inverse,
 			      double				 tolerance,
 			      cairo_antialias_t			 antialias,
 			      cairo_clip_t			*clip)
@@ -2155,40 +2296,37 @@ _cairo_script_surface_stroke (void				*abstract_surface,
     cairo_bool_t matrix_updated = FALSE;
     cairo_status_t status;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    goto DONE;
-    }
-
-    active (surface);
+    status = active (surface);
+    if (unlikely (status))
+	return status;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_context (surface);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_identity (surface, &matrix_updated);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_path (surface, path);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_source (surface, op, source);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_scaling_matrix (surface, ctm, &matrix_updated);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_operator (surface, op);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     if (_scaling_matrix_equal (&surface->cr.current_ctm,
 			       &surface->cr.current_stroke_matrix))
@@ -2203,25 +2341,22 @@ _cairo_script_surface_stroke (void				*abstract_surface,
 
     status = _emit_stroke_style (surface, style, matrix_updated);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     if (! path->is_rectilinear) {
 	status = _emit_tolerance (surface, tolerance, matrix_updated);
 	if (unlikely (status))
-	    return status;
+	    goto BAIL;
     }
 
     status = _emit_antialias (surface, antialias);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "stroke+\n");
-
-    surface->is_clear = FALSE;
+    _cairo_output_stream_puts (to_context (surface)->stream, "stroke+\n");
 
     inactive (surface);
 
-  DONE:
     if (_cairo_surface_wrapper_is_active (&surface->wrapper)) {
 	return _cairo_surface_wrapper_stroke (&surface->wrapper,
 					      op, source, path,
@@ -2232,6 +2367,10 @@ _cairo_script_surface_stroke (void				*abstract_surface,
     }
 
     return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    inactive (surface);
+    return status;
 }
 
 static cairo_int_status_t
@@ -2249,62 +2388,56 @@ _cairo_script_surface_fill (void			*abstract_surface,
     cairo_status_t status;
     cairo_box_t box;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    goto DONE;
-    }
-
-    active (surface);
+    status = active (surface);
+    if (unlikely (status))
+	return status;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_context (surface);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_identity (surface, &matrix_updated);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_source (surface, op, source);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     if (! _cairo_path_fixed_is_box (path, &box)) {
 	status = _emit_fill_rule (surface, fill_rule);
 	if (unlikely (status))
-	    return status;
+	    goto BAIL;
     }
 
     if (! path->is_rectilinear) {
 	status = _emit_tolerance (surface, tolerance, matrix_updated);
 	if (unlikely (status))
-	    return status;
+	    goto BAIL;
     }
 
     if (! path->maybe_fill_region) {
 	status = _emit_antialias (surface, antialias);
 	if (unlikely (status))
-	    return status;
+	    goto BAIL;
     }
 
     status = _emit_path (surface, path);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_operator (surface, op);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "fill+\n");
-
-    surface->is_clear = FALSE;
+    _cairo_output_stream_puts (to_context (surface)->stream, "fill+\n");
 
     inactive (surface);
 
-  DONE:
     if (_cairo_surface_wrapper_is_active (&surface->wrapper)) {
 	return _cairo_surface_wrapper_fill (&surface->wrapper,
 					    op, source, path,
@@ -2315,6 +2448,10 @@ _cairo_script_surface_fill (void			*abstract_surface,
     }
 
     return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    inactive (surface);
+    return status;
 }
 
 static cairo_surface_t *
@@ -2373,16 +2510,18 @@ static cairo_status_t
 _emit_font_options (cairo_script_surface_t *surface,
 		    cairo_font_options_t *font_options)
 {
+    cairo_script_context_t *ctx = to_context (surface);
+
     if (cairo_font_options_equal (&surface->cr.current_font_options,
 				  font_options))
     {
 	return CAIRO_STATUS_SUCCESS;
     }
 
-    _cairo_output_stream_printf (surface->ctx->stream, "<<");
+    _cairo_output_stream_printf (ctx->stream, "<<");
 
     if (font_options->antialias != surface->cr.current_font_options.antialias) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /antialias //%s",
 				     _antialias_to_string (font_options->antialias));
     }
@@ -2390,7 +2529,7 @@ _emit_font_options (cairo_script_surface_t *surface,
     if (font_options->subpixel_order !=
 	surface->cr.current_font_options.subpixel_order)
     {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /subpixel-order //%s",
 				     _subpixel_order_to_string (font_options->subpixel_order));
     }
@@ -2398,7 +2537,7 @@ _emit_font_options (cairo_script_surface_t *surface,
     if (font_options->hint_style !=
 	surface->cr.current_font_options.hint_style)
     {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /hint-style //%s",
 				     _hint_style_to_string (font_options->hint_style));
     }
@@ -2406,12 +2545,12 @@ _emit_font_options (cairo_script_surface_t *surface,
     if (font_options->hint_metrics !=
 	surface->cr.current_font_options.hint_metrics)
     {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /hint-metrics //%s",
 				     _hint_metrics_to_string (font_options->hint_metrics));
     }
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 " >> set-font-options\n");
 
     surface->cr.current_font_options = *font_options;
@@ -2425,14 +2564,22 @@ _cairo_script_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 
     font_private = scaled_font->surface_private;
     if (font_private != NULL) {
-	_cairo_output_stream_printf (font_private->ctx->stream,
-				     "/f%lu undef /sf%lu undef\n",
-				     font_private->id,
-				     font_private->id);
+	cairo_status_t status;
+	cairo_device_t *device;
 
-	_bitmap_release_id (&font_private->ctx->font_id, font_private->id);
-	cairo_list_del (&font_private->link);
-	free (font_private);
+	status = cairo_device_acquire (device = &font_private->ctx->base);
+	if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	    _cairo_output_stream_printf (font_private->ctx->stream,
+					 "/f%lu undef /sf%lu undef\n",
+					 font_private->id,
+					 font_private->id);
+
+	    _bitmap_release_id (&font_private->ctx->font_id, font_private->id);
+	    cairo_list_del (&font_private->link);
+	    free (font_private);
+
+	    cairo_device_release (device);
+	}
 
 	scaled_font->surface_private = NULL;
     }
@@ -2442,6 +2589,7 @@ static cairo_status_t
 _emit_type42_font (cairo_script_surface_t *surface,
 		   cairo_scaled_font_t *scaled_font)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     const cairo_scaled_font_backend_t *backend;
     cairo_script_surface_font_private_t *font_private;
     cairo_output_stream_t *base85_stream;
@@ -2465,14 +2613,18 @@ _emit_type42_font (cairo_script_surface_t *surface,
     if (unlikely (buf == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    status = backend->load_truetype_table (scaled_font, 0, 0, buf, NULL);
+    status = backend->load_truetype_table (scaled_font, 0, 0, buf, &size);
     if (unlikely (status)) {
 	free (buf);
 	return status;
     }
 
+#if CAIRO_HAS_FT_FONT
     load_flags = _cairo_ft_scaled_font_get_load_flags (scaled_font);
-    _cairo_output_stream_printf (surface->ctx->stream,
+#else
+    load_flags = 0;
+#endif
+    _cairo_output_stream_printf (ctx->stream,
 				 "<< "
 				 "/type 42 "
 				 "/index 0 "
@@ -2480,8 +2632,8 @@ _emit_type42_font (cairo_script_surface_t *surface,
 				 "/source <|",
 				 load_flags);
 
-    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
-    len = size;
+    base85_stream = _cairo_base85_stream_create (ctx->stream);
+    len = to_be32 (size);
     _cairo_output_stream_write (base85_stream, &len, sizeof (len));
 
     zlib_stream = _cairo_deflate_stream_create (base85_stream);
@@ -2498,7 +2650,7 @@ _emit_type42_font (cairo_script_surface_t *surface,
 	status = status2;
 
     font_private = scaled_font->surface_private;
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "~> >> font dup /f%lu exch def set-font-face",
 				 font_private->id);
 
@@ -2509,6 +2661,7 @@ static cairo_status_t
 _emit_scaled_font_init (cairo_script_surface_t *surface,
 			cairo_scaled_font_t *scaled_font)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_script_surface_font_private_t *font_private;
     cairo_status_t status;
 
@@ -2516,14 +2669,14 @@ _emit_scaled_font_init (cairo_script_surface_t *surface,
     if (unlikely (font_private == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    font_private->ctx = surface->ctx;
+    font_private->ctx = ctx;
     font_private->parent = scaled_font;
     font_private->subset_glyph_index = 0;
     font_private->has_sfnt = TRUE;
 
-    cairo_list_add (&font_private->link, &surface->ctx->fonts);
+    cairo_list_add (&font_private->link, &ctx->fonts);
 
-    status = _bitmap_next_id (&surface->ctx->font_id,
+    status = _bitmap_next_id (&ctx->font_id,
 			      &font_private->id);
     if (unlikely (status)) {
 	free (font_private);
@@ -2542,7 +2695,7 @@ _emit_scaled_font_init (cairo_script_surface_t *surface,
 	return status;
 
     font_private->has_sfnt = FALSE;
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "dict\n"
 				 "  /type 3 set\n"
 				 "  /metrics [%f %f %f %f %f] set\n"
@@ -2562,6 +2715,7 @@ static cairo_status_t
 _emit_scaled_font (cairo_script_surface_t *surface,
 		   cairo_scaled_font_t *scaled_font)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_matrix_t matrix;
     cairo_font_options_t options;
     cairo_bool_t matrix_updated = FALSE;
@@ -2604,11 +2758,11 @@ _emit_scaled_font (cairo_script_surface_t *surface,
 	assert (font_private != NULL);
 
 	assert (target_is_active (surface));
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " /scaled-font get /sf%lu exch def\n",
 				     font_private->id);
     } else {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "sf%lu set-scaled-font\n",
 				     font_private->id);
     }
@@ -2621,6 +2775,7 @@ _emit_scaled_glyph_vector (cairo_script_surface_t *surface,
 			   cairo_scaled_font_t *scaled_font,
 			   cairo_scaled_glyph_t *scaled_glyph)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_script_surface_font_private_t *font_private;
     cairo_script_implicit_context_t old_cr;
     cairo_status_t status;
@@ -2630,7 +2785,7 @@ _emit_scaled_glyph_vector (cairo_script_surface_t *surface,
     index = ++font_private->subset_glyph_index;
     scaled_glyph->surface_private = (void *) index;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "%lu <<\n"
 				 "  /metrics [%f %f %f %f %f %f]\n"
 				 "  /render {\n",
@@ -2643,7 +2798,7 @@ _emit_scaled_glyph_vector (cairo_script_surface_t *surface,
 				 scaled_glyph->fs_metrics.y_advance);
 
     if (! _cairo_matrix_is_identity (&scaled_font->scale_inverse)) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "[%f %f %f %f %f %f] transform\n",
 				     scaled_font->scale_inverse.xx,
 				     scaled_font->scale_inverse.yx,
@@ -2659,7 +2814,7 @@ _emit_scaled_glyph_vector (cairo_script_surface_t *surface,
 					      &surface->base);
     surface->cr = old_cr;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "} >> set\n");
+    _cairo_output_stream_puts (ctx->stream, "} >> set\n");
 
     return status;
 }
@@ -2669,6 +2824,7 @@ _emit_scaled_glyph_bitmap (cairo_script_surface_t *surface,
 			   cairo_scaled_font_t *scaled_font,
 			   cairo_scaled_glyph_t *scaled_glyph)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_script_surface_font_private_t *font_private;
     cairo_status_t status;
     unsigned long index;
@@ -2677,7 +2833,7 @@ _emit_scaled_glyph_bitmap (cairo_script_surface_t *surface,
     index = ++font_private->subset_glyph_index;
     scaled_glyph->surface_private = (void *) index;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "%lu <<\n"
 				 "  /metrics [%f %f %f %f %f %f]\n"
 				 "  /render {\n"
@@ -2696,8 +2852,10 @@ _emit_scaled_glyph_bitmap (cairo_script_surface_t *surface,
     if (unlikely (status))
 	return status;
 
+    _cairo_output_stream_puts (ctx->stream, "pattern ");
+
     if (! _cairo_matrix_is_identity (&scaled_font->font_matrix)) {
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     "\n  [%f %f %f %f %f %f] set-matrix\n",
 				     scaled_font->font_matrix.xx,
 				     scaled_font->font_matrix.yx,
@@ -2706,7 +2864,7 @@ _emit_scaled_glyph_bitmap (cairo_script_surface_t *surface,
 				     scaled_font->font_matrix.x0,
 				     scaled_font->font_matrix.y0);
     }
-    _cairo_output_stream_puts (surface->ctx->stream,
+    _cairo_output_stream_puts (ctx->stream,
 				 "mask\n} >> set\n");
 
     return CAIRO_STATUS_SUCCESS;
@@ -2722,7 +2880,7 @@ _emit_scaled_glyph_prologue (cairo_script_surface_t *surface,
 
     font_private = scaled_font->surface_private;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (to_context (surface)->stream,
 				 "f%lu /glyphs get\n",
 				 font_private->id);
 
@@ -2814,20 +2972,30 @@ _emit_scaled_glyphs (cairo_script_surface_t *surface,
     _cairo_scaled_font_thaw_cache (scaled_font);
 
     if (have_glyph_prologue) {
-	_cairo_output_stream_puts (surface->ctx->stream, "pop pop\n");
+	_cairo_output_stream_puts (to_context (surface)->stream, "pop pop\n");
     }
 
     return status;
 }
 
+static void
+to_octal (int value, char *buf, size_t size)
+{
+    do {
+	buf[--size] = '0' + (value & 7);
+	value >>= 3;
+    } while (size);
+}
+
 static void
 _emit_string_literal (cairo_script_surface_t *surface,
 		      const char *utf8, int len)
 {
+    cairo_script_context_t *ctx = to_context (surface);
     char c;
     const char *end;
 
-    _cairo_output_stream_puts (surface->ctx->stream, "(");
+    _cairo_output_stream_puts (ctx->stream, "(");
 
     if (utf8 == NULL) {
 	end = utf8;
@@ -2858,25 +3026,21 @@ _emit_string_literal (cairo_script_surface_t *surface,
 	case '(':
 	case ')':
 ESCAPED_CHAR:
-	    _cairo_output_stream_printf (surface->ctx->stream, "\\%c", c);
+	    _cairo_output_stream_printf (ctx->stream, "\\%c", c);
 	    break;
 	default:
 	    if (isprint (c) || isspace (c)) {
-		_cairo_output_stream_printf (surface->ctx->stream, "%c", c);
+		_cairo_output_stream_printf (ctx->stream, "%c", c);
 	    } else {
-		int octal = 0;
-		while (c) {
-		    octal *= 10;
-		    octal += c&7;
-		    c /= 8;
-		}
-		_cairo_output_stream_printf (surface->ctx->stream,
-					     "\\%03d", octal);
+		char buf[4] = { '\\' };
+
+		to_octal (c, buf+1, 3);
+		_cairo_output_stream_write (ctx->stream, buf, 4);
 	    }
 	    break;
 	}
     }
-    _cairo_output_stream_puts (surface->ctx->stream, ")");
+    _cairo_output_stream_puts (ctx->stream, ")");
 }
 
 static cairo_int_status_t
@@ -2894,6 +3058,7 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 					cairo_clip_t		    *clip)
 {
     cairo_script_surface_t *surface = abstract_surface;
+    cairo_script_context_t *ctx = to_context (surface);
     cairo_script_surface_font_private_t *font_private;
     cairo_scaled_glyph_t *scaled_glyph;
     cairo_matrix_t matrix;
@@ -2902,43 +3067,40 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
     int n;
     cairo_output_stream_t *base85_stream = NULL;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    goto DONE;
-    }
-
-    active (surface);
+    status = active (surface);
+    if (unlikely (status))
+	return status;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_context (surface);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_source (surface, op, source);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_scaled_font (surface, scaled_font);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_operator (surface, op);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     status = _emit_scaled_glyphs (surface, scaled_font, glyphs, num_glyphs);
     if (unlikely (status))
-	return status;
+	goto BAIL;
 
     /* (utf8) [cx cy [glyphs]] [clusters] backward show_text_glyphs */
     /* [cx cy [glyphs]] show_glyphs */
 
     if (utf8 != NULL && clusters != NULL) {
 	_emit_string_literal (surface, utf8, utf8_len);
-	_cairo_output_stream_puts (surface->ctx->stream, " ");
+	_cairo_output_stream_puts (ctx->stream, " ");
     }
 
     matrix = surface->cr.current_ctm;
@@ -2954,7 +3116,7 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
     _cairo_scaled_font_freeze_cache (scaled_font);
     font_private = scaled_font->surface_private;
 
-    _cairo_output_stream_printf (surface->ctx->stream,
+    _cairo_output_stream_printf (ctx->stream,
 				 "[%f %f ",
 				 ix, iy);
 
@@ -2969,7 +3131,7 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 						 &scaled_glyph);
 	    if (unlikely (status)) {
 		_cairo_scaled_font_thaw_cache (scaled_font);
-		return status;
+		goto BAIL;
 	    }
 
 	    if ((long unsigned) scaled_glyph->surface_private > 256)
@@ -2978,10 +3140,10 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
     }
 
     if (n == num_glyphs) {
-	_cairo_output_stream_puts (surface->ctx->stream, "<~");
-	base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	_cairo_output_stream_puts (ctx->stream, "<~");
+	base85_stream = _cairo_base85_stream_create (ctx->stream);
     } else
-	_cairo_output_stream_puts (surface->ctx->stream, "[");
+	_cairo_output_stream_puts (ctx->stream, "[");
 
     for (n = 0; n < num_glyphs; n++) {
 	double dx, dy;
@@ -2991,7 +3153,7 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 					     CAIRO_SCALED_GLYPH_INFO_METRICS,
 					     &scaled_glyph);
 	if (unlikely (status))
-	    break;
+	    goto BAIL;
 
 	if (fabs (glyphs[n].x - x) > 1e-5 || fabs (glyphs[n].y - y) > 1e-5) {
 	    if (fabs (glyphs[n].y - y) < 1e-5) {
@@ -3002,11 +3164,11 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 			break;
 		    }
 
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 "~> %f <~", glyphs[n].x - x);
-		    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+		    base85_stream = _cairo_base85_stream_create (ctx->stream);
 		} else {
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 " ] %f [ ", glyphs[n].x - x);
 		}
 
@@ -3024,12 +3186,12 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 			break;
 		    }
 
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 "~> %f %f <~",
 						 ix, iy);
-		    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+		    base85_stream = _cairo_base85_stream_create (ctx->stream);
 		} else {
-		    _cairo_output_stream_printf (surface->ctx->stream,
+		    _cairo_output_stream_printf (ctx->stream,
 						 " ] %f %f [ ",
 						 ix, iy);
 		}
@@ -3046,10 +3208,10 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 	    _cairo_output_stream_write (base85_stream, &c, 1);
 	} else {
 	    if (font_private->has_sfnt)
-		_cairo_output_stream_printf (surface->ctx->stream, " %lu",
+		_cairo_output_stream_printf (ctx->stream, " %lu",
 					     glyphs[n].index);
 	    else
-		_cairo_output_stream_printf (surface->ctx->stream, " %lu",
+		_cairo_output_stream_printf (ctx->stream, " %lu",
 					     (long unsigned) scaled_glyph->surface_private);
 	}
 
@@ -3068,9 +3230,9 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 	if (status == CAIRO_STATUS_SUCCESS)
 	    status = status2;
 
-	_cairo_output_stream_printf (surface->ctx->stream, "~>");
+	_cairo_output_stream_printf (ctx->stream, "~>");
     } else {
-	_cairo_output_stream_puts (surface->ctx->stream, " ]");
+	_cairo_output_stream_puts (ctx->stream, " ]");
     }
     if (unlikely (status))
 	return status;
@@ -3085,19 +3247,19 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 	}
 
 	if (n < num_clusters) {
-	    _cairo_output_stream_puts (surface->ctx->stream, "] [ ");
+	    _cairo_output_stream_puts (ctx->stream, "] [ ");
 	    for (n = 0; n < num_clusters; n++) {
-		_cairo_output_stream_printf (surface->ctx->stream,
+		_cairo_output_stream_printf (ctx->stream,
 					     "%d %d ",
 					     clusters[n].num_bytes,
 					     clusters[n].num_glyphs);
 	    }
-	    _cairo_output_stream_puts (surface->ctx->stream, "]");
+	    _cairo_output_stream_puts (ctx->stream, "]");
 	}
 	else
 	{
-	    _cairo_output_stream_puts (surface->ctx->stream, "] <~");
-	    base85_stream = _cairo_base85_stream_create (surface->ctx->stream);
+	    _cairo_output_stream_puts (ctx->stream, "] <~");
+	    base85_stream = _cairo_base85_stream_create (ctx->stream);
 	    for (n = 0; n < num_clusters; n++) {
 		uint8_t c[2];
 		c[0] = clusters[n].num_bytes;
@@ -3106,24 +3268,21 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
 	    }
 	    status = _cairo_output_stream_destroy (base85_stream);
 	    if (unlikely (status))
-		return status;
+		goto BAIL;
 
-	    _cairo_output_stream_puts (surface->ctx->stream, "~>");
+	    _cairo_output_stream_puts (ctx->stream, "~>");
 	}
 
-	_cairo_output_stream_printf (surface->ctx->stream,
+	_cairo_output_stream_printf (ctx->stream,
 				     " //%s show-text-glyphs\n",
 				     _direction_to_string (backward));
     } else {
-	_cairo_output_stream_puts (surface->ctx->stream,
+	_cairo_output_stream_puts (ctx->stream,
 				   "] show-glyphs\n");
     }
 
-    surface->is_clear = FALSE;
-
     inactive (surface);
 
-  DONE:
     if (_cairo_surface_wrapper_is_active (&surface->wrapper)){
 	return _cairo_surface_wrapper_show_text_glyphs (&surface->wrapper,
 							op, source,
@@ -3136,6 +3295,10 @@ _cairo_script_surface_show_text_glyphs (void			    *abstract_surface,
     }
 
     return CAIRO_STATUS_SUCCESS;
+
+BAIL:
+    inactive (surface);
+    return status;
 }
 
 static cairo_bool_t
@@ -3214,8 +3377,7 @@ _cairo_script_implicit_context_init (cairo_script_implicit_context_t *cr)
     cr->current_antialias = CAIRO_ANTIALIAS_DEFAULT;
     _cairo_stroke_style_init (&cr->current_style);
     _cairo_pattern_init_solid (&cr->current_source.solid,
-			       CAIRO_COLOR_BLACK,
-			       CAIRO_CONTENT_COLOR);
+			       CAIRO_COLOR_BLACK);
     _cairo_path_fixed_init (&cr->current_path);
     cairo_matrix_init_identity (&cr->current_ctm);
     cairo_matrix_init_identity (&cr->current_stroke_matrix);
@@ -3256,6 +3418,7 @@ _cairo_script_surface_create_internal (cairo_script_context_t *ctx,
 
     _cairo_surface_init (&surface->base,
 			 &_cairo_script_surface_backend,
+			 &ctx->base,
 			 content);
 
     _cairo_surface_wrapper_init (&surface->wrapper, passthrough);
@@ -3263,15 +3426,11 @@ _cairo_script_surface_create_internal (cairo_script_context_t *ctx,
     _cairo_surface_clipper_init (&surface->clipper,
 				 _cairo_script_surface_clipper_intersect_clip_path);
 
-    surface->ctx = ctx;
-    ctx->ref++;
-
     surface->width = width;
     surface->height = height;
 
     surface->emitted = FALSE;
     surface->defined = FALSE;
-    surface->is_clear = FALSE;
     surface->active = FALSE;
     surface->operand.type = SURFACE;
     cairo_list_init (&surface->operand.link);
@@ -3281,25 +3440,28 @@ _cairo_script_surface_create_internal (cairo_script_context_t *ctx,
     return surface;
 }
 
-static const cairo_script_context_t _nil_context = {
-    CAIRO_STATUS_NO_MEMORY,
-    -1
+static const cairo_device_backend_t _cairo_script_device_backend = {
+    CAIRO_DEVICE_TYPE_SCRIPT,
+
+    NULL, NULL, /* lock, unlock */
+
+    _device_flush,  /* flush */
+    NULL,  /* finish */
+    _device_destroy
 };
 
-static cairo_script_context_t *
+static cairo_device_t *
 _cairo_script_context_create_internal (cairo_output_stream_t *stream)
 {
     cairo_script_context_t *ctx;
 
     ctx = malloc (sizeof (cairo_script_context_t));
-    if (unlikely (ctx == NULL)) {
-	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-	return (cairo_script_context_t *) &_nil_context;
-    }
+    if (unlikely (ctx == NULL))
+	return _cairo_device_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
     memset (ctx, 0, sizeof (cairo_script_context_t));
-    ctx->status = CAIRO_STATUS_SUCCESS;
-    ctx->ref = 1;
+
+    _cairo_device_init (&ctx->base, &_cairo_script_device_backend);
 
     cairo_list_init (&ctx->operands);
     cairo_list_init (&ctx->deferred);
@@ -3311,39 +3473,43 @@ _cairo_script_context_create_internal (cairo_output_stream_t *stream)
 
     _cairo_output_stream_puts (ctx->stream, "%!CairoScript\n");
 
-    return ctx;
+    return &ctx->base;
 }
 
-cairo_script_context_t *
-cairo_script_context_create (const char *filename)
+cairo_device_t *
+cairo_script_create (const char *filename)
 {
     cairo_output_stream_t *stream;
+    cairo_status_t status;
 
     stream = _cairo_output_stream_create_for_filename (filename);
-    if (_cairo_output_stream_get_status (stream))
-	return (cairo_script_context_t *) &_nil_context;
+    if ((status = _cairo_output_stream_get_status (stream)))
+	return _cairo_device_create_in_error (status);
 
     return _cairo_script_context_create_internal (stream);
 }
 
-cairo_script_context_t *
-cairo_script_context_create_for_stream (cairo_write_func_t	 write_func,
-					void			*closure)
+cairo_device_t *
+cairo_script_create_for_stream (cairo_write_func_t	 write_func,
+				void			*closure)
 {
     cairo_output_stream_t *stream;
+    cairo_status_t status;
 
     stream = _cairo_output_stream_create (write_func, NULL, closure);
-    if (_cairo_output_stream_get_status (stream))
-	return (cairo_script_context_t *) &_nil_context;
+    if ((status = _cairo_output_stream_get_status (stream)))
+	return _cairo_device_create_in_error (status);
 
     return _cairo_script_context_create_internal (stream);
 }
 
 void
-cairo_script_context_write_comment (cairo_script_context_t *context,
-				    const char *comment,
-				    int len)
+cairo_script_write_comment (cairo_device_t *device,
+			    const char *comment,
+			    int len)
 {
+    cairo_script_context_t *context = (cairo_script_context_t *) device;
+
     if (len < 0)
 	len = strlen (comment);
 
@@ -3353,43 +3519,59 @@ cairo_script_context_write_comment (cairo_script_context_t *context,
 }
 
 void
-cairo_script_context_set_mode (cairo_script_context_t *context,
-			       cairo_script_mode_t mode)
+cairo_script_set_mode (cairo_device_t *device,
+		       cairo_script_mode_t mode)
 {
+    cairo_script_context_t *context = (cairo_script_context_t *) device;
+
     context->mode = mode;
 }
 
 cairo_script_mode_t
-cairo_script_context_get_mode (cairo_script_context_t *context)
+cairo_script_get_mode (cairo_device_t *device)
 {
+    cairo_script_context_t *context = (cairo_script_context_t *) device;
+
     return context->mode;
 }
 
 cairo_surface_t *
-cairo_script_surface_create (cairo_script_context_t *context,
+cairo_script_surface_create (cairo_device_t *device,
 			     cairo_content_t content,
 			     double width,
 			     double height)
 {
-    return &_cairo_script_surface_create_internal (context,
+    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_SCRIPT))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+
+    if (unlikely (device->status))
+	return _cairo_surface_create_in_error (device->status);
+
+    return &_cairo_script_surface_create_internal ((cairo_script_context_t *) device,
 						   content,
 						   width, height,
 						   NULL)->base;
 }
 
 cairo_surface_t *
-cairo_script_surface_create_for_target (cairo_script_context_t *context,
+cairo_script_surface_create_for_target (cairo_device_t *device,
 					cairo_surface_t *target)
 {
     cairo_rectangle_int_t extents;
 
+    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_SCRIPT))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+
+    if (unlikely (device->status))
+	return _cairo_surface_create_in_error (device->status);
+
     if (unlikely (target->status))
 	return _cairo_surface_create_in_error (target->status);
 
     if (! _cairo_surface_get_extents (target, &extents))
 	extents.width = extents.height = -1;
 
-    return &_cairo_script_surface_create_internal (context,
+    return &_cairo_script_surface_create_internal ((cairo_script_context_t *) device,
 						   target->content,
 						   extents.width,
 						   extents.height,
@@ -3397,7 +3579,7 @@ cairo_script_surface_create_for_target (cairo_script_context_t *context,
 }
 
 cairo_status_t
-cairo_script_from_recording_surface (cairo_script_context_t *context,
+cairo_script_from_recording_surface (cairo_device_t *device,
 				     cairo_surface_t *recording_surface)
 {
     cairo_box_t bbox;
@@ -3405,8 +3587,11 @@ cairo_script_from_recording_surface (cairo_script_context_t *context,
     cairo_surface_t *surface;
     cairo_status_t status;
 
-    if (unlikely (context->status))
-	return context->status;
+    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_SCRIPT))
+	return _cairo_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+
+    if (unlikely (device->status))
+	return _cairo_error (device->status);
 
     if (unlikely (recording_surface->status))
 	return recording_surface->status;
@@ -3421,7 +3606,7 @@ cairo_script_from_recording_surface (cairo_script_context_t *context,
 
     _cairo_box_round_to_rectangle (&bbox, &extents);
 
-    surface = &_cairo_script_surface_create_internal (context,
+    surface = &_cairo_script_surface_create_internal ((cairo_script_context_t *) device,
 						      recording_surface->content,
 						      extents.width,
 						      extents.height,
@@ -3435,14 +3620,3 @@ cairo_script_from_recording_surface (cairo_script_context_t *context,
 
     return status;
 }
-
-void
-cairo_script_context_destroy (cairo_script_context_t *context)
-{
-    cairo_status_t status_ignored;
-
-    if (context == NULL || context->ref < 0)
-	return;
-
-    status_ignored = _context_destroy (context);
-}
diff --git a/gfx/cairo/cairo/src/cairo-script.h b/gfx/cairo/cairo/src/cairo-script.h
index 5af625c1016..b82230f2f47 100644
--- a/gfx/cairo/cairo/src/cairo-script.h
+++ b/gfx/cairo/cairo/src/cairo-script.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,48 +42,43 @@
 
 CAIRO_BEGIN_DECLS
 
-typedef struct _cairo_script_context cairo_script_context_t;
-
 typedef enum {
     CAIRO_SCRIPT_MODE_BINARY,
     CAIRO_SCRIPT_MODE_ASCII
 } cairo_script_mode_t;
 
-cairo_public cairo_script_context_t *
-cairo_script_context_create (const char *filename);
+cairo_public cairo_device_t *
+cairo_script_create (const char *filename);
 
-cairo_public cairo_script_context_t *
-cairo_script_context_create_for_stream (cairo_write_func_t	 write_func,
-					void			*closure);
+cairo_public cairo_device_t *
+cairo_script_create_for_stream (cairo_write_func_t	 write_func,
+				void			*closure);
 
 cairo_public void
-cairo_script_context_write_comment (cairo_script_context_t *context,
-				    const char *comment,
-				    int len);
+cairo_script_write_comment (cairo_device_t *script,
+			    const char *comment,
+			    int len);
 
 cairo_public void
-cairo_script_context_set_mode (cairo_script_context_t *context,
-			       cairo_script_mode_t mode);
+cairo_script_set_mode (cairo_device_t *script,
+		       cairo_script_mode_t mode);
 
 cairo_public cairo_script_mode_t
-cairo_script_context_get_mode (cairo_script_context_t *context);
-
-cairo_public void
-cairo_script_context_destroy (cairo_script_context_t *context);
+cairo_script_get_mode (cairo_device_t *script);
 
 cairo_public cairo_surface_t *
-cairo_script_surface_create (cairo_script_context_t *context,
+cairo_script_surface_create (cairo_device_t *script,
 			     cairo_content_t content,
 			     double width,
 			     double height);
 
 cairo_public cairo_surface_t *
-cairo_script_surface_create_for_target (cairo_script_context_t *context,
+cairo_script_surface_create_for_target (cairo_device_t *script,
 					cairo_surface_t *target);
 
 cairo_public cairo_status_t
-cairo_script_from_recording_surface (cairo_script_context_t *context,
-				     cairo_surface_t        *recording_surface);
+cairo_script_from_recording_surface (cairo_device_t	*script,
+				     cairo_surface_t	*recording_surface);
 
 CAIRO_END_DECLS
 
diff --git a/gfx/cairo/cairo/src/cairo-skia.h b/gfx/cairo/cairo/src/cairo-skia.h
index 046599faa31..f6282352247 100644
--- a/gfx/cairo/cairo/src/cairo-skia.h
+++ b/gfx/cairo/cairo/src/cairo-skia.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,7 +39,7 @@
 
 #include "cairo.h"
 
-#ifdef CAIRO_HAS_SKIA_SURFACE
+#if CAIRO_HAS_SKIA_SURFACE
 
 CAIRO_BEGIN_DECLS
 
diff --git a/gfx/cairo/cairo/src/cairo-slope-private.h b/gfx/cairo/cairo/src/cairo-slope-private.h
index 64f0dde381d..6a58c9f456d 100644
--- a/gfx/cairo/cairo/src/cairo-slope-private.h
+++ b/gfx/cairo/cairo/src/cairo-slope-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-slope.c b/gfx/cairo/cairo/src/cairo-slope.c
index bb3b411e612..827037f76d5 100644
--- a/gfx/cairo/cairo/src/cairo-slope.c
+++ b/gfx/cairo/cairo/src/cairo-slope.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-spans-private.h b/gfx/cairo/cairo/src/cairo-spans-private.h
index af3b38ca9e0..00a4df86847 100644
--- a/gfx/cairo/cairo/src/cairo-spans-private.h
+++ b/gfx/cairo/cairo/src/cairo-spans-private.h
@@ -103,6 +103,54 @@ _cairo_tor_scan_converter_create (int			xmin,
 				  int			ymax,
 				  cairo_fill_rule_t	fill_rule);
 
+typedef struct _cairo_rectangular_scan_converter {
+    cairo_scan_converter_t base;
+
+    int xmin, xmax;
+    int ymin, ymax;
+
+    struct _cairo_rectangular_scan_converter_chunk {
+	struct _cairo_rectangular_scan_converter_chunk *next;
+	void *base;
+	int count;
+	int size;
+    } chunks, *tail;
+    char buf[CAIRO_STACK_BUFFER_SIZE];
+    int num_rectangles;
+} cairo_rectangular_scan_converter_t;
+
+cairo_private void
+_cairo_rectangular_scan_converter_init (cairo_rectangular_scan_converter_t *self,
+					const cairo_rectangle_int_t *extents);
+
+cairo_private cairo_status_t
+_cairo_rectangular_scan_converter_add_box (cairo_rectangular_scan_converter_t *self,
+					   const cairo_box_t *box,
+					   int dir);
+
+typedef struct _cairo_botor_scan_converter {
+    cairo_scan_converter_t base;
+
+    cairo_box_t extents;
+    cairo_fill_rule_t fill_rule;
+
+    int xmin, xmax;
+
+    struct _cairo_botor_scan_converter_chunk {
+	struct _cairo_botor_scan_converter_chunk *next;
+	void *base;
+	int count;
+	int size;
+    } chunks, *tail;
+    char buf[CAIRO_STACK_BUFFER_SIZE];
+    int num_edges;
+} cairo_botor_scan_converter_t;
+
+cairo_private void
+_cairo_botor_scan_converter_init (cairo_botor_scan_converter_t *self,
+				  const cairo_box_t *extents,
+				  cairo_fill_rule_t fill_rule);
+
 /* cairo-spans.c: */
 
 cairo_private cairo_scan_converter_t *
@@ -138,16 +186,4 @@ _cairo_surface_composite_polygon (cairo_surface_t	*surface,
 				  cairo_polygon_t	*polygon,
 				  cairo_region_t	*clip_region);
 
-cairo_private cairo_status_t
-_cairo_surface_composite_trapezoids_as_polygon (cairo_surface_t	*surface,
-						cairo_operator_t	 op,
-						const cairo_pattern_t	*pattern,
-						cairo_antialias_t	antialias,
-						int src_x, int src_y,
-						int dst_x, int dst_y,
-						int width, int height,
-						cairo_trapezoid_t	*traps,
-						int num_traps,
-						cairo_region_t	*clip_region);
-
 #endif /* CAIRO_SPANS_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-spans.c b/gfx/cairo/cairo/src/cairo-spans.c
index 69894c11f50..a187b899807 100644
--- a/gfx/cairo/cairo/src/cairo-spans.c
+++ b/gfx/cairo/cairo/src/cairo-spans.c
@@ -26,6 +26,7 @@
  */
 #include "cairoint.h"
 
+#include "cairo-composite-rectangles-private.h"
 #include "cairo-fixed-private.h"
 
 static cairo_scan_converter_t *
@@ -38,10 +39,10 @@ _create_scan_converter (cairo_fill_rule_t			 fill_rule,
 	return NULL;
     }
 
-    return _cairo_tor_scan_converter_create (rects->mask.x,
-					     rects->mask.y,
-					     rects->mask.x + rects->width,
-					     rects->mask.y + rects->height,
+    return _cairo_tor_scan_converter_create (rects->bounded.x,
+					     rects->bounded.y,
+					     rects->bounded.x + rects->bounded.width,
+					     rects->bounded.y + rects->bounded.height,
 					     fill_rule);
 }
 
@@ -83,71 +84,6 @@ _cairo_surface_composite_polygon (cairo_surface_t	*surface,
     return status;
 }
 
-cairo_status_t
-_cairo_surface_composite_trapezoids_as_polygon (cairo_surface_t	*surface,
-						cairo_operator_t	 op,
-						const cairo_pattern_t	*pattern,
-						cairo_antialias_t	antialias,
-						int src_x, int src_y,
-						int dst_x, int dst_y,
-						int width, int height,
-						cairo_trapezoid_t	*traps,
-						int num_traps,
-						cairo_region_t	*clip_region)
-{
-    cairo_span_renderer_t *renderer;
-    cairo_scan_converter_t *converter;
-    cairo_composite_rectangles_t rects;
-    cairo_status_t status;
-
-    rects.src.x = src_x;
-    rects.src.y = src_y;
-    rects.dst.x = dst_x;
-    rects.dst.y = dst_y;
-    rects.mask.x = dst_x;
-    rects.mask.y = dst_y;
-    rects.width  = width;
-    rects.height = height;
-
-    converter = _create_scan_converter (CAIRO_FILL_RULE_WINDING,
-					antialias,
-					&rects);
-    status = converter->status;
-    if (unlikely (status))
-	goto CLEANUP_CONVERTER;
-
-    while (num_traps--) {
-	status = converter->add_edge (converter,
-				      &traps->left.p1, &traps->left.p2,
-				      traps->top, traps->bottom, 1);
-	if (unlikely (status))
-	    goto CLEANUP_CONVERTER;
-
-	status = converter->add_edge (converter,
-				      &traps->right.p1, &traps->right.p2,
-				      traps->top, traps->bottom, -1);
-	if (unlikely (status))
-	    goto CLEANUP_CONVERTER;
-
-	traps++;
-    }
-
-    renderer = _cairo_surface_create_span_renderer (op, pattern, surface,
-						    antialias, &rects,
-						    clip_region);
-    status = converter->generate (converter, renderer);
-    if (unlikely (status))
-	goto CLEANUP_RENDERER;
-
-    status = renderer->finish (renderer);
-
- CLEANUP_RENDERER:
-    renderer->destroy (renderer);
- CLEANUP_CONVERTER:
-    converter->destroy (converter);
-    return status;
-}
-
 static void
 _cairo_nil_destroy (void *abstract)
 {
@@ -266,6 +202,8 @@ _cairo_scan_converter_create_in_error (cairo_status_t status)
     case CAIRO_STATUS_NO_MEMORY: RETURN_NIL;
     case CAIRO_STATUS_INVALID_SIZE: RETURN_NIL;
     case CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: RETURN_NIL;
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH: RETURN_NIL;
+    case CAIRO_STATUS_DEVICE_ERROR: RETURN_NIL;
     default:
 	break;
     }
@@ -374,6 +312,8 @@ _cairo_span_renderer_create_in_error (cairo_status_t status)
     case CAIRO_STATUS_NO_MEMORY: RETURN_NIL;
     case CAIRO_STATUS_INVALID_SIZE: RETURN_NIL;
     case CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: RETURN_NIL;
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH: RETURN_NIL;
+    case CAIRO_STATUS_DEVICE_ERROR: RETURN_NIL;
     default:
 	break;
     }
diff --git a/gfx/cairo/cairo/src/cairo-spline.c b/gfx/cairo/cairo/src/cairo-spline.c
index 132d9a516ef..e75ff5ee326 100644
--- a/gfx/cairo/cairo/src/cairo-spline.c
+++ b/gfx/cairo/cairo/src/cairo-spline.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-stroke-style.c b/gfx/cairo/cairo/src/cairo-stroke-style.c
index 36afeeb017e..1513d1f358e 100644
--- a/gfx/cairo/cairo/src/cairo-stroke-style.c
+++ b/gfx/cairo/cairo/src/cairo-stroke-style.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -34,6 +34,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 void
 _cairo_stroke_style_init (cairo_stroke_style_t *style)
@@ -52,7 +53,7 @@ _cairo_stroke_style_init (cairo_stroke_style_t *style)
 
 cairo_status_t
 _cairo_stroke_style_init_copy (cairo_stroke_style_t *style,
-			       cairo_stroke_style_t *other)
+			       const cairo_stroke_style_t *other)
 {
     if (CAIRO_INJECT_FAULT ())
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
@@ -144,6 +145,22 @@ _cairo_stroke_style_dash_period (const cairo_stroke_style_t *style)
 /*
  * Coefficient of the linear approximation (minimizing square difference)
  * of the surface covered by round caps
+ *
+ * This can be computed in the following way:
+ * the area inside the circle with radius w/2 and the region -d/2 <= x <= d/2 is:
+ *   f(w,d) = 2 * integrate (sqrt (w*w/4 - x*x), x, -d/2, d/2)
+ * The square difference to a generic linear approximation (c*d) in the range (0,w) would be:
+ *   integrate ((f(w,d) - c*d)^2, d, 0, w)
+ * To minimize this difference it is sufficient to find a solution of the differential with
+ * respect to c:
+ *   solve ( diff (integrate ((f(w,d) - c*d)^2, d, 0, w), c), c)
+ * Which leads to c = 9/32*pi*w
+ * Since we're not interested in the true area, but just in a coverage extimate,
+ * we always divide the real area by the line width (w).
+ * The same computation for square caps would be
+ *   f(w,d) = 2 * integrate(w/2, x, -d/2, d/2)
+ *   c = 1*w
+ * but in this case it would not be an approximation, since f is already linear in d.
  */
 #define ROUND_MINSQ_APPROXIMATION (9*M_PI/32)
 
@@ -222,8 +239,8 @@ _cairo_stroke_style_dash_approximate (const cairo_stroke_style_t *style,
     scale = tolerance / _cairo_matrix_transformed_circle_major_axis (ctm, 1.0);
 
     /* We stop searching for a starting point as soon as the
-       offset reaches zero.  Otherwise when an initial dash
-       segment shrinks to zero it will be skipped over. */
+     * offset reaches zero.  Otherwise when an initial dash
+     * segment shrinks to zero it will be skipped over. */
     offset = style->dash_offset;
     while (offset > 0.0 && offset >= style->dash[i]) {
 	offset -= style->dash[i];
@@ -234,8 +251,60 @@ _cairo_stroke_style_dash_approximate (const cairo_stroke_style_t *style,
 
     *num_dashes = 2;
 
-    dashes[0] = scale * coverage;
-    dashes[1] = scale * (1.0 - coverage);
+    /*
+     * We want to create a new dash pattern with the same relative coverage,
+     * but composed of just 2 elements with total length equal to scale.
+     * Based on the formula in _cairo_stroke_style_dash_stroked:
+     * scale * coverage = dashes[0] + cap_scale * MIN (dashes[1], line_width)
+     *                  = MIN (dashes[0] + cap_scale * (scale - dashes[0]),
+     *                         dashes[0] + cap_scale * line_width) = 
+     *                  = MIN (dashes[0] * (1 - cap_scale) + cap_scale * scale,
+     *	                       dashes[0] + cap_scale * line_width)
+     *
+     * Solving both cases we get:
+     *   dashes[0] = scale * (coverage - cap_scale) / (1 - cap_scale)
+     *	  when scale - dashes[0] <= line_width
+     *	dashes[0] = scale * coverage - cap_scale * line_width
+     *	  when scale - dashes[0] > line_width.
+     *
+     * Comparing the two cases we get:
+     *   second > first
+     *   second > scale * (coverage - cap_scale) / (1 - cap_scale)
+     *   second - cap_scale * second - scale * coverage + scale * cap_scale > 0
+     * 	 (scale * coverage - cap_scale * line_width) - cap_scale * second - scale * coverage + scale * cap_scale > 0
+     *   - line_width - second + scale > 0
+     *   scale - second > line_width
+     * which is the condition for the second solution to be the valid one.
+     * So when second > first, the second solution is the correct one (i.e.
+     * the solution is always MAX (first, second).
+     */
+    switch (style->line_cap) {
+    default:
+        ASSERT_NOT_REACHED;
+	dashes[0] = 0.0;
+	break;
+
+    case CAIRO_LINE_CAP_BUTT:
+        /* Simplified formula (substituting 0 for cap_scale): */
+        dashes[0] = scale * coverage;
+	break;
+
+    case CAIRO_LINE_CAP_ROUND:
+        dashes[0] = MAX(scale * (coverage - ROUND_MINSQ_APPROXIMATION) / (1.0 - ROUND_MINSQ_APPROXIMATION),
+			scale * coverage - ROUND_MINSQ_APPROXIMATION * style->line_width);
+	break;
+
+    case CAIRO_LINE_CAP_SQUARE:
+        /*
+	 * Special attention is needed to handle the case cap_scale == 1 (since the first solution
+	 * is either indeterminate or -inf in this case). Since dash lengths are always >=0, using
+	 * 0 as first solution always leads to the correct solution.
+	 */
+        dashes[0] = MAX(0.0, scale * coverage - style->line_width);
+	break;
+    }
+
+    dashes[1] = scale - dashes[0];
 
     *dash_offset = on ? 0.0 : dashes[0];
 }
diff --git a/gfx/cairo/cairo/src/cairo-supported-features.h b/gfx/cairo/cairo/src/cairo-supported-features.h
index 676b61e19cf..aacbab78181 100644
--- a/gfx/cairo/cairo/src/cairo-supported-features.h
+++ b/gfx/cairo/cairo/src/cairo-supported-features.h
@@ -6,13 +6,11 @@
 
 #define CAIRO_HAS_XLIB_SURFACE 1
 #define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
-#define CAIRO_HAS_XCB_SHM_FUNCTIONS 1
 #define CAIRO_HAS_QUARTZ_SURFACE 1
 #define CAIRO_HAS_QUARTZ_FONT 1
 #define CAIRO_HAS_WIN32_SURFACE 1
 #define CAIRO_HAS_WIN32_FONT 1
 #define CAIRO_HAS_PNG_FUNCTIONS 1
-#define CAIRO_HAS_EAGLE_FUNCTIONS 1
 #define CAIRO_HAS_EGL_FUNCTIONS 1
 #define CAIRO_HAS_GLX_FUNCTIONS 1
 #define CAIRO_HAS_FT_FONT 1
@@ -21,9 +19,7 @@
 #define CAIRO_HAS_PDF_SURFACE 1
 #define CAIRO_HAS_SVG_SURFACE 1
 #define CAIRO_HAS_IMAGE_SURFACE 1
-#define CAIRO_HAS_RECORDING_SURFACE 1
-#define CAIRO_HAS_TEE_SURFACE 1
-#define CAIRO_HAS_XML_SURFACE 1
+#define CAIRO_HAS_META_SURFACE 1
 #define CAIRO_HAS_USER_FONT 1
 
 #endif
diff --git a/gfx/cairo/cairo/src/cairo-surface-clipper-private.h b/gfx/cairo/cairo/src/cairo-surface-clipper-private.h
index f3d9de18939..b9ca3cb1cb5 100644
--- a/gfx/cairo/cairo/src/cairo-surface-clipper-private.h
+++ b/gfx/cairo/cairo/src/cairo-surface-clipper-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-surface-clipper.c b/gfx/cairo/cairo/src/cairo-surface-clipper.c
index 03610d16558..9487300477d 100644
--- a/gfx/cairo/cairo/src/cairo-surface-clipper.c
+++ b/gfx/cairo/cairo/src/cairo-surface-clipper.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -75,8 +75,11 @@ _cairo_surface_clipper_set_clip (cairo_surface_clipper_t *clipper,
     if (clip == NULL && clipper->clip.path == NULL)
 	return CAIRO_STATUS_SUCCESS;
 
-    if (clip != NULL && clip->path == clipper->clip.path)
+    if (clip != NULL && clipper->clip.path != NULL &&
+	_cairo_clip_equal (clip, &clipper->clip))
+    {
 	return CAIRO_STATUS_SUCCESS;
+    }
 
     /* all clipped out state should never propagate this far */
     assert (clip == NULL || clip->path != NULL);
diff --git a/gfx/cairo/cairo/src/cairo-surface-fallback-private.h b/gfx/cairo/cairo/src/cairo-surface-fallback-private.h
index c63c36e7495..e993de62eb1 100644
--- a/gfx/cairo/cairo/src/cairo-surface-fallback-private.h
+++ b/gfx/cairo/cairo/src/cairo-surface-fallback-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -59,9 +59,9 @@ _cairo_surface_fallback_stroke (cairo_surface_t		*surface,
 				cairo_operator_t	 op,
 				const cairo_pattern_t	*source,
 				cairo_path_fixed_t	*path,
-				cairo_stroke_style_t	*stroke_style,
-				cairo_matrix_t		*ctm,
-				cairo_matrix_t		*ctm_inverse,
+				const cairo_stroke_style_t	*stroke_style,
+				const cairo_matrix_t		*ctm,
+				const cairo_matrix_t		*ctm_inverse,
 				double			 tolerance,
 				cairo_antialias_t	 antialias,
 				cairo_clip_t		*clip);
diff --git a/gfx/cairo/cairo/src/cairo-surface-fallback.c b/gfx/cairo/cairo/src/cairo-surface-fallback.c
index 316558d0be5..51893ee6588 100644
--- a/gfx/cairo/cairo/src/cairo-surface-fallback.c
+++ b/gfx/cairo/cairo/src/cairo-surface-fallback.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,10 +40,13 @@
 
 #include "cairoint.h"
 
-#include "cairo-surface-fallback-private.h"
+#include "cairo-boxes-private.h"
 #include "cairo-clip-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-region-private.h"
 #include "cairo-spans-private.h"
+#include "cairo-surface-fallback-private.h"
 
 typedef struct {
     cairo_surface_t *dst;
@@ -124,22 +127,19 @@ _create_composite_mask_pattern (cairo_surface_pattern_t       *mask_pattern,
 				const cairo_rectangle_int_t   *extents)
 {
     cairo_surface_t *mask;
-    cairo_region_t *clip_region = NULL;
-    cairo_solid_pattern_t solid;
+    cairo_region_t *clip_region = NULL, *fallback_region = NULL;
     cairo_status_t status;
     cairo_bool_t clip_surface = FALSE;
 
     if (clip != NULL) {
 	status = _cairo_clip_get_region (clip, &clip_region);
-	assert (! _cairo_status_is_error (status));
-
-	/* The all-clipped state should never propagate this far. */
-	assert (status != CAIRO_INT_STATUS_NOTHING_TO_DO);
+	if (unlikely (_cairo_status_is_error (status) ||
+		      status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	{
+	    return status;
+	}
 
 	clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
-
-	if (clip_region && cairo_region_num_rectangles (clip_region) == 1)
-	    clip_region = NULL;
     }
 
     /* We need to use solid here, because to use CAIRO_OPERATOR_SOURCE with
@@ -154,9 +154,20 @@ _create_composite_mask_pattern (cairo_surface_pattern_t       *mask_pattern,
     if (unlikely (mask->status))
 	return mask->status;
 
-    _cairo_pattern_init_solid (&solid, CAIRO_COLOR_WHITE, CAIRO_CONTENT_ALPHA);
+    if (clip_region && (extents->x || extents->y)) {
+	fallback_region = cairo_region_copy (clip_region);
+	status = fallback_region->status;
+	if (unlikely (status))
+	    goto CLEANUP_SURFACE;
+
+	cairo_region_translate (fallback_region,
+				-extents->x,
+				-extents->y);
+	clip_region = fallback_region;
+    }
+
     status = draw_func (draw_closure, CAIRO_OPERATOR_ADD,
-			&solid.base, mask,
+			&_cairo_pattern_white.base, mask,
 			extents->x, extents->y,
 			extents,
 			clip_region);
@@ -164,11 +175,13 @@ _create_composite_mask_pattern (cairo_surface_pattern_t       *mask_pattern,
 	goto CLEANUP_SURFACE;
 
     if (clip_surface)
-	status = _cairo_clip_combine_with_surface (clip, mask, extents);
+	status = _cairo_clip_combine_with_surface (clip, mask, extents->x, extents->y);
 
     _cairo_pattern_init_for_surface (mask_pattern, mask);
 
  CLEANUP_SURFACE:
+    if (fallback_region)
+        cairo_region_destroy (fallback_region);
     cairo_surface_destroy (mask);
 
     return status;
@@ -224,6 +237,7 @@ _clip_and_composite_combine (cairo_clip_t                  *clip,
     cairo_surface_pattern_t pattern;
     cairo_surface_pattern_t clip_pattern;
     cairo_surface_t *clip_surface;
+    int clip_x, clip_y;
     cairo_status_t status;
 
     /* We'd be better off here creating a surface identical in format
@@ -268,36 +282,35 @@ _clip_and_composite_combine (cairo_clip_t                  *clip,
 	goto CLEANUP_SURFACE;
 
     assert (clip->path != NULL);
-    clip_surface = _cairo_clip_get_surface (clip, dst);
+    clip_surface = _cairo_clip_get_surface (clip, dst, &clip_x, &clip_y);
     if (unlikely (clip_surface->status))
 	goto CLEANUP_SURFACE;
 
     _cairo_pattern_init_for_surface (&clip_pattern, clip_surface);
-    cairo_surface_destroy (clip_surface);
 
     /* Combine that with the clip */
     status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_IN,
 				       &clip_pattern.base, NULL, intermediate,
-				       extents->x - clip->path->extents.x,
-				       extents->y - clip->path->extents.y,
+				       extents->x - clip_x,
+				       extents->y - clip_y,
 				       0, 0,
 				       0, 0,
 				       extents->width, extents->height,
 				       NULL);
     if (unlikely (status))
-	goto CLEANUP_SURFACE;
+	goto CLEANUP_CLIP;
 
     /* Punch the clip out of the destination */
     status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_OUT,
 				       &clip_pattern.base, NULL, dst,
-				       extents->x - clip->path->extents.x,
-				       extents->y - clip->path->extents.y,
+				       extents->x - clip_x,
+				       extents->y - clip_y,
 				       0, 0,
 				       extents->x, extents->y,
 				       extents->width, extents->height,
 				       NULL);
     if (unlikely (status))
-	goto CLEANUP_SURFACE;
+	goto CLEANUP_CLIP;
 
     /* Now add the two results together */
     _cairo_pattern_init_for_surface (&pattern, intermediate);
@@ -310,8 +323,9 @@ _clip_and_composite_combine (cairo_clip_t                  *clip,
 				       NULL);
     _cairo_pattern_fini (&pattern.base);
 
- CLEANUP_SURFACE:
+ CLEANUP_CLIP:
     _cairo_pattern_fini (&clip_pattern.base);
+ CLEANUP_SURFACE:
     cairo_surface_destroy (intermediate);
 
     return status;
@@ -334,13 +348,13 @@ _clip_and_composite_source (cairo_clip_t                  *clip,
 
     if (clip != NULL) {
 	status = _cairo_clip_get_region (clip, &clip_region);
-	assert (! _cairo_status_is_error (status));
-	if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
-	    return CAIRO_STATUS_SUCCESS;
-
+	if (unlikely (_cairo_status_is_error (status) ||
+		      status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	{
+	    return status;
+	}
     }
 
-
     /* Create a surface that is mask IN clip */
     status = _create_composite_mask_pattern (&mask_pattern,
 					     clip,
@@ -411,7 +425,6 @@ _clip_and_composite (cairo_clip_t                  *clip,
 		     cairo_surface_t               *dst,
 		     const cairo_rectangle_int_t   *extents)
 {
-    cairo_solid_pattern_t solid_pattern;
     cairo_status_t status;
 
     if (_cairo_rectangle_empty (extents))
@@ -419,9 +432,7 @@ _clip_and_composite (cairo_clip_t                  *clip,
 	return CAIRO_STATUS_SUCCESS;
 
     if (op == CAIRO_OPERATOR_CLEAR) {
-	_cairo_pattern_init_solid (&solid_pattern, CAIRO_COLOR_WHITE,
-				   CAIRO_CONTENT_COLOR);
-	src = &solid_pattern.base;
+	src = &_cairo_pattern_white.base;
 	op = CAIRO_OPERATOR_DEST_OUT;
     }
 
@@ -436,9 +447,11 @@ _clip_and_composite (cairo_clip_t                  *clip,
 
 	if (clip != NULL) {
 	    status = _cairo_clip_get_region (clip, &clip_region);
-	    assert (! _cairo_status_is_error (status));
-	    if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
-		return CAIRO_STATUS_SUCCESS;
+	    if (unlikely (_cairo_status_is_error (status) ||
+			  status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	    {
+		return status;
+	    }
 
 	    clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
 	}
@@ -456,7 +469,6 @@ _clip_and_composite (cairo_clip_t                  *clip,
 						      dst, extents);
 	    }
 	} else {
-
 	    status = draw_func (draw_closure, op,
 				src, dst,
 				0, 0,
@@ -479,32 +491,26 @@ _composite_trap_region (cairo_clip_t            *clip,
 			const cairo_rectangle_int_t   *extents)
 {
     cairo_status_t status;
-    cairo_solid_pattern_t solid_pattern;
     cairo_surface_pattern_t mask_pattern;
     cairo_pattern_t *mask = NULL;
     int mask_x = 0, mask_y =0;
 
     if (clip != NULL) {
 	cairo_surface_t *clip_surface = NULL;
-	const cairo_rectangle_int_t *clip_extents;
+	int clip_x, clip_y;
 
-	clip_surface = _cairo_clip_get_surface (clip, dst);
+	clip_surface = _cairo_clip_get_surface (clip, dst, &clip_x, &clip_y);
 	if (unlikely (clip_surface->status))
 	    return clip_surface->status;
 
 	if (op == CAIRO_OPERATOR_CLEAR) {
-	    _cairo_pattern_init_solid (&solid_pattern, CAIRO_COLOR_WHITE,
-				       CAIRO_CONTENT_COLOR);
-	    src = &solid_pattern.base;
+	    src = &_cairo_pattern_white.base;
 	    op = CAIRO_OPERATOR_DEST_OUT;
 	}
 
 	_cairo_pattern_init_for_surface (&mask_pattern, clip_surface);
-	cairo_surface_destroy (clip_surface);
-
-	clip_extents = _cairo_clip_get_extents (clip);
-	mask_x = extents->x - clip_extents->x;
-	mask_y = extents->y - clip_extents->y;
+	mask_x = extents->x - clip_x;
+	mask_y = extents->y - clip_y;
 	mask = &mask_pattern.base;
     }
 
@@ -537,18 +543,34 @@ _composite_traps_draw_func (void                          *closure,
 			    cairo_region_t		  *clip_region)
 {
     cairo_composite_traps_info_t *info = closure;
+    cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
 
     if (dst_x != 0 || dst_y != 0)
 	_cairo_traps_translate (info->traps, - dst_x, - dst_y);
 
-    return _cairo_surface_composite_trapezoids (op,
-						src, dst, info->antialias,
-						extents->x,         extents->y,
-						extents->x - dst_x, extents->y - dst_y,
-						extents->width,     extents->height,
-						info->traps->traps,
-						info->traps->num_traps,
-						clip_region);
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
+
+    status = _cairo_surface_composite_trapezoids (op,
+                                                  src, dst, info->antialias,
+                                                  extents->x,         extents->y,
+                                                  extents->x - dst_x, extents->y - dst_y,
+                                                  extents->width,     extents->height,
+                                                  info->traps->traps,
+                                                  info->traps->num_traps,
+                                                  clip_region);
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
 }
 
 enum {
@@ -782,13 +804,15 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
     {
 	cairo_region_t *trap_region = NULL;
 
-	status = _fill_rectangles (dst, op, src, traps, clip);
-	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	    return status;
+        if (_cairo_operator_bounded_by_source (op)) {
+            status = _fill_rectangles (dst, op, src, traps, clip);
+            if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+                return status;
 
-	status = _composite_rectangle (dst, op, src, traps, clip);
-	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	    return status;
+            status = _composite_rectangle (dst, op, src, traps, clip);
+            if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+                return status;
+        }
 
 	status = _cairo_traps_extract_region (traps, &trap_region);
 	if (unlikely (_cairo_status_is_error (status)))
@@ -853,171 +877,37 @@ _clip_and_composite_trapezoids (const cairo_pattern_t *src,
 				&traps_info, dst, extents);
 }
 
-typedef struct {
-    cairo_polygon_t		*polygon;
-    cairo_fill_rule_t		 fill_rule;
-    cairo_antialias_t		 antialias;
-} cairo_composite_spans_info_t;
-
-static cairo_status_t
-_composite_spans_draw_func (void                          *closure,
-			    cairo_operator_t               op,
-			    const cairo_pattern_t         *src,
-			    cairo_surface_t               *dst,
-			    int                            dst_x,
-			    int                            dst_y,
-			    const cairo_rectangle_int_t   *extents,
-			    cairo_region_t		  *clip_region)
-{
-    cairo_composite_rectangles_t rects;
-    cairo_composite_spans_info_t *info = closure;
-
-    _cairo_composite_rectangles_init (&rects,
-				      extents->x, extents->y,
-				      extents->width, extents->height);
-
-    /* The incoming dst_x/y are where we're pretending the origin of
-     * the dst surface is -- *not* the offset of a rectangle where
-     * we'd like to place the result. */
-    rects.dst.x -= dst_x;
-    rects.dst.y -= dst_y;
-
-    return _cairo_surface_composite_polygon (dst, op, src,
-					     info->fill_rule,
-					     info->antialias,
-					     &rects,
-					     info->polygon,
-					     clip_region);
-}
-
-static cairo_status_t
-_rectangle_intersect_clip (cairo_rectangle_int_t *extents, cairo_clip_t *clip)
-{
-    if (clip != NULL) {
-	if (! _cairo_rectangle_intersect (extents,
-					  _cairo_clip_get_extents (clip)))
-	{
-	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-	}
-
-	return _cairo_clip_rectangle (clip, extents);
-    } else if (_cairo_rectangle_empty (extents))
-	return CAIRO_INT_STATUS_NOTHING_TO_DO;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_bool_t
-_clip_contains_rectangle (cairo_clip_t *clip,
-			  const cairo_rectangle_int_t *rect)
-{
-    cairo_clip_path_t *clip_path;
-
-    clip_path = clip->path;
-
-    if (clip_path->extents.x > rect->x ||
-	clip_path->extents.y > rect->y ||
-	clip_path->extents.x + clip_path->extents.width < rect->x + rect->width ||
-	clip_path->extents.y + clip_path->extents.height < rect->y + rect->height)
-    {
-	return FALSE;
-    }
-
-    do {
-	cairo_box_t box;
-
-	if (! _cairo_path_fixed_is_box (&clip_path->path, &box))
-	    return FALSE;
-
-	if (box.p1.x > _cairo_fixed_from_int (rect->x) ||
-	    box.p1.y > _cairo_fixed_from_int (rect->y) ||
-	    box.p2.x < _cairo_fixed_from_int (rect->x + rect->width) ||
-	    box.p2.y < _cairo_fixed_from_int (rect->y + rect->height))
-	{
-	    return FALSE;
-	}
-    } while ((clip_path = clip_path->prev) != NULL);
-
-    return TRUE;
-}
-
-static inline cairo_status_t
-_clip_to_boxes (cairo_clip_t **clip,
-		const cairo_rectangle_int_t *extents,
-		cairo_bool_t is_bounded,
-		cairo_box_t **boxes,
-		int *num_boxes)
-{
-    cairo_status_t status;
-
-    if (*clip == NULL) {
-	status = CAIRO_STATUS_SUCCESS;
-	goto EXTENTS;
-    }
-
-    status = _cairo_clip_get_boxes (*clip, boxes, num_boxes);
-    switch ((int) status) {
-    case CAIRO_STATUS_SUCCESS:
-	if (is_bounded)
-	    *clip = NULL;
-	goto DONE;
-
-    case  CAIRO_INT_STATUS_UNSUPPORTED:
-	status = CAIRO_STATUS_SUCCESS;
-	goto EXTENTS;
-    }
-
-  EXTENTS:
-    _cairo_box_from_rectangle (&(*boxes)[0], extents);
-    *num_boxes = 1;
-  DONE:
-    return status;
-}
-
 cairo_status_t
 _cairo_surface_fallback_paint (cairo_surface_t		*surface,
 			       cairo_operator_t		 op,
 			       const cairo_pattern_t	*source,
 			       cairo_clip_t		*clip)
 {
-    cairo_status_t status;
-    cairo_rectangle_int_t extents;
-    cairo_bool_t is_bounded;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
     cairo_clip_path_t *clip_path = clip ? clip->path : NULL;
-    cairo_box_t boxes_stack[32], *boxes = boxes_stack;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    cairo_boxes_t  boxes;
     int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_status_t status;
     cairo_traps_t traps;
 
-    is_bounded = _cairo_surface_get_extents (surface, &extents);
-    assert (is_bounded || clip);
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
 
-    is_bounded = FALSE;
-    if (_cairo_operator_bounded_by_source (op)) {
-	cairo_rectangle_int_t source_extents;
+    status = _cairo_composite_rectangles_init_for_paint (&extents,
+							 &rect,
+							 op, source,
+							 clip);
+    if (unlikely (status))
+	return status;
 
-	_cairo_pattern_get_extents (source, &source_extents);
-	if (! _cairo_rectangle_intersect (&extents, &source_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (is_bounded && clip != NULL && _clip_contains_rectangle (clip, &extents))
+    if (_cairo_clip_contains_extents (clip, &extents))
 	clip = NULL;
 
-    status = _rectangle_intersect_clip (&extents, clip);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
 	return status;
-    }
-
-    status = _clip_to_boxes (&clip, &extents, is_bounded, &boxes, &num_boxes);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
-	return status;
-    }
 
     /* If the clip cannot be reduced to a set of boxes, we will need to
      * use a clipmask. Paint is special as it is the only operation that
@@ -1035,51 +925,70 @@ _cairo_surface_fallback_paint (cairo_surface_t		*surface,
 				    NULL);
     }
 
-    status = _cairo_traps_init_boxes (&traps, boxes, num_boxes);
+    /* meh, surface-fallback is dying anyway... */
+    _cairo_boxes_init_for_array (&boxes, clip_boxes, num_boxes);
+    status = _cairo_traps_init_boxes (&traps, &boxes);
     if (unlikely (status))
 	goto CLEANUP_BOXES;
 
     status = _clip_and_composite_trapezoids (source, op, surface,
 					     &traps, CAIRO_ANTIALIAS_DEFAULT,
-					     clip, &extents);
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
     _cairo_traps_fini (&traps);
 
 CLEANUP_BOXES:
-    if (boxes != boxes_stack)
-	free (boxes);
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
 
     return status;
 }
 
 static cairo_status_t
-_cairo_surface_mask_draw_func (void                          *closure,
-			       cairo_operator_t               op,
-			       const cairo_pattern_t         *src,
-			       cairo_surface_t               *dst,
-			       int                            dst_x,
-			       int                            dst_y,
+_cairo_surface_mask_draw_func (void                        *closure,
+			       cairo_operator_t             op,
+			       const cairo_pattern_t       *src,
+			       cairo_surface_t             *dst,
+			       int                          dst_x,
+			       int                          dst_y,
 			       const cairo_rectangle_int_t *extents,
-			       cairo_region_t		    *clip_region)
+			       cairo_region_t		   *clip_region)
 {
     cairo_pattern_t *mask = closure;
+    cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
+
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
 
     if (src) {
-	return _cairo_surface_composite (op,
-					 src, mask, dst,
-					 extents->x,         extents->y,
-					 extents->x,         extents->y,
-					 extents->x - dst_x, extents->y - dst_y,
-					 extents->width,     extents->height,
-					 clip_region);
+	status = _cairo_surface_composite (op,
+                                           src, mask, dst,
+                                           extents->x,         extents->y,
+                                           extents->x,         extents->y,
+                                           extents->x - dst_x, extents->y - dst_y,
+                                           extents->width,     extents->height,
+                                           clip_region);
     } else {
-	return _cairo_surface_composite (op,
-					 mask, NULL, dst,
-					 extents->x,         extents->y,
-					 0,                  0, /* unused */
-					 extents->x - dst_x, extents->y - dst_y,
-					 extents->width,     extents->height,
-					 clip_region);
+	status = _cairo_surface_composite (op,
+                                           mask, NULL, dst,
+                                           extents->x,         extents->y,
+                                           0,                  0, /* unused */
+                                           extents->x - dst_x, extents->y - dst_y,
+                                           extents->width,     extents->height,
+                                           clip_region);
     }
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
 }
 
 cairo_status_t
@@ -1089,48 +998,33 @@ _cairo_surface_fallback_mask (cairo_surface_t		*surface,
 			      const cairo_pattern_t	*mask,
 			      cairo_clip_t		*clip)
 {
-    cairo_rectangle_int_t extents;
-    cairo_bool_t is_bounded;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
     cairo_status_t status;
 
-    is_bounded = _cairo_surface_get_extents (surface, &extents);
-    assert (is_bounded || clip);
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
 
-    is_bounded = FALSE;
-    if (_cairo_operator_bounded_by_source (op)) {
-	cairo_rectangle_int_t source_extents;
+    status = _cairo_composite_rectangles_init_for_mask (&extents,
+							&rect,
+							op, source, mask, clip);
+    if (unlikely (status))
+	return status;
 
-	_cairo_pattern_get_extents (source, &source_extents);
-	if (! _cairo_rectangle_intersect (&extents, &source_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (_cairo_operator_bounded_by_mask (op)) {
-	cairo_rectangle_int_t mask_extents;
-
-	_cairo_pattern_get_extents (mask, &mask_extents);
-	if (! _cairo_rectangle_intersect (&extents, &mask_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (is_bounded && clip != NULL && _clip_contains_rectangle (clip, &extents))
+    if (_cairo_clip_contains_extents (clip, &extents))
 	clip = NULL;
 
-    status = _rectangle_intersect_clip (&extents, clip);
-    if (status) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
-	return status;
+    if (clip != NULL && extents.is_bounded) {
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status))
+	    return status;
     }
 
     return _clip_and_composite (clip, op, source,
 				_cairo_surface_mask_draw_func,
 				(void *) mask,
-				surface, &extents);
+				surface,
+                                extents.is_bounded ? &extents.bounded : &extents.unbounded);
 }
 
 cairo_status_t
@@ -1138,69 +1032,44 @@ _cairo_surface_fallback_stroke (cairo_surface_t		*surface,
 				cairo_operator_t	 op,
 				const cairo_pattern_t	*source,
 				cairo_path_fixed_t	*path,
-				cairo_stroke_style_t	*stroke_style,
-				cairo_matrix_t		*ctm,
-				cairo_matrix_t		*ctm_inverse,
+				const cairo_stroke_style_t	*stroke_style,
+				const cairo_matrix_t		*ctm,
+				const cairo_matrix_t		*ctm_inverse,
 				double			 tolerance,
 				cairo_antialias_t	 antialias,
 				cairo_clip_t		*clip)
 {
     cairo_polygon_t polygon;
     cairo_traps_t traps;
-    cairo_box_t boxes_stack[32], *boxes = boxes_stack;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
     int num_boxes = ARRAY_LENGTH (boxes_stack);
-    cairo_rectangle_int_t extents;
-    cairo_bool_t is_bounded;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
     cairo_status_t status;
 
-    is_bounded = _cairo_surface_get_extents (surface, &extents);
-    assert (is_bounded || clip);
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
 
-    is_bounded = FALSE;
-    if (_cairo_operator_bounded_by_source (op)) {
-	cairo_rectangle_int_t source_extents;
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  &rect,
+							  op, source,
+							  path, stroke_style, ctm,
+							  clip);
+    if (unlikely (status))
+	return status;
 
-	_cairo_pattern_get_extents (source, &source_extents);
-	if (! _cairo_rectangle_intersect (&extents, &source_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (_cairo_operator_bounded_by_mask (op)) {
-	cairo_rectangle_int_t path_extents;
-
-	_cairo_path_fixed_approximate_stroke_extents (path,
-						      stroke_style, ctm,
-						      &path_extents);
-	if (! _cairo_rectangle_intersect (&extents, &path_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (is_bounded && clip != NULL && _clip_contains_rectangle (clip, &extents))
+    if (_cairo_clip_contains_extents (clip, &extents))
 	clip = NULL;
 
-    status = _rectangle_intersect_clip (&extents, clip);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
 	return status;
-    }
-
-    status = _clip_to_boxes (&clip, &extents, is_bounded, &boxes, &num_boxes);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
-	return status;
-    }
 
     _cairo_polygon_init (&polygon);
-    _cairo_polygon_limit (&polygon, boxes, num_boxes);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
 
     _cairo_traps_init (&traps);
-    _cairo_traps_limit (&traps, boxes, num_boxes);
+    _cairo_traps_limit (&traps, clip_boxes, num_boxes);
 
     if (path->is_rectilinear) {
 	status = _cairo_path_fixed_stroke_rectilinear_to_traps (path,
@@ -1226,26 +1095,11 @@ _cairo_surface_fallback_stroke (cairo_surface_t		*surface,
 	goto DO_TRAPS;
 
     if (_cairo_operator_bounded_by_mask (op)) {
-	cairo_rectangle_int_t polygon_extents;
-
-	_cairo_box_round_to_rectangle (&polygon.extents, &polygon_extents);
-	if (! _cairo_rectangle_intersect (&extents, &polygon_extents))
+	_cairo_box_round_to_rectangle (&polygon.extents, &extents.mask);
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
 	    goto CLEANUP;
     }
 
-    if (_cairo_surface_check_span_renderer (op, source, surface, antialias)) {
-	cairo_composite_spans_info_t info;
-
-	info.polygon = &polygon;
-	info.fill_rule = CAIRO_FILL_RULE_WINDING;
-	info.antialias = antialias;
-
-	status = _clip_and_composite (clip, op, source,
-				      _composite_spans_draw_func,
-				      &info, surface, &extents);
-	goto CLEANUP;
-    }
-
     /* Fall back to trapezoid fills. */
     status = _cairo_bentley_ottmann_tessellate_polygon (&traps,
 							&polygon,
@@ -1256,12 +1110,13 @@ _cairo_surface_fallback_stroke (cairo_surface_t		*surface,
   DO_TRAPS:
     status = _clip_and_composite_trapezoids (source, op, surface,
 					     &traps, antialias,
-					     clip, &extents);
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
   CLEANUP:
     _cairo_traps_fini (&traps);
     _cairo_polygon_fini (&polygon);
-    if (boxes != boxes_stack)
-	free (boxes);
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
 
     return status;
 }
@@ -1278,67 +1133,35 @@ _cairo_surface_fallback_fill (cairo_surface_t		*surface,
 {
     cairo_polygon_t polygon;
     cairo_traps_t traps;
-    cairo_box_t boxes_stack[32], *boxes = boxes_stack;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
     int num_boxes = ARRAY_LENGTH (boxes_stack);
-    cairo_rectangle_int_t extents;
-    cairo_bool_t is_bounded;
     cairo_bool_t is_rectilinear;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
     cairo_status_t status;
 
-    is_bounded = _cairo_surface_get_extents (surface, &extents);
-    assert (is_bounded || clip);
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
 
-    is_bounded = FALSE;
-    if (_cairo_operator_bounded_by_source (op)) {
-	cairo_rectangle_int_t source_extents;
-
-	_cairo_pattern_get_extents (source, &source_extents);
-	if (! _cairo_rectangle_intersect (&extents, &source_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (_cairo_operator_bounded_by_mask (op)) {
-	cairo_rectangle_int_t path_extents;
-
-	_cairo_path_fixed_approximate_fill_extents (path, &path_extents);
-	if (! _cairo_rectangle_intersect (&extents, &path_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (is_bounded) {
-	if (clip != NULL && _clip_contains_rectangle (clip, &extents))
-	    clip = NULL;
-
-	if (clip != NULL && clip->path->prev == NULL &&
-	    _cairo_path_fixed_equal (&clip->path->path, path))
-	{
-	    clip = NULL;
-	}
-    }
-
-    status = _rectangle_intersect_clip (&extents, clip);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							&rect,
+							op, source, path,
+							clip);
+    if (unlikely (status))
 	return status;
-    }
 
-    status = _clip_to_boxes (&clip, &extents, is_bounded, &boxes, &num_boxes);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
 	return status;
-    }
 
     _cairo_traps_init (&traps);
-    _cairo_traps_limit (&traps, boxes, num_boxes);
+    _cairo_traps_limit (&traps, clip_boxes, num_boxes);
 
     _cairo_polygon_init (&polygon);
-    _cairo_polygon_limit (&polygon, boxes, num_boxes);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
 
     if (path->is_empty_fill)
 	goto DO_TRAPS;
@@ -1363,10 +1186,8 @@ _cairo_surface_fallback_fill (cairo_surface_t		*surface,
 	goto DO_TRAPS;
 
     if (_cairo_operator_bounded_by_mask (op)) {
-	cairo_rectangle_int_t polygon_extents;
-
-	_cairo_box_round_to_rectangle (&polygon.extents, &polygon_extents);
-	if (! _cairo_rectangle_intersect (&extents, &polygon_extents))
+	_cairo_box_round_to_rectangle (&polygon.extents, &extents.mask);
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
 	    goto CLEANUP;
     }
 
@@ -1381,20 +1202,6 @@ _cairo_surface_fallback_fill (cairo_surface_t		*surface,
 	    goto CLEANUP;
     }
 
-
-    if (_cairo_surface_check_span_renderer (op, source, surface, antialias)) {
-	cairo_composite_spans_info_t info;
-
-	info.polygon = &polygon;
-	info.fill_rule = fill_rule;
-	info.antialias = antialias;
-
-	status = _clip_and_composite (clip, op, source,
-				      _composite_spans_draw_func,
-				      &info, surface, &extents);
-	goto CLEANUP;
-    }
-
     /* Fall back to trapezoid fills. */
     status = _cairo_bentley_ottmann_tessellate_polygon (&traps,
 							&polygon,
@@ -1405,12 +1212,13 @@ _cairo_surface_fallback_fill (cairo_surface_t		*surface,
   DO_TRAPS:
     status = _clip_and_composite_trapezoids (source, op, surface,
 					     &traps, antialias,
-					     clip, &extents);
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
   CLEANUP:
     _cairo_traps_fini (&traps);
     _cairo_polygon_fini (&polygon);
-    if (boxes != boxes_stack)
-	free (boxes);
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
 
     return status;
 }
@@ -1433,6 +1241,16 @@ _cairo_surface_old_show_glyphs_draw_func (void                          *closure
 {
     cairo_show_glyphs_info_t *glyph_info = closure;
     cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
+
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
 
     /* Modifying the glyph array is fine because we know that this function
      * will be called only once, and we've already made a copy of the
@@ -1457,19 +1275,24 @@ _cairo_surface_old_show_glyphs_draw_func (void                          *closure
 					     glyph_info->glyphs,
 					     glyph_info->num_glyphs,
 					     clip_region);
-    if (status != CAIRO_INT_STATUS_UNSUPPORTED)
-	return status;
 
-    return _cairo_scaled_font_show_glyphs (glyph_info->font,
-					   op,
-					   src, dst,
-					   extents->x,         extents->y,
-					   extents->x - dst_x,
-					   extents->y - dst_y,
-					   extents->width,     extents->height,
-					   glyph_info->glyphs,
-					   glyph_info->num_glyphs,
-					   clip_region);
+    if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
+	status = _cairo_scaled_font_show_glyphs (glyph_info->font,
+                                                 op,
+                                                 src, dst,
+                                                 extents->x,         extents->y,
+                                                 extents->x - dst_x,
+                                                 extents->y - dst_y,
+                                                 extents->width,     extents->height,
+                                                 glyph_info->glyphs,
+                                                 glyph_info->num_glyphs,
+                                                 clip_region);
+    }
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
 }
 
 cairo_status_t
@@ -1481,50 +1304,31 @@ _cairo_surface_fallback_show_glyphs (cairo_surface_t		*surface,
 				     cairo_scaled_font_t	*scaled_font,
 				     cairo_clip_t		*clip)
 {
-    cairo_status_t status;
-    cairo_rectangle_int_t extents;
     cairo_show_glyphs_info_t glyph_info;
-    cairo_bool_t is_bounded;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_status_t status;
 
-    is_bounded = _cairo_surface_get_extents (surface, &extents);
-    assert (is_bounded || clip);
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
 
-    is_bounded = FALSE;
-    if (_cairo_operator_bounded_by_source (op)) {
-	cairo_rectangle_int_t source_extents;
-
-	_cairo_pattern_get_extents (source, &source_extents);
-	if (! _cairo_rectangle_intersect (&extents, &source_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (_cairo_operator_bounded_by_mask (op)) {
-        cairo_rectangle_int_t glyph_extents;
-
-	status = _cairo_scaled_font_glyph_device_extents (scaled_font,
-							  glyphs,
-							  num_glyphs,
-							  &glyph_extents,
+    status = _cairo_composite_rectangles_init_for_glyphs (&extents,
+							  &rect,
+							  op, source,
+							  scaled_font,
+							  glyphs, num_glyphs,
+							  clip,
 							  NULL);
-	if (unlikely (status))
-	    return status;
+    if (unlikely (status))
+	return status;
 
-	if (! _cairo_rectangle_intersect (&extents, &glyph_extents))
-	    return CAIRO_STATUS_SUCCESS;
-
-	is_bounded = TRUE;
-    }
-
-    if (is_bounded && clip != NULL && _clip_contains_rectangle (clip, &extents))
+    if (_cairo_clip_contains_rectangle (clip, &extents.mask))
 	clip = NULL;
 
-    status = _rectangle_intersect_clip (&extents, clip);
-    if (status) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
-	return status;
+    if (clip != NULL && extents.is_bounded) {
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status))
+	    return status;
     }
 
     glyph_info.font = scaled_font;
@@ -1535,7 +1339,7 @@ _cairo_surface_fallback_show_glyphs (cairo_surface_t		*surface,
 				_cairo_surface_old_show_glyphs_draw_func,
 				&glyph_info,
 				surface,
-				&extents);
+                                extents.is_bounded ? &extents.bounded : &extents.unbounded);
 }
 
 cairo_surface_t *
@@ -1603,11 +1407,8 @@ _cairo_surface_fallback_composite (cairo_operator_t		 op,
     cairo_status_t status;
 
     status = _fallback_init (&state, dst, dst_x, dst_y, width, height);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    if (unlikely (status))
 	return status;
-    }
 
     /* We know this will never fail with the image backend; but
      * instead of calling into it directly, we call
@@ -1681,11 +1482,8 @@ _cairo_surface_fallback_fill_rectangles (cairo_surface_t         *surface,
     }
 
     status = _fallback_init (&state, surface, x1, y1, x2 - x1, y2 - y1);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    if (unlikely (status))
 	return status;
-    }
 
     /* If the fetched image isn't at 0,0, we need to offset the rectangles */
 
@@ -1739,11 +1537,8 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t		op,
     cairo_status_t status;
 
     status = _fallback_init (&state, dst, dst_x, dst_y, width, height);
-    if (unlikely (status)) {
-	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
-	    status = CAIRO_STATUS_SUCCESS;
+    if (unlikely (status))
 	return status;
-    }
 
     /* If the destination image isn't at 0,0, we need to offset the trapezoids */
 
@@ -1782,12 +1577,13 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t		op,
 						  width, height,
 						  traps, num_traps,
 						  clip_region);
+ FAIL:
     if (offset_traps != NULL)
 	free (offset_traps);
 
- FAIL:
     if (fallback_region != NULL)
 	cairo_region_destroy (fallback_region);
+
     _fallback_fini (&state);
 
     return status;
diff --git a/gfx/cairo/cairo/src/cairo-surface-offset-private.h b/gfx/cairo/cairo/src/cairo-surface-offset-private.h
new file mode 100644
index 00000000000..b7877b3de4f
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-offset-private.h
@@ -0,0 +1,95 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2002 University of Southern California
+ * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.u>
+ */
+
+#ifndef CAIRO_SURFACE_OFFSET_PRIVATE_H
+#define CAIRO_SURFACE_OFFSET_PRIVATE_H
+
+#include "cairo-types-private.h"
+
+CAIRO_BEGIN_DECLS
+
+cairo_private cairo_status_t
+_cairo_surface_offset_paint (cairo_surface_t *target,
+			     int x, int y,
+			     cairo_operator_t	 op,
+			     const cairo_pattern_t *source,
+			     cairo_clip_t	    *clip);
+
+cairo_private cairo_status_t
+_cairo_surface_offset_mask (cairo_surface_t *target,
+			    int x, int y,
+			    cairo_operator_t	 op,
+			    const cairo_pattern_t *source,
+			    const cairo_pattern_t *mask,
+			    cairo_clip_t	    *clip);
+
+cairo_private cairo_status_t
+_cairo_surface_offset_stroke (cairo_surface_t *surface,
+			      int x, int y,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      cairo_path_fixed_t	*path,
+			      const cairo_stroke_style_t	*stroke_style,
+			      const cairo_matrix_t		*ctm,
+			      const cairo_matrix_t		*ctm_inverse,
+			      double			 tolerance,
+			      cairo_antialias_t	 antialias,
+			      cairo_clip_t		*clip);
+
+cairo_private cairo_status_t
+_cairo_surface_offset_fill (cairo_surface_t	*surface,
+			    int x, int y,
+			    cairo_operator_t	 op,
+			    const cairo_pattern_t*source,
+			    cairo_path_fixed_t	*path,
+			    cairo_fill_rule_t	 fill_rule,
+			    double		 tolerance,
+			    cairo_antialias_t	 antialias,
+			    cairo_clip_t		*clip);
+
+cairo_private cairo_status_t
+_cairo_surface_offset_glyphs (cairo_surface_t		*surface,
+			      int x, int y,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      cairo_scaled_font_t	*scaled_font,
+			      cairo_glyph_t		*glyphs,
+			      int			 num_glyphs,
+			      cairo_clip_t		*clip);
+
+#endif /* CAIRO_SURFACE_OFFSET_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-surface-offset.c b/gfx/cairo/cairo/src/cairo-surface-offset.c
new file mode 100644
index 00000000000..fdbe1a124be
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-offset.c
@@ -0,0 +1,342 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2005 Red Hat, Inc
+ * Copyright © 2007 Adrian Johnson
+ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Red Hat, Inc.
+ *
+ * Contributor(s):
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-error-private.h"
+#include "cairo-surface-offset-private.h"
+
+/* A collection of routines to facilitate drawing to an alternate surface. */
+
+static void
+_copy_transformed_pattern (cairo_pattern_t *pattern,
+			   const cairo_pattern_t *original,
+			   const cairo_matrix_t  *ctm_inverse)
+{
+    _cairo_pattern_init_static_copy (pattern, original);
+
+    if (! _cairo_matrix_is_identity (ctm_inverse))
+	_cairo_pattern_transform (pattern, ctm_inverse);
+}
+
+cairo_status_t
+_cairo_surface_offset_paint (cairo_surface_t		*target,
+			     int x, int y,
+			     cairo_operator_t		 op,
+			     const cairo_pattern_t	*source,
+			     cairo_clip_t		*clip)
+{
+    cairo_status_t status;
+    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_pattern_union_t source_copy;
+
+    if (unlikely (target->status))
+	return target->status;
+
+    if (clip && clip->all_clipped)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (x | y) {
+	cairo_matrix_t m;
+
+	if (clip != NULL) {
+	    cairo_matrix_init_translate (&m, -x, -y);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    if (unlikely (status))
+		goto FINISH;
+
+	    dev_clip = &clip_copy;
+	}
+
+	cairo_matrix_init_translate (&m, x, y);
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+    }
+
+    status = _cairo_surface_paint (target, op, source, dev_clip);
+
+  FINISH:
+    if (dev_clip != clip)
+	_cairo_clip_reset (dev_clip);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_surface_offset_mask (cairo_surface_t		*target,
+			    int x, int y,
+			    cairo_operator_t		 op,
+			    const cairo_pattern_t	*source,
+			    const cairo_pattern_t	*mask,
+			    cairo_clip_t		*clip)
+{
+    cairo_status_t status;
+    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_pattern_union_t source_copy;
+    cairo_pattern_union_t mask_copy;
+
+    if (unlikely (target->status))
+	return target->status;
+
+    if (clip && clip->all_clipped)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (x | y) {
+	cairo_matrix_t m;
+
+	if (clip != NULL) {
+	    cairo_matrix_init_translate (&m, -x, -y);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    if (unlikely (status))
+		goto FINISH;
+
+	    dev_clip = &clip_copy;
+	}
+
+	cairo_matrix_init_translate (&m, x, y);
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	_copy_transformed_pattern (&mask_copy.base, mask, &m);
+	source = &source_copy.base;
+	mask = &mask_copy.base;
+    }
+
+    status = _cairo_surface_mask (target, op,
+				  source, mask,
+				  dev_clip);
+
+  FINISH:
+    if (dev_clip != clip)
+	_cairo_clip_reset (dev_clip);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_surface_offset_stroke (cairo_surface_t		*surface,
+			      int x, int y,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      cairo_path_fixed_t	*path,
+			      const cairo_stroke_style_t*stroke_style,
+			      const cairo_matrix_t	*ctm,
+			      const cairo_matrix_t	*ctm_inverse,
+			      double			 tolerance,
+			      cairo_antialias_t		 antialias,
+			      cairo_clip_t		*clip)
+{
+    cairo_path_fixed_t path_copy, *dev_path = path;
+    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_matrix_t dev_ctm = *ctm;
+    cairo_matrix_t dev_ctm_inverse = *ctm_inverse;
+    cairo_pattern_union_t source_copy;
+    cairo_status_t status;
+
+    if (unlikely (surface->status))
+	return surface->status;
+
+    if (clip && clip->all_clipped)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (x | y) {
+	cairo_matrix_t m;
+
+	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
+	if (unlikely (status))
+	    goto FINISH;
+
+	_cairo_path_fixed_translate (&path_copy,
+				     _cairo_fixed_from_int (-x),
+				     _cairo_fixed_from_int (-y));
+	dev_path = &path_copy;
+
+	cairo_matrix_init_translate (&m, -x, -y);
+	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &m);
+	if (clip != NULL) {
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    if (unlikely (status))
+		goto FINISH;
+
+	    dev_clip = &clip_copy;
+	}
+
+	cairo_matrix_init_translate (&m, x, y);
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+	cairo_matrix_multiply (&dev_ctm_inverse, &m, &dev_ctm_inverse);
+    }
+
+    status = _cairo_surface_stroke (surface, op, source,
+				    dev_path, stroke_style,
+				    &dev_ctm, &dev_ctm_inverse,
+				    tolerance, antialias,
+				    dev_clip);
+
+ FINISH:
+    if (dev_path != path)
+	_cairo_path_fixed_fini (dev_path);
+    if (dev_clip != clip)
+	_cairo_clip_reset (dev_clip);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_surface_offset_fill (cairo_surface_t	*surface,
+			    int x, int y,
+			    cairo_operator_t	 op,
+			    const cairo_pattern_t*source,
+			    cairo_path_fixed_t	*path,
+			    cairo_fill_rule_t	 fill_rule,
+			    double		 tolerance,
+			    cairo_antialias_t	 antialias,
+			    cairo_clip_t	*clip)
+{
+    cairo_status_t status;
+    cairo_path_fixed_t path_copy, *dev_path = path;
+    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_pattern_union_t source_copy;
+
+    if (unlikely (surface->status))
+	return surface->status;
+
+    if (clip && clip->all_clipped)
+	return CAIRO_STATUS_SUCCESS;
+
+    if (x | y) {
+	cairo_matrix_t m;
+
+	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
+	if (unlikely (status))
+	    goto FINISH;
+
+	_cairo_path_fixed_translate (&path_copy,
+				     _cairo_fixed_from_int (-x),
+				     _cairo_fixed_from_int (-y));
+	dev_path = &path_copy;
+
+	if (clip != NULL) {
+	    cairo_matrix_init_translate (&m, -x, -y);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    if (unlikely (status))
+		goto FINISH;
+
+	    dev_clip = &clip_copy;
+	}
+
+	cairo_matrix_init_translate (&m, x, y);
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+    }
+
+    status = _cairo_surface_fill (surface, op, source,
+				  dev_path, fill_rule,
+				  tolerance, antialias,
+				  dev_clip);
+
+ FINISH:
+    if (dev_path != path)
+	_cairo_path_fixed_fini (dev_path);
+    if (dev_clip != clip)
+	_cairo_clip_reset (dev_clip);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_surface_offset_glyphs (cairo_surface_t		*surface,
+			      int x, int y,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      cairo_scaled_font_t	*scaled_font,
+			      cairo_glyph_t		*glyphs,
+			      int			 num_glyphs,
+			      cairo_clip_t		*clip)
+{
+    cairo_status_t status;
+    cairo_clip_t clip_copy, *dev_clip = clip;
+    cairo_pattern_union_t source_copy;
+    cairo_glyph_t *dev_glyphs;
+    int i;
+
+    if (unlikely (surface->status))
+	return surface->status;
+
+    if (clip && clip->all_clipped)
+	return CAIRO_STATUS_SUCCESS;
+
+    dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));
+    if (dev_glyphs == NULL)
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    memcpy (dev_glyphs, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
+
+    if (x | y) {
+	cairo_matrix_t m;
+
+	if (clip != NULL) {
+	    cairo_matrix_init_translate (&m, -x, -y);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
+	    if (unlikely (status))
+		goto FINISH;
+
+	    dev_clip = &clip_copy;
+	}
+
+	cairo_matrix_init_translate (&m, x, y);
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+
+	for (i = 0; i < num_glyphs; i++) {
+	    dev_glyphs[i].x -= x;
+	    dev_glyphs[i].y -= y;
+	}
+    }
+
+    status = _cairo_surface_show_text_glyphs (surface, op, source,
+					      NULL, 0,
+					      dev_glyphs, num_glyphs,
+					      NULL, 0, 0,
+					      scaled_font,
+					      dev_clip);
+
+ FINISH:
+    if (dev_clip != clip)
+	_cairo_clip_reset (dev_clip);
+    free (dev_glyphs);
+
+    return status;
+}
diff --git a/gfx/cairo/cairo/src/cairo-surface-private.h b/gfx/cairo/cairo/src/cairo-surface-private.h
index e569f18cbf5..929bc70cb00 100644
--- a/gfx/cairo/cairo/src/cairo-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-surface-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
 #include "cairo.h"
 
 #include "cairo-types-private.h"
+#include "cairo-list-private.h"
 #include "cairo-reference-count-private.h"
 #include "cairo-clip-private.h"
 
@@ -48,6 +49,7 @@ typedef void (*cairo_surface_func_t) (cairo_surface_t *);
 
 struct _cairo_surface {
     const cairo_surface_backend_t *backend;
+    cairo_device_t *device;
 
     /* We allow surfaces to override the backend->type by shoving something
      * else into surface->type. This is for "wrapper" surfaces that want to
@@ -63,6 +65,7 @@ struct _cairo_surface {
     unsigned finished : 1;
     unsigned is_clear : 1;
     unsigned has_font_options : 1;
+    unsigned owns_device : 1;
     unsigned permit_subpixel_antialiasing : 1;
 
     cairo_user_data_array_t user_data;
@@ -70,6 +73,7 @@ struct _cairo_surface {
 
     cairo_matrix_t device_transform;
     cairo_matrix_t device_transform_inverse;
+    cairo_list_t device_transform_observers;
 
     /* The actual resolution of the device, in dots per inch. */
     double x_resolution;
@@ -85,8 +89,10 @@ struct _cairo_surface {
     /* A "snapshot" surface is immutable. See _cairo_surface_snapshot. */
     cairo_surface_t *snapshot_of;
     cairo_surface_func_t snapshot_detach;
-    /* current snapshots of this surface */
-    cairo_array_t snapshots;
+    /* current snapshots of this surface*/
+    cairo_list_t snapshots;
+    /* place upon snapshot list */
+    cairo_list_t snapshot;
 
     /*
      * Surface font options, falling back to backend's default options,
diff --git a/gfx/cairo/cairo/src/cairo-surface-snapshot-private.h b/gfx/cairo/cairo/src/cairo-surface-snapshot-private.h
new file mode 100644
index 00000000000..bbb2bf2a0a9
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-snapshot-private.h
@@ -0,0 +1,48 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation.
+ *
+ * Contributor(s):
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
+#define CAIRO_SURFACE_SNAPSHOT_PRIVATE_H
+
+#include "cairo-surface-private.h"
+
+struct _cairo_surface_snapshot {
+    cairo_surface_t base;
+
+    cairo_surface_t *target;
+    cairo_surface_t *clone;
+};
+
+#endif /* CAIRO_SURFACE_SNAPSHOT_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-surface-snapshot.c b/gfx/cairo/cairo/src/cairo-surface-snapshot.c
new file mode 100644
index 00000000000..20cc6b9ade6
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-snapshot.c
@@ -0,0 +1,255 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2002 University of Southern California
+ * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is University of Southern
+ * California.
+ *
+ * Contributor(s):
+ *	Carl D. Worth <cworth@cworth.org>
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-error-private.h"
+#include "cairo-surface-snapshot-private.h"
+
+static cairo_status_t
+_cairo_surface_snapshot_finish (void *abstract_surface)
+{
+    cairo_surface_snapshot_t *surface = abstract_surface;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+
+    if (surface->clone != NULL) {
+	cairo_surface_finish (surface->clone);
+	status = surface->clone->status;
+
+	cairo_surface_destroy (surface->clone);
+    }
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_surface_snapshot_acquire_source_image (void                    *abstract_surface,
+					      cairo_image_surface_t  **image_out,
+					      void                   **extra_out)
+{
+    cairo_surface_snapshot_t *surface = abstract_surface;
+
+    return _cairo_surface_acquire_source_image (surface->target, image_out, extra_out);
+}
+
+static void
+_cairo_surface_snapshot_release_source_image (void                   *abstract_surface,
+					      cairo_image_surface_t  *image,
+					      void                   *extra)
+{
+    cairo_surface_snapshot_t *surface = abstract_surface;
+
+    _cairo_surface_release_source_image (surface->target, image, extra);
+}
+
+static cairo_bool_t
+_cairo_surface_snapshot_get_extents (void                  *abstract_surface,
+				     cairo_rectangle_int_t *extents)
+{
+    cairo_surface_snapshot_t *surface = abstract_surface;
+
+    return _cairo_surface_get_extents (surface->target, extents);
+}
+
+static const cairo_surface_backend_t _cairo_surface_snapshot_backend = {
+    CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT,
+
+    NULL, /* create similar */
+    _cairo_surface_snapshot_finish,
+
+    _cairo_surface_snapshot_acquire_source_image,
+    _cairo_surface_snapshot_release_source_image,
+    NULL, NULL, /* acquire, release dest */
+    NULL, /* clone similar */
+    NULL, /* composite */
+    NULL, /* fill rectangles */
+    NULL, /* composite trapezoids */
+    NULL, /* create span renderer */
+    NULL, /* check span renderer */
+    NULL, /* copy_page */
+    NULL, /* show_page */
+    _cairo_surface_snapshot_get_extents,
+};
+
+static void
+_cairo_surface_snapshot_copy_on_write (cairo_surface_t *surface)
+{
+    cairo_surface_snapshot_t *snapshot = (cairo_surface_snapshot_t *) surface;
+    cairo_image_surface_t *image;
+    cairo_image_surface_t *clone;
+    void *extra;
+    cairo_status_t status;
+
+    /* We need to make an image copy of the original surface since the
+     * snapshot may exceed the lifetime of the original device, i.e.
+     * when we later need to use the snapshot the data may have already
+     * been lost.
+     */
+
+    status = _cairo_surface_acquire_source_image (snapshot->target, &image, &extra);
+    if (unlikely (status)) {
+	snapshot->target = _cairo_surface_create_in_error (status);
+	status = _cairo_surface_set_error (surface, status);
+	return;
+    }
+
+    clone = (cairo_image_surface_t *)
+	_cairo_image_surface_create_with_pixman_format (NULL,
+							image->pixman_format,
+							image->width,
+							image->height,
+							0);
+    if (likely (clone->base.status == CAIRO_STATUS_SUCCESS)) {
+	if (clone->stride == image->stride) {
+	    memcpy (clone->data, image->data, image->stride * image->height);
+	} else {
+	    pixman_image_composite32 (PIXMAN_OP_SRC,
+				      image->pixman_image, NULL, clone->pixman_image,
+				      0, 0,
+				      0, 0,
+				      0, 0,
+				      image->width, image->height);
+	}
+	clone->base.is_clear = FALSE;
+
+	snapshot->clone = &clone->base;
+    } else {
+	snapshot->clone = &clone->base;
+	status = _cairo_surface_set_error (surface, clone->base.status);
+    }
+
+    _cairo_surface_release_source_image (snapshot->target, image, extra);
+    snapshot->target = snapshot->clone;
+    snapshot->base.type = snapshot->target->type;
+}
+
+/**
+ * _cairo_surface_snapshot
+ * @surface: a #cairo_surface_t
+ *
+ * Make an immutable reference to @surface. It is an error to call a
+ * surface-modifying function on the result of this function. The
+ * resulting 'snapshot' is a lazily copied-on-write surface i.e. it
+ * remains a reference to the original surface until that surface is
+ * written to again, at which time a copy is made of the original surface
+ * and the snapshot then points to that instead. Multiple snapshots of the
+ * same unmodified surface point to the same copy.
+ *
+ * The caller owns the return value and should call
+ * cairo_surface_destroy() when finished with it. This function will not
+ * return %NULL, but will return a nil surface instead.
+ *
+ * Return value: The snapshot surface. Note that the return surface
+ * may not necessarily be of the same type as @surface.
+ **/
+cairo_surface_t *
+_cairo_surface_snapshot (cairo_surface_t *surface)
+{
+    cairo_surface_snapshot_t *snapshot;
+    cairo_status_t status;
+
+    if (unlikely (surface->status))
+	return _cairo_surface_create_in_error (surface->status);
+
+    if (surface->finished)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+
+    if (surface->snapshot_of != NULL)
+	return cairo_surface_reference (surface);
+
+    if (surface->backend->snapshot != NULL) {
+	cairo_surface_t *snap;
+
+	snap = _cairo_surface_has_snapshot (surface, surface->backend);
+	if (snap != NULL)
+	    return cairo_surface_reference (snap);
+
+	snap = surface->backend->snapshot (surface);
+	if (snap != NULL) {
+	    if (unlikely (snap->status))
+		return snap;
+
+	    status = _cairo_surface_copy_mime_data (snap, surface);
+	    if (unlikely (status)) {
+		cairo_surface_destroy (snap);
+		return _cairo_surface_create_in_error (status);
+	    }
+
+	    snap->device_transform = surface->device_transform;
+	    snap->device_transform_inverse = surface->device_transform_inverse;
+
+	    _cairo_surface_attach_snapshot (surface, snap, NULL);
+
+	    return snap;
+	}
+    }
+
+    snapshot = (cairo_surface_snapshot_t *)
+	_cairo_surface_has_snapshot (surface, &_cairo_surface_snapshot_backend);
+    if (snapshot != NULL)
+	return cairo_surface_reference (&snapshot->base);
+
+    snapshot = malloc (sizeof (cairo_surface_snapshot_t));
+    if (unlikely (snapshot == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+
+    _cairo_surface_init (&snapshot->base,
+			 &_cairo_surface_snapshot_backend,
+			 NULL, /* device */
+			 surface->content);
+    snapshot->base.type = surface->type;
+
+    snapshot->target = surface;
+    snapshot->clone = NULL;
+
+    status = _cairo_surface_copy_mime_data (&snapshot->base, surface);
+    if (unlikely (status)) {
+	cairo_surface_destroy (&snapshot->base);
+	return _cairo_surface_create_in_error (status);
+    }
+
+    snapshot->base.device_transform = surface->device_transform;
+    snapshot->base.device_transform_inverse = surface->device_transform_inverse;
+
+    _cairo_surface_attach_snapshot (surface,
+				    &snapshot->base,
+				    _cairo_surface_snapshot_copy_on_write);
+
+    return &snapshot->base;
+}
diff --git a/gfx/cairo/cairo/src/cairo-surface-subsurface-private.h b/gfx/cairo/cairo/src/cairo-surface-subsurface-private.h
new file mode 100644
index 00000000000..435e1eb8318
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-subsurface-private.h
@@ -0,0 +1,49 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation.
+ *
+ * Contributor(s):
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef CAIRO_SURFACE_SUBSURFACE_PRIVATE_H
+#define CAIRO_SURFACE_SUBSURFACE_PRIVATE_H
+
+#include "cairo-surface-private.h"
+
+struct _cairo_surface_subsurface {
+    cairo_surface_t base;
+
+    cairo_rectangle_int_t extents;
+
+    cairo_surface_t *target;
+};
+
+#endif /* CAIRO_SURFACE_SUBSURFACE_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-surface-subsurface.c b/gfx/cairo/cairo/src/cairo-surface-subsurface.c
new file mode 100644
index 00000000000..3cf8330248e
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-surface-subsurface.c
@@ -0,0 +1,552 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Intel Corporation.
+ *
+ * Contributor(s):
+ *      Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#include "cairoint.h"
+
+#include "cairo-error-private.h"
+#include "cairo-recording-surface-private.h"
+#include "cairo-surface-offset-private.h"
+#include "cairo-surface-subsurface-private.h"
+
+static const cairo_surface_backend_t _cairo_surface_subsurface_backend;
+
+static cairo_status_t
+_cairo_surface_subsurface_finish (void *abstract_surface)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+
+    cairo_surface_destroy (surface->target);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static cairo_surface_t *
+_cairo_surface_subsurface_create_similar (void *other,
+					  cairo_content_t content,
+					  int width, int height)
+{
+    cairo_surface_subsurface_t *surface = other;
+    return surface->target->backend->create_similar (surface->target, content, width, height);
+}
+
+static cairo_int_status_t
+_cairo_surface_subsurface_paint (void *abstract_surface,
+				 cairo_operator_t op,
+				 const cairo_pattern_t *source,
+				 cairo_clip_t *clip)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_rectangle_int_t rect = { 0, 0, surface->extents.width, surface->extents.height };
+    cairo_status_t status;
+    cairo_clip_t target_clip;
+
+    _cairo_clip_init_copy (&target_clip, clip);
+    status = _cairo_clip_rectangle (&target_clip, &rect);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    status = _cairo_surface_offset_paint (surface->target,
+					 -surface->extents.x, -surface->extents.y,
+					  op, source, &target_clip);
+  CLEANUP:
+    _cairo_clip_fini (&target_clip);
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_surface_subsurface_mask (void *abstract_surface,
+				cairo_operator_t op,
+				const cairo_pattern_t *source,
+				const cairo_pattern_t *mask,
+				cairo_clip_t *clip)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_rectangle_int_t rect = { 0, 0, surface->extents.width, surface->extents.height };
+    cairo_status_t status;
+    cairo_clip_t target_clip;
+
+    _cairo_clip_init_copy (&target_clip, clip);
+    status = _cairo_clip_rectangle (&target_clip, &rect);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    status = _cairo_surface_offset_mask (surface->target,
+					 -surface->extents.x, -surface->extents.y,
+					 op, source, mask, &target_clip);
+  CLEANUP:
+    _cairo_clip_fini (&target_clip);
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_surface_subsurface_fill (void			*abstract_surface,
+				cairo_operator_t	 op,
+				const cairo_pattern_t	*source,
+				cairo_path_fixed_t	*path,
+				cairo_fill_rule_t	 fill_rule,
+				double			 tolerance,
+				cairo_antialias_t	 antialias,
+				cairo_clip_t		*clip)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_rectangle_int_t rect = { 0, 0, surface->extents.width, surface->extents.height };
+    cairo_status_t status;
+    cairo_clip_t target_clip;
+
+    _cairo_clip_init_copy (&target_clip, clip);
+    status = _cairo_clip_rectangle (&target_clip, &rect);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    status = _cairo_surface_offset_fill (surface->target,
+					 -surface->extents.x, -surface->extents.y,
+					 op, source, path, fill_rule, tolerance, antialias,
+					 &target_clip);
+  CLEANUP:
+    _cairo_clip_fini (&target_clip);
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_surface_subsurface_stroke (void				*abstract_surface,
+				  cairo_operator_t		 op,
+				  const cairo_pattern_t		*source,
+				  cairo_path_fixed_t		*path,
+				  const cairo_stroke_style_t	*stroke_style,
+				  const cairo_matrix_t		*ctm,
+				  const cairo_matrix_t		*ctm_inverse,
+				  double			 tolerance,
+				  cairo_antialias_t		 antialias,
+				  cairo_clip_t			*clip)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_rectangle_int_t rect = { 0, 0, surface->extents.width, surface->extents.height };
+    cairo_status_t status;
+    cairo_clip_t target_clip;
+
+    _cairo_clip_init_copy (&target_clip, clip);
+    status = _cairo_clip_rectangle (&target_clip, &rect);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    status = _cairo_surface_offset_stroke (surface->target,
+					   -surface->extents.x, -surface->extents.y,
+					   op, source, path, stroke_style, ctm, ctm_inverse,
+					   tolerance, antialias,
+					   &target_clip);
+  CLEANUP:
+    _cairo_clip_fini (&target_clip);
+    return status;
+}
+
+static cairo_int_status_t
+_cairo_surface_subsurface_glyphs (void			*abstract_surface,
+				  cairo_operator_t	 op,
+				  const cairo_pattern_t	*source,
+				  cairo_glyph_t		*glyphs,
+				  int			 num_glyphs,
+				  cairo_scaled_font_t	*scaled_font,
+				  cairo_clip_t		*clip,
+				  int *remaining_glyphs)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_rectangle_int_t rect = { 0, 0, surface->extents.width, surface->extents.height };
+    cairo_status_t status;
+    cairo_clip_t target_clip;
+
+    _cairo_clip_init_copy (&target_clip, clip);
+    status = _cairo_clip_rectangle (&target_clip, &rect);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    status = _cairo_surface_offset_glyphs (surface->target,
+					   -surface->extents.x, -surface->extents.y,
+					   op, source,
+					   scaled_font, glyphs, num_glyphs,
+					   &target_clip);
+    *remaining_glyphs = 0;
+  CLEANUP:
+    _cairo_clip_fini (&target_clip);
+    return status;
+}
+
+static cairo_status_t
+_cairo_surface_subsurface_flush (void *abstract_surface)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_status_t status;
+
+    status = CAIRO_STATUS_SUCCESS;
+    if (surface->target->backend->flush != NULL)
+	status = surface->target->backend->flush (surface->target);
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_surface_subsurface_mark_dirty (void *abstract_surface,
+				      int x, int y,
+				      int width, int height)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_status_t status;
+
+    status = CAIRO_STATUS_SUCCESS;
+    if (surface->target->backend->mark_dirty_rectangle != NULL) {
+	cairo_rectangle_int_t rect, extents;
+
+	rect.x = x;
+	rect.y = y;
+	rect.width  = width;
+	rect.height = height;
+
+	extents.x = extents.y = 0;
+	extents.width  = surface->extents.width;
+	extents.height = surface->extents.height;
+
+	if (_cairo_rectangle_intersect (&rect, &extents)) {
+	    status = surface->target->backend->mark_dirty_rectangle (surface->target,
+								     rect.x + surface->extents.x,
+								     rect.y + surface->extents.y,
+								     rect.width, rect.height);
+	}
+    }
+
+    return status;
+}
+
+static cairo_bool_t
+_cairo_surface_subsurface_get_extents (void *abstract_surface,
+				       cairo_rectangle_int_t *extents)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+
+    extents->x = 0;
+    extents->y = 0;
+    extents->width  = surface->extents.width;
+    extents->height = surface->extents.height;
+
+    return TRUE;
+}
+
+static void
+_cairo_surface_subsurface_get_font_options (void *abstract_surface,
+					    cairo_font_options_t *options)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+
+    if (surface->target->backend->get_font_options != NULL)
+	surface->target->backend->get_font_options (surface->target, options);
+}
+
+struct extra {
+    cairo_image_surface_t *image;
+    void *image_extra;
+};
+
+static void
+cairo_surface_paint_to_target (cairo_surface_t            *target,
+                               cairo_surface_subsurface_t *subsurface)
+{
+    cairo_t *cr;
+    
+    cr = cairo_create (target);
+
+    cairo_set_source_surface (cr,
+                              subsurface->target,
+                              - subsurface->extents.x,
+                              - subsurface->extents.y);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint (cr);
+    
+    cairo_destroy (cr);
+}
+
+static cairo_status_t
+_cairo_surface_subsurface_acquire_source_image (void                    *abstract_surface,
+						cairo_image_surface_t  **image_out,
+						void                   **extra_out)
+{
+    cairo_rectangle_int_t target_extents;
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_image_surface_t *image;
+    cairo_status_t status;
+    struct extra *extra;
+    uint8_t *data;
+    cairo_bool_t ret;
+
+    if (surface->target->type == CAIRO_SURFACE_TYPE_RECORDING) {
+	cairo_recording_surface_t *meta = (cairo_recording_surface_t *) surface->target;
+	cairo_surface_t *snapshot;
+
+	snapshot = _cairo_surface_has_snapshot (&surface->base,
+						&_cairo_image_surface_backend);
+	if (snapshot != NULL) {
+	    *image_out = (cairo_image_surface_t *) cairo_surface_reference (snapshot);
+	    *extra_out = NULL;
+	    return CAIRO_STATUS_SUCCESS;
+	}
+
+	if (! _cairo_surface_has_snapshot (&meta->base,
+					   &_cairo_image_surface_backend))
+	{
+	    image = (cairo_image_surface_t *)
+		_cairo_image_surface_create_with_content (meta->content,
+							  surface->extents.width,
+							  surface->extents.height);
+	    if (unlikely (image->base.status))
+		return image->base.status;
+
+            cairo_surface_paint_to_target (&image->base, surface);
+
+	    _cairo_surface_attach_snapshot (&surface->base, &image->base, NULL);
+
+	    *image_out = image;
+	    *extra_out = NULL;
+	    return CAIRO_STATUS_SUCCESS;
+	}
+    }
+
+    extra = malloc (sizeof (struct extra));
+    if (unlikely (extra == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    status = _cairo_surface_acquire_source_image (surface->target, &extra->image, &extra->image_extra);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    ret = _cairo_surface_get_extents (&extra->image->base, &target_extents);
+    assert (ret);
+
+    /* only copy if we need to perform sub-byte manipulation */
+    if (PIXMAN_FORMAT_BPP (extra->image->pixman_format) >= 8 &&
+	target_extents.x <= surface->extents.x &&
+	target_extents.y <= surface->extents.y &&
+	surface->extents.x + surface->extents.width <= target_extents.x + target_extents.width &&
+	surface->extents.y + surface->extents.height <= target_extents.y + target_extents.height) {
+
+	assert ((PIXMAN_FORMAT_BPP (extra->image->pixman_format) % 8) == 0);
+
+	data = extra->image->data + surface->extents.y * extra->image->stride;
+	data += PIXMAN_FORMAT_BPP (extra->image->pixman_format) / 8 * surface->extents.x;
+
+	image = (cairo_image_surface_t *)
+	    _cairo_image_surface_create_with_pixman_format (data,
+							    extra->image->pixman_format,
+							    surface->extents.width,
+							    surface->extents.height,
+							    extra->image->stride);
+	if (unlikely ((status = image->base.status)))
+	    goto CLEANUP_IMAGE;
+
+        image->base.is_clear = FALSE;
+    } else {
+	image = (cairo_image_surface_t *)
+	    _cairo_image_surface_create_with_pixman_format (NULL,
+							    extra->image->pixman_format,
+							    surface->extents.width,
+							    surface->extents.height,
+							    0);
+	if (unlikely ((status = image->base.status)))
+	    goto CLEANUP_IMAGE;
+
+        cairo_surface_paint_to_target (&image->base, surface);
+    }
+
+    *image_out = image;
+    *extra_out = extra;
+    return CAIRO_STATUS_SUCCESS;
+
+CLEANUP_IMAGE:
+    _cairo_surface_release_source_image (surface->target, extra->image, extra->image_extra);
+CLEANUP:
+    free (extra);
+    return status;
+}
+
+static void
+_cairo_surface_subsurface_release_source_image (void                   *abstract_surface,
+						cairo_image_surface_t  *image,
+						void                   *abstract_extra)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+
+    if (abstract_extra != NULL) {
+	struct extra *extra = abstract_extra;
+
+	_cairo_surface_release_source_image (surface->target, extra->image, extra->image_extra);
+	free (extra);
+    }
+
+    cairo_surface_destroy (&image->base);
+}
+
+static cairo_surface_t *
+_cairo_surface_subsurface_snapshot (void *abstract_surface)
+{
+    cairo_surface_subsurface_t *surface = abstract_surface;
+    cairo_surface_subsurface_t *snapshot;
+
+    snapshot = malloc (sizeof (cairo_surface_subsurface_t));
+    if (unlikely (snapshot == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    _cairo_surface_init (&snapshot->base,
+			 &_cairo_surface_subsurface_backend,
+			 NULL, /* device */
+			 surface->target->content);
+    snapshot->target = _cairo_surface_snapshot (surface->target);
+    if (unlikely (snapshot->target->status)) {
+	cairo_status_t status;
+
+	status = snapshot->target->status;
+	free (snapshot);
+	return _cairo_surface_create_in_error (status);
+    }
+
+    snapshot->base.type = snapshot->target->type;
+    snapshot->extents = surface->extents;
+
+    return &snapshot->base;
+}
+
+static const cairo_surface_backend_t _cairo_surface_subsurface_backend = {
+    CAIRO_SURFACE_TYPE_SUBSURFACE,
+    _cairo_surface_subsurface_create_similar,
+    _cairo_surface_subsurface_finish,
+
+    _cairo_surface_subsurface_acquire_source_image,
+    _cairo_surface_subsurface_release_source_image,
+    NULL, NULL, /* acquire, release dest */
+    NULL, /* clone similar */
+    NULL, /* composite */
+    NULL, /* fill rectangles */
+    NULL, /* composite trapezoids */
+    NULL, /* create span renderer */
+    NULL, /* check span renderer */
+    NULL, /* copy_page */
+    NULL, /* show_page */
+    _cairo_surface_subsurface_get_extents,
+    NULL, /* old_show_glyphs */
+    _cairo_surface_subsurface_get_font_options,
+    _cairo_surface_subsurface_flush,
+    _cairo_surface_subsurface_mark_dirty,
+    NULL, /* font_fini */
+    NULL, /* glyph_fini */
+
+    _cairo_surface_subsurface_paint,
+    _cairo_surface_subsurface_mask,
+    _cairo_surface_subsurface_stroke,
+    _cairo_surface_subsurface_fill,
+    _cairo_surface_subsurface_glyphs,
+
+    _cairo_surface_subsurface_snapshot,
+};
+
+/**
+ * cairo_surface_create_for_rectangle:
+ * @target: an existing surface for which the sub-surface will point to
+ * @x: the x-origin of the sub-surface from the top-left of the target surface (in device-space units)
+ * @y: the y-origin of the sub-surface from the top-left of the target surface (in device-space units)
+ * @width: width of the sub-surface (in device-space units)
+ * @height: height of the sub-surface (in device-space units)
+ *
+ * Create a new surface that is a rectangle within the target surface.
+ * All operations drawn to this surface are then clipped and translated
+ * onto the target surface. Nothing drawn via this sub-surface outside of
+ * its bounds is drawn onto the target surface, making this a useful method
+ * for passing constrained child surfaces to library routines that draw
+ * directly onto the parent surface, i.e. with no further backend allocations,
+ * double buffering or copies.
+ *
+ * <note><para>The semantics of subsurfaces have not been finalized yet
+ * unless the rectangle is in full device units, is contained within
+ * the extents of the target surface, and the target or subsurface's
+ * device transforms are not changed.</para></note>
+ *
+ * Return value: a pointer to the newly allocated surface. The caller
+ * owns the surface and should call cairo_surface_destroy() when done
+ * with it.
+ *
+ * This function always returns a valid pointer, but it will return a
+ * pointer to a "nil" surface if @other is already in an error state
+ * or any other error occurs.
+ *
+ * Since: 1.10
+ **/
+cairo_surface_t *
+cairo_surface_create_for_rectangle (cairo_surface_t *target,
+				    double x, double y,
+				    double width, double height)
+{
+    cairo_surface_subsurface_t *surface;
+
+    if (unlikely (target->status))
+	return _cairo_surface_create_in_error (target->status);
+    if (unlikely (target->finished))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+
+    surface = malloc (sizeof (cairo_surface_subsurface_t));
+    if (unlikely (surface == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    assert (_cairo_matrix_is_translation (&target->device_transform));
+    x += target->device_transform.x0;
+    y += target->device_transform.y0;
+
+    _cairo_surface_init (&surface->base,
+			 &_cairo_surface_subsurface_backend,
+			 NULL, /* device */
+			 target->content);
+
+    /* XXX forced integer alignment */
+    surface->extents.x = ceil (x);
+    surface->extents.y = ceil (y);
+    surface->extents.width = floor (x + width) - surface->extents.x;
+    surface->extents.height = floor (y + height) - surface->extents.y;
+
+    if (target->backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	/* Maintain subsurfaces as 1-depth */
+	cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) target;
+	surface->extents.x += sub->extents.x;
+	surface->extents.y += sub->extents.y;
+	target = sub->target;
+    }
+
+    surface->target = cairo_surface_reference (target);
+
+    return &surface->base;
+}
+/* XXX observe mark-dirty */
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper-private.h b/gfx/cairo/cairo/src/cairo-surface-wrapper-private.h
index 658f5786c91..a1f05d386b2 100644
--- a/gfx/cairo/cairo/src/cairo-surface-wrapper-private.h
+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -46,13 +46,18 @@ CAIRO_BEGIN_DECLS
 struct _cairo_surface_wrapper {
     cairo_surface_t *target;
 
-    /* any other information? */
+    cairo_bool_t has_extents;
+    cairo_rectangle_int_t extents;
 };
 
 cairo_private void
 _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper,
 			     cairo_surface_t *target);
 
+cairo_private void
+_cairo_surface_wrapper_set_extents (cairo_surface_wrapper_t *wrapper,
+				    const cairo_rectangle_int_t *extents);
+
 cairo_private void
 _cairo_surface_wrapper_fini (cairo_surface_wrapper_t *wrapper);
 
@@ -85,9 +90,9 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper,
 			       cairo_operator_t		 op,
 			       const cairo_pattern_t	*source,
 			       cairo_path_fixed_t	*path,
-			       cairo_stroke_style_t	*stroke_style,
-			       cairo_matrix_t		*ctm,
-			       cairo_matrix_t		*ctm_inverse,
+			       const cairo_stroke_style_t	*stroke_style,
+			       const cairo_matrix_t		*ctm,
+			       const cairo_matrix_t		*ctm_inverse,
 			       double			 tolerance,
 			       cairo_antialias_t	 antialias,
 			       cairo_clip_t		*clip);
@@ -102,9 +107,9 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
 				    cairo_path_fixed_t	    *path,
 				    cairo_operator_t	     stroke_op,
 				    const cairo_pattern_t   *stroke_source,
-				    cairo_stroke_style_t    *stroke_style,
-				    cairo_matrix_t	    *stroke_ctm,
-				    cairo_matrix_t	    *stroke_ctm_inverse,
+				    const cairo_stroke_style_t    *stroke_style,
+				    const cairo_matrix_t	    *stroke_ctm,
+				    const cairo_matrix_t	    *stroke_ctm_inverse,
 				    double		     stroke_tolerance,
 				    cairo_antialias_t	     stroke_antialias,
 				    cairo_clip_t	    *clip);
diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
index 05bd33405d1..fb4b0577af6 100644
--- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,19 +37,44 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-surface-wrapper-private.h"
 
 /* A collection of routines to facilitate surface wrapping */
 
-static cairo_bool_t
-_cairo_surface_wrapper_needs_device_transform (cairo_surface_wrapper_t *wrapper,
-					       cairo_matrix_t *matrix)
+static void
+_copy_transformed_pattern (cairo_pattern_t *pattern,
+			   const cairo_pattern_t *original,
+			   const cairo_matrix_t  *ctm_inverse)
 {
-    if (_cairo_matrix_is_identity (&wrapper->target->device_transform))
-	return FALSE;
+    _cairo_pattern_init_static_copy (pattern, original);
 
-    *matrix = wrapper->target->device_transform;
-    return TRUE;
+    /* apply device_transform first so that it is transformed by ctm_inverse */
+    if (original->type == CAIRO_PATTERN_TYPE_SURFACE) {
+	cairo_surface_pattern_t *surface_pattern;
+	cairo_surface_t *surface;
+
+        surface_pattern = (cairo_surface_pattern_t *) original;
+        surface = surface_pattern->surface;
+
+	if (_cairo_surface_has_device_transform (surface))
+	    _cairo_pattern_transform (pattern, &surface->device_transform);
+    }
+
+    if (! _cairo_matrix_is_identity (ctm_inverse))
+	_cairo_pattern_transform (pattern, ctm_inverse);
+}
+
+static inline cairo_bool_t
+_cairo_surface_wrapper_needs_device_transform (cairo_surface_wrapper_t *wrapper)
+{
+    return ! _cairo_matrix_is_identity (&wrapper->target->device_transform);
+}
+
+static cairo_bool_t
+_cairo_surface_wrapper_needs_extents_transform (cairo_surface_wrapper_t *wrapper)
+{
+    return wrapper->has_extents && (wrapper->extents.x | wrapper->extents.y);
 }
 
 cairo_status_t
@@ -72,56 +97,67 @@ _cairo_surface_wrapper_release_source_image (cairo_surface_wrapper_t *wrapper,
     _cairo_surface_release_source_image (wrapper->target, image, image_extra);
 }
 
-static void
-_cairo_surface_wrapper_transform_pattern (cairo_surface_wrapper_t *wrapper,
-                                          cairo_pattern_t         *pattern,
-                                          const cairo_pattern_t   *original)
-{
-    _cairo_pattern_init_static_copy (pattern, original);
-
-    if (_cairo_surface_has_device_transform (wrapper->target))
-        _cairo_pattern_transform (pattern,
-                                  &wrapper->target->device_transform_inverse);
-}
-
 cairo_status_t
 _cairo_surface_wrapper_paint (cairo_surface_wrapper_t *wrapper,
-			      cairo_operator_t	       op,
-			      const cairo_pattern_t   *source,
-			      cairo_clip_t	      *clip)
+			      cairo_operator_t	 op,
+			      const cairo_pattern_t *source,
+			      cairo_clip_t	    *clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
     cairo_clip_t clip_copy, *dev_clip = clip;
-    cairo_pattern_union_t source_pattern;
+    cairo_pattern_union_t source_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (clip != NULL) {
-	if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-							   &device_transform))
-	{
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
+    {
+	cairo_matrix_t m;
+
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
+	if (clip != NULL) {
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
 
-	} else {
-	    _cairo_clip_init_copy (&clip_copy, clip);
+	    dev_clip = &clip_copy;
 	}
 
-	dev_clip = &clip_copy;
+	status = cairo_matrix_invert (&m);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &source_pattern.base, source);
-
-    status = _cairo_surface_paint (wrapper->target, op, &source_pattern.base, dev_clip);
+    status = _cairo_surface_paint (wrapper->target, op, source, dev_clip);
 
   FINISH:
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
     return status;
@@ -135,40 +171,64 @@ _cairo_surface_wrapper_mask (cairo_surface_wrapper_t *wrapper,
 			     cairo_clip_t	    *clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
     cairo_clip_t clip_copy, *dev_clip = clip;
-    cairo_pattern_union_t source_pattern, mask_pattern;
+    cairo_pattern_union_t source_copy;
+    cairo_pattern_union_t mask_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (clip != NULL) {
-	if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-							   &device_transform))
-	{
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
+    {
+	cairo_matrix_t m;
+
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
+	if (clip != NULL) {
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
 
-	} else {
-	    _cairo_clip_init_copy (&clip_copy, clip);
+	    dev_clip = &clip_copy;
 	}
 
-	dev_clip = &clip_copy;
+	status = cairo_matrix_invert (&m);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+
+	_copy_transformed_pattern (&mask_copy.base, mask, &m);
+	mask = &mask_copy.base;
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &source_pattern.base, source);
-    _cairo_surface_wrapper_transform_pattern (wrapper, &mask_pattern.base, mask);
-
-    status = _cairo_surface_mask (wrapper->target, op,
-                                  &source_pattern.base, &mask_pattern.base,
-                                  dev_clip);
+    status = _cairo_surface_mask (wrapper->target, op, source, mask, dev_clip);
 
   FINISH:
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
     return status;
@@ -179,62 +239,85 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper,
 			       cairo_operator_t		 op,
 			       const cairo_pattern_t	*source,
 			       cairo_path_fixed_t	*path,
-			       cairo_stroke_style_t	*stroke_style,
-			       cairo_matrix_t		*ctm,
-			       cairo_matrix_t		*ctm_inverse,
+			       const cairo_stroke_style_t	*stroke_style,
+			       const cairo_matrix_t		*ctm,
+			       const cairo_matrix_t		*ctm_inverse,
 			       double			 tolerance,
 			       cairo_antialias_t	 antialias,
 			       cairo_clip_t		*clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
     cairo_path_fixed_t path_copy, *dev_path = path;
     cairo_clip_t clip_copy, *dev_clip = clip;
     cairo_matrix_t dev_ctm = *ctm;
     cairo_matrix_t dev_ctm_inverse = *ctm_inverse;
-    cairo_pattern_union_t source_pattern;
+    cairo_pattern_union_t source_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-						       &device_transform))
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
     {
+	cairo_matrix_t m;
+
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
 	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
 	if (unlikely (status))
 	    goto FINISH;
 
-	_cairo_path_fixed_transform (&path_copy, &device_transform);
+	_cairo_path_fixed_transform (&path_copy, &m);
 	dev_path = &path_copy;
 
 	if (clip != NULL) {
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
 
 	    dev_clip = &clip_copy;
 	}
 
-	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &device_transform);
-	status = cairo_matrix_invert (&device_transform);
+	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &m);
+
+	status = cairo_matrix_invert (&m);
 	assert (status == CAIRO_STATUS_SUCCESS);
-	cairo_matrix_multiply (&dev_ctm_inverse,
-			       &device_transform,
-			       &dev_ctm_inverse);
-    } else {
+
+	cairo_matrix_multiply (&dev_ctm_inverse, &m, &dev_ctm_inverse);
+
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+    }
+    else
+    {
 	if (clip != NULL) {
 	    dev_clip = &clip_copy;
 	    _cairo_clip_init_copy (&clip_copy, clip);
 	}
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &source_pattern.base, source);
-
-    status = _cairo_surface_stroke (wrapper->target, op, &source_pattern.base,
+    status = _cairo_surface_stroke (wrapper->target, op, source,
 				    dev_path, stroke_style,
 				    &dev_ctm, &dev_ctm_inverse,
 				    tolerance, antialias,
@@ -243,6 +326,8 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper,
  FINISH:
     if (dev_path != path)
 	_cairo_path_fixed_fini (dev_path);
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
     return status;
@@ -258,67 +343,93 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
 				    cairo_path_fixed_t	    *path,
 				    cairo_operator_t	     stroke_op,
 				    const cairo_pattern_t   *stroke_source,
-				    cairo_stroke_style_t    *stroke_style,
-				    cairo_matrix_t	    *stroke_ctm,
-				    cairo_matrix_t	    *stroke_ctm_inverse,
+				    const cairo_stroke_style_t    *stroke_style,
+				    const cairo_matrix_t	    *stroke_ctm,
+				    const cairo_matrix_t	    *stroke_ctm_inverse,
 				    double		     stroke_tolerance,
 				    cairo_antialias_t	     stroke_antialias,
 				    cairo_clip_t	    *clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
     cairo_path_fixed_t path_copy, *dev_path = path;
     cairo_clip_t clip_copy, *dev_clip = clip;
     cairo_matrix_t dev_ctm = *stroke_ctm;
     cairo_matrix_t dev_ctm_inverse = *stroke_ctm_inverse;
-    cairo_pattern_union_t fill_pattern, stroke_pattern;
+    cairo_pattern_union_t stroke_source_copy;
+    cairo_pattern_union_t fill_source_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-						       &device_transform))
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
     {
+	cairo_matrix_t m;
+
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
 	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
 	if (unlikely (status))
 	    goto FINISH;
 
-	_cairo_path_fixed_transform (&path_copy, &device_transform);
+	_cairo_path_fixed_transform (&path_copy, &m);
 	dev_path = &path_copy;
 
 	if (clip != NULL) {
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
 
 	    dev_clip = &clip_copy;
 	}
 
-	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &device_transform);
-	status = cairo_matrix_invert (&device_transform);
+	cairo_matrix_multiply (&dev_ctm, &dev_ctm, &m);
+
+	status = cairo_matrix_invert (&m);
 	assert (status == CAIRO_STATUS_SUCCESS);
-	cairo_matrix_multiply (&dev_ctm_inverse,
-			       &device_transform,
-			       &dev_ctm_inverse);
-    } else {
+
+	cairo_matrix_multiply (&dev_ctm_inverse, &m, &dev_ctm_inverse);
+
+	_copy_transformed_pattern (&stroke_source_copy.base, stroke_source, &m);
+	stroke_source = &stroke_source_copy.base;
+
+	_copy_transformed_pattern (&fill_source_copy.base, fill_source, &m);
+	fill_source = &fill_source_copy.base;
+    }
+    else
+    {
 	if (clip != NULL) {
 	    dev_clip = &clip_copy;
 	    _cairo_clip_init_copy (&clip_copy, clip);
 	}
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &fill_pattern.base, fill_source);
-    _cairo_surface_wrapper_transform_pattern (wrapper, &stroke_pattern.base, stroke_source);
-
     status = _cairo_surface_fill_stroke (wrapper->target,
-					 fill_op, &fill_pattern.base, fill_rule,
+					 fill_op, fill_source, fill_rule,
 					 fill_tolerance, fill_antialias,
 					 dev_path,
-					 stroke_op, &stroke_pattern.base,
+					 stroke_op, stroke_source,
 					 stroke_style,
 					 &dev_ctm, &dev_ctm_inverse,
 					 stroke_tolerance, stroke_antialias,
@@ -327,6 +438,8 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper,
   FINISH:
     if (dev_path != path)
 	_cairo_path_fixed_fini (dev_path);
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
     return status;
@@ -343,46 +456,71 @@ _cairo_surface_wrapper_fill (cairo_surface_wrapper_t	*wrapper,
 			     cairo_clip_t	*clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
     cairo_path_fixed_t path_copy, *dev_path = path;
     cairo_clip_t clip_copy, *dev_clip = clip;
-    cairo_pattern_union_t source_pattern;
+    cairo_pattern_union_t source_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-						       &device_transform))
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
     {
+	cairo_matrix_t m;
+
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
 	status = _cairo_path_fixed_init_copy (&path_copy, dev_path);
 	if (unlikely (status))
 	    goto FINISH;
 
-	_cairo_path_fixed_transform (&path_copy, &device_transform);
+	_cairo_path_fixed_transform (&path_copy, &m);
 	dev_path = &path_copy;
 
 	if (clip != NULL) {
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
 
 	    dev_clip = &clip_copy;
 	}
-    } else {
+
+	status = cairo_matrix_invert (&m);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+    }
+    else
+    {
 	if (clip != NULL) {
 	    dev_clip = &clip_copy;
 	    _cairo_clip_init_copy (&clip_copy, clip);
 	}
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &source_pattern.base, source);
-
-    status = _cairo_surface_fill (wrapper->target, op,
-                                  &source_pattern.base,
+    status = _cairo_surface_fill (wrapper->target, op, source,
 				  dev_path, fill_rule,
 				  tolerance, antialias,
 				  dev_clip);
@@ -390,6 +528,8 @@ _cairo_surface_wrapper_fill (cairo_surface_wrapper_t	*wrapper,
  FINISH:
     if (dev_path != path)
 	_cairo_path_fixed_fini (dev_path);
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
     return status;
@@ -410,10 +550,10 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
 					 cairo_clip_t		    *clip)
 {
     cairo_status_t status;
-    cairo_matrix_t device_transform;
-    cairo_pattern_union_t source_pattern;
     cairo_clip_t clip_copy, *dev_clip = clip;
     cairo_glyph_t *dev_glyphs = glyphs;
+    cairo_pattern_union_t source_copy;
+    cairo_clip_t target_clip;
 
     if (unlikely (wrapper->target->status))
 	return wrapper->target->status;
@@ -421,20 +561,40 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
     if (glyphs == NULL || num_glyphs == 0)
 	return CAIRO_STATUS_SUCCESS;
 
-    if (clip && clip->all_clipped)
-	return CAIRO_STATUS_SUCCESS;
+    if (wrapper->has_extents) {
+	_cairo_clip_init_copy (&target_clip, clip);
+	status = _cairo_clip_rectangle (&target_clip, &wrapper->extents);
+	if (unlikely (status))
+	    goto FINISH;
 
-    if (_cairo_surface_wrapper_needs_device_transform (wrapper,
-						       &device_transform))
+	dev_clip = clip = &target_clip;
+    }
+
+    if (clip && clip->all_clipped) {
+	status = CAIRO_STATUS_SUCCESS;
+	goto FINISH;
+    }
+
+    if (_cairo_surface_wrapper_needs_device_transform (wrapper) ||
+	_cairo_surface_wrapper_needs_extents_transform (wrapper))
     {
+	cairo_matrix_t m;
 	int i;
 
+	cairo_matrix_init_identity (&m);
+
+	if (_cairo_surface_wrapper_needs_extents_transform (wrapper))
+	    cairo_matrix_translate (&m, -wrapper->extents.x, -wrapper->extents.y);
+
+	if (_cairo_surface_wrapper_needs_device_transform (wrapper))
+	    cairo_matrix_multiply (&m, &wrapper->target->device_transform, &m);
+
 	if (clip != NULL) {
-	    dev_clip = &clip_copy;
-	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip,
-							&device_transform);
+	    status = _cairo_clip_init_copy_transformed (&clip_copy, clip, &m);
 	    if (unlikely (status))
 		goto FINISH;
+
+	    dev_clip = &clip_copy;
 	}
 
 	dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));
@@ -445,30 +605,36 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
 
 	for (i = 0; i < num_glyphs; i++) {
 	    dev_glyphs[i] = glyphs[i];
-	    cairo_matrix_transform_point (&device_transform,
-					  &dev_glyphs[i].x,
-					  &dev_glyphs[i].y);
+	    cairo_matrix_transform_point (&m, &dev_glyphs[i].x, &dev_glyphs[i].y);
 	}
-    } else {
+
+	status = cairo_matrix_invert (&m);
+	assert (status == CAIRO_STATUS_SUCCESS);
+
+	_copy_transformed_pattern (&source_copy.base, source, &m);
+	source = &source_copy.base;
+    }
+    else
+    {
 	if (clip != NULL) {
 	    dev_clip = &clip_copy;
 	    _cairo_clip_init_copy (&clip_copy, clip);
 	}
     }
 
-    _cairo_surface_wrapper_transform_pattern (wrapper, &source_pattern.base, source);
-
-    status = _cairo_surface_show_text_glyphs (wrapper->target, op,
-                                              &source_pattern.base,
+    status = _cairo_surface_show_text_glyphs (wrapper->target, op, source,
 					      utf8, utf8_len,
 					      dev_glyphs, num_glyphs,
 					      clusters, num_clusters,
 					      cluster_flags,
 					      scaled_font,
 					      dev_clip);
+
  FINISH:
     if (dev_clip != clip)
 	_cairo_clip_reset (dev_clip);
+    if (wrapper->has_extents)
+	_cairo_clip_reset (&target_clip);
     if (dev_glyphs != glyphs)
 	free (dev_glyphs);
     return status;
@@ -480,17 +646,36 @@ _cairo_surface_wrapper_create_similar (cairo_surface_wrapper_t *wrapper,
 				       int		width,
 				       int		height)
 {
-    return _cairo_surface_create_similar_solid (wrapper->target,
-						content, width, height,
-						CAIRO_COLOR_TRANSPARENT,
-						TRUE);
+    return _cairo_surface_create_similar_scratch (wrapper->target,
+						  content, width, height);
 }
 
 cairo_bool_t
 _cairo_surface_wrapper_get_extents (cairo_surface_wrapper_t *wrapper,
 				    cairo_rectangle_int_t   *extents)
 {
-    return _cairo_surface_get_extents (wrapper->target, extents);
+    if (wrapper->has_extents) {
+	if (_cairo_surface_get_extents (wrapper->target, extents))
+	    _cairo_rectangle_intersect (extents, &wrapper->extents);
+	else
+	    *extents = wrapper->extents;
+
+	return TRUE;
+    } else {
+	return _cairo_surface_get_extents (wrapper->target, extents);
+    }
+}
+
+void
+_cairo_surface_wrapper_set_extents (cairo_surface_wrapper_t *wrapper,
+				    const cairo_rectangle_int_t *extents)
+{
+    if (extents != NULL) {
+	wrapper->extents = *extents;
+	wrapper->has_extents = TRUE;
+    } else {
+	wrapper->has_extents = FALSE;
+    }
 }
 
 void
@@ -517,6 +702,7 @@ _cairo_surface_wrapper_init (cairo_surface_wrapper_t *wrapper,
 			     cairo_surface_t *target)
 {
     wrapper->target = cairo_surface_reference (target);
+    wrapper->has_extents = FALSE;
 }
 
 void
diff --git a/gfx/cairo/cairo/src/cairo-surface.c b/gfx/cairo/cairo/src/cairo-surface.c
index c3f6f03a7ef..cb6ada9c722 100644
--- a/gfx/cairo/cairo/src/cairo-surface.c
+++ b/gfx/cairo/cairo/src/cairo-surface.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,13 +40,63 @@
 
 #include "cairo-surface-fallback-private.h"
 #include "cairo-clip-private.h"
+#include "cairo-device-private.h"
+#include "cairo-error-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-region-private.h"
 #include "cairo-tee-surface-private.h"
 
+/**
+ * SECTION:cairo-surface
+ * @Title: cairo_surface_t
+ * @Short_Description: Base class for surfaces
+ * @See_Also: #cairo_t, #cairo_pattern_t
+ *
+ * #cairo_surface_t is the abstract type representing all different drawing
+ * targets that cairo can render to.  The actual drawings are
+ * performed using a cairo <firstterm>context</firstterm>.
+ *
+ * A cairo surface is created by using <firstterm>backend</firstterm>-specific
+ * constructors, typically of the form
+ * cairo_<emphasis>backend</emphasis>_surface_create().
+ *
+ * Most surface types allow accessing the surface without using Cairo
+ * functions. If you do this, keep in mind that it is mandatory that you call
+ * cairo_surface_flush() before reading from or writing to the surface and that
+ * you must use cairo_surface_mark_dirty() after modifying it.
+ * <example>
+ * <title>Directly modifying an image surface</title>
+ * <programlisting>
+ * void
+ * modify_image_surface (cairo_surface_t *surface)
+ * {
+ *   unsigned char *data;
+ *   int width, height, stride;
+ *
+ *   // flush to ensure all writing to the image was done
+ *   cairo_surface_flush (surface);
+ *
+ *   // modify the image
+ *   data = cairo_image_surface_get_data (surface);
+ *   width = cairo_image_surface_get_width (surface);
+ *   height = cairo_image_surface_get_height (surface);
+ *   stride = cairo_image_surface_get_stride (surface);
+ *   modify_image_data (data, width, height, stride);
+ *
+ *   // mark the image dirty so Cairo clears its caches.
+ *   cairo_surface_mark_dirty (surface);
+ * }
+ * </programlisting>
+ * </example>
+ * Note that for other surface types it might be necessary to acquire the
+ * surface's device first. See cairo_device_acquire() for a discussion of
+ * devices.
+ */
+
 #define DEFINE_NIL_SURFACE(status, name)			\
 const cairo_surface_t name = {					\
     NULL,				/* backend */		\
+    NULL,				/* device */		\
     CAIRO_SURFACE_TYPE_IMAGE,		/* type */		\
     CAIRO_CONTENT_COLOR,		/* content */		\
     CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */		\
@@ -54,27 +104,28 @@ const cairo_surface_t name = {					\
     0,					/* unique id */		\
     FALSE,				/* finished */		\
     TRUE,				/* is_clear */		\
-    FALSE,                             /* has_font_options */	\
-    FALSE,                             /* permit_subpixel_antialiasing */ \
+    FALSE,				/* has_font_options */	\
+    FALSE,				/* owns_device */	\
+    FALSE,				/* permit_subpixel_antialiasing */ \
     { 0, 0, 0, NULL, },			/* user_data */		\
     { 0, 0, 0, NULL, },			/* mime_data */         \
     { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 },   /* device_transform */	\
     { 1.0, 0.0,	0.0, 1.0, 0.0, 0.0 },	/* device_transform_inverse */	\
+    { NULL, NULL },			/* device_transform_observers */ \
     0.0,				/* x_resolution */	\
     0.0,				/* y_resolution */	\
     0.0,				/* x_fallback_resolution */	\
     0.0,				/* y_fallback_resolution */	\
     NULL,				/* snapshot_of */	\
     NULL,				/* snapshot_detach */	\
-    { 0,	/* size */					\
-      0,	/* num_elements */				\
-      0,	/* element_size */				\
-      NULL,	/* elements */					\
-    },					/* snapshots */		\
+    { NULL, NULL },			/* snapshots */		\
+    { NULL, NULL },			/* snapshot */		\
     { CAIRO_ANTIALIAS_DEFAULT,		/* antialias */		\
       CAIRO_SUBPIXEL_ORDER_DEFAULT,	/* subpixel_order */	\
+      CAIRO_LCD_FILTER_DEFAULT,		/* lcd_filter */	\
       CAIRO_HINT_STYLE_DEFAULT,		/* hint_style */	\
-      CAIRO_HINT_METRICS_DEFAULT	/* hint_metrics */	\
+      CAIRO_HINT_METRICS_DEFAULT,	/* hint_metrics */	\
+      CAIRO_ROUND_GLYPH_POS_DEFAULT	/* round_glyph_positions */	\
     }					/* font_options */	\
 }
 
@@ -92,6 +143,8 @@ static DEFINE_NIL_SURFACE(CAIRO_STATUS_READ_ERROR, _cairo_surface_nil_read_error
 static DEFINE_NIL_SURFACE(CAIRO_STATUS_WRITE_ERROR, _cairo_surface_nil_write_error);
 static DEFINE_NIL_SURFACE(CAIRO_STATUS_INVALID_STRIDE, _cairo_surface_nil_invalid_stride);
 static DEFINE_NIL_SURFACE(CAIRO_STATUS_INVALID_SIZE, _cairo_surface_nil_invalid_size);
+static DEFINE_NIL_SURFACE(CAIRO_STATUS_DEVICE_TYPE_MISMATCH, _cairo_surface_nil_device_type_mismatch);
+static DEFINE_NIL_SURFACE(CAIRO_STATUS_DEVICE_ERROR, _cairo_surface_nil_device_error);
 
 /**
  * _cairo_surface_set_error:
@@ -117,6 +170,9 @@ cairo_status_t
 _cairo_surface_set_error (cairo_surface_t *surface,
 			  cairo_status_t status)
 {
+    if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	status = CAIRO_STATUS_SUCCESS;
+
     if (status == CAIRO_STATUS_SUCCESS || status >= CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
@@ -210,103 +266,66 @@ _cairo_surface_allocate_unique_id (void)
 #endif
 }
 
+/**
+ * cairo_surface_get_device:
+ * @surface: a #cairo_surface_t
+ *
+ * This function returns the device for a @surface.
+ * See #cairo_device_t.
+ *
+ * Return value: The device for @surface or %NULL if the surface does
+ *               not have an associated device.
+ *
+ * Since: 1.10
+ **/
+cairo_device_t *
+cairo_surface_get_device (cairo_surface_t *surface)
+{
+    if (unlikely (surface->status))
+	return _cairo_device_create_in_error (surface->status);
+
+    return surface->device;
+}
+
 static cairo_bool_t
 _cairo_surface_has_snapshots (cairo_surface_t *surface)
 {
-    return surface->snapshots.num_elements != 0;
+    return ! cairo_list_is_empty (&surface->snapshots);
+}
+
+static cairo_bool_t
+_cairo_surface_has_mime_data (cairo_surface_t *surface)
+{
+    return surface->mime_data.num_elements != 0;
+}
+
+static void
+_cairo_surface_detach_mime_data (cairo_surface_t *surface)
+{
+    if (! _cairo_surface_has_mime_data (surface))
+	return;
+
+    _cairo_user_data_array_fini (&surface->mime_data);
+    _cairo_user_data_array_init (&surface->mime_data);
 }
 
 static void
 _cairo_surface_detach_snapshots (cairo_surface_t *surface)
 {
-    cairo_surface_t **snapshots;
-    unsigned int i;
-
-    if (! _cairo_surface_has_snapshots (surface))
-	return;
-
-    /* XXX do something intelligent! */
-
-    snapshots = _cairo_array_index (&surface->snapshots, 0);
-    for (i = 0; i < surface->snapshots.num_elements; i++) {
-	snapshots[i]->snapshot_of = NULL;
-
-	if (snapshots[i]->snapshot_detach != NULL)
-	    snapshots[i]->snapshot_detach (snapshots[i]);
-
-	cairo_surface_destroy (snapshots[i]);
+    while (_cairo_surface_has_snapshots (surface)) {
+	_cairo_surface_detach_snapshot (cairo_list_first_entry (&surface->snapshots,
+								cairo_surface_t,
+								snapshot));
     }
-    surface->snapshots.num_elements = 0;
-
-    assert (! _cairo_surface_has_snapshots (surface));
-}
-
-cairo_status_t
-_cairo_surface_attach_snapshot (cairo_surface_t *surface,
-				cairo_surface_t *snapshot,
-				cairo_surface_func_t detach_func)
-{
-    cairo_status_t status;
-
-    assert (surface != snapshot);
-
-    if (snapshot->snapshot_of != NULL)
-	_cairo_surface_detach_snapshot (snapshot);
-
-    snapshot->snapshot_of = surface;
-    snapshot->snapshot_detach = detach_func;
-
-    status = _cairo_array_append (&surface->snapshots, &snapshot);
-    if (unlikely (status))
-	return status;
-
-    cairo_surface_reference (snapshot);
-    return CAIRO_STATUS_SUCCESS;
-}
-
-cairo_surface_t *
-_cairo_surface_has_snapshot (cairo_surface_t *surface,
-			     const cairo_surface_backend_t *backend,
-			     cairo_content_t content)
-{
-    cairo_surface_t **snapshots;
-    unsigned int i;
-
-    snapshots = _cairo_array_index (&surface->snapshots, 0);
-    for (i = 0; i < surface->snapshots.num_elements; i++) {
-	if (snapshots[i]->backend == backend &&
-	    snapshots[i]->content == content)
-	{
-	    return snapshots[i];
-	}
-    }
-
-    return NULL;
 }
 
 void
 _cairo_surface_detach_snapshot (cairo_surface_t *snapshot)
 {
-    cairo_surface_t *surface;
-    cairo_surface_t **snapshots;
-    unsigned int i;
-
     assert (snapshot->snapshot_of != NULL);
-    surface = snapshot->snapshot_of;
-
-    snapshots = _cairo_array_index (&surface->snapshots, 0);
-    for (i = 0; i < surface->snapshots.num_elements; i++) {
-	if (snapshots[i] == snapshot)
-	    break;
-    }
-    assert (i < surface->snapshots.num_elements);
-
-    surface->snapshots.num_elements--;
-    memmove (&snapshots[i],
-	     &snapshots[i+1],
-	     sizeof (cairo_surface_t *)*(surface->snapshots.num_elements - i));
 
     snapshot->snapshot_of = NULL;
+    cairo_list_del (&snapshot->snapshot);
 
     if (snapshot->snapshot_detach != NULL)
 	snapshot->snapshot_detach (snapshot);
@@ -314,12 +333,51 @@ _cairo_surface_detach_snapshot (cairo_surface_t *snapshot)
     cairo_surface_destroy (snapshot);
 }
 
+void
+_cairo_surface_attach_snapshot (cairo_surface_t *surface,
+				 cairo_surface_t *snapshot,
+				 cairo_surface_func_t detach_func)
+{
+    assert (surface != snapshot);
+    assert (snapshot->snapshot_of != surface);
+
+    cairo_surface_reference (snapshot);
+
+    if (snapshot->snapshot_of != NULL)
+	_cairo_surface_detach_snapshot (snapshot);
+
+    snapshot->snapshot_of = surface;
+    snapshot->snapshot_detach = detach_func;
+
+    cairo_list_add (&snapshot->snapshot, &surface->snapshots);
+
+    assert (_cairo_surface_has_snapshot (surface, snapshot->backend) == snapshot);
+}
+
+cairo_surface_t *
+_cairo_surface_has_snapshot (cairo_surface_t *surface,
+			     const cairo_surface_backend_t *backend)
+{
+    cairo_surface_t *snapshot;
+
+    cairo_list_foreach_entry (snapshot, cairo_surface_t,
+			      &surface->snapshots, snapshot)
+    {
+	/* XXX is_similar? */
+	if (snapshot->backend == backend)
+	    return snapshot;
+    }
+
+    return NULL;
+}
+
 static cairo_bool_t
 _cairo_surface_is_writable (cairo_surface_t *surface)
 {
     return ! surface->finished &&
 	   surface->snapshot_of == NULL &&
-	   ! _cairo_surface_has_snapshots (surface);
+	   ! _cairo_surface_has_snapshots (surface) &&
+	   ! _cairo_surface_has_mime_data (surface);
 }
 
 static void
@@ -330,16 +388,19 @@ _cairo_surface_begin_modification (cairo_surface_t *surface)
     assert (surface->snapshot_of == NULL);
 
     _cairo_surface_detach_snapshots (surface);
+    _cairo_surface_detach_mime_data (surface);
 }
 
 void
 _cairo_surface_init (cairo_surface_t			*surface,
 		     const cairo_surface_backend_t	*backend,
+		     cairo_device_t			*device,
 		     cairo_content_t			 content)
 {
     CAIRO_MUTEX_INITIALIZE ();
 
     surface->backend = backend;
+    surface->device = cairo_device_reference (device);
     surface->content = content;
     surface->type = backend->type;
 
@@ -348,6 +409,7 @@ _cairo_surface_init (cairo_surface_t			*surface,
     surface->unique_id = _cairo_surface_allocate_unique_id ();
     surface->finished = FALSE;
     surface->is_clear = FALSE;
+    surface->owns_device = (device != NULL);
     surface->has_font_options = FALSE;
     surface->permit_subpixel_antialiasing = TRUE;
 
@@ -356,6 +418,7 @@ _cairo_surface_init (cairo_surface_t			*surface,
 
     cairo_matrix_init_identity (&surface->device_transform);
     cairo_matrix_init_identity (&surface->device_transform_inverse);
+    cairo_list_init (&surface->device_transform_observers);
 
     surface->x_resolution = CAIRO_SURFACE_RESOLUTION_DEFAULT;
     surface->y_resolution = CAIRO_SURFACE_RESOLUTION_DEFAULT;
@@ -363,7 +426,7 @@ _cairo_surface_init (cairo_surface_t			*surface,
     surface->x_fallback_resolution = CAIRO_SURFACE_FALLBACK_RESOLUTION_DEFAULT;
     surface->y_fallback_resolution = CAIRO_SURFACE_FALLBACK_RESOLUTION_DEFAULT;
 
-    _cairo_array_init (&surface->snapshots, sizeof (cairo_surface_t *));
+    cairo_list_init (&surface->snapshots);
     surface->snapshot_of = NULL;
 }
 
@@ -442,6 +505,8 @@ cairo_surface_create_similar (cairo_surface_t  *other,
 {
     if (unlikely (other->status))
 	return _cairo_surface_create_in_error (other->status);
+    if (unlikely (other->finished))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_SURFACE_FINISHED);
 
     if (unlikely (! CAIRO_CONTENT_VALID (content)))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_CONTENT));
@@ -472,7 +537,7 @@ _cairo_surface_create_similar_solid (cairo_surface_t	 *other,
     if (surface == NULL || surface->status)
 	return surface;
 
-    _cairo_pattern_init_solid (&pattern, color, content);
+    _cairo_pattern_init_solid (&pattern, color);
     status = _cairo_surface_paint (surface,
 				   color == CAIRO_COLOR_TRANSPARENT ?
 				   CAIRO_OPERATOR_CLEAR : CAIRO_OPERATOR_SOURCE,
@@ -499,7 +564,7 @@ _cairo_surface_create_solid_pattern_surface (cairo_surface_t	   *other,
     }
 
     return _cairo_surface_create_similar_solid (other,
-						solid_pattern->content,
+						_cairo_color_get_content (&solid_pattern->color),
 						1, 1,
 						&solid_pattern->color,
 						FALSE);
@@ -583,9 +648,14 @@ cairo_surface_destroy (cairo_surface_t *surface)
     if (! surface->finished)
 	cairo_surface_finish (surface);
 
+    /* paranoid check that nobody took a reference whilst finishing */
+    assert (! CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&surface->ref_count));
+
     _cairo_user_data_array_fini (&surface->user_data);
     _cairo_user_data_array_fini (&surface->mime_data);
-    _cairo_array_fini (&surface->snapshots);
+
+    if (surface->owns_device)
+        cairo_device_destroy (surface->device);
 
     free (surface);
 }
@@ -645,7 +715,13 @@ cairo_surface_finish (cairo_surface_t *surface)
     if (surface->finished)
 	return;
 
+    /* update the snapshots *before* we declare the surface as finished */
+    _cairo_surface_detach_snapshots (surface);
+    if (surface->snapshot_of != NULL)
+	_cairo_surface_detach_snapshot (surface);
+
     cairo_surface_flush (surface);
+    surface->finished = TRUE;
 
     /* call finish even if in error mode */
     if (surface->backend->finish) {
@@ -653,14 +729,30 @@ cairo_surface_finish (cairo_surface_t *surface)
 	if (unlikely (status))
 	    status = _cairo_surface_set_error (surface, status);
     }
-
-    surface->finished = TRUE;
-
-    if (surface->snapshot_of != NULL)
-	_cairo_surface_detach_snapshot (surface);
 }
 slim_hidden_def (cairo_surface_finish);
 
+/**
+ * _cairo_surface_release_device_reference:
+ * @surface: a #cairo_surface_t
+ *
+ * This function makes @surface release the reference to its device. The
+ * function is intended to be used for avoiding cycling references for
+ * surfaces that are owned by their device, for example cache surfaces.
+ * Note that the @surface will still assume that the device is available.
+ * So it is the caller's responsibility to ensure the device stays around
+ * until the @surface is destroyed. Just calling cairo_surface_finish() is
+ * not enough.
+ **/
+void
+_cairo_surface_release_device_reference (cairo_surface_t *surface)
+{
+    assert (surface->owns_device);
+
+    cairo_device_destroy (surface->device);
+    surface->owns_device = FALSE;
+}
+
 /**
  * cairo_surface_get_user_data:
  * @surface: a #cairo_surface_t
@@ -727,7 +819,7 @@ void
 cairo_surface_get_mime_data (cairo_surface_t		*surface,
                              const char			*mime_type,
                              const unsigned char       **data,
-                             unsigned int		*length)
+                             unsigned long		*length)
 {
     cairo_user_data_slot_t *slots;
     int i, num_slots;
@@ -770,10 +862,42 @@ _cairo_mime_data_destroy (void *ptr)
     free (mime_data);
 }
 
+/**
+ * CAIRO_MIME_TYPE_JP2:
+ *
+ * The Joint Photographic Experts Group (JPEG) 2000 image coding standard (ISO/IEC 15444-1).
+ *
+ * @Since: 1.10
+ */
+
+/**
+ * CAIRO_MIME_TYPE_JPEG:
+ *
+ * The Joint Photographic Experts Group (JPEG) image coding standard (ISO/IEC 10918-1).
+ *
+ * @Since: 1.10
+ */
+
+/**
+ * CAIRO_MIME_TYPE_PNG:
+ *
+ * The Portable Network Graphics image file format (ISO/IEC 15948).
+ *
+ * @Since: 1.10
+ */
+
+/**
+ * CAIRO_MIME_TYPE_URI:
+ *
+ * URI for an image file (unofficial MIME type).
+ *
+ * @Since: 1.10
+ */
+
 /**
  * cairo_surface_set_mime_data:
  * @surface: a #cairo_surface_t
- * @mime_type: the mime type of the image data
+ * @mime_type: the MIME type of the image data
  * @data: the image data to attach to the surface
  * @length: the length of the image data
  * @destroy: a #cairo_destroy_func_t which will be called when the
@@ -785,6 +909,20 @@ _cairo_mime_data_destroy (void *ptr)
  * the data from a surface, call this function with same mime type
  * and %NULL for @data.
  *
+ * The attached image (or filename) data can later be used by backends
+ * which support it (currently: PDF, PS, SVG and Win32 Printing
+ * surfaces) to emit this data instead of making a snapshot of the
+ * @surface.  This approach tends to be faster and requires less
+ * memory and disk space.
+ *
+ * The recognized MIME types are the following: %CAIRO_MIME_TYPE_JPEG,
+ * %CAIRO_MIME_TYPE_PNG, %CAIRO_MIME_TYPE_JP2, %CAIRO_MIME_TYPE_URI.
+ *
+ * See corresponding backend surface docs for details about which MIME
+ * types it can handle. Caution: the associated MIME data will be
+ * discarded if you draw on the surface afterwards. Use this function
+ * with care.
+ *
  * Since: 1.10
  *
  * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY if a
@@ -794,7 +932,7 @@ cairo_status_t
 cairo_surface_set_mime_data (cairo_surface_t		*surface,
                              const char			*mime_type,
                              const unsigned char	*data,
-                             unsigned int		 length,
+                             unsigned long		 length,
 			     cairo_destroy_func_t	 destroy,
 			     void			*closure)
 {
@@ -803,6 +941,8 @@ cairo_surface_set_mime_data (cairo_surface_t		*surface,
 
     if (unlikely (surface->status))
 	return surface->status;
+    if (surface->finished)
+	return _cairo_surface_set_error (surface, _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 
     status = _cairo_intern_string (&mime_type, -1);
     if (unlikely (status))
@@ -898,7 +1038,7 @@ _cairo_surface_set_font_options (cairo_surface_t       *surface,
 
     if (surface->finished) {
 	status = _cairo_surface_set_error (surface,
-		                           CAIRO_STATUS_SURFACE_FINISHED);
+		                           _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
@@ -953,7 +1093,7 @@ slim_hidden_def (cairo_surface_get_font_options);
  * @surface: a #cairo_surface_t
  *
  * Do any pending drawing for the surface and also restore any
- * temporary modification's cairo has made to the surface's
+ * temporary modifications cairo has made to the surface's
  * state. This function must be called before switching from
  * drawing on the surface with cairo to drawing on it directly
  * with native APIs. If the surface doesn't support direct access,
@@ -994,6 +1134,7 @@ cairo_surface_mark_dirty (cairo_surface_t *surface)
 {
     cairo_surface_mark_dirty_rectangle (surface, 0, 0, -1, -1);
 }
+slim_hidden_def (cairo_surface_mark_dirty);
 
 /**
  * cairo_surface_mark_dirty_rectangle:
@@ -1026,7 +1167,7 @@ cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
     assert (surface->snapshot_of == NULL);
 
     if (surface->finished) {
-	status = _cairo_surface_set_error (surface, CAIRO_STATUS_SURFACE_FINISHED);
+	status = _cairo_surface_set_error (surface, _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
@@ -1034,6 +1175,7 @@ cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
      * modifying the surface independently of cairo (and thus having to
      * call mark_dirty()). */
     assert (! _cairo_surface_has_snapshots (surface));
+    assert (! _cairo_surface_has_mime_data (surface));
 
     surface->is_clear = FALSE;
 
@@ -1084,7 +1226,7 @@ _cairo_surface_set_device_scale (cairo_surface_t *surface,
     assert (surface->snapshot_of == NULL);
 
     if (surface->finished) {
-	status = _cairo_surface_set_error (surface, CAIRO_STATUS_SURFACE_FINISHED);
+	status = _cairo_surface_set_error (surface, _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
@@ -1099,6 +1241,8 @@ _cairo_surface_set_device_scale (cairo_surface_t *surface,
     status = cairo_matrix_invert (&surface->device_transform_inverse);
     /* should always be invertible unless given pathological input */
     assert (status == CAIRO_STATUS_SUCCESS);
+
+    _cairo_observers_notify (&surface->device_transform_observers, surface);
 }
 
 /**
@@ -1132,7 +1276,7 @@ cairo_surface_set_device_offset (cairo_surface_t *surface,
     assert (surface->snapshot_of == NULL);
 
     if (surface->finished) {
-	status = _cairo_surface_set_error (surface, CAIRO_STATUS_SURFACE_FINISHED);
+	status = _cairo_surface_set_error (surface, _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
@@ -1145,6 +1289,8 @@ cairo_surface_set_device_offset (cairo_surface_t *surface,
     status = cairo_matrix_invert (&surface->device_transform_inverse);
     /* should always be invertible unless given pathological input */
     assert (status == CAIRO_STATUS_SUCCESS);
+
+    _cairo_observers_notify (&surface->device_transform_observers, surface);
 }
 slim_hidden_def (cairo_surface_set_device_offset);
 
@@ -1217,7 +1363,7 @@ cairo_surface_set_fallback_resolution (cairo_surface_t	*surface,
     assert (surface->snapshot_of == NULL);
 
     if (surface->finished) {
-	status = _cairo_surface_set_error (surface, CAIRO_STATUS_SURFACE_FINISHED);
+	status = _cairo_surface_set_error (surface, _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
@@ -1433,9 +1579,7 @@ _cairo_recording_surface_clone_similar (cairo_surface_t  *surface,
     cairo_surface_t *similar;
     cairo_status_t status;
 
-    similar = _cairo_surface_has_snapshot (src,
-					   surface->backend,
-					   src->content);
+    similar = _cairo_surface_has_snapshot (src, surface->backend);
     if (similar != NULL) {
 	*clone_out = cairo_surface_reference (similar);
 	*clone_offset_x = 0;
@@ -1446,10 +1590,11 @@ _cairo_recording_surface_clone_similar (cairo_surface_t  *surface,
     if (recorder->unbounded ||
 	width*height*8 < recorder->extents.width*recorder->extents.height)
     {
-	/* XXX use _solid to perform an initial CLEAR? */
-	similar = _cairo_surface_create_similar_scratch (surface,
-							 src->content,
-							 width, height);
+	similar = _cairo_surface_create_similar_solid (surface,
+						       src->content,
+						       width, height,
+                                                       CAIRO_COLOR_TRANSPARENT,
+                                                       FALSE);
 	if (similar == NULL)
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 	if (unlikely (similar->status))
@@ -1478,11 +1623,7 @@ _cairo_recording_surface_clone_similar (cairo_surface_t  *surface,
 	    return status;
 	}
 
-	status = _cairo_surface_attach_snapshot (src, similar, NULL);
-	if (unlikely (status)) {
-	    cairo_surface_destroy (similar);
-	    return status;
-	}
+	_cairo_surface_attach_snapshot (src, similar, NULL);
 
 	src_x = src_y = 0;
     }
@@ -1598,6 +1739,8 @@ _cairo_surface_clone_similar (cairo_surface_t  *surface,
     if (unlikely (surface->finished))
 	return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED);
 
+#if CAIRO_HAS_TEE_SURFACE
+
     if (src->type == CAIRO_SURFACE_TYPE_TEE) {
 	cairo_surface_t *match;
 
@@ -1608,6 +1751,8 @@ _cairo_surface_clone_similar (cairo_surface_t  *surface,
 	    src = match;
     }
 
+#endif
+
     if (surface->backend->clone_similar != NULL) {
 	status = surface->backend->clone_similar (surface, src,
 						  src_x, src_y,
@@ -1673,95 +1818,6 @@ _cairo_surface_clone_similar (cairo_surface_t  *surface,
     return status;
 }
 
-/* XXX: Shouldn't really need to do this here. */
-#include "cairo-recording-surface-private.h"
-
-/**
- * _cairo_surface_snapshot
- * @surface: a #cairo_surface_t
- *
- * Make an immutable copy of @surface. It is an error to call a
- * surface-modifying function on the result of this function.
- *
- * The caller owns the return value and should call
- * cairo_surface_destroy() when finished with it. This function will not
- * return %NULL, but will return a nil surface instead.
- *
- * Return value: The snapshot surface. Note that the return surface
- * may not necessarily be of the same type as @surface.
- **/
-cairo_surface_t *
-_cairo_surface_snapshot (cairo_surface_t *surface)
-{
-    cairo_surface_t *snapshot;
-    cairo_status_t status;
-
-    if (surface->status)
-	return _cairo_surface_create_in_error (surface->status);
-
-    if (surface->finished)
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
-
-    if (surface->snapshot_of != NULL)
-	return cairo_surface_reference (surface);
-
-    snapshot = _cairo_surface_has_snapshot (surface,
-					    surface->backend,
-					    surface->content);
-    if (snapshot != NULL)
-	return cairo_surface_reference (snapshot);
-
-    if (surface->backend->snapshot != NULL) {
-	snapshot = surface->backend->snapshot (surface);
-	if (snapshot != NULL) {
-	    if (unlikely (snapshot->status))
-		return snapshot;
-
-	    /* Is this surface just a proxy - e.g. paginated surfaces? */
-	    if (snapshot->backend != surface->backend) {
-		cairo_surface_t *previous;
-
-		previous = _cairo_surface_has_snapshot (surface,
-							snapshot->backend,
-							snapshot->content);
-		if (previous != NULL) {
-		    cairo_surface_destroy (snapshot);
-		    return cairo_surface_reference (previous);
-		}
-	    }
-	}
-    }
-
-    if (snapshot == NULL) {
-	snapshot = _cairo_surface_has_snapshot (surface,
-						&_cairo_image_surface_backend,
-						surface->content);
-	if (snapshot != NULL)
-	    return cairo_surface_reference (snapshot);
-
-	snapshot = _cairo_surface_fallback_snapshot (surface);
-	if (unlikely (snapshot->status))
-	    return snapshot;
-    }
-
-    status = _cairo_surface_copy_mime_data (snapshot, surface);
-    if (unlikely (status)) {
-	cairo_surface_destroy (snapshot);
-	return _cairo_surface_create_in_error (status);
-    }
-
-    snapshot->device_transform = surface->device_transform;
-    snapshot->device_transform_inverse = surface->device_transform_inverse;
-
-    status = _cairo_surface_attach_snapshot (surface, snapshot, NULL);
-    if (unlikely (status)) {
-	cairo_surface_destroy (snapshot);
-	return _cairo_surface_create_in_error (status);
-    }
-
-    return snapshot;
-}
-
 /**
  * _cairo_surface_is_similar
  * @surface_a: a #cairo_surface_t
@@ -1779,14 +1835,13 @@ _cairo_surface_snapshot (cairo_surface_t *surface)
  **/
 cairo_bool_t
 _cairo_surface_is_similar (cairo_surface_t *surface_a,
-	                   cairo_surface_t *surface_b,
-			   cairo_content_t content)
+	                   cairo_surface_t *surface_b)
 {
     if (surface_a->backend != surface_b->backend)
 	return FALSE;
 
     if (surface_a->backend->is_similar != NULL)
-	return surface_a->backend->is_similar (surface_a, surface_b, content);
+	return surface_a->backend->is_similar (surface_a, surface_b);
 
     return TRUE;
 }
@@ -1990,6 +2045,27 @@ _cairo_surface_fill_rectangles (cairo_surface_t		*surface,
 						     rects, num_rects));
 }
 
+static cairo_status_t
+_pattern_has_error (const cairo_pattern_t *pattern)
+{
+    const cairo_surface_pattern_t *spattern;
+
+    if (unlikely (pattern->status))
+	return pattern->status;
+
+    if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE)
+	return CAIRO_STATUS_SUCCESS;
+
+    spattern = (const cairo_surface_pattern_t *) pattern;
+    if (unlikely (spattern->surface->status))
+	return spattern->surface->status;
+
+    if (unlikely (spattern->surface->finished))
+	return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
 cairo_status_t
 _cairo_surface_paint (cairo_surface_t	*surface,
 		      cairo_operator_t	 op,
@@ -2004,14 +2080,19 @@ _cairo_surface_paint (cairo_surface_t	*surface,
     if (clip && clip->all_clipped)
 	return CAIRO_STATUS_SUCCESS;
 
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	if (surface->is_clear)
-	    return CAIRO_STATUS_SUCCESS;
+    if (op == CAIRO_OPERATOR_CLEAR && surface->is_clear)
+	return CAIRO_STATUS_SUCCESS;
 
-	if (clip == NULL)
-	    surface->is_clear = TRUE;
+    if (op == CAIRO_OPERATOR_OVER &&
+	_cairo_pattern_is_clear (source))
+    {
+	return CAIRO_STATUS_SUCCESS;
     }
 
+    status = _pattern_has_error (source);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (surface->backend->paint != NULL) {
@@ -2023,7 +2104,7 @@ _cairo_surface_paint (cairo_surface_t	*surface,
     status = _cairo_surface_fallback_paint (surface, op, source, clip);
 
  FINISH:
-    surface->is_clear &= op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = op == CAIRO_OPERATOR_CLEAR && clip == NULL;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -2047,12 +2128,26 @@ _cairo_surface_mask (cairo_surface_t		*surface,
 	return CAIRO_STATUS_SUCCESS;
 
     /* If the mask is blank, this is just an expensive no-op */
-    if (mask->type == CAIRO_PATTERN_TYPE_SURFACE) {
-	const cairo_surface_pattern_t *spattern = (cairo_surface_pattern_t *) mask;
-	if (spattern->surface->is_clear)
-	    return CAIRO_STATUS_SUCCESS;
+    if (_cairo_pattern_is_clear (mask) &&
+	_cairo_operator_bounded_by_mask (op))
+    {
+	return CAIRO_STATUS_SUCCESS;
     }
 
+    if (op == CAIRO_OPERATOR_OVER &&
+	_cairo_pattern_is_clear (source))
+    {
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    status = _pattern_has_error (source);
+    if (unlikely (status))
+	return status;
+
+    status = _pattern_has_error (mask);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (surface->backend->mask != NULL) {
@@ -2064,7 +2159,7 @@ _cairo_surface_mask (cairo_surface_t		*surface,
     status = _cairo_surface_fallback_mask (surface, op, source, mask, clip);
 
  FINISH:
-    surface->is_clear &= op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = FALSE;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -2079,9 +2174,9 @@ _cairo_surface_fill_stroke (cairo_surface_t	    *surface,
 			    cairo_path_fixed_t	    *path,
 			    cairo_operator_t	     stroke_op,
 			    const cairo_pattern_t   *stroke_source,
-			    cairo_stroke_style_t    *stroke_style,
-			    cairo_matrix_t	    *stroke_ctm,
-			    cairo_matrix_t	    *stroke_ctm_inverse,
+			    const cairo_stroke_style_t    *stroke_style,
+			    const cairo_matrix_t	    *stroke_ctm,
+			    const cairo_matrix_t	    *stroke_ctm_inverse,
 			    double		     stroke_tolerance,
 			    cairo_antialias_t	     stroke_antialias,
 			    cairo_clip_t	    *clip)
@@ -2101,6 +2196,14 @@ _cairo_surface_fill_stroke (cairo_surface_t	    *surface,
 	return CAIRO_STATUS_SUCCESS;
     }
 
+    status = _pattern_has_error (fill_source);
+    if (unlikely (status))
+	return status;
+
+    status = _pattern_has_error (stroke_source);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (surface->backend->fill_stroke) {
@@ -2135,8 +2238,7 @@ _cairo_surface_fill_stroke (cairo_surface_t	    *surface,
 	goto FINISH;
 
   FINISH:
-    surface->is_clear &= fill_op == CAIRO_OPERATOR_CLEAR;
-    surface->is_clear &= stroke_op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = FALSE;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -2146,9 +2248,9 @@ _cairo_surface_stroke (cairo_surface_t		*surface,
 		       cairo_operator_t		 op,
 		       const cairo_pattern_t	*source,
 		       cairo_path_fixed_t	*path,
-		       cairo_stroke_style_t	*stroke_style,
-		       cairo_matrix_t		*ctm,
-		       cairo_matrix_t		*ctm_inverse,
+		       const cairo_stroke_style_t	*stroke_style,
+		       const cairo_matrix_t		*ctm,
+		       const cairo_matrix_t		*ctm_inverse,
 		       double			 tolerance,
 		       cairo_antialias_t	 antialias,
 		       cairo_clip_t		*clip)
@@ -2164,6 +2266,16 @@ _cairo_surface_stroke (cairo_surface_t		*surface,
     if (op == CAIRO_OPERATOR_CLEAR && surface->is_clear)
 	return CAIRO_STATUS_SUCCESS;
 
+    if (op == CAIRO_OPERATOR_OVER &&
+	_cairo_pattern_is_clear (source))
+    {
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    status = _pattern_has_error (source);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (surface->backend->stroke != NULL) {
@@ -2184,7 +2296,7 @@ _cairo_surface_stroke (cairo_surface_t		*surface,
 					     clip);
 
  FINISH:
-    surface->is_clear &= op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = FALSE;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -2210,6 +2322,16 @@ _cairo_surface_fill (cairo_surface_t	*surface,
     if (op == CAIRO_OPERATOR_CLEAR && surface->is_clear)
 	return CAIRO_STATUS_SUCCESS;
 
+    if (op == CAIRO_OPERATOR_OVER &&
+	_cairo_pattern_is_clear (source))
+    {
+	return CAIRO_STATUS_SUCCESS;
+    }
+
+    status = _pattern_has_error (source);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (surface->backend->fill != NULL) {
@@ -2228,7 +2350,7 @@ _cairo_surface_fill (cairo_surface_t	*surface,
 					   clip);
 
  FINISH:
-    surface->is_clear &= op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = FALSE;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -2389,14 +2511,14 @@ cairo_surface_show_page (cairo_surface_t *surface)
     if (surface->status)
 	return;
 
-    _cairo_surface_begin_modification (surface);
-
     if (surface->finished) {
 	status_ignored = _cairo_surface_set_error (surface,
 		                                 CAIRO_STATUS_SURFACE_FINISHED);
 	return;
     }
 
+    _cairo_surface_begin_modification (surface);
+
     /* It's fine if some backends don't implement show_page */
     if (surface->backend->show_page == NULL)
 	return;
@@ -2434,11 +2556,9 @@ cairo_bool_t
 _cairo_surface_get_extents (cairo_surface_t         *surface,
 			    cairo_rectangle_int_t   *extents)
 {
-    cairo_bool_t bounded = FALSE;
-
-    if (unlikely (surface->status || surface->finished))
-	return TRUE;
+    cairo_bool_t bounded;
 
+    bounded = FALSE;
     if (surface->backend->get_extents != NULL)
 	bounded = surface->backend->get_extents (surface, extents);
 
@@ -2585,6 +2705,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t	    *surface,
     if (op == CAIRO_OPERATOR_CLEAR && surface->is_clear)
 	return CAIRO_STATUS_SUCCESS;
 
+    status = _pattern_has_error (source);
+    if (unlikely (status))
+	return status;
+
     _cairo_surface_begin_modification (surface);
 
     if (_cairo_surface_has_device_transform (surface) &&
@@ -2681,7 +2805,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t	    *surface,
     if (dev_scaled_font != scaled_font)
 	cairo_scaled_font_destroy (dev_scaled_font);
 
-    surface->is_clear &= op == CAIRO_OPERATOR_CLEAR;
+    surface->is_clear = FALSE;
 
     return _cairo_surface_set_error (surface, status);
 }
@@ -3034,7 +3158,7 @@ _cairo_surface_stroke_extents (cairo_surface_t *surface,
 			       cairo_operator_t op,
 			       const cairo_pattern_t *source,
 			       cairo_path_fixed_t	*path,
-			       cairo_stroke_style_t *style,
+			       const cairo_stroke_style_t *style,
 			       const cairo_matrix_t *ctm,
 			       const cairo_matrix_t *ctm_inverse,
 			       double tolerance,
@@ -3149,6 +3273,10 @@ _cairo_surface_create_in_error (cairo_status_t status)
 	return (cairo_surface_t *) &_cairo_surface_nil_invalid_stride;
     case CAIRO_STATUS_INVALID_SIZE:
 	return (cairo_surface_t *) &_cairo_surface_nil_invalid_size;
+    case CAIRO_STATUS_DEVICE_TYPE_MISMATCH:
+	return (cairo_surface_t *) &_cairo_surface_nil_device_type_mismatch;
+    case CAIRO_STATUS_DEVICE_ERROR:
+	return (cairo_surface_t *) &_cairo_surface_nil_device_error;
     case CAIRO_STATUS_SUCCESS:
     case CAIRO_STATUS_LAST_STATUS:
 	ASSERT_NOT_REACHED;
diff --git a/gfx/cairo/cairo/src/cairo-svg-surface-private.h b/gfx/cairo/cairo/src/cairo-svg-surface-private.h
index 64efe7f2a22..ddbf464b1d2 100644
--- a/gfx/cairo/cairo/src/cairo-svg-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-svg-surface-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-svg-surface.c b/gfx/cairo/cairo/src/cairo-svg-surface.c
index fa25b821e2c..fb612fadf5b 100644
--- a/gfx/cairo/cairo/src/cairo-svg-surface.c
+++ b/gfx/cairo/cairo/src/cairo-svg-surface.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -43,6 +43,7 @@
 #include "cairoint.h"
 #include "cairo-svg.h"
 #include "cairo-analysis-surface-private.h"
+#include "cairo-error-private.h"
 #include "cairo-image-info-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-output-stream-private.h"
@@ -52,6 +53,23 @@
 #include "cairo-surface-clipper-private.h"
 #include "cairo-svg-surface-private.h"
 
+/**
+ * SECTION:cairo-svg
+ * @Title: SVG Surfaces
+ * @Short_Description: Rendering SVG documents
+ * @See_Also: #cairo_surface_t
+ *
+ * The SVG surface is used to render cairo graphics to
+ * SVG files and is a multi-page vector surface backend.
+ */
+
+/**
+ * CAIRO_HAS_SVG_SURFACE:
+ *
+ * Defined if the SVG surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 typedef struct cairo_svg_page cairo_svg_page_t;
 
 static const int invalid_pattern_id = -1;
@@ -65,9 +83,9 @@ static const cairo_svg_version_t _cairo_svg_versions[] =
 #define CAIRO_SVG_VERSION_LAST ARRAY_LENGTH (_cairo_svg_versions)
 
 static void
-_cairo_svg_surface_emit_path (cairo_output_stream_t *output,
-			      cairo_path_fixed_t    *path,
-			      cairo_matrix_t	    *ctm_inverse);
+_cairo_svg_surface_emit_path (cairo_output_stream_t	*output,
+			      cairo_path_fixed_t	*path,
+			      const cairo_matrix_t	*ctm_inverse);
 
 static cairo_bool_t
 _cairo_svg_version_has_page_set_support (cairo_svg_version_t version)
@@ -202,6 +220,22 @@ cairo_svg_surface_create_for_stream (cairo_write_func_t		 write_func,
  * Creates a SVG surface of the specified size in points to be written
  * to @filename.
  *
+ * The SVG surface backend recognizes the following MIME types for the
+ * data attached to a surface (see cairo_surface_set_mime_data()) when
+ * it is used as a source pattern for drawing on this surface:
+ * %CAIRO_MIME_TYPE_JPEG, %CAIRO_MIME_TYPE_PNG,
+ * %CAIRO_MIME_TYPE_URI. If any of them is specified, the SVG backend
+ * emits a href with the content of MIME data instead of a surface
+ * snapshot (PNG, Base64-encoded) in the corresponding image tag.
+ *
+ * The unofficial MIME type %CAIRO_MIME_TYPE_URI is examined
+ * first. If present, the URI is emitted as is: assuring the
+ * correctness of URI is left to the client code.
+ *
+ * If %CAIRO_MIME_TYPE_URI is not present, but %CAIRO_MIME_TYPE_JPEG
+ * or %CAIRO_MIME_TYPE_PNG is specified, the corresponding data is
+ * Base64-encoded and emitted.
+ *
  * Return value: a pointer to the newly created surface. The caller
  * owns the surface and should call cairo_surface_destroy() when done
  * with it.
@@ -234,30 +268,49 @@ _cairo_surface_is_svg (cairo_surface_t *surface)
 
 /* If the abstract_surface is a paginated surface, and that paginated
  * surface's target is a svg_surface, then set svg_surface to that
- * target. Otherwise return %CAIRO_STATUS_SURFACE_TYPE_MISMATCH.
+ * target. Otherwise return FALSE.
  */
-static cairo_status_t
+static cairo_bool_t
 _extract_svg_surface (cairo_surface_t		 *surface,
 		      cairo_svg_surface_t	**svg_surface)
 {
     cairo_surface_t *target;
+    cairo_status_t status_ignored;
 
     if (surface->status)
-	return surface->status;
+	return FALSE;
+    if (surface->finished) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+        return FALSE;
+    }
 
-    if (! _cairo_surface_is_paginated (surface))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_paginated (surface)) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     target = _cairo_paginated_surface_get_target (surface);
-    if (target->status)
-	return target->status;
+    if (target->status) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   target->status);
+	return FALSE;
+    }
+    if (target->finished) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+        return FALSE;
+    }
 
-    if (! _cairo_surface_is_svg (target))
-	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+    if (! _cairo_surface_is_svg (target)) {
+	status_ignored = _cairo_surface_set_error (surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return FALSE;
+    }
 
     *svg_surface = (cairo_svg_surface_t *) target;
-
-    return CAIRO_STATUS_SUCCESS;
+    return TRUE;
 }
 
 /**
@@ -280,13 +333,9 @@ cairo_svg_surface_restrict_to_version (cairo_surface_t		*abstract_surface,
 				       cairo_svg_version_t	 version)
 {
     cairo_svg_surface_t *surface = NULL; /* hide compiler warning */
-    cairo_status_t status;
 
-    status = _extract_svg_surface (abstract_surface, &surface);
-    if (unlikely (status)) {
-	status = _cairo_surface_set_error (abstract_surface, status);
+    if (! _extract_svg_surface (abstract_surface, &surface))
 	return;
-    }
 
     if (version < CAIRO_SVG_VERSION_LAST)
 	surface->document->svg_version = version;
@@ -415,7 +464,9 @@ _cairo_svg_surface_create_for_document (cairo_svg_document_t	*document,
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&surface->base, &cairo_svg_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_svg_surface_backend,
+			 NULL, /* device */
 			 content);
 
     surface->width = width;
@@ -589,7 +640,7 @@ _cairo_svg_surface_emit_transform (cairo_output_stream_t *output,
 
 typedef struct {
     cairo_output_stream_t *output;
-    cairo_matrix_t *ctm_inverse;
+    const cairo_matrix_t *ctm_inverse;
 } svg_path_info_t;
 
 static cairo_status_t
@@ -662,9 +713,9 @@ _cairo_svg_path_close_path (void *closure)
 }
 
 static void
-_cairo_svg_surface_emit_path (cairo_output_stream_t *output,
-			      cairo_path_fixed_t    *path,
-			      cairo_matrix_t	    *ctm_inverse)
+_cairo_svg_surface_emit_path (cairo_output_stream_t	*output,
+			      cairo_path_fixed_t	*path,
+			      const cairo_matrix_t	*ctm_inverse)
 {
     cairo_status_t status;
     svg_path_info_t info;
@@ -733,8 +784,8 @@ _cairo_svg_document_emit_bitmap_glyph_data (cairo_svg_document_t	*document,
     if (unlikely (status))
 	return status;
 
-    image = _cairo_image_surface_coerce (scaled_glyph->surface,
-					 CAIRO_FORMAT_A1);
+    image = _cairo_image_surface_coerce_to_format (scaled_glyph->surface,
+					           CAIRO_FORMAT_A1);
     status = image->base.status;
     if (unlikely (status))
 	return status;
@@ -1035,7 +1086,7 @@ _cairo_surface_base64_encode_jpeg (cairo_surface_t       *surface,
 				   cairo_output_stream_t *output)
 {
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     cairo_image_info_t image_info;
     base64_write_closure_t info;
     cairo_status_t status;
@@ -1074,7 +1125,7 @@ _cairo_surface_base64_encode_png (cairo_surface_t       *surface,
 				  cairo_output_stream_t *output)
 {
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     base64_write_closure_t info;
     cairo_status_t status;
 
@@ -1168,6 +1219,45 @@ _cairo_svg_surface_emit_operator_for_style (cairo_output_stream_t *output,
     }
 }
 
+/**
+ * _cairo_svg_surface_emit_attr_value:
+ *
+ * Write the value to output the stream as a sequence of characters,
+ * while escaping those which have special meaning in the XML
+ * attribute's value context: &amp; and &quot;.
+ **/
+static void
+_cairo_svg_surface_emit_attr_value (cairo_output_stream_t *stream,
+				    const unsigned char *value,
+				    unsigned int length)
+{
+    const unsigned char *p;
+    const unsigned char *q;
+    unsigned int i;
+
+    /* we'll accumulate non-special chars in [q, p) range */
+    p = value;
+    q = p;
+    for (i = 0; i < length; i++, p++) {
+	if (*p == '&' || *p == '"') {
+	    /* flush what's left before special char */
+	    if (p != q) {
+		_cairo_output_stream_write (stream, q, p - q);
+		q = p + 1;
+	    }
+
+	    if (*p == '&')
+		_cairo_output_stream_printf (stream, "&amp;");
+	    else // p == '"'
+		_cairo_output_stream_printf (stream, "&quot;");
+	}
+    }
+
+    /* flush the trailing chars if any */
+    if (p != q)
+	_cairo_output_stream_write (stream, q, p - q);
+}
+
 static cairo_status_t
 _cairo_svg_surface_emit_surface (cairo_svg_document_t *document,
 				 cairo_surface_t *surface)
@@ -1175,6 +1265,8 @@ _cairo_svg_surface_emit_surface (cairo_svg_document_t *document,
     cairo_rectangle_int_t extents;
     cairo_bool_t is_bounded;
     cairo_status_t status;
+    const unsigned char *uri;
+    unsigned long uri_len;
 
     if (_cairo_user_data_array_get_data (&surface->user_data,
 					 (cairo_user_data_key_t *) document))
@@ -1192,10 +1284,17 @@ _cairo_svg_surface_emit_surface (cairo_svg_document_t *document,
 
     _cairo_output_stream_printf (document->xml_node_defs, " xlink:href=\"");
 
-    status = _cairo_surface_base64_encode (surface,
-					   document->xml_node_defs);
-    if (unlikely (status))
-	return status;
+    cairo_surface_get_mime_data (surface, CAIRO_MIME_TYPE_URI,
+				 &uri, &uri_len);
+    if (uri != NULL) {
+	_cairo_svg_surface_emit_attr_value (document->xml_node_defs,
+					    uri, uri_len);
+    } else {
+	status = _cairo_surface_base64_encode (surface,
+					       document->xml_node_defs);
+	if (unlikely (status))
+	    return status;
+    }
 
     _cairo_output_stream_printf (document->xml_node_defs, "\"/>\n");
 
@@ -1571,14 +1670,14 @@ _cairo_svg_surface_emit_pattern_stops (cairo_output_stream_t          *output,
     else {
 	cairo_bool_t found = FALSE;
 	unsigned int offset_index;
-	cairo_color_t offset_color_start, offset_color_stop;
+	cairo_color_stop_t offset_color_start, offset_color_stop;
 
 	for (i = 0; i < n_stops; i++) {
 	    if (stops[i].offset >= -start_offset) {
 		if (i > 0) {
 		    if (stops[i].offset != stops[i-1].offset) {
 			double x0, x1;
-			cairo_color_t *color0, *color1;
+			cairo_color_stop_t *color0, *color1;
 
 			x0 = stops[i-1].offset;
 			x1 = stops[i].offset;
@@ -1947,7 +2046,7 @@ _cairo_svg_surface_emit_fill_style (cairo_output_stream_t	*output,
 				    cairo_operator_t		 op,
 				    const cairo_pattern_t	*source,
 				    cairo_fill_rule_t		 fill_rule,
-				    cairo_matrix_t		*parent_matrix)
+				    const cairo_matrix_t	*parent_matrix)
 {
     _cairo_output_stream_printf (output,
 				 "fill-rule:%s;",
@@ -1958,12 +2057,12 @@ _cairo_svg_surface_emit_fill_style (cairo_output_stream_t	*output,
 }
 
 static cairo_status_t
-_cairo_svg_surface_emit_stroke_style (cairo_output_stream_t	    *output,
-				      cairo_svg_surface_t	    *surface,
-				      cairo_operator_t		     op,
-				      const cairo_pattern_t	    *source,
-				      cairo_stroke_style_t	    *stroke_style,
-				      cairo_matrix_t		    *parent_matrix)
+_cairo_svg_surface_emit_stroke_style (cairo_output_stream_t	   *output,
+				      cairo_svg_surface_t	   *surface,
+				      cairo_operator_t		    op,
+				      const cairo_pattern_t	   *source,
+				      const cairo_stroke_style_t   *stroke_style,
+				      const cairo_matrix_t	   *parent_matrix)
 {
     cairo_status_t status;
     const char *line_cap, *line_join;
@@ -2045,9 +2144,9 @@ _cairo_svg_surface_fill_stroke (void			*abstract_surface,
 				cairo_path_fixed_t	*path,
 				cairo_operator_t	 stroke_op,
 				const cairo_pattern_t	*stroke_source,
-				cairo_stroke_style_t	*stroke_style,
-				cairo_matrix_t		*stroke_ctm,
-				cairo_matrix_t		*stroke_ctm_inverse,
+				const cairo_stroke_style_t	*stroke_style,
+				const cairo_matrix_t		*stroke_ctm,
+				const cairo_matrix_t		*stroke_ctm_inverse,
 				double			 stroke_tolerance,
 				cairo_antialias_t	 stroke_antialias,
 				cairo_clip_t		*clip)
@@ -2336,9 +2435,9 @@ _cairo_svg_surface_stroke (void			*abstract_dst,
 			   cairo_operator_t      op,
 			   const cairo_pattern_t *source,
 			   cairo_path_fixed_t	*path,
-			   cairo_stroke_style_t *stroke_style,
-			   cairo_matrix_t	*ctm,
-			   cairo_matrix_t	*ctm_inverse,
+			   const cairo_stroke_style_t *stroke_style,
+			   const cairo_matrix_t	*ctm,
+			   const cairo_matrix_t	*ctm_inverse,
 			   double		 tolerance,
 			   cairo_antialias_t	 antialias,
 			   cairo_clip_t		*clip)
diff --git a/gfx/cairo/cairo/src/cairo-svg.h b/gfx/cairo/cairo/src/cairo-svg.h
index 78513381338..0f739fc04ca 100644
--- a/gfx/cairo/cairo/src/cairo-svg.h
+++ b/gfx/cairo/cairo/src/cairo-svg.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-system.c b/gfx/cairo/cairo/src/cairo-system.c
index 85c74876eb2..1ff4d078f89 100644
--- a/gfx/cairo/cairo/src/cairo-system.c
+++ b/gfx/cairo/cairo/src/cairo-system.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-tee-surface-private.h b/gfx/cairo/cairo/src/cairo-tee-surface-private.h
index 258816b5974..a83cfc959db 100644
--- a/gfx/cairo/cairo/src/cairo-tee-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-tee-surface-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-tee-surface.c b/gfx/cairo/cairo/src/cairo-tee-surface.c
index 2dcd5d54d71..bca07716f5b 100644
--- a/gfx/cairo/cairo/src/cairo-tee-surface.c
+++ b/gfx/cairo/cairo/src/cairo-tee-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,6 +40,9 @@
 
 #include "cairoint.h"
 
+#include "cairo-tee.h"
+
+#include "cairo-error-private.h"
 #include "cairo-tee-surface-private.h"
 #include "cairo-surface-wrapper-private.h"
 
@@ -298,9 +301,9 @@ _cairo_tee_surface_stroke (void				*abstract_surface,
 			   cairo_operator_t		 op,
 			   const cairo_pattern_t	*source,
 			   cairo_path_fixed_t		*path,
-			   cairo_stroke_style_t		*style,
-			   cairo_matrix_t		*ctm,
-			   cairo_matrix_t		*ctm_inverse,
+			   const cairo_stroke_style_t	*style,
+			   const cairo_matrix_t		*ctm,
+			   const cairo_matrix_t		*ctm_inverse,
 			   double			 tolerance,
 			   cairo_antialias_t		 antialias,
 			   cairo_clip_t			*clip)
@@ -543,6 +546,7 @@ cairo_tee_surface_create (cairo_surface_t *master)
 
     _cairo_surface_init (&surface->base,
 			 &cairo_tee_surface_backend,
+			 master->device,
 			 master->content);
 
     _cairo_surface_wrapper_init (&surface->master, master);
@@ -566,6 +570,11 @@ cairo_tee_surface_add (cairo_surface_t *abstract_surface,
 
     if (unlikely (abstract_surface->status))
 	return;
+    if (unlikely (abstract_surface->finished)) {
+	status = _cairo_surface_set_error (abstract_surface,
+					   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return;
+    }
 
     if (abstract_surface->backend != &cairo_tee_surface_backend) {
 	status = _cairo_surface_set_error (abstract_surface,
@@ -598,6 +607,14 @@ cairo_tee_surface_remove (cairo_surface_t *abstract_surface,
     int n, num_slaves;
     cairo_status_t status;
 
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
+	status = _cairo_surface_set_error (abstract_surface,
+					   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return;
+    }
+
     if (abstract_surface->backend != &cairo_tee_surface_backend) {
 	status = _cairo_surface_set_error (abstract_surface,
 					   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
@@ -638,6 +655,8 @@ cairo_tee_surface_index (cairo_surface_t *abstract_surface,
 
     if (unlikely (abstract_surface->status))
 	return _cairo_surface_create_in_error (abstract_surface->status);
+    if (unlikely (abstract_surface->finished))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 
     if (abstract_surface->backend != &cairo_tee_surface_backend)
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
diff --git a/gfx/cairo/cairo/src/cairo-tee.h b/gfx/cairo/cairo/src/cairo-tee.h
new file mode 100644
index 00000000000..9c048c6fe1d
--- /dev/null
+++ b/gfx/cairo/cairo/src/cairo-tee.h
@@ -0,0 +1,66 @@
+/* cairo - a vector graphics library with display and print output
+ *
+ * Copyright © 2009 Chris Wilson
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it either under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * (the "LGPL") or, at your option, under the terms of the Mozilla
+ * Public License Version 1.1 (the "MPL"). If you do not alter this
+ * notice, a recipient may use your version of this file under either
+ * the MPL or the LGPL.
+ *
+ * You should have received a copy of the LGPL along with this library
+ * in the file COPYING-LGPL-2.1; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+ * You should have received a copy of the MPL along with this library
+ * in the file COPYING-MPL-1.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/
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+ * OF ANY KIND, either express or implied. See the LGPL or the MPL for
+ * the specific language governing rights and limitations.
+ *
+ * The Original Code is the cairo graphics library.
+ *
+ * The Initial Developer of the Original Code is Chris Wilson
+ *
+ * Contributor(s):
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+#ifndef CAIRO_TEE_H
+#define CAIRO_TEE_H
+
+#include "cairo.h"
+
+#if CAIRO_HAS_TEE_SURFACE
+
+CAIRO_BEGIN_DECLS
+
+cairo_public cairo_surface_t *
+cairo_tee_surface_create (cairo_surface_t *master);
+
+cairo_public void
+cairo_tee_surface_add (cairo_surface_t *surface,
+		       cairo_surface_t *target);
+
+cairo_public void
+cairo_tee_surface_remove (cairo_surface_t *surface,
+			  cairo_surface_t *target);
+
+cairo_public cairo_surface_t *
+cairo_tee_surface_index (cairo_surface_t *surface,
+			 int index);
+
+CAIRO_END_DECLS
+
+#else  /*CAIRO_HAS_TEE_SURFACE*/
+# error Cairo was not compiled with support for the TEE backend
+#endif /*CAIRO_HAS_TEE_SURFACE*/
+
+#endif /*CAIRO_TEE_H*/
diff --git a/gfx/cairo/cairo/src/cairo-tor-scan-converter.c b/gfx/cairo/cairo/src/cairo-tor-scan-converter.c
index 2b9fb1bc707..dc8dad1c503 100644
--- a/gfx/cairo/cairo/src/cairo-tor-scan-converter.c
+++ b/gfx/cairo/cairo/src/cairo-tor-scan-converter.c
@@ -95,6 +95,7 @@
  */
 #include "cairoint.h"
 #include "cairo-spans-private.h"
+#include "cairo-error-private.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -1214,46 +1215,111 @@ active_list_init(struct active_list *active)
     active_list_reset(active);
 }
 
-/* Merge the edges in an unsorted list of edges into a sorted
- * list. The sort order is edges ascending by edge->x.quo.  Returns
- * the new head of the sorted list. */
+/*
+ * Merge two sorted edge lists.
+ * Input:
+ *  - head_a: The head of the first list.
+ *  - head_b: The head of the second list; head_b cannot be NULL.
+ * Output:
+ * Returns the head of the merged list.
+ *
+ * Implementation notes:
+ * To make it fast (in particular, to reduce to an insertion sort whenever
+ * one of the two input lists only has a single element) we iterate through
+ * a list until its head becomes greater than the head of the other list,
+ * then we switch their roles. As soon as one of the two lists is empty, we
+ * just attach the other one to the current list and exit.
+ * Writes to memory are only needed to "switch" lists (as it also requires
+ * attaching to the output list the list which we will be iterating next) and
+ * to attach the last non-empty list.
+ */
 static struct edge *
-merge_unsorted_edges(struct edge *sorted_head, struct edge *unsorted_head)
+merge_sorted_edges (struct edge *head_a, struct edge *head_b)
 {
-    struct edge **cursor = &sorted_head;
-    int x;
+    struct edge *head, **next;
 
-    if (sorted_head == NULL) {
-	sorted_head = unsorted_head;
-	unsorted_head = unsorted_head->next;
-	sorted_head->next = NULL;
-	if (unsorted_head == NULL)
-	    return sorted_head;
-    }
+    head = head_a;
+    next = &head;
 
-    do {
-	struct edge *next = unsorted_head->next;
-	struct edge *prev = *cursor;
-
-	x = unsorted_head->x.quo;
-	if (x < prev->x.quo)
-	    cursor = &sorted_head;
-
-	while (1) {
-	    UNROLL3({
-		prev = *cursor;
-		if (NULL == prev || prev->x.quo >= x)
-		    break;
-		cursor = &prev->next;
-	    });
+    while (1) {
+	while (head_a != NULL && head_a->x.quo <= head_b->x.quo) {
+	    next = &head_a->next;
+	    head_a = head_a->next;
 	}
 
-	unsorted_head->next = *cursor;
-	*cursor = unsorted_head;
-	unsorted_head = next;
-    } while (unsorted_head != NULL);
+	*next = head_b;
+	if (head_a == NULL)
+	    return head;
 
-    return sorted_head;
+	while (head_b != NULL && head_b->x.quo <= head_a->x.quo) {
+	    next = &head_b->next;
+	    head_b = head_b->next;
+	}
+
+	*next = head_a;
+	if (head_b == NULL)
+	    return head;
+    }
+}
+
+/*
+ * Sort (part of) a list.
+ * Input:
+ *  - list: The list to be sorted; list cannot be NULL.
+ *  - limit: Recursion limit.
+ * Output:
+ *  - head_out: The head of the sorted list containing the first 2^(level+1) elements of the
+ *              input list; if the input list has fewer elements, head_out be a sorted list
+ *              containing all the elements of the input list.
+ * Returns the head of the list of unprocessed elements (NULL if the sorted list contains
+ * all the elements of the input list).
+ *
+ * Implementation notes:
+ * Special case single element list, unroll/inline the sorting of the first two elements.
+ * Some tail recursion is used since we iterate on the bottom-up solution of the problem
+ * (we start with a small sorted list and keep merging other lists of the same size to it).
+ */
+static struct edge *
+sort_edges (struct edge  *list,
+	    unsigned int  level,
+	    struct edge **head_out)
+{
+    struct edge *head_other, *remaining;
+    unsigned int i;
+
+    head_other = list->next;
+
+    /* Single element list -> return */
+    if (head_other == NULL) {
+	*head_out = list;
+	return NULL;
+    }
+
+    /* Unroll the first iteration of the following loop (halves the number of calls to merge_sorted_edges):
+     *  - Initialize remaining to be the list containing the elements after the second in the input list.
+     *  - Initialize *head_out to be the sorted list containing the first two element.
+     */
+    remaining = head_other->next;
+    if (list->x.quo <= head_other->x.quo) {
+	*head_out = list;
+	/* list->next = head_other; */ /* The input list is already like this. */
+	head_other->next = NULL;
+    } else {
+	*head_out = head_other;
+	head_other->next = list;
+	list->next = NULL;
+    }
+
+    for (i = 0; i < level && remaining; i++) {
+	/* Extract a sorted list of the same size as *head_out
+	 * (2^(i+1) elements) from the list of remaining elements. */
+	remaining = sort_edges (remaining, i, &head_other);
+	*head_out = merge_sorted_edges (*head_out, head_other);
+    }
+
+    /* *head_out now contains (at most) 2^(level+1) elements. */
+
+    return remaining;
 }
 
 /* Test if the edges on the active list can be safely advanced by a
@@ -1344,7 +1410,8 @@ active_list_merge_edges_from_polygon(
 	}
     }
     if (subrow_edges) {
-	active->head = merge_unsorted_edges(active->head, subrow_edges);
+	sort_edges (subrow_edges, UINT_MAX, &subrow_edges);
+	active->head = merge_sorted_edges (active->head, subrow_edges);
 	active->min_height = min_height;
     }
 }
@@ -1390,8 +1457,10 @@ active_list_substep_edges(
 	});
     }
 
-    if (unsorted)
-	active->head = merge_unsorted_edges(active->head, unsorted);
+    if (unsorted) {
+	sort_edges (unsorted, UINT_MAX, &unsorted);
+	active->head = merge_sorted_edges (active->head, unsorted);
+    }
 }
 
 inline static glitter_status_t
@@ -1563,11 +1632,11 @@ apply_evenodd_fill_rule_and_step_edges (struct active_list *active,
 
 	    winding += right_edge->dir;
 	    if ((winding & 1) == 0) {
-	    if (right_edge->next == NULL ||
-		right_edge->next->x.quo != right_edge->x.quo)
-	    {
-		break;
-	    }
+		if (right_edge->next == NULL ||
+		    right_edge->next->x.quo != right_edge->x.quo)
+		{
+		    break;
+		}
 	    }
 
 	    if (! right_edge->vertical) {
diff --git a/gfx/cairo/cairo/src/cairo-toy-font-face.c b/gfx/cairo/cairo/src/cairo-toy-font-face.c
index e7c841a9cf4..4c690da534c 100644
--- a/gfx/cairo/cairo/src/cairo-toy-font-face.c
+++ b/gfx/cairo/cairo/src/cairo-toy-font-face.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
 
 #define _BSD_SOURCE /* for strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 
 static const cairo_font_face_t _cairo_font_face_null_pointer = {
diff --git a/gfx/cairo/cairo/src/cairo-traps.c b/gfx/cairo/cairo/src/cairo-traps.c
index 70d4c69e0e1..2fe6684db7d 100644
--- a/gfx/cairo/cairo/src/cairo-traps.c
+++ b/gfx/cairo/cairo/src/cairo-traps.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -39,6 +39,8 @@
 
 #include "cairoint.h"
 
+#include "cairo-boxes-private.h"
+#include "cairo-error-private.h"
 #include "cairo-region-private.h"
 #include "cairo-slope-private.h"
 
@@ -156,45 +158,45 @@ _cairo_traps_add_trap (cairo_traps_t *traps,
  **/
 cairo_status_t
 _cairo_traps_init_boxes (cairo_traps_t	    *traps,
-		         const cairo_box_t  *boxes,
-			 int		     num_boxes)
+		         const cairo_boxes_t *boxes)
 {
     cairo_trapezoid_t *trap;
+    const struct _cairo_boxes_chunk *chunk;
 
     _cairo_traps_init (traps);
 
-    while (traps->traps_size < num_boxes) {
+    while (traps->traps_size < boxes->num_boxes) {
 	if (unlikely (! _cairo_traps_grow (traps))) {
 	    _cairo_traps_fini (traps);
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	}
     }
 
-    traps->num_traps = num_boxes;
+    traps->num_traps = boxes->num_boxes;
     traps->is_rectilinear = TRUE;
     traps->is_rectangular = TRUE;
+    traps->maybe_region = boxes->is_pixel_aligned;
 
     trap = &traps->traps[0];
-    while (num_boxes--) {
-	trap->top    = boxes->p1.y;
-	trap->bottom = boxes->p2.y;
+    for (chunk = &boxes->chunks; chunk != NULL; chunk = chunk->next) {
+	const cairo_box_t *box;
+	int i;
 
-	trap->left.p1   = boxes->p1;
-	trap->left.p2.x = boxes->p1.x;
-	trap->left.p2.y = boxes->p2.y;
+	box = chunk->base;
+	for (i = 0; i < chunk->count; i++) {
+	    trap->top    = box->p1.y;
+	    trap->bottom = box->p2.y;
 
-	trap->right.p1.x = boxes->p2.x;
-	trap->right.p1.y = boxes->p1.y;
-	trap->right.p2   = boxes->p2;
+	    trap->left.p1   = box->p1;
+	    trap->left.p2.x = box->p1.x;
+	    trap->left.p2.y = box->p2.y;
 
-	if (traps->maybe_region) {
-	    traps->maybe_region  = _cairo_fixed_is_integer (boxes->p1.x) &&
-		                   _cairo_fixed_is_integer (boxes->p1.y) &&
-		                   _cairo_fixed_is_integer (boxes->p2.x) &&
-		                   _cairo_fixed_is_integer (boxes->p2.y);
+	    trap->right.p1.x = box->p2.x;
+	    trap->right.p1.y = box->p1.y;
+	    trap->right.p2   = box->p2;
+
+	    box++, trap++;
 	}
-
-	trap++, boxes++;
     }
 
     return CAIRO_STATUS_SUCCESS;
diff --git a/gfx/cairo/cairo/src/cairo-truetype-subset-private.h b/gfx/cairo/cairo/src/cairo-truetype-subset-private.h
index 978256f6b45..aed60d02824 100644
--- a/gfx/cairo/cairo/src/cairo-truetype-subset-private.h
+++ b/gfx/cairo/cairo/src/cairo-truetype-subset-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-truetype-subset.c b/gfx/cairo/cairo/src/cairo-truetype-subset.c
index 3a813ee7e94..9bf2f8ffc67 100644
--- a/gfx/cairo/cairo/src/cairo-truetype-subset.c
+++ b/gfx/cairo/cairo/src/cairo-truetype-subset.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,6 +42,7 @@
 
 #define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FONT_SUBSET
 
diff --git a/gfx/cairo/cairo/src/cairo-type1-fallback.c b/gfx/cairo/cairo/src/cairo-type1-fallback.c
index 1023bbdcb28..b93c42348ba 100644
--- a/gfx/cairo/cairo/src/cairo-type1-fallback.c
+++ b/gfx/cairo/cairo/src/cairo-type1-fallback.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -35,6 +35,7 @@
 
 #define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FONT_SUBSET
 
@@ -726,20 +727,20 @@ _cairo_type1_fallback_init_internal (cairo_type1_subset_t	*type1_subset,
         goto fail1;
     }
 
-    type1_subset->widths = calloc (sizeof (int), font->scaled_font_subset->num_glyphs);
+    type1_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
     if (unlikely (type1_subset->widths == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail2;
     }
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++)
-	type1_subset->widths[i] = font->widths[i];
+	type1_subset->widths[i] = (double)font->widths[i]/1000;
 
-    type1_subset->x_min   = (int) font->x_min;
-    type1_subset->y_min   = (int) font->y_min;
-    type1_subset->x_max   = (int) font->x_max;
-    type1_subset->y_max   = (int) font->y_max;
-    type1_subset->ascent  = (int) font->y_max;
-    type1_subset->descent = (int) font->y_min;
+    type1_subset->x_min   = (double)font->x_min/1000;
+    type1_subset->y_min   = (double)font->y_min/1000;
+    type1_subset->x_max   = (double)font->x_max/1000;
+    type1_subset->y_max   = (double)font->y_max/1000;
+    type1_subset->ascent  = (double)font->y_max/1000;
+    type1_subset->descent = (double)font->y_min/1000;
 
     length = font->header_size + font->data_size +
 	font->trailer_size;
diff --git a/gfx/cairo/cairo/src/cairo-type1-private.h b/gfx/cairo/cairo/src/cairo-type1-private.h
index 171c224902d..1630397bca6 100644
--- a/gfx/cairo/cairo/src/cairo-type1-private.h
+++ b/gfx/cairo/cairo/src/cairo-type1-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-type1-subset.c b/gfx/cairo/cairo/src/cairo-type1-subset.c
index 7ded39a4108..9c0a2cf1026 100644
--- a/gfx/cairo/cairo/src/cairo-type1-subset.c
+++ b/gfx/cairo/cairo/src/cairo-type1-subset.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
 
 #define _BSD_SOURCE /* for snprintf(), strdup() */
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #if CAIRO_HAS_FONT_SUBSET
 
@@ -82,7 +83,7 @@ typedef struct _cairo_type1_font_subset {
 
     struct {
 	int subset_index;
-	int width;
+	double width;
 	char *name;
     } *glyphs;
 
@@ -565,7 +566,7 @@ cairo_type1_font_subset_get_glyph_names_and_widths (cairo_type1_font_subset_t *f
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 	}
 
-	font->glyphs[i].width = font->face->glyph->metrics.horiAdvance;
+	font->glyphs[i].width = font->face->glyph->linearHoriAdvance / 65536.0; /* 16.16 format */
 
 	error = FT_Get_Glyph_Name(font->face, i, buffer, sizeof buffer);
 	if (error != FT_Err_Ok) {
@@ -1345,7 +1346,7 @@ _cairo_type1_subset_init (cairo_type1_subset_t		*type1_subset,
     if (unlikely (type1_subset->base_font == NULL))
 	goto fail1;
 
-    type1_subset->widths = calloc (sizeof (int), font.num_glyphs);
+    type1_subset->widths = calloc (sizeof (double), font.num_glyphs);
     if (unlikely (type1_subset->widths == NULL))
 	goto fail2;
     for (i = 0; i < font.base.num_glyphs; i++) {
@@ -1355,12 +1356,12 @@ _cairo_type1_subset_init (cairo_type1_subset_t		*type1_subset,
 	    font.glyphs[i].width;
     }
 
-    type1_subset->x_min = font.base.x_min;
-    type1_subset->y_min = font.base.y_min;
-    type1_subset->x_max = font.base.x_max;
-    type1_subset->y_max = font.base.y_max;
-    type1_subset->ascent = font.base.ascent;
-    type1_subset->descent = font.base.descent;
+    type1_subset->x_min = font.base.x_min/1000.0;
+    type1_subset->y_min = font.base.y_min/1000.0;
+    type1_subset->x_max = font.base.x_max/1000.0;
+    type1_subset->y_max = font.base.y_max/1000.0;
+    type1_subset->ascent = font.base.ascent/1000.0;
+    type1_subset->descent = font.base.descent/1000.0;
 
     length = font.base.header_size +
 	     font.base.data_size +
diff --git a/gfx/cairo/cairo/src/cairo-type3-glyph-surface-private.h b/gfx/cairo/cairo/src/cairo-type3-glyph-surface-private.h
index 0b0010bcca4..b4abcf60430 100644
--- a/gfx/cairo/cairo/src/cairo-type3-glyph-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-type3-glyph-surface-private.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-type3-glyph-surface.c b/gfx/cairo/cairo/src/cairo-type3-glyph-surface.c
index 6878bbaae25..74257d4bf85 100644
--- a/gfx/cairo/cairo/src/cairo-type3-glyph-surface.c
+++ b/gfx/cairo/cairo/src/cairo-type3-glyph-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,6 +42,7 @@
 #include "cairo-output-stream-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-analysis-surface-private.h"
+#include "cairo-error-private.h"
 #include "cairo-surface-clipper-private.h"
 
 static const cairo_surface_backend_t cairo_type3_glyph_surface_backend;
@@ -83,7 +84,9 @@ _cairo_type3_glyph_surface_create (cairo_scaled_font_t			 *scaled_font,
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&surface->base, &cairo_type3_glyph_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_type3_glyph_surface_backend,
+			 NULL, /* device */
 			 CAIRO_CONTENT_COLOR_ALPHA);
 
     surface->scaled_font = scaled_font;
@@ -117,7 +120,7 @@ _cairo_type3_glyph_surface_emit_image (cairo_type3_glyph_surface_t *surface,
     cairo_status_t status;
 
     /* The only image type supported by Type 3 fonts are 1-bit masks */
-    image = _cairo_image_surface_coerce (image, CAIRO_FORMAT_A1);
+    image = _cairo_image_surface_coerce_to_format (image, CAIRO_FORMAT_A1);
     status = image->base.status;
     if (unlikely (status))
 	return status;
@@ -232,9 +235,9 @@ _cairo_type3_glyph_surface_stroke (void			*abstract_surface,
 				   cairo_operator_t	 op,
 				   const cairo_pattern_t *source,
 				   cairo_path_fixed_t	*path,
-				   cairo_stroke_style_t	*style,
-				   cairo_matrix_t	*ctm,
-				   cairo_matrix_t	*ctm_inverse,
+				   const cairo_stroke_style_t	*style,
+				   const cairo_matrix_t	*ctm,
+				   const cairo_matrix_t	*ctm_inverse,
 				   double		 tolerance,
 				   cairo_antialias_t	 antialias,
 				   cairo_clip_t		*clip)
@@ -288,25 +291,15 @@ _cairo_type3_glyph_surface_show_glyphs (void		     *abstract_surface,
     cairo_type3_glyph_surface_t *surface = abstract_surface;
     cairo_int_status_t status;
     cairo_scaled_font_t *font;
-    cairo_matrix_t new_ctm, ctm_inverse;
-    int i;
+    cairo_matrix_t new_ctm, invert_y_axis;
 
     status = _cairo_surface_clipper_set_clip (&surface->clipper, clip);
     if (unlikely (status))
 	return status;
 
-    for (i = 0; i < num_glyphs; i++) {
-	cairo_matrix_transform_point (&surface->cairo_to_pdf,
-				      &glyphs[i].x, &glyphs[i].y);
-    }
-
-    /* We require the matrix to be invertable. */
-    ctm_inverse = scaled_font->ctm;
-    status = cairo_matrix_invert (&ctm_inverse);
-    if (unlikely (status))
-	return CAIRO_INT_STATUS_IMAGE_FALLBACK;
-
-    cairo_matrix_multiply (&new_ctm, &scaled_font->ctm, &ctm_inverse);
+    cairo_matrix_init_scale (&invert_y_axis, 1, -1);
+    cairo_matrix_multiply (&new_ctm, &invert_y_axis, &scaled_font->ctm);
+    cairo_matrix_multiply (&new_ctm, &surface->cairo_to_pdf, &new_ctm);
     font = cairo_scaled_font_create (scaled_font->font_face,
 				     &scaled_font->font_matrix,
 				     &new_ctm,
@@ -437,7 +430,6 @@ _cairo_type3_glyph_surface_analyze_glyph (void		     *abstract_surface,
     _cairo_scaled_font_freeze_cache (surface->scaled_font);
     status = _cairo_scaled_glyph_lookup (surface->scaled_font,
 					 glyph_index,
-					 CAIRO_SCALED_GLYPH_INFO_METRICS |
 					 CAIRO_SCALED_GLYPH_INFO_RECORDING_SURFACE,
 					 &scaled_glyph);
 
@@ -454,10 +446,7 @@ _cairo_type3_glyph_surface_analyze_glyph (void		     *abstract_surface,
     if (unlikely (status))
 	goto cleanup;
 
-    status2 = _cairo_pdf_operators_flush (&surface->pdf_operators);
-    if (status == CAIRO_STATUS_SUCCESS)
-	status = status2;
-
+    status = _cairo_pdf_operators_flush (&surface->pdf_operators);
     if (status == CAIRO_INT_STATUS_IMAGE_FALLBACK)
 	status = CAIRO_STATUS_SUCCESS;
 
@@ -514,7 +503,7 @@ _cairo_type3_glyph_surface_emit_glyph (void		     *abstract_surface,
     status2 = cairo_matrix_invert (&font_matrix_inverse);
 
     /* The invertability of font_matrix is tested in
-     * pdf_operators_show_glyphs before any glyphs are mappped to the
+     * pdf_operators_show_glyphs before any glyphs are mapped to the
      * subset. */
     assert (status2 == CAIRO_STATUS_SUCCESS);
 
diff --git a/gfx/cairo/cairo/src/cairo-types-private.h b/gfx/cairo/cairo/src/cairo-types-private.h
index 3a3b8496273..93b035d7cf6 100644
--- a/gfx/cairo/cairo/src/cairo-types-private.h
+++ b/gfx/cairo/cairo/src/cairo-types-private.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,18 +44,31 @@
 #include "cairo-list-private.h"
 #include "cairo-reference-count-private.h"
 
+/**
+ * SECTION:cairo-types
+ * @Title: Types
+ * @Short_Description: Generic data types
+ *
+ * This section lists generic data types used in the cairo API.
+ */
+
 typedef struct _cairo_array cairo_array_t;
 typedef struct _cairo_backend cairo_backend_t;
+typedef struct _cairo_boxes_t cairo_boxes_t;
 typedef struct _cairo_cache cairo_cache_t;
+typedef struct _cairo_composite_rectangles cairo_composite_rectangles_t;
 typedef struct _cairo_clip cairo_clip_t;
 typedef struct _cairo_clip_path cairo_clip_path_t;
 typedef struct _cairo_color cairo_color_t;
+typedef struct _cairo_color_stop cairo_color_stop_t;
+typedef struct _cairo_device_backend cairo_device_backend_t;
 typedef struct _cairo_font_face_backend     cairo_font_face_backend_t;
 typedef struct _cairo_gstate cairo_gstate_t;
 typedef struct _cairo_hash_entry cairo_hash_entry_t;
 typedef struct _cairo_hash_table cairo_hash_table_t;
 typedef struct _cairo_image_surface cairo_image_surface_t;
 typedef struct _cairo_mime_data cairo_mime_data_t;
+typedef struct _cairo_observer cairo_observer_t;
 typedef struct _cairo_output_stream cairo_output_stream_t;
 typedef struct _cairo_paginated_surface_backend cairo_paginated_surface_backend_t;
 typedef struct _cairo_path_fixed cairo_path_fixed_t;
@@ -64,12 +77,19 @@ typedef struct _cairo_scaled_font_backend   cairo_scaled_font_backend_t;
 typedef struct _cairo_scaled_font_subsets cairo_scaled_font_subsets_t;
 typedef struct _cairo_solid_pattern cairo_solid_pattern_t;
 typedef struct _cairo_surface_backend cairo_surface_backend_t;
+typedef struct _cairo_surface_snapshot cairo_surface_snapshot_t;
+typedef struct _cairo_surface_subsurface cairo_surface_subsurface_t;
 typedef struct _cairo_surface_wrapper cairo_surface_wrapper_t;
 typedef struct _cairo_unscaled_font_backend cairo_unscaled_font_backend_t;
 typedef struct _cairo_xlib_screen_info cairo_xlib_screen_info_t;
 
 typedef cairo_array_t cairo_user_data_array_t;
 
+struct _cairo_observer {
+    cairo_list_t link;
+    void (*callback) (cairo_observer_t *self, void *arg);
+};
+
 /**
  * cairo_hash_entry_t:
  *
@@ -117,11 +137,43 @@ struct _cairo_array {
     cairo_bool_t is_snapshot;
 };
 
+/**
+ * cairo_lcd_filter_t:
+ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for
+ *   font backend and target device
+ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering
+ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter
+ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel
+ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel
+ *
+ * The LCD filter specifies the low-pass filter applied to LCD-optimized
+ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL.
+ *
+ * Note: This API was temporarily made available in the public
+ * interface during the 1.7.x development series, but was made private
+ * before 1.8.
+ **/
+typedef enum _cairo_lcd_filter {
+    CAIRO_LCD_FILTER_DEFAULT,
+    CAIRO_LCD_FILTER_NONE,
+    CAIRO_LCD_FILTER_INTRA_PIXEL,
+    CAIRO_LCD_FILTER_FIR3,
+    CAIRO_LCD_FILTER_FIR5
+} cairo_lcd_filter_t;
+
+typedef enum _cairo_round_glyph_positions {
+    CAIRO_ROUND_GLYPH_POS_DEFAULT,
+    CAIRO_ROUND_GLYPH_POS_ON,
+    CAIRO_ROUND_GLYPH_POS_OFF
+} cairo_round_glyph_positions_t;
+
 struct _cairo_font_options {
     cairo_antialias_t antialias;
     cairo_subpixel_order_t subpixel_order;
+    cairo_lcd_filter_t lcd_filter;
     cairo_hint_style_t hint_style;
     cairo_hint_metrics_t hint_metrics;
+    cairo_round_glyph_positions_t round_glyph_positions;
 };
 
 /* XXX: Right now, the _cairo_color structure puts unpremultiplied
@@ -142,6 +194,20 @@ struct _cairo_color {
     unsigned short alpha_short;
 };
 
+struct _cairo_color_stop {
+    /* unpremultiplied */
+    double red;
+    double green;
+    double blue;
+    double alpha;
+
+    /* unpremultipled, for convenience */
+    uint16_t red_short;
+    uint16_t green_short;
+    uint16_t blue_short;
+    uint16_t alpha_short;
+};
+
 typedef enum _cairo_paginated_mode {
     CAIRO_PAGINATED_MODE_ANALYZE,	/* analyze page regions */
     CAIRO_PAGINATED_MODE_RENDER,	/* render page contents */
@@ -164,7 +230,8 @@ typedef enum _cairo_int_status {
 } cairo_int_status_t;
 
 typedef enum _cairo_internal_surface_type {
-    CAIRO_INTERNAL_SURFACE_TYPE_PAGINATED = 0x1000,
+    CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT = 0x1000,
+    CAIRO_INTERNAL_SURFACE_TYPE_PAGINATED,
     CAIRO_INTERNAL_SURFACE_TYPE_ANALYSIS,
     CAIRO_INTERNAL_SURFACE_TYPE_TEST_FALLBACK,
     CAIRO_INTERNAL_SURFACE_TYPE_TEST_PAGINATED,
@@ -209,29 +276,6 @@ typedef struct _cairo_point_int {
 #define CAIRO_RECT_INT_MIN (INT_MIN >> CAIRO_FIXED_FRAC_BITS)
 #define CAIRO_RECT_INT_MAX (INT_MAX >> CAIRO_FIXED_FRAC_BITS)
 
-/* Rectangles that take part in a composite operation.
- *
- * This defines four translations that define which pixels of the
- * source pattern, mask, clip and destination surface take part in a
- * general composite operation.  The idea is that the pixels at
- *
- *	(i,j)+(src.x, src.y) of the source,
- *      (i,j)+(mask.x, mask.y) of the mask,
- *      (i,j)+(clip.x, clip.y) of the clip and
- *      (i,j)+(dst.x, dst.y) of the destination
- *
- * all combine together to form the result at (i,j)+(dst.x,dst.y),
- * for i,j ranging in [0,width) and [0,height) respectively.
- */
-typedef struct _cairo_composite_rectangles {
-        cairo_point_int_t src;
-        cairo_point_int_t mask;
-        cairo_point_int_t clip;
-        cairo_point_int_t dst;
-        int width;
-        int height;
-} cairo_composite_rectangles_t;
-
 typedef enum _cairo_direction {
     CAIRO_DIRECTION_FORWARD,
     CAIRO_DIRECTION_REVERSE
@@ -322,7 +366,8 @@ typedef struct _cairo_format_masks {
 typedef enum {
     CAIRO_STOCK_WHITE,
     CAIRO_STOCK_BLACK,
-    CAIRO_STOCK_TRANSPARENT
+    CAIRO_STOCK_TRANSPARENT,
+    CAIRO_STOCK_NUM_COLORS,
 } cairo_stock_t;
 
 typedef enum _cairo_image_transparency {
@@ -335,7 +380,7 @@ typedef enum _cairo_image_transparency {
 struct _cairo_mime_data {
     cairo_reference_count_t ref_count;
     unsigned char *data;
-    unsigned int length;
+    unsigned long length;
     cairo_destroy_func_t destroy;
     void *closure;
 };
@@ -356,7 +401,6 @@ struct _cairo_pattern {
 struct _cairo_solid_pattern {
     cairo_pattern_t base;
     cairo_color_t color;
-    cairo_content_t content;
 };
 
 typedef struct _cairo_surface_pattern {
@@ -367,7 +411,7 @@ typedef struct _cairo_surface_pattern {
 
 typedef struct _cairo_gradient_stop {
     double offset;
-    cairo_color_t color;
+    cairo_color_stop_t color;
 } cairo_gradient_stop_t;
 
 typedef struct _cairo_gradient_pattern {
@@ -411,4 +455,30 @@ typedef union {
     cairo_gradient_pattern_union_t  gradient;
 } cairo_pattern_union_t;
 
+/*
+ * A #cairo_unscaled_font_t is just an opaque handle we use in the
+ * glyph cache.
+ */
+typedef struct _cairo_unscaled_font {
+    cairo_hash_entry_t			 hash_entry;
+    cairo_reference_count_t		 ref_count;
+    const cairo_unscaled_font_backend_t	*backend;
+} cairo_unscaled_font_t;
+
+typedef struct _cairo_scaled_glyph {
+    cairo_hash_entry_t hash_entry;
+
+    cairo_text_extents_t    metrics;		/* user-space metrics */
+    cairo_text_extents_t    fs_metrics;		/* font-space metrics */
+    cairo_box_t		    bbox;		/* device-space bounds */
+    int16_t                 x_advance;		/* device-space rounded X advance */
+    int16_t                 y_advance;		/* device-space rounded Y advance */
+
+    unsigned int	    has_info;
+    cairo_image_surface_t   *surface;		/* device-space image */
+    cairo_path_fixed_t	    *path;		/* device-space outline */
+    cairo_surface_t         *recording_surface;	/* device-space recording-surface */
+
+    void		    *surface_private;	/* for the surface backend */
+} cairo_scaled_glyph_t;
 #endif /* CAIRO_TYPES_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-unicode.c b/gfx/cairo/cairo/src/cairo-unicode.c
index b1567d42d6e..88de39516b6 100644
--- a/gfx/cairo/cairo/src/cairo-unicode.c
+++ b/gfx/cairo/cairo/src/cairo-unicode.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,6 +41,7 @@
  */
 
 #include "cairoint.h"
+#include "cairo-error-private.h"
 
 #define UTF8_COMPUTE(Char, Mask, Len)					      \
   if (Char < 128)							      \
diff --git a/gfx/cairo/cairo/src/cairo-user-font-private.h b/gfx/cairo/cairo/src/cairo-user-font-private.h
index 2a39ff97a8e..d54ef78b44e 100644
--- a/gfx/cairo/cairo/src/cairo-user-font-private.h
+++ b/gfx/cairo/cairo/src/cairo-user-font-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-user-font.c b/gfx/cairo/cairo/src/cairo-user-font.c
index 3304392f450..a524d588fa9 100644
--- a/gfx/cairo/cairo/src/cairo-user-font.c
+++ b/gfx/cairo/cairo/src/cairo-user-font.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,6 +38,29 @@
 #include "cairo-user-font-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-analysis-surface-private.h"
+#include "cairo-error-private.h"
+
+/**
+ * SECTION:cairo-user-fonts
+ * @Title:User Fonts
+ * @Short_Description: Font support with font data provided by the user
+ * 
+ * The user-font feature allows the cairo user to provide drawings for glyphs
+ * in a font.  This is most useful in implementing fonts in non-standard
+ * formats, like SVG fonts and Flash fonts, but can also be used by games and
+ * other application to draw "funky" fonts.
+ */
+
+/**
+ * CAIRO_HAS_USER_FONT:
+ *
+ * Defined if the user font backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ * The user font backend is always built in versions of cairo that support
+ * this feature (1.8 and later).
+ *
+ * @Since: 1.8
+ */
 
 typedef struct _cairo_user_scaled_font_methods {
     cairo_user_scaled_font_init_func_t			init;
@@ -74,22 +97,34 @@ typedef struct _cairo_user_scaled_font {
 
 /* #cairo_user_scaled_font_t */
 
-static cairo_t *
-_cairo_user_scaled_font_create_recording_context (cairo_user_scaled_font_t *scaled_font)
+static cairo_surface_t *
+_cairo_user_scaled_font_create_recording_surface (const cairo_user_scaled_font_t *scaled_font)
 {
     cairo_content_t content;
-    cairo_surface_t *recording_surface;
-    cairo_t *cr;
 
     content = scaled_font->base.options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ?
 						     CAIRO_CONTENT_COLOR_ALPHA :
 						     CAIRO_CONTENT_ALPHA;
 
-    recording_surface = cairo_recording_surface_create (content, NULL);
-    cr = cairo_create (recording_surface);
-    cairo_surface_destroy (recording_surface);
+    return cairo_recording_surface_create (content, NULL);
+}
+
+
+static cairo_t *
+_cairo_user_scaled_font_create_recording_context (const cairo_user_scaled_font_t *scaled_font,
+						  cairo_surface_t                *recording_surface)
+{
+    cairo_t *cr;
+
+    cr = cairo_create (recording_surface);
+
+    if (!_cairo_matrix_is_scale_0 (&scaled_font->base.scale)) {
+        cairo_matrix_t scale;
+	scale = scaled_font->base.scale;
+	scale.x0 = scale.y0 = 0.;
+	cairo_set_matrix (cr, &scale);
+    }
 
-    cairo_set_matrix (cr, &scaled_font->base.scale);
     cairo_set_font_size (cr, 1.0);
     cairo_set_font_options (cr, &scaled_font->base.options);
     cairo_set_source_rgb (cr, 1., 1., 1.);
@@ -112,25 +147,26 @@ _cairo_user_scaled_glyph_init (void			 *abstract_font,
 	cairo_text_extents_t extents = scaled_font->default_glyph_extents;
 	cairo_t *cr;
 
-	cr = _cairo_user_scaled_font_create_recording_context (scaled_font);
+	if (!face->scaled_font_methods.render_glyph)
+	    return CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED;
 
-	if (face->scaled_font_methods.render_glyph) {
+	recording_surface = _cairo_user_scaled_font_create_recording_surface (scaled_font);
+
+	/* special case for 0 rank matrix (as in _cairo_scaled_font_init): empty surface */
+        if (!_cairo_matrix_is_scale_0 (&scaled_font->base.scale)) {
+	    cr = _cairo_user_scaled_font_create_recording_context (scaled_font, recording_surface);
 	    status = face->scaled_font_methods.render_glyph ((cairo_scaled_font_t *)scaled_font,
 							     _cairo_scaled_glyph_index(scaled_glyph),
 							     cr, &extents);
-	} else
-	    status = CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED;
+	    if (status == CAIRO_STATUS_SUCCESS)
+	        status = cairo_status (cr);
 
-	if (status == CAIRO_STATUS_SUCCESS)
-	    status = cairo_status (cr);
+	    cairo_destroy (cr);
 
-	recording_surface = cairo_surface_reference (cairo_get_target (cr));
-
-	cairo_destroy (cr);
-
-	if (unlikely (status)) {
-	    cairo_surface_destroy (recording_surface);
-	    return status;
+	    if (unlikely (status)) {
+	        cairo_surface_destroy (recording_surface);
+	        return status;
+	    }
 	}
 
 	_cairo_scaled_glyph_set_recording_surface (scaled_glyph,
@@ -419,9 +455,12 @@ _cairo_user_font_face_scaled_font_create (void                        *abstract_
 	/* Give away fontmap lock such that user-font can use other fonts */
 	status = _cairo_scaled_font_register_placeholder_and_unlock_font_map (&user_scaled_font->base);
 	if (status == CAIRO_STATUS_SUCCESS) {
+	    cairo_surface_t *recording_surface;
 	    cairo_t *cr;
 
-	    cr = _cairo_user_scaled_font_create_recording_context (user_scaled_font);
+	    recording_surface = _cairo_user_scaled_font_create_recording_surface (user_scaled_font);
+	    cr = _cairo_user_scaled_font_create_recording_context (user_scaled_font, recording_surface);
+	    cairo_surface_destroy (recording_surface);
 
 	    status = font_face->scaled_font_methods.init (&user_scaled_font->base,
 							  cr,
diff --git a/gfx/cairo/cairo/src/cairo-version.c b/gfx/cairo/cairo/src/cairo-version.c
index fd7bf7a52bf..b07b48b37ab 100644
--- a/gfx/cairo/cairo/src/cairo-version.c
+++ b/gfx/cairo/cairo/src/cairo-version.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,6 +44,162 @@
 #undef CAIRO_VERSION_H
 #include "cairo-features.h"
 
+/**
+ * SECTION:cairo-version
+ * @Title: Version Information
+ * @Short_Description: Compile-time and run-time version checks.
+ *
+ * Cairo has a three-part version number scheme. In this scheme, we use
+ * even vs. odd numbers to distinguish fixed points in the software
+ * vs. in-progress development, (such as from git instead of a tar file,
+ * or as a "snapshot" tar file as opposed to a "release" tar file).
+ *
+ * <informalexample><programlisting>
+ *  _____ Major. Always 1, until we invent a new scheme.
+ * /  ___ Minor. Even/Odd = Release/Snapshot (tar files) or Branch/Head (git)
+ * | /  _ Micro. Even/Odd = Tar-file/git
+ * | | /
+ * 1.0.0
+ * </programlisting></informalexample>
+ *
+ * Here are a few examples of versions that one might see.
+ * <informalexample><programlisting>
+ * Releases
+ * --------
+ * 1.0.0 - A major release
+ * 1.0.2 - A subsequent maintenance release
+ * 1.2.0 - Another major release
+ *
+ * Snapshots
+ * ---------
+ * 1.1.2 - A snapshot (working toward the 1.2.0 release)
+ *
+ * In-progress development (eg. from git)
+ * --------------------------------------
+ * 1.0.1 - Development on a maintenance branch (toward 1.0.2 release)
+ * 1.1.1 - Development on head (toward 1.1.2 snapshot and 1.2.0 release)
+ * </programlisting></informalexample>
+ * </para>
+ * <refsect2>
+ * <title>Compatibility</title>
+ * <para>
+ * The API/ABI compatibility guarantees for various versions are as
+ * follows. First, let's assume some cairo-using application code that is
+ * successfully using the API/ABI "from" one version of cairo. Then let's
+ * ask the question whether this same code can be moved "to" the API/ABI
+ * of another version of cairo.
+ *
+ * Moving from a release to any later version (release, snapshot,
+ * development) is always guaranteed to provide compatibility.
+ *
+ * Moving from a snapshot to any later version is not guaranteed to
+ * provide compatibility, since snapshots may introduce new API that ends
+ * up being removed before the next release.
+ *
+ * Moving from an in-development version (odd micro component) to any
+ * later version is not guaranteed to provide compatibility. In fact,
+ * there's not even a guarantee that the code will even continue to work
+ * with the same in-development version number. This is because these
+ * numbers don't correspond to any fixed state of the software, but
+ * rather the many states between snapshots and releases.
+ * </para>
+ * </refsect2>
+ * <refsect2>
+ * <title>Examining the version</title>
+ * <para>
+ * Cairo provides the ability to examine the version at either
+ * compile-time or run-time and in both a human-readable form as well as
+ * an encoded form suitable for direct comparison. Cairo also provides the
+ * macro CAIRO_VERSION_ENCODE() to perform the encoding.
+ *
+ * <informalexample><programlisting>
+ * Compile-time
+ * ------------
+ * CAIRO_VERSION_STRING    Human-readable
+ * CAIRO_VERSION           Encoded, suitable for comparison
+ *
+ * Run-time
+ * --------
+ * cairo_version_string()  Human-readable
+ * cairo_version()         Encoded, suitable for comparison
+ * </programlisting></informalexample>
+ *
+ * For example, checking that the cairo version is greater than or equal
+ * to 1.0.0 could be achieved at compile-time or run-time as follows:
+ *
+ * <informalexample><programlisting>
+ * ##if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 0, 0)
+ * printf ("Compiling with suitable cairo version: %s\n", %CAIRO_VERSION_STRING);
+ * ##endif
+ *
+ * if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 0, 0))
+ *     printf ("Running with suitable cairo version: %s\n", cairo_version_string ());
+ * </programlisting></informalexample>
+ * </para>
+ * </refsect2>
+ */
+
+/**
+ * CAIRO_VERSION:
+ *
+ * The version of cairo available at compile-time, encoded using
+ * CAIRO_VERSION_ENCODE().
+ */
+
+/**
+ * CAIRO_VERSION_MAJOR:
+ *
+ * The major component of the version of cairo available at compile-time.
+ */
+
+/**
+ * CAIRO_VERSION_MINOR:
+ *
+ * The minor component of the version of cairo available at compile-time.
+ */
+
+/**
+ * CAIRO_VERSION_MICRO:
+ *
+ * The micro component of the version of cairo available at compile-time.
+ */
+
+/**
+ * CAIRO_VERSION_STRING:
+ *
+ * A human-readable string literal containing the version of cairo available
+ * at compile-time, in the form of "X.Y.Z".
+ */
+
+/**
+ * CAIRO_VERSION_ENCODE:
+ * @major: the major component of the version number
+ * @minor: the minor component of the version number
+ * @micro: the micro component of the version number
+ * 
+ * This macro encodes the given cairo version into an integer.  The numbers
+ * returned by %CAIRO_VERSION and cairo_version() are encoded using this macro.
+ * Two encoded version numbers can be compared as integers.  The encoding ensures
+ * that later versions compare greater than earlier versions.
+ *
+ * @Returns: the encoded version.
+ */
+
+/**
+ * CAIRO_VERSION_STRINGIZE:
+ * @major: the major component of the version number
+ * @minor: the minor component of the version number
+ * @micro: the micro component of the version number
+ *
+ * This macro encodes the given cairo version into an string.  The numbers
+ * returned by %CAIRO_VERSION_STRING and cairo_version_string() are encoded using this macro.
+ * The parameters to this macro must expand to numerical literals.
+ *
+ * @Returns: a string literal containing the version.
+ *
+ * @Since: 1.8
+ */
+
 /**
  * cairo_version:
  *
diff --git a/gfx/cairo/cairo/src/cairo-vg-surface.c b/gfx/cairo/cairo/src/cairo-vg-surface.c
index 5ca01b6e0e4..acc3f804bc2 100644
--- a/gfx/cairo/cairo/src/cairo-vg-surface.c
+++ b/gfx/cairo/cairo/src/cairo-vg-surface.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,10 +38,11 @@
 
 #include "cairo-vg.h"
 
+#include "cairo-cache-private.h"
+#include "cairo-error-private.h"
 #include "cairo-path-fixed-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-surface-clipper-private.h"
-#include "cairo-cache-private.h"
 
 #include <pixman.h>
 #include <VG/openvg.h>
@@ -409,7 +410,6 @@ _vg_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clipper,
 						      cairo_vg_surface_t,
 						      clipper);
     cairo_vg_surface_t *mask;
-    cairo_solid_pattern_t white;
     cairo_status_t status;
 
     if (path == NULL) {
@@ -428,9 +428,9 @@ _vg_surface_clipper_intersect_clip_path (cairo_surface_clipper_t *clipper,
     if (unlikely (mask->base.status))
 	return mask->base.status;
 
-    _cairo_pattern_init_solid (&white, CAIRO_COLOR_WHITE, CAIRO_CONTENT_ALPHA);
     status = _cairo_surface_fill (&mask->base,
-				  CAIRO_OPERATOR_SOURCE, &white.base,
+				  CAIRO_OPERATOR_SOURCE,
+				  &_cairo_pattern_white.base,
 				  path, fill_rule, tolerance, antialias,
 				  NULL);
     if (status) {
@@ -958,8 +958,7 @@ _vg_setup_surface_source (cairo_vg_context_t *context,
     cairo_status_t status;
 
     snapshot = _cairo_surface_has_snapshot (spat->surface,
-					    &cairo_vg_surface_backend,
-					    spat->surface->content);
+					    &cairo_vg_surface_backend);
     if (snapshot != NULL) {
 	clone = (cairo_vg_surface_t *) cairo_surface_reference (snapshot);
 	goto DONE;
@@ -983,12 +982,8 @@ _vg_setup_surface_source (cairo_vg_context_t *context,
 	return status;
     }
 
-    status = _cairo_surface_attach_snapshot (spat->surface, &clone->base,
-					     _vg_surface_remove_from_cache);
-    if (unlikely (status)) {
-	cairo_surface_destroy (&clone->base);
-	return status;
-    }
+    _cairo_surface_attach_snapshot (spat->surface, &clone->base,
+				    _vg_surface_remove_from_cache);
 
 DONE:
     cairo_surface_destroy (&context->source->base);
@@ -1606,6 +1601,7 @@ _vg_surface_create_internal (cairo_vg_context_t *context,
 
     _cairo_surface_init (&surface->base,
 			 &cairo_vg_surface_backend,
+			 NULL, /* device */
 			 _vg_format_to_content (format));
 
     surface->width  = width;
diff --git a/gfx/cairo/cairo/src/cairo-vg.h b/gfx/cairo/cairo/src/cairo-vg.h
index 98392fc2ddb..f9a62e51c69 100644
--- a/gfx/cairo/cairo/src/cairo-vg.h
+++ b/gfx/cairo/cairo/src/cairo-vg.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-wideint-private.h b/gfx/cairo/cairo/src/cairo-wideint-private.h
index d1322e34215..b9f8dae64f6 100644
--- a/gfx/cairo/cairo/src/cairo-wideint-private.h
+++ b/gfx/cairo/cairo/src/cairo-wideint-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-wideint-type-private.h b/gfx/cairo/cairo/src/cairo-wideint-type-private.h
index c7363c02969..4c910edf5fa 100644
--- a/gfx/cairo/cairo/src/cairo-wideint-type-private.h
+++ b/gfx/cairo/cairo/src/cairo-wideint-type-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-wideint.c b/gfx/cairo/cairo/src/cairo-wideint.c
index 2c70d8662e8..78dedcdf0cf 100644
--- a/gfx/cairo/cairo/src/cairo-wideint.c
+++ b/gfx/cairo/cairo/src/cairo-wideint.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -802,7 +802,7 @@ _cairo_int_96by64_32x64_divrem (cairo_int128_t num, cairo_int64_t den)
     uqr = _cairo_uint_96by64_32x64_divrem (num, nonneg_den);
     if (_cairo_uint64_eq (uqr.rem, nonneg_den)) {
 	/* bail on overflow. */
-	qr.quo = _cairo_uint32s_to_uint64 (0x7FFFFFFF, -1U);;
+	qr.quo = _cairo_uint32s_to_uint64 (0x7FFFFFFF, -1U);
 	qr.rem = den;
 	return qr;
     }
diff --git a/gfx/cairo/cairo/src/cairo-win32-font.c b/gfx/cairo/cairo/src/cairo-win32-font.c
index 3d5489b29e8..940d896647c 100644
--- a/gfx/cairo/cairo/src/cairo-win32-font.c
+++ b/gfx/cairo/cairo/src/cairo-win32-font.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -45,6 +45,7 @@
 #include "cairoint.h"
 
 #include "cairo-win32-private.h"
+#include "cairo-error-private.h"
 
 #ifndef SPI_GETFONTSMOOTHINGTYPE
 #define SPI_GETFONTSMOOTHINGTYPE 0x200a
@@ -61,6 +62,23 @@
 
 #define CMAP_TAG 0x70616d63
 
+/**
+ * SECTION:cairo-win32-fonts
+ * @Title: Win32 Fonts
+ * @Short_Description: Font support for Microsoft Windows
+ * @See_Also: #cairo_font_face_t
+ *
+ * The Microsoft Windows font backend is primarily used to render text on
+ * Microsoft Windows systems.
+ */
+
+/**
+ * CAIRO_HAS_WIN32_FONT:
+ *
+ * Defined if the Microsoft Windows font backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 const cairo_scaled_font_backend_t _cairo_win32_scaled_font_backend;
 
 typedef struct {
@@ -966,7 +984,7 @@ _cairo_win32_scaled_font_init_glyph_metrics (cairo_win32_scaled_font_t *scaled_f
 	extents.height = scaled_font->base.ctm.yy * (font_extents.ascent + font_extents.descent) / scaled_font->y_scale;
 	extents.x_advance = extents.width;
 	extents.y_advance = 0;
-    } else if (scaled_font->preserve_axes && scaled_font->base.options.hint_style != CAIRO_HINT_METRICS_OFF) {
+    } else if (scaled_font->preserve_axes && scaled_font->base.options.hint_metrics != CAIRO_HINT_METRICS_OFF) {
 	/* If we aren't rotating / skewing the axes, then we get the metrics
 	 * from the GDI in device space and convert to font space.
 	 */
diff --git a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
index 94a8fd94c13..b95a059b2c7 100644
--- a/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
+++ b/gfx/cairo/cairo/src/cairo-win32-printing-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -46,6 +46,7 @@
 
 #include "cairoint.h"
 
+#include "cairo-error-private.h"
 #include "cairo-paginated-private.h"
 
 #include "cairo-clip-private.h"
@@ -262,7 +263,7 @@ _cairo_win32_printing_surface_analyze_operation (cairo_win32_surface_t *surface,
 	return analyze_surface_pattern_transparency (surface_pattern);
     }
 
-    if (_cairo_pattern_is_opaque (pattern))
+    if (_cairo_pattern_is_opaque (pattern, NULL))
 	return CAIRO_STATUS_SUCCESS;
     else
 	return CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY;
@@ -284,9 +285,9 @@ _cairo_win32_printing_surface_init_clear_color (cairo_win32_surface_t *surface,
 						cairo_solid_pattern_t *color)
 {
     if (surface->content == CAIRO_CONTENT_COLOR_ALPHA)
-	_cairo_pattern_init_solid (color, CAIRO_COLOR_WHITE, CAIRO_CONTENT_COLOR);
+	_cairo_pattern_init_solid (color, CAIRO_COLOR_WHITE);
     else
-	_cairo_pattern_init_solid (color, CAIRO_COLOR_BLACK, CAIRO_CONTENT_COLOR);
+	_cairo_pattern_init_solid (color, CAIRO_COLOR_BLACK);
 }
 
 static COLORREF
@@ -438,13 +439,9 @@ _cairo_win32_printing_surface_paint_recording_pattern (cairo_win32_surface_t   *
 
     old_content = surface->content;
     if (recording_surface->base.content == CAIRO_CONTENT_COLOR) {
-	cairo_pattern_t  *source;
-	cairo_solid_pattern_t black;
-
 	surface->content = CAIRO_CONTENT_COLOR;
-	_cairo_pattern_init_solid (&black, CAIRO_COLOR_BLACK, CAIRO_CONTENT_COLOR);
-	source = (cairo_pattern_t*) &black;
-	status = _cairo_win32_printing_surface_paint_solid_pattern (surface, source);
+	status = _cairo_win32_printing_surface_paint_solid_pattern (surface,
+								    &_cairo_pattern_black.base);
 	if (status)
 	    return status;
     }
@@ -500,7 +497,7 @@ _cairo_win32_printing_surface_paint_recording_pattern (cairo_win32_surface_t   *
 	    SelectClipPath (surface->dc, RGN_AND);
 
 	    SaveDC (surface->dc); /* Allow clip path to be reset during replay */
-	    status = _cairo_recording_surface_replay_region (&recording_surface->base,
+	    status = _cairo_recording_surface_replay_region (&recording_surface->base, NULL,
 							     &surface->base,
 							     CAIRO_RECORDING_REGION_NATIVE);
 	    assert (status != CAIRO_INT_STATUS_UNSUPPORTED);
@@ -524,11 +521,11 @@ static cairo_int_status_t
 _cairo_win32_printing_surface_check_jpeg (cairo_win32_surface_t   *surface,
 					  cairo_surface_t         *source,
 					  const unsigned char    **data,
-					  unsigned int            *length,
+					  unsigned long           *length,
 					  cairo_image_info_t      *info)
 {
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
     cairo_int_status_t status;
     DWORD result;
 
@@ -562,11 +559,11 @@ static cairo_int_status_t
 _cairo_win32_printing_surface_check_png (cairo_win32_surface_t   *surface,
 					 cairo_surface_t         *source,
 					 const unsigned char    **data,
-					 unsigned int            *length,
+					 unsigned long           *length,
 					 cairo_image_info_t      *info)
 {
     const unsigned char *mime_data;
-    unsigned int mime_data_length;
+    unsigned long mime_data_length;
 
     cairo_int_status_t status;
     DWORD result;
@@ -614,7 +611,7 @@ _cairo_win32_printing_surface_paint_image_pattern (cairo_win32_surface_t   *surf
     RECT clip;
     const cairo_color_t *background_color;
     const unsigned char *mime_data;
-    unsigned int mime_size;
+    unsigned long mime_size;
     cairo_image_info_t mime_info;
     cairo_bool_t use_mime;
     DWORD mime_type;
@@ -680,8 +677,7 @@ _cairo_win32_printing_surface_paint_image_pattern (cairo_win32_surface_t   *surf
 	}
 
 	_cairo_pattern_init_solid (&background_pattern,
-				   background_color,
-				   CAIRO_CONTENT_COLOR);
+				   background_color);
 	status = _cairo_surface_paint (opaque_surface,
 				       CAIRO_OPERATOR_SOURCE,
 				       &background_pattern.base,
@@ -791,7 +787,7 @@ _cairo_win32_printing_surface_paint_surface_pattern (cairo_win32_surface_t   *su
 }
 
 static void
-vertex_set_color (TRIVERTEX *vert, cairo_color_t *color)
+vertex_set_color (TRIVERTEX *vert, cairo_color_stop_t *color)
 {
     /* MSDN says that the range here is 0x0000 .. 0xff00;
      * that may well be a typo, but just chop the low bits
@@ -1161,6 +1157,7 @@ _cairo_win32_printing_surface_get_font_options (void                  *abstract_
     cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
     cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_OFF);
     cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY);
+    _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON);
 }
 
 static cairo_int_status_t
@@ -1245,9 +1242,9 @@ _cairo_win32_printing_surface_stroke (void			*abstract_surface,
                                       cairo_operator_t		 op,
                                       const cairo_pattern_t	*source,
                                       cairo_path_fixed_t	*path,
-                                      cairo_stroke_style_t	*style,
-                                      cairo_matrix_t		*stroke_ctm,
-                                      cairo_matrix_t		*stroke_ctm_inverse,
+                                      const cairo_stroke_style_t *style,
+                                      const cairo_matrix_t	*stroke_ctm,
+                                      const cairo_matrix_t	*stroke_ctm_inverse,
                                       double			tolerance,
                                       cairo_antialias_t		antialias,
 				      cairo_clip_t    *clip)
@@ -1835,6 +1832,7 @@ cairo_win32_printing_surface_create (HDC hdc)
     _cairo_win32_printing_surface_init_language_pack (surface);
     _cairo_surface_init (&surface->base,
 			 &cairo_win32_printing_surface_backend,
+			 NULL, /* device */
                          CAIRO_CONTENT_COLOR_ALPHA);
 
     paginated = _cairo_paginated_surface_create (&surface->base,
diff --git a/gfx/cairo/cairo/src/cairo-win32-private.h b/gfx/cairo/cairo/src/cairo-win32-private.h
index b13b5eb2ec6..6a28f56bffb 100644
--- a/gfx/cairo/cairo/src/cairo-win32-private.h
+++ b/gfx/cairo/cairo/src/cairo-win32-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -49,6 +49,9 @@
 
 #define WIN32_FONT_LOGICAL_SCALE 1
 
+
+CAIRO_BEGIN_DECLS
+
 typedef struct _cairo_win32_surface {
     cairo_surface_t base;
 
@@ -235,7 +238,6 @@ inline BOOL ModifyWorldTransform(HDC hdc, CONST XFORM * lpxf, DWORD mode) { retu
 #endif
 
 #ifdef CAIRO_HAS_DWRITE_FONT
-CAIRO_BEGIN_DECLS
 
 cairo_int_status_t
 _cairo_dwrite_show_glyphs_on_surface(void			*surface,
@@ -250,6 +252,6 @@ cairo_int_status_t
 _cairo_dwrite_scaled_font_create_win32_scaled_font(cairo_scaled_font_t *scaled_font,
                                                    cairo_scaled_font_t **new_font);
 
-CAIRO_END_DECLS
 #endif /* CAIRO_HAS_DWRITE_FONT */
+CAIRO_END_DECLS
 #endif /* CAIRO_WIN32_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c
index 0bb1904d84f..5edff97cb0f 100644
--- a/gfx/cairo/cairo/src/cairo-win32-surface.c
+++ b/gfx/cairo/cairo/src/cairo-win32-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -48,6 +48,8 @@
 #include "cairoint.h"
 
 #include "cairo-clip-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
 #include "cairo-paginated-private.h"
 #include "cairo-win32-private.h"
 #include "cairo-scaled-font-subsets-private.h"
@@ -74,6 +76,30 @@
 
 #define PELS_72DPI  ((LONG)(72. / 0.0254))
 
+/**
+ * SECTION:cairo-win32
+ * @Title: Win32 Surfaces
+ * @Short_Description: Microsoft Windows surface support
+ * @See_Also: #cairo_surface_t
+ *
+ * The Microsoft Windows surface is used to render cairo graphics to
+ * Microsoft Windows windows, bitmaps, and printing device contexts.
+ *
+ * The surface returned by cairo_win32_printing_surface_create() is of surface
+ * type %CAIRO_SURFACE_TYPE_WIN32_PRINTING and is a multi-page vector surface
+ * type.
+ *
+ * The surface returned by the other win32 constructors is of surface type
+ * %CAIRO_SURFACE_TYPE_WIN32 and is a raster surface type.
+ */
+
+/**
+ * CAIRO_HAS_WIN32_SURFACE:
+ *
+ * Defined if the Microsoft Windows surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 static const cairo_surface_backend_t cairo_win32_surface_backend;
 
 /**
@@ -96,11 +122,11 @@ _cairo_win32_print_gdi_error (const char *context)
 			 NULL,
 			 last_error,
 			 MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-			 (LPSTR) &lpMsgBuf,
+			 (LPWSTR) &lpMsgBuf,
 			 0, NULL)) {
 	fprintf (stderr, "%s: Unknown GDI error", context);
     } else {
-	fprintf (stderr, "%s: %S", context, (char *)lpMsgBuf);
+	fwprintf (stderr, L"%s: %S", context, (wchar_t *)lpMsgBuf);
 
 	LocalFree (lpMsgBuf);
     }
@@ -177,6 +203,9 @@ _create_dc_and_bitmap (cairo_win32_surface_t *surface,
     surface->is_dib = FALSE;
 
     switch (format) {
+    default:
+    case CAIRO_FORMAT_INVALID:
+	return _cairo_error (CAIRO_STATUS_INVALID_FORMAT);
     case CAIRO_FORMAT_ARGB32:
     case CAIRO_FORMAT_RGB24:
 	num_palette = 0;
@@ -338,6 +367,9 @@ _cairo_win32_surface_create_for_dc (HDC             original_dc,
     unsigned char *bits;
     int rowstride;
 
+    if (! CAIRO_FORMAT_VALID (format))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT));
+
     surface = malloc (sizeof (cairo_win32_surface_t));
     if (surface == NULL)
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
@@ -369,7 +401,9 @@ _cairo_win32_surface_create_for_dc (HDC             original_dc,
     surface->extents = surface->clip_rect;
     surface->font_subsets = NULL;
 
-    _cairo_surface_init (&surface->base, &cairo_win32_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_win32_surface_backend,
+			 NULL, /* device */
 			 _cairo_content_from_format (format));
 
     return &surface->base;
@@ -518,8 +552,8 @@ static void
 _cairo_win32_convert_ddb_to_dib (cairo_win32_surface_t *surface)
 {
     cairo_win32_surface_t *new_surface;
-    int width = surface->extents.width;
-    int height = surface->extents.height;
+    int width  = surface->extents.width  + surface->extents.x;
+    int height = surface->extents.height + surface->extents.y;
 
     BOOL ok;
     HBITMAP oldbitmap;
@@ -924,7 +958,7 @@ _cairo_win32_surface_composite_inner (cairo_win32_surface_t *src,
     } else if (!needs_alpha) {
 	/* BitBlt or StretchBlt? */
 	if (!needs_scale && (dst->flags & CAIRO_WIN32_SURFACE_CAN_BITBLT)) {
-	    if (!BitBlt (dst->dc,
+            if (!BitBlt (dst->dc,
 			 dst_r.x, dst_r.y,
 			 dst_r.width, dst_r.height,
 			 src->dc,
@@ -949,6 +983,8 @@ _cairo_win32_surface_composite_inner (cairo_win32_surface_t *src,
 		return _cairo_win32_print_gdi_error ("StretchBlt");
 	}
     } else if (needs_alpha && !needs_scale) {
+	RECT r = {0, 0, 5000, 5000};
+        //FillRect(dst->dc, &r, GetStockObject(DKGRAY_BRUSH));
   	return _composite_alpha_blend (dst, src, alpha,
 				       src_r.x, src_r.y, src_r.width, src_r.height,
 				       dst_r.x, dst_r.y, dst_r.width, dst_r.height);
@@ -1137,18 +1173,20 @@ _cairo_win32_surface_composite (cairo_operator_t	op,
 
 	if (src_r.x < 0) {
 	    src_r.width += src_r.x;
-	    src_r.x = 0;
 
 	    dst_r.width += src_r.x;
 	    dst_r.x -= src_r.x;
+
+            src_r.x = 0;
 	}
 
 	if (src_r.y < 0) {
 	    src_r.height += src_r.y;
-	    src_r.y = 0;
 
-	    dst_r.height += dst_r.y;
+	    dst_r.height += src_r.y;
 	    dst_r.y -= src_r.y;
+	    
+            src_r.y = 0;
 	}
 
 	if (src_r.x + src_r.width > src_extents.width) {
@@ -1751,7 +1789,9 @@ cairo_win32_surface_create_internal (HDC hdc, cairo_format_t format)
 
     surface->flags = _cairo_win32_flags_for_dc (surface->dc);
 
-    _cairo_surface_init (&surface->base, &cairo_win32_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &cairo_win32_surface_backend,
+			 NULL, /* device */
 			 _cairo_content_from_format (format));
 
     return &surface->base;
@@ -2026,8 +2066,7 @@ cairo_win32_surface_get_image (cairo_surface_t *surface)
 
 static cairo_bool_t
 _cairo_win32_surface_is_similar (void *surface_a,
-	                         void *surface_b,
-				 cairo_content_t content)
+	                         void *surface_b)
 {
     cairo_win32_surface_t *a = surface_a;
     cairo_win32_surface_t *b = surface_b;
@@ -2098,11 +2137,10 @@ _cairo_win32_surface_span_renderer_finish (void *abstract_renderer)
 
 	    status = dst->image->backend->composite (renderer->op,
 		    renderer->pattern, mask_pattern, dst->image,
-		    rects->src.x,
-		    rects->src.y,
+		    rects->bounded.x, rects->bounded.y,
 		    0, 0,		/* mask.x, mask.y */
-		    rects->dst.x, rects->dst.y,
-		    rects->width, rects->height,
+		    rects->bounded.x, rects->bounded.y,
+		    rects->bounded.width, rects->bounded.height,
 		    renderer->clip_region);
 	} else {
 	    /* otherwise go through the fallback_composite path which
@@ -2110,11 +2148,10 @@ _cairo_win32_surface_span_renderer_finish (void *abstract_renderer)
 	    status = _cairo_surface_fallback_composite (
 		    renderer->op,
 		    renderer->pattern, mask_pattern, &dst->base,
-		    rects->src.x,
-		    rects->src.y,
+		    rects->bounded.x, rects->bounded.y,
 		    0, 0,		/* mask.x, mask.y */
-		    rects->dst.x, rects->dst.y,
-		    rects->width, rects->height,
+		    rects->bounded.x, rects->bounded.y,
+		    rects->bounded.width, rects->bounded.height,
 		    renderer->clip_region);
 	}
 	cairo_pattern_destroy (mask_pattern);
@@ -2150,8 +2187,8 @@ _cairo_win32_surface_create_span_renderer (cairo_operator_t	 op,
     cairo_win32_surface_t *dst = abstract_dst;
     cairo_win32_surface_span_renderer_t *renderer;
     cairo_status_t status;
-    int width = rects->width;
-    int height = rects->height;
+    int width = rects->bounded.width;
+    int height = rects->bounded.height;
 
     renderer = calloc(1, sizeof(*renderer));
     if (renderer == NULL)
@@ -2181,12 +2218,1948 @@ _cairo_win32_surface_create_span_renderer (cairo_operator_t	 op,
 	return _cairo_span_renderer_create_in_error (status);
     }
 
-    renderer->mask_data = renderer->mask->data - rects->mask.x - rects->mask.y * renderer->mask->stride;
+    renderer->mask_data = renderer->mask->data - rects->bounded.x - rects->bounded.y * renderer->mask->stride;
     renderer->mask_stride = renderer->mask->stride;
     return &renderer->base;
 }
 
 
+static cairo_int_status_t
+_cairo_win32_surface_paint (void			*abstract_surface,
+			    cairo_operator_t		 op,
+			    const cairo_pattern_t	*source,
+			    cairo_clip_t		*clip)
+{
+    cairo_win32_surface_t *surface = abstract_surface;
+
+    if (surface->image) {
+	return _cairo_surface_paint (surface->image, op, source, clip);
+    }
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
+
+static cairo_int_status_t
+_cairo_win32_surface_mask (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   const cairo_pattern_t	*mask,
+			   cairo_clip_t			*clip)
+{
+    cairo_win32_surface_t *surface = abstract_surface;
+
+    if (surface->image) {
+	return _cairo_surface_mask (surface->image, op, source, mask, clip);
+    }
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
+
+static cairo_int_status_t
+_cairo_win32_surface_stroke (void			*abstract_surface,
+			     cairo_operator_t		 op,
+			     const cairo_pattern_t	*source,
+			     cairo_path_fixed_t		*path,
+			     const cairo_stroke_style_t	*style,
+			     const cairo_matrix_t	*ctm,
+			     const cairo_matrix_t	*ctm_inverse,
+			     double			 tolerance,
+			     cairo_antialias_t		 antialias,
+			     cairo_clip_t		*clip)
+{
+    cairo_win32_surface_t *surface = abstract_surface;
+
+    if (surface->image) {
+	return _cairo_surface_stroke (surface->image, op, source,
+					        path, style,
+					        ctm, ctm_inverse,
+					        tolerance, antialias,
+					        clip);
+
+    }
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
+
+static cairo_int_status_t
+_cairo_win32_surface_fill (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   cairo_path_fixed_t		*path,
+			   cairo_fill_rule_t		 fill_rule,
+			   double			 tolerance,
+			   cairo_antialias_t		 antialias,
+			   cairo_clip_t			*clip)
+{
+    cairo_win32_surface_t *surface = abstract_surface;
+
+    if (surface->image) {
+	return _cairo_surface_fill (surface->image, op, source,
+					 path, fill_rule,
+					 tolerance, antialias,
+					 clip);
+    }
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+}
+
+
+#include "cairoint.h"
+
+#include "cairo-boxes-private.h"
+#include "cairo-clip-private.h"
+#include "cairo-composite-rectangles-private.h"
+#include "cairo-error-private.h"
+#include "cairo-region-private.h"
+#include "cairo-spans-private.h"
+#include "cairo-surface-fallback-private.h"
+
+typedef struct {
+    cairo_surface_t *dst;
+    cairo_rectangle_int_t extents;
+    cairo_image_surface_t *image;
+    cairo_rectangle_int_t image_rect;
+    void *image_extra;
+} fallback_state_t;
+
+/**
+ * _fallback_init:
+ *
+ * Acquire destination image surface needed for an image-based
+ * fallback.
+ *
+ * Return value: %CAIRO_INT_STATUS_NOTHING_TO_DO if the extents are not
+ * visible, %CAIRO_STATUS_SUCCESS if some portion is visible and all
+ * went well, or some error status otherwise.
+ **/
+static cairo_int_status_t
+_fallback_init (fallback_state_t *state,
+		cairo_surface_t  *dst,
+		int               x,
+		int               y,
+		int               width,
+		int               height)
+{
+    cairo_status_t status;
+
+    state->extents.x = x;
+    state->extents.y = y;
+    state->extents.width = width;
+    state->extents.height = height;
+
+    state->dst = dst;
+
+    status = _cairo_surface_acquire_dest_image (dst, &state->extents,
+						&state->image, &state->image_rect,
+						&state->image_extra);
+    if (unlikely (status))
+	return status;
+
+
+    /* XXX: This NULL value tucked away in state->image is a rather
+     * ugly interface. Cleaner would be to push the
+     * CAIRO_INT_STATUS_NOTHING_TO_DO value down into
+     * _cairo_surface_acquire_dest_image and its backend
+     * counterparts. */
+    assert (state->image != NULL);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_fallback_fini (fallback_state_t *state)
+{
+    _cairo_surface_release_dest_image (state->dst, &state->extents,
+				       state->image, &state->image_rect,
+				       state->image_extra);
+}
+
+typedef cairo_status_t
+(*cairo_draw_func_t) (void                          *closure,
+		      cairo_operator_t               op,
+		      const cairo_pattern_t         *src,
+		      cairo_surface_t               *dst,
+		      int                            dst_x,
+		      int                            dst_y,
+		      const cairo_rectangle_int_t   *extents,
+		      cairo_region_t		    *clip_region);
+
+static cairo_status_t
+_create_composite_mask_pattern (cairo_surface_pattern_t       *mask_pattern,
+				cairo_clip_t                  *clip,
+				cairo_draw_func_t              draw_func,
+				void                          *draw_closure,
+				cairo_surface_t               *dst,
+				const cairo_rectangle_int_t   *extents)
+{
+    cairo_surface_t *mask;
+    cairo_region_t *clip_region = NULL, *fallback_region = NULL;
+    cairo_status_t status;
+    cairo_bool_t clip_surface = FALSE;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	if (unlikely (_cairo_status_is_error (status) ||
+		      status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	{
+	    return status;
+	}
+
+	clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    /* We need to use solid here, because to use CAIRO_OPERATOR_SOURCE with
+     * a mask (as called via _cairo_surface_mask) triggers assertion failures.
+     */
+    mask = _cairo_surface_create_similar_solid (dst,
+						CAIRO_CONTENT_ALPHA,
+						extents->width,
+						extents->height,
+						CAIRO_COLOR_TRANSPARENT,
+						TRUE);
+    if (unlikely (mask->status))
+	return mask->status;
+
+    if (clip_region && (extents->x || extents->y)) {
+	fallback_region = cairo_region_copy (clip_region);
+	status = fallback_region->status;
+	if (unlikely (status))
+	    goto CLEANUP_SURFACE;
+
+	cairo_region_translate (fallback_region,
+				-extents->x,
+				-extents->y);
+	clip_region = fallback_region;
+    }
+
+    status = draw_func (draw_closure, CAIRO_OPERATOR_ADD,
+			&_cairo_pattern_white.base, mask,
+			extents->x, extents->y,
+			extents,
+			clip_region);
+    if (unlikely (status))
+	goto CLEANUP_SURFACE;
+
+    if (clip_surface)
+	status = _cairo_clip_combine_with_surface (clip, mask, extents->x, extents->y);
+
+    _cairo_pattern_init_for_surface (mask_pattern, mask);
+
+ CLEANUP_SURFACE:
+    if (fallback_region)
+        cairo_region_destroy (fallback_region);
+    cairo_surface_destroy (mask);
+
+    return status;
+}
+
+/* Handles compositing with a clip surface when the operator allows
+ * us to combine the clip with the mask
+ */
+static cairo_status_t
+_clip_and_composite_with_mask (cairo_clip_t                  *clip,
+			       cairo_operator_t               op,
+			       const cairo_pattern_t         *src,
+			       cairo_draw_func_t              draw_func,
+			       void                          *draw_closure,
+			       cairo_surface_t               *dst,
+			       const cairo_rectangle_int_t   *extents)
+{
+    cairo_surface_pattern_t mask_pattern;
+    cairo_status_t status;
+
+    status = _create_composite_mask_pattern (&mask_pattern,
+					     clip,
+					     draw_func, draw_closure,
+					     dst, extents);
+    if (likely (status == CAIRO_STATUS_SUCCESS)) {
+	status = _cairo_surface_composite (op,
+					   src, &mask_pattern.base, dst,
+					   extents->x,     extents->y,
+					   0,              0,
+					   extents->x,     extents->y,
+					   extents->width, extents->height,
+					   NULL);
+
+	_cairo_pattern_fini (&mask_pattern.base);
+    }
+
+    return status;
+}
+
+/* Handles compositing with a clip surface when we have to do the operation
+ * in two pieces and combine them together.
+ */
+static cairo_status_t
+_clip_and_composite_combine (cairo_clip_t                  *clip,
+			     cairo_operator_t               op,
+			     const cairo_pattern_t         *src,
+			     cairo_draw_func_t              draw_func,
+			     void                          *draw_closure,
+			     cairo_surface_t               *dst,
+			     const cairo_rectangle_int_t   *extents)
+{
+    cairo_surface_t *intermediate;
+    cairo_surface_pattern_t pattern;
+    cairo_surface_pattern_t clip_pattern;
+    cairo_surface_t *clip_surface;
+    int clip_x, clip_y;
+    cairo_status_t status;
+
+    /* We'd be better off here creating a surface identical in format
+     * to dst, but we have no way of getting that information. Instead
+     * we ask the backend to create a similar surface of identical content,
+     * in the belief that the backend will do something useful - like use
+     * an identical format. For example, the xlib backend will endeavor to
+     * use a compatible depth to enable core protocol routines.
+     */
+    intermediate =
+	_cairo_surface_create_similar_scratch (dst, dst->content,
+					       extents->width,
+					       extents->height);
+    if (intermediate == NULL) {
+	intermediate =
+	    _cairo_image_surface_create_with_content (dst->content,
+						      extents->width,
+						      extents->width);
+    }
+    if (unlikely (intermediate->status))
+	return intermediate->status;
+
+    /* Initialize the intermediate surface from the destination surface */
+    _cairo_pattern_init_for_surface (&pattern, dst);
+    status = _cairo_surface_composite (CAIRO_OPERATOR_SOURCE,
+				       &pattern.base, NULL, intermediate,
+				       extents->x,     extents->y,
+				       0,              0,
+				       0,              0,
+				       extents->width, extents->height,
+				       NULL);
+    _cairo_pattern_fini (&pattern.base);
+    if (unlikely (status))
+	goto CLEANUP_SURFACE;
+
+    status = (*draw_func) (draw_closure, op,
+			   src, intermediate,
+			   extents->x, extents->y,
+			   extents,
+			   NULL);
+    if (unlikely (status))
+	goto CLEANUP_SURFACE;
+
+    assert (clip->path != NULL);
+    clip_surface = _cairo_clip_get_surface (clip, dst, &clip_x, &clip_y);
+    if (unlikely (clip_surface->status))
+	goto CLEANUP_SURFACE;
+
+    _cairo_pattern_init_for_surface (&clip_pattern, clip_surface);
+
+    /* Combine that with the clip */
+    status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_IN,
+				       &clip_pattern.base, NULL, intermediate,
+				       extents->x - clip_x,
+				       extents->y - clip_y,
+				       0, 0,
+				       0, 0,
+				       extents->width, extents->height,
+				       NULL);
+    if (unlikely (status))
+	goto CLEANUP_CLIP;
+
+    /* Punch the clip out of the destination */
+    status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_OUT,
+				       &clip_pattern.base, NULL, dst,
+				       extents->x - clip_x,
+				       extents->y - clip_y,
+				       0, 0,
+				       extents->x, extents->y,
+				       extents->width, extents->height,
+				       NULL);
+    if (unlikely (status))
+	goto CLEANUP_CLIP;
+
+    /* Now add the two results together */
+    _cairo_pattern_init_for_surface (&pattern, intermediate);
+    status = _cairo_surface_composite (CAIRO_OPERATOR_ADD,
+				       &pattern.base, NULL, dst,
+				       0,              0,
+				       0,              0,
+				       extents->x,     extents->y,
+				       extents->width, extents->height,
+				       NULL);
+    _cairo_pattern_fini (&pattern.base);
+
+ CLEANUP_CLIP:
+    _cairo_pattern_fini (&clip_pattern.base);
+ CLEANUP_SURFACE:
+    cairo_surface_destroy (intermediate);
+
+    return status;
+}
+
+/* Handles compositing for %CAIRO_OPERATOR_SOURCE, which is special; it's
+ * defined as (src IN mask IN clip) ADD (dst OUT (mask IN clip))
+ */
+static cairo_status_t
+_clip_and_composite_source (cairo_clip_t                  *clip,
+			    const cairo_pattern_t         *src,
+			    cairo_draw_func_t              draw_func,
+			    void                          *draw_closure,
+			    cairo_surface_t               *dst,
+			    const cairo_rectangle_int_t   *extents)
+{
+    cairo_surface_pattern_t mask_pattern;
+    cairo_region_t *clip_region = NULL;
+    cairo_status_t status;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	if (unlikely (_cairo_status_is_error (status) ||
+		      status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	{
+	    return status;
+	}
+    }
+
+    /* Create a surface that is mask IN clip */
+    status = _create_composite_mask_pattern (&mask_pattern,
+					     clip,
+					     draw_func, draw_closure,
+					     dst, extents);
+    if (unlikely (status))
+	return status;
+
+    /* Compute dest' = dest OUT (mask IN clip) */
+    status = _cairo_surface_composite (CAIRO_OPERATOR_DEST_OUT,
+				       &mask_pattern.base, NULL, dst,
+				       0,              0,
+				       0,              0,
+				       extents->x,     extents->y,
+				       extents->width, extents->height,
+				       clip_region);
+
+    if (unlikely (status))
+	goto CLEANUP_MASK_PATTERN;
+
+    /* Now compute (src IN (mask IN clip)) ADD dest' */
+    status = _cairo_surface_composite (CAIRO_OPERATOR_ADD,
+				       src, &mask_pattern.base, dst,
+				       extents->x,     extents->y,
+				       0,              0,
+				       extents->x,     extents->y,
+				       extents->width, extents->height,
+				       clip_region);
+
+ CLEANUP_MASK_PATTERN:
+    _cairo_pattern_fini (&mask_pattern.base);
+    return status;
+}
+
+static int
+_cairo_rectangle_empty (const cairo_rectangle_int_t *rect)
+{
+    return rect->width == 0 || rect->height == 0;
+}
+
+/**
+ * _clip_and_composite:
+ * @clip: a #cairo_clip_t
+ * @op: the operator to draw with
+ * @src: source pattern
+ * @draw_func: function that can be called to draw with the mask onto a surface.
+ * @draw_closure: data to pass to @draw_func.
+ * @dst: destination surface
+ * @extents: rectangle holding a bounding box for the operation; this
+ *           rectangle will be used as the size for the temporary
+ *           surface.
+ *
+ * When there is a surface clip, we typically need to create an intermediate
+ * surface. This function handles the logic of creating a temporary surface
+ * drawing to it, then compositing the result onto the target surface.
+ *
+ * @draw_func is to called to draw the mask; it will be called no more
+ * than once.
+ *
+ * Return value: %CAIRO_STATUS_SUCCESS if the drawing succeeded.
+ **/
+static cairo_status_t
+_clip_and_composite (cairo_clip_t                  *clip,
+		     cairo_operator_t               op,
+		     const cairo_pattern_t         *src,
+		     cairo_draw_func_t              draw_func,
+		     void                          *draw_closure,
+		     cairo_surface_t               *dst,
+		     const cairo_rectangle_int_t   *extents)
+{
+    cairo_status_t status;
+
+    if (_cairo_rectangle_empty (extents))
+	/* Nothing to do */
+	return CAIRO_STATUS_SUCCESS;
+
+    if (op == CAIRO_OPERATOR_CLEAR) {
+	src = &_cairo_pattern_white.base;
+	op = CAIRO_OPERATOR_DEST_OUT;
+    }
+
+    if (op == CAIRO_OPERATOR_SOURCE) {
+	status = _clip_and_composite_source (clip,
+					     src,
+					     draw_func, draw_closure,
+					     dst, extents);
+    } else {
+	cairo_bool_t clip_surface = FALSE;
+	cairo_region_t *clip_region = NULL;
+
+	if (clip != NULL) {
+	    status = _cairo_clip_get_region (clip, &clip_region);
+	    if (unlikely (_cairo_status_is_error (status) ||
+			  status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	    {
+		return status;
+	    }
+
+	    clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+
+	if (clip_surface) {
+	    if (_cairo_operator_bounded_by_mask (op)) {
+		status = _clip_and_composite_with_mask (clip, op,
+							src,
+							draw_func, draw_closure,
+							dst, extents);
+	    } else {
+		status = _clip_and_composite_combine (clip, op,
+						      src,
+						      draw_func, draw_closure,
+						      dst, extents);
+	    }
+	} else {
+	    status = draw_func (draw_closure, op,
+				src, dst,
+				0, 0,
+				extents,
+				clip_region);
+	}
+    }
+
+    return status;
+}
+
+/* Composites a region representing a set of trapezoids.
+ */
+static cairo_status_t
+_composite_trap_region (cairo_clip_t            *clip,
+			const cairo_pattern_t	*src,
+			cairo_operator_t         op,
+			cairo_surface_t         *dst,
+			cairo_region_t          *trap_region,
+			const cairo_rectangle_int_t   *extents)
+{
+    cairo_status_t status;
+    cairo_surface_pattern_t mask_pattern;
+    cairo_pattern_t *mask = NULL;
+    int mask_x = 0, mask_y =0;
+
+    if (clip != NULL) {
+	cairo_surface_t *clip_surface = NULL;
+	int clip_x, clip_y;
+
+	clip_surface = _cairo_clip_get_surface (clip, dst, &clip_x, &clip_y);
+	if (unlikely (clip_surface->status))
+	    return clip_surface->status;
+
+	if (op == CAIRO_OPERATOR_CLEAR) {
+	    src = &_cairo_pattern_white.base;
+	    op = CAIRO_OPERATOR_DEST_OUT;
+	}
+
+	_cairo_pattern_init_for_surface (&mask_pattern, clip_surface);
+	mask_x = extents->x - clip_x;
+	mask_y = extents->y - clip_y;
+	mask = &mask_pattern.base;
+    }
+
+    status = _cairo_surface_composite (op, src, mask, dst,
+				       extents->x, extents->y,
+				       mask_x, mask_y,
+				       extents->x, extents->y,
+				       extents->width, extents->height,
+				       trap_region);
+
+    if (mask != NULL)
+      _cairo_pattern_fini (mask);
+
+    return status;
+}
+
+typedef struct {
+    cairo_traps_t *traps;
+    cairo_antialias_t antialias;
+} cairo_composite_traps_info_t;
+
+static cairo_status_t
+_composite_traps_draw_func (void                          *closure,
+			    cairo_operator_t               op,
+			    const cairo_pattern_t         *src,
+			    cairo_surface_t               *dst,
+			    int                            dst_x,
+			    int                            dst_y,
+			    const cairo_rectangle_int_t   *extents,
+			    cairo_region_t		  *clip_region)
+{
+    cairo_composite_traps_info_t *info = closure;
+    cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
+
+    if (dst_x != 0 || dst_y != 0)
+	_cairo_traps_translate (info->traps, - dst_x, - dst_y);
+
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
+
+    status = _cairo_surface_composite_trapezoids (op,
+                                                  src, dst, info->antialias,
+                                                  extents->x,         extents->y,
+                                                  extents->x - dst_x, extents->y - dst_y,
+                                                  extents->width,     extents->height,
+                                                  info->traps->traps,
+                                                  info->traps->num_traps,
+                                                  clip_region);
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
+}
+
+enum {
+    HAS_CLEAR_REGION = 0x1,
+};
+
+static cairo_status_t
+_clip_and_composite_region (const cairo_pattern_t *src,
+			    cairo_operator_t op,
+			    cairo_surface_t *dst,
+			    cairo_region_t *trap_region,
+			    cairo_clip_t *clip,
+			    cairo_rectangle_int_t *extents)
+{
+    cairo_region_t clear_region;
+    unsigned int has_region = 0;
+    cairo_status_t status;
+
+    if (! _cairo_operator_bounded_by_mask (op) && clip == NULL) {
+	/* If we optimize drawing with an unbounded operator to
+	 * _cairo_surface_fill_rectangles() or to drawing with a
+	 * clip region, then we have an additional region to clear.
+	 */
+	_cairo_region_init_rectangle (&clear_region, extents);
+	status = cairo_region_subtract (&clear_region, trap_region);
+	if (unlikely (status))
+	    return status;
+
+	if (! cairo_region_is_empty (&clear_region))
+	    has_region |= HAS_CLEAR_REGION;
+    }
+
+    if ((src->type == CAIRO_PATTERN_TYPE_SOLID || op == CAIRO_OPERATOR_CLEAR) &&
+	clip == NULL)
+    {
+	const cairo_color_t *color;
+
+	if (op == CAIRO_OPERATOR_CLEAR)
+	    color = CAIRO_COLOR_TRANSPARENT;
+	else
+	    color = &((cairo_solid_pattern_t *)src)->color;
+
+	/* Solid rectangles special case */
+	status = _cairo_surface_fill_region (dst, op, color, trap_region);
+    } else {
+	/* For a simple rectangle, we can just use composite(), for more
+	 * rectangles, we have to set a clip region. The cost of rasterizing
+	 * trapezoids is pretty high for most backends currently, so it's
+	 * worthwhile even if a region is needed.
+	 *
+	 * If we have a clip surface, we set it as the mask; this only works
+	 * for bounded operators other than SOURCE; for unbounded operators,
+	 * clip and mask cannot be interchanged. For SOURCE, the operator
+	 * as implemented by the backends is different in its handling
+	 * of the mask then what we want.
+	 *
+	 * CAIRO_INT_STATUS_UNSUPPORTED will be returned if the region has
+	 * more than rectangle and the destination doesn't support clip
+	 * regions. In that case, we fall through.
+	 */
+	status = _composite_trap_region (clip, src, op, dst,
+					 trap_region, extents);
+    }
+
+    if (has_region & HAS_CLEAR_REGION) {
+	if (status == CAIRO_STATUS_SUCCESS) {
+	    status = _cairo_surface_fill_region (dst,
+						 CAIRO_OPERATOR_CLEAR,
+						 CAIRO_COLOR_TRANSPARENT,
+						 &clear_region);
+	}
+	_cairo_region_fini (&clear_region);
+    }
+
+    return status;
+}
+
+/* avoid using region code to re-validate boxes */
+static cairo_status_t
+_fill_rectangles (cairo_surface_t *dst,
+		  cairo_operator_t op,
+		  const cairo_pattern_t *src,
+		  cairo_traps_t *traps,
+		  cairo_clip_t *clip)
+{
+    const cairo_color_t *color;
+    cairo_rectangle_int_t stack_rects[CAIRO_STACK_ARRAY_LENGTH (cairo_rectangle_int_t)];
+    cairo_rectangle_int_t *rects = stack_rects;
+    cairo_status_t status;
+    int i;
+
+    if (! traps->is_rectilinear || ! traps->maybe_region)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    /* XXX: convert clip region to geometric boxes? */
+    if (clip != NULL)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    /* XXX: fallback for the region_subtract() operation */
+    if (! _cairo_operator_bounded_by_mask (op))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (! (src->type == CAIRO_PATTERN_TYPE_SOLID || op == CAIRO_OPERATOR_CLEAR))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (traps->has_intersections) {
+	if (traps->is_rectangular) {
+	    status = _cairo_bentley_ottmann_tessellate_rectangular_traps (traps, CAIRO_FILL_RULE_WINDING);
+	} else {
+	    status = _cairo_bentley_ottmann_tessellate_rectilinear_traps (traps, CAIRO_FILL_RULE_WINDING);
+	}
+	if (unlikely (status))
+	    return status;
+    }
+
+    for (i = 0; i < traps->num_traps; i++) {
+	if (! _cairo_fixed_is_integer (traps->traps[i].top)          ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].bottom)       ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].left.p1.x)    ||
+	    ! _cairo_fixed_is_integer (traps->traps[i].right.p1.x))
+	{
+	    traps->maybe_region = FALSE;
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+    }
+
+    if (traps->num_traps > ARRAY_LENGTH (stack_rects)) {
+	rects = _cairo_malloc_ab (traps->num_traps,
+				  sizeof (cairo_rectangle_int_t));
+	if (unlikely (rects == NULL))
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    }
+
+    for (i = 0; i < traps->num_traps; i++) {
+	int x1 = _cairo_fixed_integer_part (traps->traps[i].left.p1.x);
+	int y1 = _cairo_fixed_integer_part (traps->traps[i].top);
+	int x2 = _cairo_fixed_integer_part (traps->traps[i].right.p1.x);
+	int y2 = _cairo_fixed_integer_part (traps->traps[i].bottom);
+
+	rects[i].x = x1;
+	rects[i].y = y1;
+	rects[i].width = x2 - x1;
+	rects[i].height = y2 - y1;
+    }
+
+    if (op == CAIRO_OPERATOR_CLEAR)
+	color = CAIRO_COLOR_TRANSPARENT;
+    else
+	color = &((cairo_solid_pattern_t *)src)->color;
+
+    status =  _cairo_surface_fill_rectangles (dst, op, color, rects, i);
+
+    if (rects != stack_rects)
+	free (rects);
+
+    return status;
+}
+
+/* fast-path for very common composite of a single rectangle */
+static cairo_status_t
+_composite_rectangle (cairo_surface_t *dst,
+		      cairo_operator_t op,
+		      const cairo_pattern_t *src,
+		      cairo_traps_t *traps,
+		      cairo_clip_t *clip)
+{
+    cairo_rectangle_int_t rect;
+
+    if (clip != NULL)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (traps->num_traps > 1 || ! traps->is_rectilinear || ! traps->maybe_region)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (! _cairo_fixed_is_integer (traps->traps[0].top)          ||
+	! _cairo_fixed_is_integer (traps->traps[0].bottom)       ||
+	! _cairo_fixed_is_integer (traps->traps[0].left.p1.x)    ||
+	! _cairo_fixed_is_integer (traps->traps[0].right.p1.x))
+    {
+	traps->maybe_region = FALSE;
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    rect.x = _cairo_fixed_integer_part (traps->traps[0].left.p1.x);
+    rect.y = _cairo_fixed_integer_part (traps->traps[0].top);
+    rect.width  = _cairo_fixed_integer_part (traps->traps[0].right.p1.x) - rect.x;
+    rect.height = _cairo_fixed_integer_part (traps->traps[0].bottom) - rect.y;
+
+    return _cairo_surface_composite (op, src, NULL, dst,
+				     rect.x, rect.y,
+				     0, 0,
+				     rect.x, rect.y,
+				     rect.width, rect.height,
+				     NULL);
+}
+
+/* Warning: This call modifies the coordinates of traps */
+static cairo_status_t
+_clip_and_composite_trapezoids (const cairo_pattern_t *src,
+				cairo_operator_t op,
+				cairo_surface_t *dst,
+				cairo_traps_t *traps,
+				cairo_antialias_t antialias,
+				cairo_clip_t *clip,
+				cairo_rectangle_int_t *extents)
+{
+    cairo_composite_traps_info_t traps_info;
+    cairo_region_t *clip_region = NULL;
+    cairo_bool_t clip_surface = FALSE;
+    cairo_status_t status;
+
+    if (traps->num_traps == 0 && _cairo_operator_bounded_by_mask (op))
+	return CAIRO_STATUS_SUCCESS;
+
+    if (clip != NULL) {
+	status = _cairo_clip_get_region (clip, &clip_region);
+	if (unlikely (_cairo_status_is_error (status)))
+	    return status;
+	if (unlikely (status == CAIRO_INT_STATUS_NOTHING_TO_DO))
+	    return CAIRO_STATUS_SUCCESS;
+
+	clip_surface = status == CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    /* Use a fast path if the trapezoids consist of a simple region,
+     * but we can only do this if we do not have a clip surface, or can
+     * substitute the mask with the clip.
+     */
+    if (! clip_surface ||
+	(_cairo_operator_bounded_by_mask (op) && op != CAIRO_OPERATOR_SOURCE))
+    {
+	cairo_region_t *trap_region = NULL;
+
+        if (_cairo_operator_bounded_by_source (op)) {
+            status = _fill_rectangles (dst, op, src, traps, clip);
+            if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+                return status;
+
+            status = _composite_rectangle (dst, op, src, traps, clip);
+            if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+                return status;
+        }
+
+	status = _cairo_traps_extract_region (traps, &trap_region);
+	if (unlikely (_cairo_status_is_error (status)))
+	    return status;
+
+	if (trap_region != NULL) {
+	    status = cairo_region_intersect_rectangle (trap_region, extents);
+	    if (unlikely (status)) {
+		cairo_region_destroy (trap_region);
+		return status;
+	    }
+
+	    if (clip_region != NULL) {
+		status = cairo_region_intersect (trap_region, clip_region);
+		if (unlikely (status)) {
+		    cairo_region_destroy (trap_region);
+		    return status;
+		}
+	    }
+
+	    if (_cairo_operator_bounded_by_mask (op)) {
+		cairo_rectangle_int_t trap_extents;
+
+		cairo_region_get_extents (trap_region, &trap_extents);
+		if (! _cairo_rectangle_intersect (extents, &trap_extents)) {
+		    cairo_region_destroy (trap_region);
+		    return CAIRO_STATUS_SUCCESS;
+		}
+	    }
+
+	    status = _clip_and_composite_region (src, op, dst,
+						 trap_region,
+						 clip_surface ? clip : NULL,
+						 extents);
+	    cairo_region_destroy (trap_region);
+
+	    if (likely (status != CAIRO_INT_STATUS_UNSUPPORTED))
+		return status;
+	}
+    }
+
+    /* No fast path, exclude self-intersections and clip trapezoids. */
+    if (traps->has_intersections) {
+	if (traps->is_rectangular)
+	    status = _cairo_bentley_ottmann_tessellate_rectangular_traps (traps, CAIRO_FILL_RULE_WINDING);
+	else if (traps->is_rectilinear)
+	    status = _cairo_bentley_ottmann_tessellate_rectilinear_traps (traps, CAIRO_FILL_RULE_WINDING);
+	else
+	    status = _cairo_bentley_ottmann_tessellate_traps (traps, CAIRO_FILL_RULE_WINDING);
+	if (unlikely (status))
+	    return status;
+    }
+
+    /* Otherwise render the trapezoids to a mask and composite in the usual
+     * fashion.
+     */
+    traps_info.traps = traps;
+    traps_info.antialias = antialias;
+
+    return _clip_and_composite (clip, op, src,
+				_composite_traps_draw_func,
+				&traps_info, dst, extents);
+}
+
+typedef struct {
+    cairo_polygon_t		*polygon;
+    cairo_fill_rule_t		 fill_rule;
+    cairo_antialias_t		 antialias;
+} cairo_composite_spans_info_t;
+
+static cairo_status_t
+_composite_spans_draw_func (void                          *closure,
+			    cairo_operator_t               op,
+			    const cairo_pattern_t         *src,
+			    cairo_surface_t               *dst,
+			    int                            dst_x,
+			    int                            dst_y,
+			    const cairo_rectangle_int_t   *extents,
+			    cairo_region_t		  *clip_region)
+{
+    cairo_composite_rectangles_t rects;
+    cairo_composite_spans_info_t *info = closure;
+
+    rects.source = *extents;
+    rects.mask = *extents;
+    rects.bounded = *extents;
+    /* The incoming dst_x/y are where we're pretending the origin of
+     * the dst surface is -- *not* the offset of a rectangle where
+     * we'd like to place the result. */
+    rects.bounded.x -= dst_x;
+    rects.bounded.y -= dst_y;
+    rects.unbounded = rects.bounded;
+    rects.is_bounded = _cairo_operator_bounded_by_either (op);
+
+    return _cairo_surface_composite_polygon (dst, op, src,
+					     info->fill_rule,
+					     info->antialias,
+					     &rects,
+					     info->polygon,
+					     clip_region);
+}
+
+static cairo_status_t
+_cairo_win32_surface_span_renderer_composite
+                 (void                          *closure,
+		  cairo_operator_t               op,
+		  const cairo_pattern_t         *src,
+                  cairo_image_surface_t         *mask,
+		  cairo_win32_surface_t         *dst,
+		  int                            dst_x,
+		  int                            dst_y,
+		  const cairo_rectangle_int_t   *extents,
+		  cairo_region_t		*clip_region)
+{
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+
+    if (src == NULL || mask == NULL)
+	return CAIRO_STATUS_SUCCESS;
+
+    status = cairo_surface_status (&mask->base);
+    if (status == CAIRO_STATUS_SUCCESS) {
+	cairo_pattern_t *mask_pattern = cairo_pattern_create_for_surface (&mask->base);
+	/* composite onto the image surface directly if we can */
+	if (dst->image) {
+	    GdiFlush(); /* XXX: I'm not sure if this needed or not */
+
+	    status = dst->image->backend->composite (op,
+		    src, mask_pattern, dst->image,
+                    extents->x, extents->y,
+		    0, 0,		/* mask.x, mask.y */
+                    extents->x - dst_x, extents->y - dst_y,
+                    extents->width, extents->height,
+		    clip_region);
+	} else {
+	    /* otherwise go through the fallback_composite path which
+	     * will do the appropriate surface acquisition */
+	    status = _cairo_surface_fallback_composite (
+		    op,
+		    src, mask_pattern, &dst->base,
+                    extents->x, extents->y,
+		    0, 0,		/* mask.x, mask.y */
+                    extents->x - dst_x, extents->y - dst_y,
+                    extents->width, extents->height,
+		    clip_region);
+	}
+	cairo_pattern_destroy (mask_pattern);
+
+    }
+    return status;
+}
+#if 0
+static cairo_span_renderer_t *
+_cairo_win32_surface_create_span_renderer (cairo_operator_t	 op,
+					   const cairo_pattern_t  *pattern,
+					   void			*abstract_dst,
+					   cairo_antialias_t	 antialias,
+					   const cairo_composite_rectangles_t *rects,
+					   cairo_region_t	*clip_region)
+{
+    cairo_win32_surface_t *dst = abstract_dst;
+    cairo_win32_surface_span_renderer_t *renderer;
+    cairo_status_t status;
+    int width = rects->bounded.width;
+    int height = rects->bounded.height;
+
+    renderer = calloc(1, sizeof(*renderer));
+    if (renderer == NULL)
+	return _cairo_span_renderer_create_in_error (CAIRO_STATUS_NO_MEMORY);
+
+    renderer->base.destroy = _cairo_win32_surface_span_renderer_destroy;
+    renderer->base.finish = _cairo_win32_surface_span_renderer_finish;
+    renderer->base.render_rows = _cairo_win32_surface_span_renderer_render_rows;
+    renderer->op = op;
+    renderer->pattern = pattern;
+    renderer->antialias = antialias;
+    renderer->dst = dst;
+    renderer->clip_region = clip_region;
+
+    renderer->composite_rectangles = *rects;
+
+    /* TODO: support rendering to A1 surfaces (or: go add span
+     * compositing to pixman.) */
+    renderer->mask = (cairo_image_surface_t *)
+	cairo_image_surface_create (CAIRO_FORMAT_A8,
+				    width, height);
+
+    status = cairo_surface_status (&renderer->mask->base);
+
+    if (status != CAIRO_STATUS_SUCCESS) {
+	_cairo_win32_surface_span_renderer_destroy (renderer);
+	return _cairo_span_renderer_create_in_error (status);
+    }
+
+    renderer->mask_data = renderer->mask->data - rects->bounded.x - rects->bounded.y * renderer->mask->stride;
+    renderer->mask_stride = renderer->mask->stride;
+    return &renderer->base;
+}
+#endif
+
+typedef struct _cairo_image_surface_span_renderer {
+    cairo_span_renderer_t base;
+
+    uint8_t *mask_data;
+    uint32_t mask_stride;
+} cairo_image_surface_span_renderer_t;
+
+cairo_status_t
+_cairo_image_surface_span (void *abstract_renderer,
+			   int y, int height,
+			   const cairo_half_open_span_t *spans,
+			   unsigned num_spans);
+
+static cairo_status_t
+_composite_spans (void                          *closure,
+		  cairo_operator_t               op,
+		  const cairo_pattern_t         *src,
+		  cairo_surface_t               *dst,
+		  int                            dst_x,
+		  int                            dst_y,
+		  const cairo_rectangle_int_t   *extents,
+		  cairo_region_t		*clip_region)
+{
+    cairo_composite_spans_info_t *info = closure;
+    cairo_image_surface_span_renderer_t renderer;
+    cairo_scan_converter_t *converter;
+    cairo_image_surface_t *mask;
+    cairo_status_t status;
+
+    converter = _cairo_tor_scan_converter_create (extents->x, extents->y,
+						  extents->x + extents->width,
+						  extents->y + extents->height,
+						  info->fill_rule);
+    status = converter->add_polygon (converter, info->polygon);
+    if (unlikely (status))
+	goto CLEANUP_CONVERTER;
+
+    /* TODO: support rendering to A1 surfaces (or: go add span
+     * compositing to pixman.) */
+
+    {
+	mask = cairo_image_surface_create (CAIRO_FORMAT_A8,
+				           extents->width,
+                                           extents->height);
+
+	if (cairo_surface_status(&mask->base)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto CLEANUP_CONVERTER;
+	}
+    }
+
+    renderer.base.render_rows = _cairo_image_surface_span;
+    renderer.mask_stride = cairo_image_surface_get_stride (mask);
+    renderer.mask_data = cairo_image_surface_get_data (mask);
+    renderer.mask_data -= extents->y * renderer.mask_stride + extents->x;
+
+    status = converter->generate (converter, &renderer.base);
+    if (unlikely (status))
+	goto CLEANUP_RENDERER;
+
+    _cairo_win32_surface_span_renderer_composite
+                 (closure,
+		  op,
+		  src,
+                  mask,
+		  (cairo_win32_surface_t*)dst, // ewwww
+		  dst_x,
+		  dst_y,
+		  extents,
+		  clip_region);
+#if 0
+    {
+	pixman_image_t *src;
+	int src_x, src_y;
+
+	src = _pixman_image_for_pattern (pattern, FALSE, extents, &src_x, &src_y);
+	if (unlikely (src == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto CLEANUP_RENDERER;
+	}
+
+	pixman_image_composite32 (_pixman_operator (op), src, mask, dst,
+                                  extents->x + src_x, extents->y + src_y,
+                                  0, 0, /* mask.x, mask.y */
+                                  extents->x - dst_x, extents->y - dst_y,
+                                  extents->width, extents->height);
+	pixman_image_unref (src);
+    }
+#endif
+ CLEANUP_RENDERER:
+    cairo_surface_destroy (mask);
+ CLEANUP_CONVERTER:
+    converter->destroy (converter);
+    return status;
+}
+
+
+
+cairo_status_t
+_cairo_win32_surface_fallback_paint (cairo_surface_t		*surface,
+			       cairo_operator_t		 op,
+			       const cairo_pattern_t	*source,
+			       cairo_clip_t		*clip)
+{
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_clip_path_t *clip_path = clip ? clip->path : NULL;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    cairo_boxes_t  boxes;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_status_t status;
+    cairo_traps_t traps;
+
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
+
+    status = _cairo_composite_rectangles_init_for_paint (&extents,
+							 &rect,
+							 op, source,
+							 clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
+	return status;
+
+    /* If the clip cannot be reduced to a set of boxes, we will need to
+     * use a clipmask. Paint is special as it is the only operation that
+     * does not implicitly use a mask, so we may be able to reduce this
+     * operation to a fill...
+     */
+    if (clip != NULL && clip_path->prev == NULL &&
+	_cairo_operator_bounded_by_mask (op))
+    {
+	return _cairo_surface_fill (surface, op, source,
+				    &clip_path->path,
+				    clip_path->fill_rule,
+				    clip_path->tolerance,
+				    clip_path->antialias,
+				    NULL);
+    }
+
+    /* meh, surface-fallback is dying anyway... */
+    _cairo_boxes_init_for_array (&boxes, clip_boxes, num_boxes);
+    status = _cairo_traps_init_boxes (&traps, &boxes);
+    if (unlikely (status))
+	goto CLEANUP_BOXES;
+
+    status = _clip_and_composite_trapezoids (source, op, surface,
+					     &traps, CAIRO_ANTIALIAS_DEFAULT,
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
+    _cairo_traps_fini (&traps);
+
+CLEANUP_BOXES:
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_surface_mask_draw_func (void                        *closure,
+			       cairo_operator_t             op,
+			       const cairo_pattern_t       *src,
+			       cairo_surface_t             *dst,
+			       int                          dst_x,
+			       int                          dst_y,
+			       const cairo_rectangle_int_t *extents,
+			       cairo_region_t		   *clip_region)
+{
+    cairo_pattern_t *mask = closure;
+    cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
+
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
+
+    if (src) {
+	status = _cairo_surface_composite (op,
+                                           src, mask, dst,
+                                           extents->x,         extents->y,
+                                           extents->x,         extents->y,
+                                           extents->x - dst_x, extents->y - dst_y,
+                                           extents->width,     extents->height,
+                                           clip_region);
+    } else {
+	status = _cairo_surface_composite (op,
+                                           mask, NULL, dst,
+                                           extents->x,         extents->y,
+                                           0,                  0, /* unused */
+                                           extents->x - dst_x, extents->y - dst_y,
+                                           extents->width,     extents->height,
+                                           clip_region);
+    }
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_mask (cairo_surface_t		*surface,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      const cairo_pattern_t	*mask,
+			      cairo_clip_t		*clip)
+{
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_status_t status;
+
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
+
+    status = _cairo_composite_rectangles_init_for_mask (&extents,
+							&rect,
+							op, source, mask, clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    if (clip != NULL && extents.is_bounded) {
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status))
+	    return status;
+    }
+
+    return _clip_and_composite (clip, op, source,
+				_cairo_surface_mask_draw_func,
+				(void *) mask,
+				surface,
+                                extents.is_bounded ? &extents.bounded : &extents.unbounded);
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_stroke (cairo_surface_t		*surface,
+				cairo_operator_t	 op,
+				const cairo_pattern_t	*source,
+				cairo_path_fixed_t	*path,
+				const cairo_stroke_style_t	*stroke_style,
+				const cairo_matrix_t		*ctm,
+				const cairo_matrix_t		*ctm_inverse,
+				double			 tolerance,
+				cairo_antialias_t	 antialias,
+				cairo_clip_t		*clip)
+{
+    cairo_polygon_t polygon;
+    cairo_traps_t traps;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_status_t status;
+
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
+
+    status = _cairo_composite_rectangles_init_for_stroke (&extents,
+							  &rect,
+							  op, source,
+							  path, stroke_style, ctm,
+							  clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
+	return status;
+
+    _cairo_polygon_init (&polygon);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+    _cairo_traps_init (&traps);
+    _cairo_traps_limit (&traps, clip_boxes, num_boxes);
+
+    if (path->is_rectilinear) {
+	status = _cairo_path_fixed_stroke_rectilinear_to_traps (path,
+								stroke_style,
+								ctm,
+								&traps);
+	if (likely (status == CAIRO_STATUS_SUCCESS))
+	    goto DO_TRAPS;
+
+	if (_cairo_status_is_error (status))
+	    goto CLEANUP;
+    }
+
+    status = _cairo_path_fixed_stroke_to_polygon (path,
+						  stroke_style,
+						  ctm, ctm_inverse,
+						  tolerance,
+						  &polygon);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    if (polygon.num_edges == 0)
+	goto DO_TRAPS;
+
+    if (_cairo_operator_bounded_by_mask (op)) {
+	_cairo_box_round_to_rectangle (&polygon.extents, &extents.mask);
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    goto CLEANUP;
+    }
+
+    if (_cairo_surface_check_span_renderer (op, source, surface, antialias)) {
+	cairo_composite_spans_info_t info;
+
+	info.polygon = &polygon;
+	info.fill_rule = CAIRO_FILL_RULE_WINDING;
+	info.antialias = antialias;
+
+	status = _clip_and_composite (clip, op, source,
+				      _composite_spans,
+				      &info, surface,
+                                      extents.is_bounded ? &extents.bounded : &extents.unbounded);
+	goto CLEANUP;
+    }
+
+    /* Fall back to trapezoid fills. */
+    status = _cairo_bentley_ottmann_tessellate_polygon (&traps,
+							&polygon,
+							CAIRO_FILL_RULE_WINDING);
+    if (unlikely (status))
+	goto CLEANUP;
+
+  DO_TRAPS:
+    status = _clip_and_composite_trapezoids (source, op, surface,
+					     &traps, antialias,
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
+  CLEANUP:
+    _cairo_traps_fini (&traps);
+    _cairo_polygon_fini (&polygon);
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_fill (cairo_surface_t		*surface,
+			      cairo_operator_t		 op,
+			      const cairo_pattern_t	*source,
+			      cairo_path_fixed_t	*path,
+			      cairo_fill_rule_t		 fill_rule,
+			      double			 tolerance,
+			      cairo_antialias_t		 antialias,
+			      cairo_clip_t		*clip)
+{
+    cairo_polygon_t polygon;
+    cairo_traps_t traps;
+    cairo_box_t boxes_stack[32], *clip_boxes = boxes_stack;
+    int num_boxes = ARRAY_LENGTH (boxes_stack);
+    cairo_bool_t is_rectilinear;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_status_t status;
+
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
+
+    status = _cairo_composite_rectangles_init_for_fill (&extents,
+							&rect,
+							op, source, path,
+							clip);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_extents (clip, &extents))
+	clip = NULL;
+
+    status = _cairo_clip_to_boxes (&clip, &extents, &clip_boxes, &num_boxes);
+    if (unlikely (status))
+	return status;
+
+    _cairo_traps_init (&traps);
+    _cairo_traps_limit (&traps, clip_boxes, num_boxes);
+
+    _cairo_polygon_init (&polygon);
+    _cairo_polygon_limit (&polygon, clip_boxes, num_boxes);
+
+    if (_cairo_path_fixed_fill_is_empty (path))
+	goto DO_TRAPS;
+
+    is_rectilinear = _cairo_path_fixed_is_rectilinear_fill (path);
+    if (is_rectilinear) {
+	status = _cairo_path_fixed_fill_rectilinear_to_traps (path,
+							      fill_rule,
+							      &traps);
+	if (likely (status == CAIRO_STATUS_SUCCESS))
+	    goto DO_TRAPS;
+
+	if (_cairo_status_is_error (status))
+	    goto CLEANUP;
+    }
+
+    status = _cairo_path_fixed_fill_to_polygon (path, tolerance, &polygon);
+    if (unlikely (status))
+	goto CLEANUP;
+
+    if (polygon.num_edges == 0)
+	goto DO_TRAPS;
+
+    if (_cairo_operator_bounded_by_mask (op)) {
+	_cairo_box_round_to_rectangle (&polygon.extents, &extents.mask);
+	if (! _cairo_rectangle_intersect (&extents.bounded, &extents.mask))
+	    goto CLEANUP;
+    }
+
+    if (is_rectilinear) {
+	status = _cairo_bentley_ottmann_tessellate_rectilinear_polygon (&traps,
+									&polygon,
+									fill_rule);
+	if (likely (status == CAIRO_STATUS_SUCCESS))
+	    goto DO_TRAPS;
+
+	if (unlikely (_cairo_status_is_error (status)))
+	    goto CLEANUP;
+    }
+
+
+    if (_cairo_surface_check_span_renderer (op, source, surface, antialias)) {
+	cairo_composite_spans_info_t info;
+
+	info.polygon = &polygon;
+	info.fill_rule = fill_rule;
+	info.antialias = antialias;
+
+	status = _clip_and_composite (clip, op, source,
+				      _composite_spans,
+				      &info, surface,
+                                      extents.is_bounded ? &extents.bounded : &extents.unbounded);
+	goto CLEANUP;
+    }
+
+    /* Fall back to trapezoid fills. */
+    status = _cairo_bentley_ottmann_tessellate_polygon (&traps,
+							&polygon,
+							fill_rule);
+    if (unlikely (status))
+	goto CLEANUP;
+
+  DO_TRAPS:
+    status = _clip_and_composite_trapezoids (source, op, surface,
+					     &traps, antialias,
+					     clip,
+                                             extents.is_bounded ? &extents.bounded : &extents.unbounded);
+  CLEANUP:
+    _cairo_traps_fini (&traps);
+    _cairo_polygon_fini (&polygon);
+    if (clip_boxes != boxes_stack)
+	free (clip_boxes);
+
+    return status;
+}
+
+typedef struct {
+    cairo_scaled_font_t *font;
+    cairo_glyph_t *glyphs;
+    int num_glyphs;
+} cairo_show_glyphs_info_t;
+
+static cairo_status_t
+_cairo_surface_old_show_glyphs_draw_func (void                          *closure,
+					  cairo_operator_t               op,
+					  const cairo_pattern_t         *src,
+					  cairo_surface_t               *dst,
+					  int                            dst_x,
+					  int                            dst_y,
+					  const cairo_rectangle_int_t	*extents,
+					  cairo_region_t		*clip_region)
+{
+    cairo_show_glyphs_info_t *glyph_info = closure;
+    cairo_status_t status;
+    cairo_region_t *extents_region = NULL;
+
+    if (clip_region == NULL &&
+        !_cairo_operator_bounded_by_source (op)) {
+        extents_region = cairo_region_create_rectangle (extents);
+        if (unlikely (extents_region->status))
+            return extents_region->status;
+        cairo_region_translate (extents_region, -dst_x, -dst_y);
+        clip_region = extents_region;
+    }
+
+    /* Modifying the glyph array is fine because we know that this function
+     * will be called only once, and we've already made a copy of the
+     * glyphs in the wrapper.
+     */
+    if (dst_x != 0 || dst_y != 0) {
+	int i;
+
+	for (i = 0; i < glyph_info->num_glyphs; ++i) {
+	    ((cairo_glyph_t *) glyph_info->glyphs)[i].x -= dst_x;
+	    ((cairo_glyph_t *) glyph_info->glyphs)[i].y -= dst_y;
+	}
+    }
+
+    status = _cairo_surface_old_show_glyphs (glyph_info->font, op, src,
+					     dst,
+					     extents->x, extents->y,
+					     extents->x - dst_x,
+					     extents->y - dst_y,
+					     extents->width,
+					     extents->height,
+					     glyph_info->glyphs,
+					     glyph_info->num_glyphs,
+					     clip_region);
+
+    if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
+	status = _cairo_scaled_font_show_glyphs (glyph_info->font,
+                                                 op,
+                                                 src, dst,
+                                                 extents->x,         extents->y,
+                                                 extents->x - dst_x,
+                                                 extents->y - dst_y,
+                                                 extents->width,     extents->height,
+                                                 glyph_info->glyphs,
+                                                 glyph_info->num_glyphs,
+                                                 clip_region);
+    }
+
+    if (extents_region)
+        cairo_region_destroy (extents_region);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_show_glyphs (cairo_surface_t		*surface,
+				     cairo_operator_t		 op,
+				     const cairo_pattern_t	*source,
+				     cairo_glyph_t		*glyphs,
+				     int			 num_glyphs,
+				     cairo_scaled_font_t	*scaled_font,
+				     cairo_clip_t		*clip)
+{
+    cairo_show_glyphs_info_t glyph_info;
+    cairo_composite_rectangles_t extents;
+    cairo_rectangle_int_t rect;
+    cairo_status_t status;
+
+    if (!_cairo_surface_get_extents (surface, &rect))
+        ASSERT_NOT_REACHED;
+
+    status = _cairo_composite_rectangles_init_for_glyphs (&extents,
+							  &rect,
+							  op, source,
+							  scaled_font,
+							  glyphs, num_glyphs,
+							  clip,
+							  NULL);
+    if (unlikely (status))
+	return status;
+
+    if (_cairo_clip_contains_rectangle (clip, &extents.mask))
+	clip = NULL;
+
+    if (clip != NULL && extents.is_bounded) {
+	status = _cairo_clip_rectangle (clip, &extents.bounded);
+	if (unlikely (status))
+	    return status;
+    }
+
+    glyph_info.font = scaled_font;
+    glyph_info.glyphs = glyphs;
+    glyph_info.num_glyphs = num_glyphs;
+
+    return _clip_and_composite (clip, op, source,
+				_cairo_surface_old_show_glyphs_draw_func,
+				&glyph_info,
+				surface,
+                                extents.is_bounded ? &extents.bounded : &extents.unbounded);
+}
+
+cairo_surface_t *
+_cairo_win32_surface_fallback_snapshot (cairo_surface_t *surface)
+{
+    cairo_surface_t *snapshot;
+    cairo_status_t status;
+    cairo_format_t format;
+    cairo_surface_pattern_t pattern;
+    cairo_image_surface_t *image;
+    void *image_extra;
+
+    status = _cairo_surface_acquire_source_image (surface,
+						  &image, &image_extra);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
+
+    format = image->format;
+    if (format == CAIRO_FORMAT_INVALID) {
+	/* Non-standard images formats can be generated when retrieving
+	 * images from unusual xservers, for example.
+	 */
+	format = _cairo_format_from_content (image->base.content);
+    }
+    snapshot = cairo_image_surface_create (format,
+					   image->width,
+					   image->height);
+    if (cairo_surface_status (snapshot)) {
+	_cairo_surface_release_source_image (surface, image, image_extra);
+	return snapshot;
+    }
+
+    _cairo_pattern_init_for_surface (&pattern, &image->base);
+    status = _cairo_surface_paint (snapshot,
+				   CAIRO_OPERATOR_SOURCE,
+				   &pattern.base,
+				   NULL);
+    _cairo_pattern_fini (&pattern.base);
+    _cairo_surface_release_source_image (surface, image, image_extra);
+    if (unlikely (status)) {
+	cairo_surface_destroy (snapshot);
+	return _cairo_surface_create_in_error (status);
+    }
+
+    return snapshot;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_composite (cairo_operator_t		 op,
+				   const cairo_pattern_t	*src,
+				   const cairo_pattern_t	*mask,
+				   cairo_surface_t		*dst,
+				   int				 src_x,
+				   int				 src_y,
+				   int				 mask_x,
+				   int				 mask_y,
+				   int				 dst_x,
+				   int				 dst_y,
+				   unsigned int			 width,
+				   unsigned int			 height,
+				   cairo_region_t		*clip_region)
+{
+    fallback_state_t state;
+    cairo_region_t *fallback_region = NULL;
+    cairo_status_t status;
+
+    status = _fallback_init (&state, dst, dst_x, dst_y, width, height);
+    if (unlikely (status))
+	return status;
+
+    /* We know this will never fail with the image backend; but
+     * instead of calling into it directly, we call
+     * _cairo_surface_composite so that we get the correct device
+     * offset handling.
+     */
+
+    if (clip_region != NULL && (state.image_rect.x || state.image_rect.y)) {
+	fallback_region = cairo_region_copy (clip_region);
+	status = fallback_region->status;
+	if (unlikely (status))
+	    goto FAIL;
+
+	cairo_region_translate (fallback_region,
+				-state.image_rect.x,
+				-state.image_rect.y);
+	clip_region = fallback_region;
+    }
+
+    status = _cairo_surface_composite (op, src, mask,
+				       &state.image->base,
+				       src_x, src_y, mask_x, mask_y,
+				       dst_x - state.image_rect.x,
+				       dst_y - state.image_rect.y,
+				       width, height,
+				       clip_region);
+  FAIL:
+    if (fallback_region != NULL)
+	cairo_region_destroy (fallback_region);
+    _fallback_fini (&state);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_fill_rectangles (cairo_surface_t         *surface,
+					 cairo_operator_t	  op,
+					 const cairo_color_t	 *color,
+					 cairo_rectangle_int_t   *rects,
+					 int			  num_rects)
+{
+    fallback_state_t state;
+    cairo_rectangle_int_t *offset_rects = NULL;
+    cairo_status_t status;
+    int x1, y1, x2, y2;
+    int i;
+
+    assert (surface->snapshot_of == NULL);
+
+    if (num_rects <= 0)
+	return CAIRO_STATUS_SUCCESS;
+
+    /* Compute the bounds of the rectangles, so that we know what area of the
+     * destination surface to fetch
+     */
+    x1 = rects[0].x;
+    y1 = rects[0].y;
+    x2 = rects[0].x + rects[0].width;
+    y2 = rects[0].y + rects[0].height;
+
+    for (i = 1; i < num_rects; i++) {
+	if (rects[i].x < x1)
+	    x1 = rects[i].x;
+	if (rects[i].y < y1)
+	    y1 = rects[i].y;
+
+	if ((int) (rects[i].x + rects[i].width) > x2)
+	    x2 = rects[i].x + rects[i].width;
+	if ((int) (rects[i].y + rects[i].height) > y2)
+	    y2 = rects[i].y + rects[i].height;
+    }
+
+    status = _fallback_init (&state, surface, x1, y1, x2 - x1, y2 - y1);
+    if (unlikely (status))
+	return status;
+
+    /* If the fetched image isn't at 0,0, we need to offset the rectangles */
+
+    if (state.image_rect.x != 0 || state.image_rect.y != 0) {
+	offset_rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int_t));
+	if (unlikely (offset_rects == NULL)) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto DONE;
+	}
+
+	for (i = 0; i < num_rects; i++) {
+	    offset_rects[i].x = rects[i].x - state.image_rect.x;
+	    offset_rects[i].y = rects[i].y - state.image_rect.y;
+	    offset_rects[i].width = rects[i].width;
+	    offset_rects[i].height = rects[i].height;
+	}
+
+	rects = offset_rects;
+    }
+
+    status = _cairo_surface_fill_rectangles (&state.image->base,
+					     op, color,
+					     rects, num_rects);
+
+    free (offset_rects);
+
+ DONE:
+    _fallback_fini (&state);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_composite_trapezoids (cairo_operator_t		op,
+					      const cairo_pattern_t    *pattern,
+					      cairo_surface_t	       *dst,
+					      cairo_antialias_t		antialias,
+					      int			src_x,
+					      int			src_y,
+					      int			dst_x,
+					      int			dst_y,
+					      unsigned int		width,
+					      unsigned int		height,
+					      cairo_trapezoid_t	       *traps,
+					      int			num_traps,
+					      cairo_region_t		*clip_region)
+{
+    fallback_state_t state;
+    cairo_region_t *fallback_region = NULL;
+    cairo_trapezoid_t *offset_traps = NULL;
+    cairo_status_t status;
+
+    status = _fallback_init (&state, dst, dst_x, dst_y, width, height);
+    if (unlikely (status))
+	return status;
+
+    /* If the destination image isn't at 0,0, we need to offset the trapezoids */
+
+    if (state.image_rect.x != 0 || state.image_rect.y != 0) {
+	offset_traps = _cairo_malloc_ab (num_traps, sizeof (cairo_trapezoid_t));
+	if (offset_traps == NULL) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    goto FAIL;
+	}
+
+	_cairo_trapezoid_array_translate_and_scale (offset_traps, traps, num_traps,
+                                                    - state.image_rect.x, - state.image_rect.y,
+                                                    1.0, 1.0);
+	traps = offset_traps;
+
+	/* similarly we need to adjust the region */
+	if (clip_region != NULL) {
+	    fallback_region = cairo_region_copy (clip_region);
+	    status = fallback_region->status;
+	    if (unlikely (status))
+		goto FAIL;
+
+	    cairo_region_translate (fallback_region,
+				    -state.image_rect.x,
+				    -state.image_rect.y);
+	    clip_region = fallback_region;
+	}
+    }
+
+    status = _cairo_surface_composite_trapezoids (op, pattern,
+					          &state.image->base,
+						  antialias,
+						  src_x, src_y,
+						  dst_x - state.image_rect.x,
+						  dst_y - state.image_rect.y,
+						  width, height,
+						  traps, num_traps,
+						  clip_region);
+ FAIL:
+    if (offset_traps != NULL)
+	free (offset_traps);
+
+    if (fallback_region != NULL)
+	cairo_region_destroy (fallback_region);
+
+    _fallback_fini (&state);
+
+    return status;
+}
+
+cairo_status_t
+_cairo_win32_surface_fallback_clone_similar (cairo_surface_t	*surface,
+				       cairo_surface_t	*src,
+				       int		 src_x,
+				       int		 src_y,
+				       int		 width,
+				       int		 height,
+				       int		*clone_offset_x,
+				       int		*clone_offset_y,
+				       cairo_surface_t **clone_out)
+{
+    cairo_surface_t *new_surface;
+    cairo_surface_pattern_t pattern;
+    cairo_status_t status;
+
+    new_surface = _cairo_surface_create_similar_scratch (surface,
+							 src->content,
+							 width, height);
+    if (new_surface == NULL)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    if (unlikely (new_surface->status))
+	return new_surface->status;
+
+    /* We have to copy these here, so that the coordinate spaces are correct */
+    new_surface->device_transform = src->device_transform;
+    new_surface->device_transform_inverse = src->device_transform_inverse;
+
+    _cairo_pattern_init_for_surface (&pattern, src);
+    cairo_matrix_init_translate (&pattern.base.matrix, src_x, src_y);
+    pattern.base.filter = CAIRO_FILTER_NEAREST;
+
+    status = _cairo_surface_paint (new_surface,
+				   CAIRO_OPERATOR_SOURCE,
+				   &pattern.base,
+				   NULL);
+    _cairo_pattern_fini (&pattern.base);
+
+    if (unlikely (status)) {
+	cairo_surface_destroy (new_surface);
+	return status;
+    }
+
+    *clone_offset_x = src_x;
+    *clone_offset_y = src_y;
+    *clone_out = new_surface;
+    return CAIRO_STATUS_SUCCESS;
+}
 static const cairo_surface_backend_t cairo_win32_surface_backend = {
     CAIRO_SURFACE_TYPE_WIN32,
     _cairo_win32_surface_create_similar,
@@ -2211,10 +4184,10 @@ static const cairo_surface_backend_t cairo_win32_surface_backend = {
     NULL, /* scaled_font_fini */
     NULL, /* scaled_glyph_fini */
 
-    NULL, /* paint */
-    NULL, /* mask */
-    NULL, /* stroke */
-    NULL, /* fill */
+    _cairo_win32_surface_fallback_paint,
+    _cairo_win32_surface_fallback_mask,
+    _cairo_win32_surface_fallback_stroke,
+    _cairo_win32_surface_fallback_fill,
     _cairo_win32_surface_show_glyphs,
 
     NULL,  /* snapshot */
diff --git a/gfx/cairo/cairo/src/cairo-win32.h b/gfx/cairo/cairo/src/cairo-win32.h
index c77866bb93f..b3af05466fc 100644
--- a/gfx/cairo/cairo/src/cairo-win32.h
+++ b/gfx/cairo/cairo/src/cairo-win32.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-xcb-surface.c b/gfx/cairo/cairo/src/cairo-xcb-surface.c
index 8cd82f023f6..6cd1c874806 100644
--- a/gfx/cairo/cairo/src/cairo-xcb-surface.c
+++ b/gfx/cairo/cairo/src/cairo-xcb-surface.c
@@ -1,6 +1,7 @@
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2002 University of Southern California
+ * Copyright © 2009 Intel Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -12,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -31,307 +32,234 @@
  * California.
  *
  * Contributor(s):
+ *	Behdad Esfahbod <behdad@behdad.org>
  *	Carl D. Worth <cworth@cworth.org>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
+ *	Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
  */
 
 #include "cairoint.h"
+
 #include "cairo-xcb.h"
-#include "cairo-xcb-xrender.h"
-#include "cairo-clip-private.h"
-#include "cairo-list-private.h"
-#include "cairo-freelist-private.h"
-#include <xcb/xcb_renderutil.h>
+#include "cairo-xcb-private.h"
 
-#define AllPlanes               ((unsigned long)~0L)
+#if CAIRO_HAS_XCB_DRM_FUNCTIONS
+#include <xcb/dri2.h>
+#endif
 
+#define AllPlanes ((unsigned) -1)
+#define CAIRO_ASSUME_PIXMAP 20
+#define XLIB_COORD_MAX 32767
+
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_proto (cairo_xcb_surface_create);
+slim_hidden_proto (cairo_xcb_surface_create_for_bitmap);
 slim_hidden_proto (cairo_xcb_surface_create_with_xrender_format);
+#endif
 
-/*
- * Instead of taking two round trips for each blending request,
- * assume that if a particular drawable fails GetImage that it will
- * fail for a "while"; use temporary pixmaps to avoid the errors
+#if CAIRO_HAS_DRM_SURFACE && CAIRO_HAS_XCB_DRM_FUNCTIONS
+#include "drm/cairo-drm-private.h"
+#endif
+
+/**
+ * SECTION:cairo-xcb
+ * @Title: XCB Surfaces
+ * @Short_Description: X Window System rendering using the XCB library
+ * @See_Also: #cairo_surface_t
+ *
+ * The XCB surface is used to render cairo graphics to X Window System
+ * windows and pixmaps using the XCB library.
+ *
+ * Note that the XCB surface automatically takes advantage of the X render
+ * extension if it is available.
  */
 
-#define CAIRO_ASSUME_PIXMAP	20
-
-typedef struct cairo_xcb_surface {
-    cairo_surface_t base;
-
-    xcb_connection_t *dpy;
-    xcb_screen_t *screen;
-
-    xcb_gcontext_t gc;
-    xcb_drawable_t drawable;
-    cairo_bool_t owns_pixmap;
-    xcb_visualtype_t *visual;
-
-    int use_pixmap;
-
-    int render_major;
-    int render_minor;
-
-    int width;
-    int height;
-    int depth;
-
-    cairo_bool_t have_clip_rects;
-    xcb_rectangle_t *clip_rects;
-    int num_clip_rects;
-    cairo_region_t *clip_region;
-
-    xcb_render_picture_t src_picture, dst_picture;
-    xcb_render_pictforminfo_t xrender_format;
-
-    cairo_list_t to_be_checked;
-    cairo_freepool_t cookie_pool;
-} cairo_xcb_surface_t;
-
-typedef struct _cairo_xcb_cookie {
-    cairo_list_t link;
-    xcb_void_cookie_t xcb;
-} cairo_xcb_cookie_t;
-
-#define CAIRO_SURFACE_RENDER_AT_LEAST(surface, major, minor)	\
-	(((surface)->render_major > major) ||			\
-	 (((surface)->render_major == major) && ((surface)->render_minor >= minor)))
-
-#define CAIRO_SURFACE_RENDER_HAS_CREATE_PICTURE(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0)
-#define CAIRO_SURFACE_RENDER_HAS_COMPOSITE(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0)
-#define CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 0)
-
-#define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLE(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1)
-#define CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 1)
-
-#define CAIRO_SURFACE_RENDER_HAS_DISJOINT(surface)			CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 2)
-#define CAIRO_SURFACE_RENDER_HAS_CONJOINT(surface)			CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 2)
-
-#define CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 4)
-#define CAIRO_SURFACE_RENDER_HAS_TRIANGLES(surface)		CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 4)
-#define CAIRO_SURFACE_RENDER_HAS_TRISTRIP(surface)			CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 4)
-#define CAIRO_SURFACE_RENDER_HAS_TRIFAN(surface)			CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 4)
-
-#define CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
-#define CAIRO_SURFACE_RENDER_HAS_FILTERS(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
-#define CAIRO_SURFACE_RENDER_HAS_REPEAT_PAD(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 10)
-#define CAIRO_SURFACE_RENDER_HAS_REPEAT_REFLECT(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 10)
-
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
 static cairo_status_t
-_cairo_xcb_surface_ensure_gc (cairo_xcb_surface_t *surface);
-
-static int
-_CAIRO_FORMAT_DEPTH (cairo_format_t format)
+_cairo_xcb_surface_create_similar_shm (cairo_xcb_surface_t *other,
+				       pixman_format_code_t pixman_format,
+				       int width, int height,
+				       cairo_surface_t **out)
 {
-    switch (format) {
-    case CAIRO_FORMAT_A1:
-	return 1;
-    case CAIRO_FORMAT_A8:
-	return 8;
-    case CAIRO_FORMAT_RGB24:
-	return 24;
-    case CAIRO_FORMAT_ARGB32:
+    size_t size, stride;
+    cairo_xcb_shm_info_t *shm_info;
+    cairo_status_t status;
+    cairo_surface_t *image;
+
+    stride = CAIRO_STRIDE_FOR_WIDTH_BPP (width, PIXMAN_FORMAT_BPP (pixman_format));
+    size = stride * height;
+    if (size < CAIRO_XCB_SHM_SMALL_IMAGE)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    status = _cairo_xcb_connection_allocate_shm_info (other->connection,
+						      size, &shm_info);
+    if (unlikely (status))
+	return status;
+
+    image = _cairo_image_surface_create_with_pixman_format (shm_info->mem,
+							    pixman_format,
+							    width, height,
+							    stride);
+    status = image->status;
+    if (unlikely (status)) {
+	_cairo_xcb_shm_info_destroy (shm_info);
+	return status;
+    }
+
+    status = _cairo_user_data_array_set_data (&image->user_data,
+					      (const cairo_user_data_key_t *) other->connection,
+					      shm_info,
+					      (cairo_destroy_func_t) _cairo_xcb_shm_info_destroy);
+    if (unlikely (status)) {
+	cairo_surface_destroy (image);
+	_cairo_xcb_shm_info_destroy (shm_info);
+	return status;
+    }
+
+    *out = image;
+    return CAIRO_STATUS_SUCCESS;
+}
+#endif
+
+cairo_surface_t *
+_cairo_xcb_surface_create_similar_image (cairo_xcb_surface_t *other,
+					 cairo_content_t content,
+					 int width, int height)
+{
+    cairo_surface_t *image = NULL;
+    pixman_format_code_t pixman_format;
+
+    /* XXX choose pixman_format from connection->image_formats */
+    switch (content) {
+    case CAIRO_CONTENT_ALPHA:
+	pixman_format = PIXMAN_a8;
+	break;
+    case CAIRO_CONTENT_COLOR:
+	pixman_format = PIXMAN_x8r8g8b8;
+	break;
     default:
-	return 32;
-    }
-}
-
-static cairo_status_t
-_cairo_xcb_add_cookie_to_be_checked (cairo_xcb_surface_t *surface,
-				     xcb_void_cookie_t xcb)
-{
-    cairo_xcb_cookie_t *cookie;
-
-    cookie = _cairo_freepool_alloc (&surface->cookie_pool);
-    if (unlikely (cookie == NULL))
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    cookie->xcb = xcb;
-    cairo_list_add_tail (&cookie->link, &surface->to_be_checked);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static xcb_render_pictforminfo_t *
-_CAIRO_FORMAT_TO_XRENDER_FORMAT(xcb_connection_t *dpy, cairo_format_t format)
-{
-    xcb_pict_standard_t	std_format;
-    switch (format) {
-    case CAIRO_FORMAT_A1:
-	std_format = XCB_PICT_STANDARD_A_1; break;
-    case CAIRO_FORMAT_A8:
-	std_format = XCB_PICT_STANDARD_A_8; break;
-    case CAIRO_FORMAT_RGB24:
-	std_format = XCB_PICT_STANDARD_RGB_24; break;
-    case CAIRO_FORMAT_ARGB32:
-    default:
-	std_format = XCB_PICT_STANDARD_ARGB_32; break;
-    }
-    return xcb_render_util_find_standard_format (xcb_render_util_query_formats (dpy), std_format);
-}
-
-static cairo_content_t
-_xcb_render_format_to_content (xcb_render_pictforminfo_t *xrender_format)
-{
-    cairo_bool_t xrender_format_has_alpha;
-    cairo_bool_t xrender_format_has_color;
-
-    /* This only happens when using a non-Render server. Let's punt
-     * and say there's no alpha here. */
-    if (xrender_format == NULL)
-	return CAIRO_CONTENT_COLOR;
-
-    xrender_format_has_alpha = (xrender_format->direct.alpha_mask != 0);
-    xrender_format_has_color = (xrender_format->direct.red_mask   != 0 ||
-				xrender_format->direct.green_mask != 0 ||
-				xrender_format->direct.blue_mask  != 0);
-
-    if (xrender_format_has_alpha)
-	if (xrender_format_has_color)
-	    return CAIRO_CONTENT_COLOR_ALPHA;
-	else
-	    return CAIRO_CONTENT_ALPHA;
-    else
-	return CAIRO_CONTENT_COLOR;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_set_gc_clip_rects (cairo_xcb_surface_t *surface)
-{
-    if (surface->have_clip_rects) {
-	xcb_void_cookie_t cookie;
-
-	cookie = xcb_set_clip_rectangles_checked (surface->dpy,
-					 XCB_CLIP_ORDERING_YX_SORTED, surface->gc,
-					 0, 0,
-					 surface->num_clip_rects,
-					 surface->clip_rects);
-
-	return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
+	ASSERT_NOT_REACHED;
+    case CAIRO_CONTENT_COLOR_ALPHA:
+	pixman_format = PIXMAN_a8r8g8b8;
+	break;
     }
 
-    return CAIRO_STATUS_SUCCESS;
-}
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+    if (other->flags & CAIRO_XCB_HAS_SHM) {
+	cairo_status_t status;
 
-static cairo_status_t
-_cairo_xcb_surface_set_picture_clip_rects (cairo_xcb_surface_t *surface)
-{
-    if (surface->have_clip_rects) {
-	xcb_void_cookie_t cookie;
+	status = _cairo_xcb_surface_create_similar_shm (other,
+							pixman_format,
+							width, height,
+							&image);
+	if (_cairo_status_is_error (status))
+	    return _cairo_surface_create_in_error (status);
+    }
+#endif
 
-	cookie = xcb_render_set_picture_clip_rectangles_checked (surface->dpy,
-								 surface->dst_picture,
-								 0, 0,
-								 surface->num_clip_rects,
-								 surface->clip_rects);
-
-	return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
+    if (image == NULL) {
+	image = _cairo_image_surface_create_with_pixman_format (NULL,
+								pixman_format,
+								width, height,
+								0);
     }
 
-    return CAIRO_STATUS_SUCCESS;
+    return image;
 }
 
-static cairo_status_t
-_cairo_xcb_surface_set_clip_region (void           *abstract_surface,
-				    cairo_region_t *region)
+cairo_surface_t *
+_cairo_xcb_surface_create_similar (void			*abstract_other,
+				   cairo_content_t	 content,
+				   int			 width,
+				   int			 height)
 {
-    cairo_xcb_surface_t *surface = abstract_surface;
-
-    if (region == surface->clip_region)
-	return CAIRO_STATUS_SUCCESS;
-
-    cairo_region_destroy (surface->clip_region);
-    region = cairo_region_reference (region);
-
-    if (surface->clip_rects) {
-	free (surface->clip_rects);
-	surface->clip_rects = NULL;
-    }
-
-    surface->have_clip_rects = FALSE;
-    surface->num_clip_rects = 0;
-
-    if (region == NULL) {
-	uint32_t none[] = { XCB_NONE };
-	if (surface->gc)
-	    xcb_change_gc (surface->dpy, surface->gc, XCB_GC_CLIP_MASK, none);
-
-	if (surface->xrender_format.id != XCB_NONE && surface->dst_picture)
-	    xcb_render_change_picture (surface->dpy, surface->dst_picture,
-		XCB_RENDER_CP_CLIP_MASK, none);
-    } else {
-	xcb_rectangle_t *rects = NULL;
-	int n_rects, i;
-
-	n_rects = cairo_region_num_rectangles (region);
-
-	if (n_rects > 0) {
-	    rects = _cairo_malloc_ab (n_rects, sizeof(xcb_rectangle_t));
-	    if (rects == NULL)
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	} else {
-	    rects = NULL;
-	}
-
-	for (i = 0; i < n_rects; i++) {
-	    cairo_rectangle_int_t rect;
-
-	    cairo_region_get_rectangle (region, i, &rect);
-
-	    rects[i].x = rect.x;
-	    rects[i].y = rect.y;
-	    rects[i].width = rect.width;
-	    rects[i].height = rect.height;
-	}
-
-	surface->have_clip_rects = TRUE;
-	surface->clip_rects = rects;
-	surface->num_clip_rects = n_rects;
-
-	if (surface->gc)
-	    _cairo_xcb_surface_set_gc_clip_rects (surface);
-
-	if (surface->dst_picture)
-	    _cairo_xcb_surface_set_picture_clip_rects (surface);
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_surface_t *
-_cairo_xcb_surface_create_similar (void		       *abstract_src,
-				   cairo_content_t	content,
-				   int			width,
-				   int			height)
-{
-    cairo_xcb_surface_t *src = abstract_src;
-    xcb_connection_t *dpy = src->dpy;
-    xcb_pixmap_t pixmap;
+    cairo_xcb_surface_t *other = abstract_other;
     cairo_xcb_surface_t *surface;
-    cairo_format_t format = _cairo_format_from_content (content);
-    xcb_render_pictforminfo_t *xrender_format;
+    cairo_xcb_connection_t *connection;
+    xcb_pixmap_t pixmap;
+    cairo_status_t status;
 
-    /* As a good first approximation, if the display doesn't have COMPOSITE,
-     * we're better off using image surfaces for all temporary operations
-     */
-    if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (src)) {
-	return cairo_image_surface_create (format, width, height);
+    if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
+	return NULL;
+
+    if (width <= 0 || height <= 0)
+	return NULL;
+
+#if CAIRO_HAS_DRM_SURFACE && CAIRO_HAS_XCB_DRM_FUNCTIONS
+    if (other->drm != NULL) {
+	cairo_surface_t *drm;
+
+	drm = _cairo_drm_surface_create_similar (other->drm, content, width, height);
+	if (drm != NULL)
+	    return drm;
+    }
+#endif
+
+    if ((other->flags & CAIRO_XCB_HAS_RENDER) == 0)
+	return _cairo_xcb_surface_create_similar_image (other, content, width, height);
+
+    connection = other->connection;
+    status = _cairo_xcb_connection_acquire (connection);
+    if (unlikely (status))
+	return _cairo_surface_create_in_error (status);
+
+    status =_cairo_xcb_connection_take_socket (connection);
+    if (unlikely (status)) {
+	_cairo_xcb_connection_release (connection);
+	return _cairo_surface_create_in_error (status);
     }
 
-    pixmap = xcb_generate_id (dpy);
-    xcb_create_pixmap (dpy, _CAIRO_FORMAT_DEPTH (format),
-		     pixmap, src->drawable,
-		     width <= 0 ? 1 : width,
-		     height <= 0 ? 1 : height);
-
-    xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (dpy, format);
-    /* XXX: what to do if xrender_format is null? */
-    surface = (cairo_xcb_surface_t *)
-	cairo_xcb_surface_create_with_xrender_format (dpy, pixmap, src->screen,
-						      xrender_format,
+    if (content == other->base.content) {
+	pixmap = _cairo_xcb_connection_create_pixmap (connection,
+						      other->depth,
+						      other->drawable,
 						      width, height);
-    if (surface->base.status)
-	return &surface->base;
 
-    surface->owns_pixmap = TRUE;
+	surface = (cairo_xcb_surface_t *)
+	    _cairo_xcb_surface_create_internal (other->screen,
+						pixmap, TRUE,
+						other->pixman_format,
+						other->xrender_format,
+						width, height);
+    } else {
+	cairo_format_t format;
+	pixman_format_code_t pixman_format;
+
+	/* XXX find a compatible xrender format */
+	switch (content) {
+	case CAIRO_CONTENT_ALPHA:
+	    pixman_format = PIXMAN_a8;
+	    format = CAIRO_FORMAT_A8;
+	    break;
+	case CAIRO_CONTENT_COLOR:
+	    pixman_format = PIXMAN_x8r8g8b8;
+	    format = CAIRO_FORMAT_RGB24;
+	    break;
+	default:
+	    ASSERT_NOT_REACHED;
+	case CAIRO_CONTENT_COLOR_ALPHA:
+	    pixman_format = PIXMAN_a8r8g8b8;
+	    format = CAIRO_FORMAT_ARGB32;
+	    break;
+	}
+
+	pixmap = _cairo_xcb_connection_create_pixmap (connection,
+						      PIXMAN_FORMAT_DEPTH (pixman_format),
+						      other->drawable,
+						      width, height);
+
+	surface = (cairo_xcb_surface_t *)
+	    _cairo_xcb_surface_create_internal (other->screen,
+						pixmap, TRUE,
+						pixman_format,
+						connection->standard_formats[format],
+						width, height);
+    }
+
+    if (unlikely (surface->base.status))
+	_cairo_xcb_connection_free_pixmap (connection, pixmap);
+
+    _cairo_xcb_connection_release (connection);
 
     return &surface->base;
 }
@@ -340,153 +268,191 @@ static cairo_status_t
 _cairo_xcb_surface_finish (void *abstract_surface)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
+    cairo_status_t status;
 
-    if (surface->dst_picture != XCB_NONE)
-	xcb_render_free_picture (surface->dpy, surface->dst_picture);
+    if (surface->fallback != NULL) {
+	cairo_surface_finish (surface->fallback);
+	cairo_surface_destroy (surface->fallback);
+    }
 
-    if (surface->src_picture != XCB_NONE)
-	xcb_render_free_picture (surface->dpy, surface->src_picture);
+    cairo_list_del (&surface->link);
 
-    if (surface->owns_pixmap)
-	xcb_free_pixmap (surface->dpy, surface->drawable);
+#if CAIRO_HAS_DRM_SURFACE && CAIRO_HAS_XCB_DRM_FUNCTIONS
+    if (surface->drm != NULL) {
+	cairo_surface_finish (surface->drm);
+	cairo_surface_destroy (surface->drm);
 
-    if (surface->gc != XCB_NONE)
-	xcb_free_gc (surface->dpy, surface->gc);
+	xcb_dri2_destroy_drawable (surface->connection->xcb_connection,
+				   surface->drawable);
+    }
+#endif
 
-    free (surface->clip_rects);
-    cairo_region_destroy (surface->clip_region);
+    status = _cairo_xcb_connection_acquire (surface->connection);
+    if (status == CAIRO_STATUS_SUCCESS) {
+	if (_cairo_xcb_connection_take_socket (surface->connection) == CAIRO_STATUS_SUCCESS) {
+	    if (surface->picture != XCB_NONE) {
+		_cairo_xcb_connection_render_free_picture (surface->connection,
+							   surface->picture);
+	    }
 
-    _cairo_freepool_fini (&surface->cookie_pool);
+	    if (surface->owns_pixmap)
+		_cairo_xcb_connection_free_pixmap (surface->connection, surface->drawable);
+	}
+	_cairo_xcb_connection_release (surface->connection);
+    }
 
-    surface->dpy = NULL;
+    _cairo_xcb_connection_destroy (surface->connection);
 
+    return status;
+}
+
+static void
+_destroy_image (pixman_image_t *image, void *data)
+{
+    free (data);
+}
+
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+static cairo_int_status_t
+_cairo_xcb_surface_create_shm_image (cairo_xcb_surface_t *target,
+				     cairo_image_surface_t **image_out,
+				     cairo_xcb_shm_info_t **shm_info_out)
+{
+    cairo_image_surface_t *image;
+    cairo_xcb_shm_info_t *shm_info;
+    cairo_status_t status;
+    size_t size, stride;
+
+    if ((target->flags & CAIRO_XCB_HAS_SHM) == 0)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    stride = CAIRO_STRIDE_FOR_WIDTH_BPP (target->width,
+					 PIXMAN_FORMAT_BPP (target->pixman_format));
+    size = stride * target->height;
+    if (size < CAIRO_XCB_SHM_SMALL_IMAGE) {
+	target->flags &= ~CAIRO_XCB_HAS_SHM;
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    status = _cairo_xcb_connection_allocate_shm_info (target->screen->connection,
+						      size, &shm_info);
+    if (unlikely (status))
+	return status;
+
+    image = (cairo_image_surface_t *)
+	_cairo_image_surface_create_with_pixman_format (shm_info->mem,
+							target->pixman_format,
+							target->width,
+							target->height,
+							stride);
+    status = image->base.status;
+    if (unlikely (status)) {
+	_cairo_xcb_shm_info_destroy (shm_info);
+	return status;
+    }
+
+    status = _cairo_user_data_array_set_data (&image->base.user_data,
+					      (const cairo_user_data_key_t *) target->connection,
+					      shm_info,
+					      (cairo_destroy_func_t) _cairo_xcb_shm_info_destroy);
+    if (unlikely (status)) {
+	cairo_surface_destroy (&image->base);
+	_cairo_xcb_shm_info_destroy (shm_info);
+	return status;
+    }
+
+    *image_out = image;
+    *shm_info_out = shm_info;
     return CAIRO_STATUS_SUCCESS;
 }
+#endif
 
-static int
-_bits_per_pixel(xcb_connection_t *c, int depth)
+static cairo_status_t
+_get_shm_image (cairo_xcb_surface_t     *surface,
+		cairo_image_surface_t  **image_out)
 {
-    xcb_format_t *fmt = xcb_setup_pixmap_formats(xcb_get_setup(c));
-    xcb_format_t *fmtend = fmt + xcb_setup_pixmap_formats_length(xcb_get_setup(c));
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+    cairo_image_surface_t *image;
+    cairo_xcb_shm_info_t *shm_info;
+    cairo_status_t status;
 
-    for(; fmt != fmtend; ++fmt)
-	if(fmt->depth == depth)
-	    return fmt->bits_per_pixel;
+    status = _cairo_xcb_surface_create_shm_image (surface, &image, &shm_info);
+    if (unlikely (status))
+	return status;
 
-    if(depth <= 4)
-	return 4;
-    if(depth <= 8)
-	return 8;
-    if(depth <= 16)
-	return 16;
-    return 32;
-}
-
-static int
-_bytes_per_line(xcb_connection_t *c, int width, int bpp)
-{
-    int bitmap_pad = xcb_get_setup(c)->bitmap_format_scanline_pad;
-    return ((bpp * width + bitmap_pad - 1) & -bitmap_pad) >> 3;
-}
-
-static cairo_bool_t
-_CAIRO_MASK_FORMAT (cairo_format_masks_t *masks, cairo_format_t *format)
-{
-    switch (masks->bpp) {
-    case 32:
-	if (masks->alpha_mask == 0xff000000 &&
-	    masks->red_mask == 0x00ff0000 &&
-	    masks->green_mask == 0x0000ff00 &&
-	    masks->blue_mask == 0x000000ff)
-	{
-	    *format = CAIRO_FORMAT_ARGB32;
-	    return TRUE;
-	}
-	if (masks->alpha_mask == 0x00000000 &&
-	    masks->red_mask == 0x00ff0000 &&
-	    masks->green_mask == 0x0000ff00 &&
-	    masks->blue_mask == 0x000000ff)
-	{
-	    *format = CAIRO_FORMAT_RGB24;
-	    return TRUE;
-	}
-	break;
-    case 8:
-	if (masks->alpha_mask == 0xff)
-	{
-	    *format = CAIRO_FORMAT_A8;
-	    return TRUE;
-	}
-	break;
-    case 1:
-	if (masks->alpha_mask == 0x1)
-	{
-	    *format = CAIRO_FORMAT_A1;
-	    return TRUE;
-	}
-	break;
+    if (! surface->base.is_clear) {
+	status = _cairo_xcb_connection_shm_get_image (surface->connection,
+						      surface->drawable,
+						      0, 0,
+						      surface->width,
+						      surface->height,
+						      shm_info->shm,
+						      shm_info->offset);
+	if (unlikely (status))
+	    return status;
+    } else {
+	memset (image->data, 0, image->stride * image->height);
     }
-    return FALSE;
+
+    *image_out = image;
+    return CAIRO_STATUS_SUCCESS;
+#else
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+#endif
 }
 
 static cairo_status_t
-_get_image_surface (cairo_xcb_surface_t     *surface,
-		    cairo_rectangle_int_t   *interest_rect,
-		    cairo_image_surface_t  **image_out,
-		    cairo_rectangle_int_t   *image_rect)
+_get_image (cairo_xcb_surface_t		 *surface,
+	    cairo_bool_t		  use_shm,
+	    cairo_image_surface_t	**image_out)
 {
     cairo_image_surface_t *image;
-    xcb_get_image_reply_t *imagerep;
-    int bpp, bytes_per_line;
-    cairo_rectangle_int_t extents;
-    unsigned char *data;
-    cairo_format_masks_t masks;
-    cairo_format_t format;
+    cairo_xcb_connection_t *connection;
+    xcb_get_image_reply_t *reply;
+    cairo_status_t status;
 
-    extents.x = 0;
-    extents.y = 0;
-    extents.width  = surface->width;
-    extents.height = surface->height;
-
-    if (interest_rect) {
-	if (! _cairo_rectangle_intersect (&extents, interest_rect)) {
-	    *image_out = NULL;
-	    return CAIRO_STATUS_SUCCESS;
-	}
+    if (surface->base.is_clear || surface->deferred_clear) {
+	image = (cairo_image_surface_t *)
+	    _cairo_image_surface_create_with_pixman_format (NULL,
+							    surface->pixman_format,
+							    surface->width,
+							    surface->height,
+							    0);
+	*image_out = image;
+	return image->base.status;
     }
 
-    if (image_rect)
-	*image_rect = extents;
+    connection = surface->connection;
 
-    /* XXX: This should try to use the XShm extension if available */
+    status = _cairo_xcb_connection_acquire (connection);
+    if (unlikely (status))
+	return status;
 
-    if (surface->use_pixmap == 0)
-    {
-	xcb_generic_error_t *error;
+    status = _cairo_xcb_connection_take_socket (connection);
+    if (unlikely (status))
+	goto FAIL;
 
-	imagerep = xcb_get_image_reply (surface->dpy,
-					xcb_get_image (surface->dpy,
-						       XCB_IMAGE_FORMAT_Z_PIXMAP,
-						       surface->drawable,
-						       extents.x, extents.y,
-						       extents.width, extents.height,
-						       AllPlanes),
-					&error);
-
-	/* If we get an error, the surface must have been a window,
-	 * so retry with the safe code path.
-	 */
-	if (error)
-	    surface->use_pixmap = CAIRO_ASSUME_PIXMAP;
+    if (use_shm) {
+	status = _get_shm_image (surface, image_out);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    goto FAIL;
     }
-    else
-    {
+
+    if (surface->use_pixmap == 0) {
+	status = _cairo_xcb_connection_get_image (connection,
+						  surface->drawable,
+						  0, 0,
+						  surface->width,
+						  surface->height,
+						  &reply);
+	if (unlikely (status))
+	    goto FAIL;
+    } else {
 	surface->use_pixmap--;
-	imagerep = NULL;
+	reply = NULL;
     }
 
-    if (!imagerep)
-    {
+    if (reply == NULL && ! surface->owns_pixmap) {
 	/* xcb_get_image_t from a window is dangerous because it can
 	 * produce errors if the window is unmapped or partially
 	 * outside the screen. We could check for errors and
@@ -494,1676 +460,786 @@ _get_image_surface (cairo_xcb_surface_t     *surface,
 	 * temporary pixmap
 	 */
 	xcb_pixmap_t pixmap;
-	cairo_xcb_cookie_t *cookies[2];
-	cairo_status_t status;
+	xcb_gcontext_t gc;
+
+	gc = _cairo_xcb_screen_get_gc (surface->screen,
+				       surface->drawable,
+				       surface->depth);
+	pixmap = _cairo_xcb_connection_create_pixmap (connection,
+						      surface->depth,
+						      surface->drawable,
+						      surface->width,
+						      surface->height);
+
+	/* XXX IncludeInferiors? */
+	_cairo_xcb_connection_copy_area (connection,
+					 surface->drawable,
+					 pixmap, gc,
+					 0, 0,
+					 0, 0,
+					 surface->width,
+					 surface->height);
+
+	_cairo_xcb_screen_put_gc (surface->screen, surface->depth, gc);
+
+	status = _cairo_xcb_connection_get_image (connection,
+						  pixmap,
+						  0, 0,
+						  surface->width,
+						  surface->height,
+						  &reply);
+	_cairo_xcb_connection_free_pixmap (connection, pixmap);
 
-	status = _cairo_xcb_surface_ensure_gc (surface);
 	if (unlikely (status))
-	    return status;
-
-	status = _cairo_freepool_alloc_array (&surface->cookie_pool,
-					      ARRAY_LENGTH (cookies),
-					      (void **) cookies);
-	if (unlikely (status))
-	    return status;
-
-	pixmap = xcb_generate_id (surface->dpy);
-	cookies[0]->xcb = xcb_create_pixmap_checked (surface->dpy,
-						     surface->depth,
-						     pixmap,
-						     surface->drawable,
-						     extents.width, extents.height);
-	cairo_list_add_tail (&cookies[0]->link, &surface->to_be_checked);
-
-	cookies[1]->xcb = xcb_copy_area_checked (surface->dpy,
-						 surface->drawable,
-						 pixmap, surface->gc,
-						 extents.x, extents.y,
-						 0, 0,
-						 extents.width, extents.height);
-	cairo_list_add_tail (&cookies[1]->link, &surface->to_be_checked);
-
-	imagerep = xcb_get_image_reply (surface->dpy,
-					xcb_get_image (surface->dpy,
-						       XCB_IMAGE_FORMAT_Z_PIXMAP,
-						       pixmap,
-						       extents.x, extents.y,
-						       extents.width, extents.height,
-						       AllPlanes),
-					0);
-
-	xcb_free_pixmap (surface->dpy, pixmap);
-
-    }
-    if (unlikely (imagerep == NULL))
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    bpp = _bits_per_pixel(surface->dpy, imagerep->depth);
-    bytes_per_line = _bytes_per_line(surface->dpy, surface->width, bpp);
-
-    data = _cairo_malloc_ab (surface->height, bytes_per_line);
-    if (data == NULL) {
-	free (imagerep);
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-    }
-
-    memcpy (data, xcb_get_image_data (imagerep), bytes_per_line * surface->height);
-    free (imagerep);
-
-    /*
-     * Compute the pixel format masks from either an xcb_visualtype_t or
-     * a xcb_render_pctforminfo_t, failing we assume the drawable is an
-     * alpha-only pixmap as it could only have been created that way
-     * through the cairo_xlib_surface_create_for_bitmap function.
-     */
-    if (surface->visual) {
-	masks.bpp = bpp;
-	masks.alpha_mask = 0;
-	masks.red_mask = surface->visual->red_mask;
-	masks.green_mask = surface->visual->green_mask;
-	masks.blue_mask = surface->visual->blue_mask;
-    } else if (surface->xrender_format.id != XCB_NONE) {
-	masks.bpp = bpp;
-	masks.red_mask = (unsigned long)surface->xrender_format.direct.red_mask << surface->xrender_format.direct.red_shift;
-	masks.green_mask = (unsigned long)surface->xrender_format.direct.green_mask << surface->xrender_format.direct.green_shift;
-	masks.blue_mask = (unsigned long)surface->xrender_format.direct.blue_mask << surface->xrender_format.direct.blue_shift;
-	masks.alpha_mask = (unsigned long)surface->xrender_format.direct.alpha_mask << surface->xrender_format.direct.alpha_shift;
-    } else {
-	masks.bpp = bpp;
-	masks.red_mask = 0;
-	masks.green_mask = 0;
-	masks.blue_mask = 0;
-	if (surface->depth < 32)
-	    masks.alpha_mask = (1 << surface->depth) - 1;
-	else
-	    masks.alpha_mask = 0xffffffff;
-    }
-
-    /*
-     * Prefer to use a standard pixman format instead of the
-     * general masks case.
-     */
-    if (_CAIRO_MASK_FORMAT (&masks, &format)) {
-	image = (cairo_image_surface_t *)
-	    cairo_image_surface_create_for_data (data,
-						 format,
-						 extents.width,
-						 extents.height,
-						 bytes_per_line);
-	if (image->base.status)
-	    goto FAIL;
-    } else {
-	/*
-	 * XXX This can't work.  We must convert the data to one of the
-	 * supported pixman formats.  Pixman needs another function
-	 * which takes data in an arbitrary format and converts it
-	 * to something supported by that library.
-	 */
-	image = (cairo_image_surface_t *)
-	    _cairo_image_surface_create_with_masks (data,
-						    &masks,
-						    extents.width,
-						    extents.height,
-						    bytes_per_line);
-	if (image->base.status)
 	    goto FAIL;
     }
 
-    /* Let the surface take ownership of the data */
-    _cairo_image_surface_assume_ownership_of_data (image);
+    if (unlikely (reply == NULL)) {
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	goto FAIL;
+    }
+
+    /* XXX byte swap */
+    /* XXX format conversion */
+    assert (reply->depth == surface->depth);
+
+    image = (cairo_image_surface_t *)
+	_cairo_image_surface_create_with_pixman_format
+	(xcb_get_image_data (reply),
+	 surface->pixman_format,
+	 surface->width,
+	 surface->height,
+	 CAIRO_STRIDE_FOR_WIDTH_BPP (surface->width,
+				     PIXMAN_FORMAT_BPP (surface->pixman_format)));
+    status = image->base.status;
+    if (unlikely (status)) {
+	free (reply);
+	goto FAIL;
+    }
+
+    assert (xcb_get_image_data_length (reply) == image->height * image->stride);
+
+    pixman_image_set_destroy_function (image->pixman_image, _destroy_image, reply);
+
+    _cairo_xcb_connection_release (connection);
+
+    /* synchronisation point */
+    surface->marked_dirty = FALSE;
 
     *image_out = image;
     return CAIRO_STATUS_SUCCESS;
 
- FAIL:
-    free (data);
-    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+FAIL:
+    _cairo_xcb_connection_release (connection);
+    return status;
 }
 
 static cairo_status_t
-_cairo_xcb_surface_ensure_src_picture (cairo_xcb_surface_t    *surface)
-{
-    if (!surface->src_picture) {
-	xcb_void_cookie_t cookie;
-
-	surface->src_picture = xcb_generate_id (surface->dpy);
-	cookie = xcb_render_create_picture_checked (surface->dpy,
-						    surface->src_picture,
-						    surface->drawable,
-						    surface->xrender_format.id,
-						    0, NULL);
-
-	return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_ensure_dst_picture (cairo_xcb_surface_t    *surface)
-{
-    if (!surface->dst_picture) {
-	xcb_void_cookie_t cookie;
-
-	surface->dst_picture = xcb_generate_id (surface->dpy);
-	cookie = xcb_render_create_picture_checked (surface->dpy,
-						    surface->dst_picture,
-						    surface->drawable,
-						    surface->xrender_format.id,
-						    0, NULL);
-
-	return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_ensure_gc (cairo_xcb_surface_t *surface)
-{
-    xcb_void_cookie_t cookie;
-
-    if (surface->gc)
-	return CAIRO_STATUS_SUCCESS;
-
-    surface->gc = xcb_generate_id(surface->dpy);
-    cookie = xcb_create_gc_checked (surface->dpy, surface->gc, surface->drawable, 0, 0);
-    _cairo_xcb_surface_set_gc_clip_rects (surface);
-
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-static cairo_status_t
-_draw_image_surface (cairo_xcb_surface_t    *surface,
-		     cairo_image_surface_t  *image,
-		     int                    src_x,
-		     int                    src_y,
-		     int                    width,
-		     int                    height,
-		     int                    dst_x,
-		     int                    dst_y)
-{
-    int bpp, bpl;
-    uint32_t data_len;
-    uint8_t *data, left_pad=0;
-    xcb_void_cookie_t cookie;
-
-    /* equivalent of XPutImage(..., src_x,src_y, dst_x,dst_y, width,height); */
-    /* XXX: assumes image and surface formats and depths are the same */
-    /* XXX: assumes depth is a multiple of 8 (not bitmap) */
-
-    /* fit src_{x,y,width,height} within image->{0,0,width,height} */
-    if (src_x < 0) {
-	width += src_x;
-	src_x = 0;
-    }
-    if (src_y < 0) {
-	height += src_y;
-	src_y = 0;
-    }
-    if (width + src_x > image->width)
-	width = image->width - src_x;
-    if (height + src_y > image->height)
-	height = image->height - src_y;
-    if (width <= 0 || height <= 0)
-	return CAIRO_STATUS_SUCCESS;
-
-    bpp = _bits_per_pixel(surface->dpy, image->depth);
-    /* XXX: could use bpl = image->stride? */
-    bpl = _bytes_per_line(surface->dpy, image->width, bpp);
-
-    if (src_x == 0 && width == image->width) {
-	/* can work in-place */
-	data_len = height * bpl;
-	data = image->data + src_y * bpl;
-    } else {
-	/* must copy {src_x,src_y,width,height} into new data */
-	int line = 0;
-	uint8_t *data_line, *image_line;
-	int data_bpl = _bytes_per_line(surface->dpy, width, bpp);
-	data_len = height * data_bpl;
-	data_line = data = malloc(data_len);
-	if (data == NULL)
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-	image_line = image->data + src_y * bpl + (src_x * bpp / 8);
-	while (line++ < height) {
-	    memcpy(data_line, image_line, data_bpl);
-	    data_line += data_bpl;
-	    image_line += bpl;
-	}
-    }
-    _cairo_xcb_surface_ensure_gc (surface);
-    cookie = xcb_put_image_checked (surface->dpy, XCB_IMAGE_FORMAT_Z_PIXMAP,
-				    surface->drawable, surface->gc,
-				    width, height,
-				    dst_x, dst_y,
-				    left_pad, image->depth,
-				    data_len, data);
-
-    if (data < image->data || data >= image->data + image->height * bpl)
-	free (data);
-
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_acquire_source_image (void                    *abstract_surface,
-					 cairo_image_surface_t  **image_out,
-					 void                   **image_extra)
+_cairo_xcb_surface_acquire_source_image (void *abstract_surface,
+					 cairo_image_surface_t **image_out,
+					 void **image_extra)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
     cairo_image_surface_t *image;
     cairo_status_t status;
 
-    status = _get_image_surface (surface, NULL, &image, NULL);
-    if (status)
+    if (surface->drm != NULL && ! surface->marked_dirty) {
+	return _cairo_surface_acquire_source_image (surface->drm,
+						    image_out, image_extra);
+    }
+
+    if (surface->fallback != NULL) {
+	image = (cairo_image_surface_t *) cairo_surface_reference (surface->fallback);
+	goto DONE;
+    }
+
+    image = (cairo_image_surface_t *)
+	_cairo_surface_has_snapshot (&surface->base,
+				     &_cairo_image_surface_backend);
+    if (image != NULL) {
+	image = (cairo_image_surface_t *) cairo_surface_reference (&image->base);
+	goto DONE;
+    }
+
+    status = _get_image (surface, FALSE, &image);
+    if (unlikely (status))
 	return status;
 
+    _cairo_surface_attach_snapshot (&surface->base, &image->base, NULL);
+
+DONE:
     *image_out = image;
     *image_extra = NULL;
+    return CAIRO_STATUS_SUCCESS;
+}
 
+static void
+_cairo_xcb_surface_release_source_image (void *abstract_surface,
+					 cairo_image_surface_t *image,
+					 void *image_extra)
+{
+    cairo_xcb_surface_t *surface = abstract_surface;
+
+    if (surface->drm != NULL && ! surface->marked_dirty) {
+	return _cairo_surface_release_source_image (surface->drm,
+						    image, image_extra);
+    }
+
+    cairo_surface_destroy (&image->base);
+}
+
+static cairo_bool_t
+_cairo_xcb_surface_get_extents (void *abstract_surface,
+				cairo_rectangle_int_t *extents)
+{
+    cairo_xcb_surface_t *surface = abstract_surface;
+
+    extents->x = extents->y = 0;
+    extents->width  = surface->width;
+    extents->height = surface->height;
+    return TRUE;
+}
+
+static void
+_cairo_xcb_surface_get_font_options (void *abstract_surface,
+				     cairo_font_options_t *options)
+{
+    /* XXX  copy from xlib */
+    _cairo_font_options_init_default (options);
+    _cairo_font_options_set_round_glyph_positions (options, CAIRO_ROUND_GLYPH_POS_ON);
+}
+
+static cairo_status_t
+_put_shm_image (cairo_xcb_surface_t    *surface,
+		xcb_gcontext_t		gc,
+		cairo_image_surface_t  *image)
+{
+#if CAIRO_HAS_XCB_SHM_FUNCTIONS
+    cairo_xcb_shm_info_t *shm_info;
+
+    shm_info = _cairo_user_data_array_get_data (&image->base.user_data,
+						(const cairo_user_data_key_t *) surface->connection);
+    if (shm_info == NULL)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    shm_info->seqno =
+	_cairo_xcb_connection_shm_put_image (surface->connection,
+					     surface->drawable,
+					     gc,
+					     surface->width, surface->height,
+					     0, 0,
+					     image->width, image->height,
+					     0, 0,
+					     image->depth,
+					     shm_info->shm,
+					     shm_info->offset);
+
+    return CAIRO_STATUS_SUCCESS;
+#else
+    return CAIRO_INT_STATUS_UNSUPPORTED;
+#endif
+}
+
+static cairo_status_t
+_put_image (cairo_xcb_surface_t    *surface,
+	    cairo_image_surface_t  *image)
+{
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+
+    /* XXX track damaged region? */
+
+    status = _cairo_xcb_connection_acquire (surface->connection);
+    if (unlikely (status))
+	return status;
+
+    status = _cairo_xcb_connection_take_socket (surface->connection);
+    if (unlikely (status)) {
+	_cairo_xcb_connection_release (surface->connection);
+	return status;
+    }
+
+    if (image->pixman_format == surface->pixman_format) {
+	xcb_gcontext_t gc;
+
+	assert (image->width == surface->width);
+	assert (image->height == surface->height);
+	assert (image->depth == surface->depth);
+	assert (image->stride == (int) CAIRO_STRIDE_FOR_WIDTH_BPP (image->width, PIXMAN_FORMAT_BPP (image->pixman_format)));
+
+	gc = _cairo_xcb_screen_get_gc (surface->screen,
+				       surface->drawable,
+				       surface->depth);
+
+	status = _put_shm_image (surface, gc, image);
+	if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
+	    _cairo_xcb_connection_put_image (surface->connection,
+					     surface->drawable, gc,
+					     image->width, image->height,
+					     0, 0,
+					     image->depth,
+					     image->stride,
+					     image->data);
+	    status = CAIRO_STATUS_SUCCESS;
+	}
+
+	_cairo_xcb_screen_put_gc (surface->screen, surface->depth, gc);
+    } else {
+	ASSERT_NOT_REACHED;
+    }
+
+    _cairo_xcb_connection_release (surface->connection);
+    return status;
+}
+
+static cairo_status_t
+_cairo_xcb_surface_flush (void *abstract_surface)
+{
+    cairo_xcb_surface_t *surface = abstract_surface;
+    cairo_status_t status;
+
+    if (surface->drm != NULL && ! surface->marked_dirty)
+	return surface->drm->backend->flush (surface->drm);
+
+    if (likely (surface->fallback == NULL)) {
+	status = CAIRO_STATUS_SUCCESS;
+	if (! surface->base.finished && surface->deferred_clear)
+	    status = _cairo_xcb_surface_clear (surface);
+
+	return status;
+    }
+
+    status = surface->base.status;
+    if (status == CAIRO_STATUS_SUCCESS && ! surface->base.finished) {
+	status = cairo_surface_status (surface->fallback);
+
+	if (status == CAIRO_STATUS_SUCCESS) {
+	    status = _put_image (surface,
+				 (cairo_image_surface_t *) surface->fallback);
+	}
+
+	if (status == CAIRO_STATUS_SUCCESS) {
+	    _cairo_surface_attach_snapshot (&surface->base,
+					    surface->fallback,
+					    cairo_surface_finish);
+	}
+    }
+
+    cairo_surface_destroy (surface->fallback);
+    surface->fallback = NULL;
+
+    return status;
+}
+
+static cairo_status_t
+_cairo_xcb_surface_mark_dirty (void *abstract_surface,
+			       int x, int y,
+			       int width, int height)
+{
+    cairo_xcb_surface_t *surface = abstract_surface;
+    surface->marked_dirty = TRUE;
     return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_surface_t *
-_cairo_xcb_surface_snapshot (void *abstract_surface)
+_cairo_xcb_surface_map_to_image (cairo_xcb_surface_t *surface)
 {
-    cairo_xcb_surface_t *surface = abstract_surface;
-    cairo_image_surface_t *image;
     cairo_status_t status;
+    cairo_image_surface_t *image;
 
-    status = _get_image_surface (surface, NULL, &image, NULL);
+    status = _get_image (surface, TRUE, &image);
     if (unlikely (status))
 	return _cairo_surface_create_in_error (status);
 
     return &image->base;
 }
 
-static void
-_cairo_xcb_surface_release_source_image (void                   *abstract_surface,
-					 cairo_image_surface_t  *image,
-					 void                   *image_extra)
-{
-    cairo_surface_destroy (&image->base);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_acquire_dest_image (void                    *abstract_surface,
-				       cairo_rectangle_int_t   *interest_rect,
-				       cairo_image_surface_t  **image_out,
-				       cairo_rectangle_int_t   *image_rect_out,
-				       void                   **image_extra)
+static cairo_int_status_t
+_cairo_xcb_surface_paint (void			*abstract_surface,
+			  cairo_operator_t	 op,
+			  const cairo_pattern_t	*source,
+			  cairo_clip_t		*clip)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
-    cairo_image_surface_t *image;
     cairo_status_t status;
 
-    status = _get_image_surface (surface, interest_rect, &image, image_rect_out);
-    if (status)
-	return status;
+    if (surface->drm != NULL && ! surface->marked_dirty)
+	return _cairo_surface_paint (surface->drm, op, source, clip);
 
-    *image_out = image;
-    *image_extra = NULL;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-_cairo_xcb_surface_release_dest_image (void                   *abstract_surface,
-				       cairo_rectangle_int_t  *interest_rect,
-				       cairo_image_surface_t  *image,
-				       cairo_rectangle_int_t  *image_rect,
-				       void                   *image_extra)
-{
-    cairo_xcb_surface_t *surface = abstract_surface;
-
-    /* ignore errors */
-    _draw_image_surface (surface, image, 0, 0, image->width, image->height,
-			 image_rect->x, image_rect->y);
-
-    cairo_surface_destroy (&image->base);
-}
-
-/*
- * Return whether two xcb surfaces share the same
- * screen.  Both core and Render drawing require this
- * when using multiple drawables in an operation.
- */
-static cairo_bool_t
-_cairo_xcb_surface_same_screen (cairo_xcb_surface_t *dst,
-				cairo_xcb_surface_t *src)
-{
-    return dst->dpy == src->dpy && dst->screen == src->screen;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_clone_similar (void			*abstract_surface,
-				  cairo_surface_t	*src,
-				  cairo_content_t	 content,
-				  int                    src_x,
-				  int                    src_y,
-				  int                    width,
-				  int                    height,
-				  int                   *clone_offset_x,
-				  int                   *clone_offset_y,
-				  cairo_surface_t     **clone_out)
-{
-    cairo_xcb_surface_t *surface = abstract_surface;
-    cairo_xcb_surface_t *clone;
-
-    if (src->backend == surface->base.backend ) {
-	cairo_xcb_surface_t *xcb_src = (cairo_xcb_surface_t *)src;
-
-	if (_cairo_xcb_surface_same_screen(surface, xcb_src)) {
-	    *clone_offset_x = 0;
-	    *clone_offset_y = 0;
-	    *clone_out = cairo_surface_reference (src);
-
-	    return CAIRO_STATUS_SUCCESS;
-	}
-    } else if (_cairo_surface_is_image (src)) {
-	cairo_image_surface_t *image_src = (cairo_image_surface_t *)src;
-	cairo_content_t content = _cairo_content_from_format (image_src->format);
-	cairo_status_t status;
-
-	if (surface->base.status)
-	    return surface->base.status;
-
-	clone = (cairo_xcb_surface_t *)
-	    _cairo_xcb_surface_create_similar (surface, content, width, height);
-	if (clone == NULL)
-	    return CAIRO_INT_STATUS_UNSUPPORTED;
-	if (clone->base.status)
-	    return clone->base.status;
-
-	status = _draw_image_surface (clone, image_src,
-		                      src_x, src_y,
-		                      width, height,
-				      0, 0);
-	if (status) {
-	    cairo_surface_destroy (&clone->base);
-	    return status;
-	}
-
-	*clone_offset_x = src_x;
-	*clone_offset_y = src_y;
-	*clone_out = &clone->base;
-
-	return CAIRO_STATUS_SUCCESS;
-    }
-
-    return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_set_matrix (cairo_xcb_surface_t *surface,
-			       cairo_matrix_t	   *matrix)
-{
-    xcb_render_transform_t xtransform;
-    xcb_void_cookie_t cookie;
-
-    xtransform.matrix11 = _cairo_fixed_16_16_from_double (matrix->xx);
-    xtransform.matrix12 = _cairo_fixed_16_16_from_double (matrix->xy);
-    xtransform.matrix13 = _cairo_fixed_16_16_from_double (matrix->x0);
-
-    xtransform.matrix21 = _cairo_fixed_16_16_from_double (matrix->yx);
-    xtransform.matrix22 = _cairo_fixed_16_16_from_double (matrix->yy);
-    xtransform.matrix23 = _cairo_fixed_16_16_from_double (matrix->y0);
-
-    xtransform.matrix31 = 0;
-    xtransform.matrix32 = 0;
-    xtransform.matrix33 = 1 << 16;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface))
-    {
-	static const xcb_render_transform_t identity = {
-	    1 << 16, 0x00000, 0x00000,
-	    0x00000, 1 << 16, 0x00000,
-	    0x00000, 0x00000, 1 << 16
-	};
-
-	if (memcmp (&xtransform, &identity, sizeof (xcb_render_transform_t)) == 0)
-	    return CAIRO_STATUS_SUCCESS;
-
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    }
-
-    cookie = xcb_render_set_picture_transform_checked (surface->dpy,
-						       surface->src_picture,
-						       xtransform);
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_set_filter (cairo_xcb_surface_t *surface,
-			       cairo_filter_t	   filter)
-{
-    const char *render_filter;
-    xcb_void_cookie_t cookie;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_FILTERS (surface))
-    {
-	if (filter == CAIRO_FILTER_FAST || filter == CAIRO_FILTER_NEAREST)
-	    return CAIRO_STATUS_SUCCESS;
-
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    }
-
-    switch (filter) {
-    case CAIRO_FILTER_FAST:
-	render_filter = "fast";
-	break;
-    case CAIRO_FILTER_GOOD:
-	render_filter = "good";
-	break;
-    case CAIRO_FILTER_BEST:
-	render_filter = "best";
-	break;
-    case CAIRO_FILTER_NEAREST:
-	render_filter = "nearest";
-	break;
-    case CAIRO_FILTER_BILINEAR:
-	render_filter = "bilinear";
-	break;
-    case CAIRO_FILTER_GAUSSIAN:
-    default:
-	render_filter = "best";
-	break;
-    }
-
-    cookie = xcb_render_set_picture_filter_checked (surface->dpy, surface->src_picture,
-						    strlen(render_filter), render_filter,
-						    0, NULL);
-
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_set_repeat (cairo_xcb_surface_t *surface, cairo_extend_t extend)
-{
-    uint32_t mask = XCB_RENDER_CP_REPEAT;
-    uint32_t pa[1];
-    xcb_void_cookie_t cookie;
-
-    switch (extend) {
-    case CAIRO_EXTEND_NONE:
-	pa[0] = XCB_RENDER_REPEAT_NONE;
-	break;
-
-    case CAIRO_EXTEND_REPEAT:
-	pa[0] = XCB_RENDER_REPEAT_NORMAL;
-	break;
-
-    case CAIRO_EXTEND_REFLECT:
-	if (!CAIRO_SURFACE_RENDER_HAS_REPEAT_REFLECT(surface))
-	    return CAIRO_INT_STATUS_UNSUPPORTED;
-
-	pa[0] = XCB_RENDER_REPEAT_REFLECT;
-	break;
-
-    case CAIRO_EXTEND_PAD:
-	if (!CAIRO_SURFACE_RENDER_HAS_REPEAT_PAD(surface))
-	    return CAIRO_INT_STATUS_UNSUPPORTED;
-
-	pa[0] = XCB_RENDER_REPEAT_PAD;
-	break;
-
-    default:
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-    }
-
-    cookie = xcb_render_change_picture_checked (surface->dpy, surface->src_picture,
-						mask, pa);
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-static cairo_int_status_t
-_cairo_xcb_surface_set_attributes (cairo_xcb_surface_t	      *surface,
-				   cairo_surface_attributes_t *attributes)
-{
-    cairo_int_status_t status;
-
-    status = _cairo_xcb_surface_ensure_src_picture (surface);
-    if (status)
-	return status;
-
-    status = _cairo_xcb_surface_set_matrix (surface, &attributes->matrix);
-    if (status)
-	return status;
-
-    status = _cairo_xcb_surface_set_repeat (surface, attributes->extend);
-    if (status)
-	return status;
-
-    status = _cairo_xcb_surface_set_filter (surface, attributes->filter);
-    if (status)
-	return status;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-/* Checks whether we can can directly draw from src to dst with
- * the core protocol: either with CopyArea or using src as a
- * a tile in a GC.
- */
-static cairo_bool_t
-_surfaces_compatible (cairo_xcb_surface_t *dst,
-		      cairo_xcb_surface_t *src)
-{
-    /* same screen */
-    if (!_cairo_xcb_surface_same_screen (dst, src))
-	return FALSE;
-
-    /* same depth (for core) */
-    if (src->depth != dst->depth)
-	return FALSE;
-
-    /* if Render is supported, match picture formats */
-    if (src->xrender_format.id != dst->xrender_format.id)
-	return FALSE;
-    else if (src->xrender_format.id != XCB_NONE)
-	return TRUE;
-
-    /* Without Render, match visuals instead */
-    if (src->visual == dst->visual)
-	return TRUE;
-
-    return FALSE;
-}
-
-static cairo_bool_t
-_surface_has_alpha (cairo_xcb_surface_t *surface)
-{
-    if (surface->xrender_format.id != XCB_NONE) {
-	if (surface->xrender_format.type == XCB_RENDER_PICT_TYPE_DIRECT &&
-	    surface->xrender_format.direct.alpha_mask != 0)
-	    return TRUE;
-	else
-	    return FALSE;
-    } else {
-
-	/* In the no-render case, we never have alpha */
-	return FALSE;
-    }
-}
-
-/* Returns true if the given operator and source-alpha combination
- * requires alpha compositing to complete.
- */
-static cairo_bool_t
-_operator_needs_alpha_composite (cairo_operator_t op,
-				 cairo_bool_t     surface_has_alpha)
-{
-    if (op == CAIRO_OPERATOR_SOURCE ||
-	(!surface_has_alpha &&
-	 (op == CAIRO_OPERATOR_OVER ||
-	  op == CAIRO_OPERATOR_ATOP ||
-	  op == CAIRO_OPERATOR_IN)))
-	return FALSE;
-
-    return TRUE;
-}
-
-/* There is a bug in most older X servers with compositing using a
- * untransformed repeating source pattern when the source is in off-screen
- * video memory, and another with repeated transformed images using a
- * general transform matrix. When these bugs could be triggered, we need a
- * fallback: in the common case where we have no transformation and the
- * source and destination have the same format/visual, we can do the
- * operation using the core protocol for the first bug, otherwise, we need
- * a software fallback.
- *
- * We can also often optimize a compositing operation by calling XCopyArea
- * for some common cases where there is no alpha compositing to be done.
- * We figure that out here as well.
- */
-typedef enum {
-    DO_RENDER,		/* use render */
-    DO_XCOPYAREA,	/* core protocol XCopyArea optimization/fallback */
-    DO_XTILE,		/* core protocol XSetTile optimization/fallback */
-    DO_UNSUPPORTED	/* software fallback */
-} composite_operation_t;
-
-/* Initial check for the render bugs; we need to recheck for the
- * offscreen-memory bug after we turn patterns into surfaces, since that
- * may introduce a repeating pattern for gradient patterns.  We don't need
- * to check for the repeat+transform bug because gradient surfaces aren't
- * transformed.
- *
- * All we do here is reject cases where we *know* are going to
- * hit the bug and won't be able to use a core protocol fallback.
- */
-static composite_operation_t
-_categorize_composite_operation (cairo_xcb_surface_t	    *dst,
-				 cairo_operator_t	     op,
-				 const cairo_pattern_t	    *src_pattern,
-				 cairo_bool_t		     have_mask)
-
-{
-#if XXX_BUGGY_REPEAT
-    if (!dst->buggy_repeat)
-	return DO_RENDER;
-
-    if (src_pattern->type == CAIRO_PATTERN_TYPE_SURFACE)
-    {
-	cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *)src_pattern;
-
-	if (_cairo_matrix_is_integer_translation (&src_pattern->matrix, NULL, NULL) &&
-	    src_pattern->extend == CAIRO_EXTEND_REPEAT)
-	{
-	    /* This is the case where we have the bug involving
-	     * untransformed repeating source patterns with off-screen
-	     * video memory; reject some cases where a core protocol
-	     * fallback is impossible.
-	     */
-	    if (have_mask ||
-		!(op == CAIRO_OPERATOR_SOURCE || op == CAIRO_OPERATOR_OVER))
-		return DO_UNSUPPORTED;
-
-	    if (_cairo_surface_is_xcb (surface_pattern->surface)) {
-		cairo_xcb_surface_t *src = (cairo_xcb_surface_t *)surface_pattern->surface;
-
-		if (op == CAIRO_OPERATOR_OVER && _surface_has_alpha (src))
-		    return DO_UNSUPPORTED;
-
-		/* If these are on the same screen but otherwise incompatible,
-		 * make a copy as core drawing can't cross depths and doesn't
-		 * work rightacross visuals of the same depth
-		 */
-		if (_cairo_xcb_surface_same_screen (dst, src) &&
-		    !_surfaces_compatible (dst, src))
-		    return DO_UNSUPPORTED;
-	    }
-	}
-
-	/* Check for the other bug involving repeat patterns with general
-	 * transforms. */
-	if (!_cairo_matrix_is_integer_translation (&src_pattern->matrix, NULL, NULL) &&
-	    src_pattern->extend == CAIRO_EXTEND_REPEAT)
-	    return DO_UNSUPPORTED;
-    }
-#endif
-    return DO_RENDER;
-}
-
-/* Recheck for composite-repeat once we've turned patterns into Xlib surfaces
- * If we end up returning DO_UNSUPPORTED here, we're throwing away work we
- * did to turn gradients into a pattern, but most of the time we can handle
- * that case with core protocol fallback.
- *
- * Also check here if we can just use XCopyArea, instead of going through
- * Render.
- */
-static composite_operation_t
-_recategorize_composite_operation (cairo_xcb_surface_t	      *dst,
-				   cairo_operator_t	       op,
-				   cairo_xcb_surface_t	      *src,
-				   cairo_surface_attributes_t *src_attr,
-				   cairo_bool_t		       have_mask)
-{
-    cairo_bool_t is_integer_translation =
-	_cairo_matrix_is_integer_translation (&src_attr->matrix, NULL, NULL);
-    cairo_bool_t needs_alpha_composite =
-	_operator_needs_alpha_composite (op, _surface_has_alpha (src));
-
-    if (!have_mask &&
-	is_integer_translation &&
-	src_attr->extend == CAIRO_EXTEND_NONE &&
-	!needs_alpha_composite &&
-	_surfaces_compatible(src, dst))
-    {
-	return DO_XCOPYAREA;
-    }
-#if XXX_BUGGY_REPEAT
-    if (!dst->buggy_repeat)
-	return DO_RENDER;
-
-    if (is_integer_translation &&
-	src_attr->extend == CAIRO_EXTEND_REPEAT &&
-	(src->width != 1 || src->height != 1))
-    {
-	if (!have_mask &&
-	    !needs_alpha_composite &&
-	    _surfaces_compatible (dst, src))
-	{
-	    return DO_XTILE;
-	}
-
-	return DO_UNSUPPORTED;
-    }
-#endif
-    return DO_RENDER;
-}
-
-static int
-_render_operator (cairo_operator_t op)
-{
-    switch (op) {
-    case CAIRO_OPERATOR_CLEAR:
-	return XCB_RENDER_PICT_OP_CLEAR;
-    case CAIRO_OPERATOR_SOURCE:
-	return XCB_RENDER_PICT_OP_SRC;
-    case CAIRO_OPERATOR_DEST:
-	return XCB_RENDER_PICT_OP_DST;
-    case CAIRO_OPERATOR_OVER:
-	return XCB_RENDER_PICT_OP_OVER;
-    case CAIRO_OPERATOR_DEST_OVER:
-	return XCB_RENDER_PICT_OP_OVER_REVERSE;
-    case CAIRO_OPERATOR_IN:
-	return XCB_RENDER_PICT_OP_IN;
-    case CAIRO_OPERATOR_DEST_IN:
-	return XCB_RENDER_PICT_OP_IN_REVERSE;
-    case CAIRO_OPERATOR_OUT:
-	return XCB_RENDER_PICT_OP_OUT;
-    case CAIRO_OPERATOR_DEST_OUT:
-	return XCB_RENDER_PICT_OP_OUT_REVERSE;
-    case CAIRO_OPERATOR_ATOP:
-	return XCB_RENDER_PICT_OP_ATOP;
-    case CAIRO_OPERATOR_DEST_ATOP:
-	return XCB_RENDER_PICT_OP_ATOP_REVERSE;
-    case CAIRO_OPERATOR_XOR:
-	return XCB_RENDER_PICT_OP_XOR;
-    case CAIRO_OPERATOR_ADD:
-	return XCB_RENDER_PICT_OP_ADD;
-    case CAIRO_OPERATOR_SATURATE:
-	return XCB_RENDER_PICT_OP_SATURATE;
-    default:
-	return XCB_RENDER_PICT_OP_OVER;
-    }
-}
-
-static cairo_int_status_t
-_cairo_xcb_surface_composite (cairo_operator_t		op,
-			      const cairo_pattern_t	*src_pattern,
-			      const cairo_pattern_t	*mask_pattern,
-			      void			*abstract_dst,
-			      int			src_x,
-			      int			src_y,
-			      int			mask_x,
-			      int			mask_y,
-			      int			dst_x,
-			      int			dst_y,
-			      unsigned int		width,
-			      unsigned int		height,
-			      cairo_region_t		*clip_region)
-{
-    cairo_surface_attributes_t	src_attr, mask_attr;
-    cairo_xcb_surface_t		*dst = abstract_dst;
-    cairo_xcb_surface_t		*src;
-    cairo_xcb_surface_t		*mask;
-    cairo_int_status_t		status;
-    composite_operation_t       operation;
-    int				itx, ity;
-    cairo_bool_t                is_integer_translation;
-    xcb_void_cookie_t		cookie;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    operation = _categorize_composite_operation (dst, op, src_pattern,
-						 mask_pattern != NULL);
-    if (operation == DO_UNSUPPORTED)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    status = _cairo_pattern_acquire_surfaces (src_pattern, mask_pattern,
-					      &dst->base,
-					      src_x, src_y,
-					      mask_x, mask_y,
-					      width, height,
-					      CAIRO_PATTERN_ACQUIRE_NO_REFLECT,
-					      (cairo_surface_t **) &src,
-					      (cairo_surface_t **) &mask,
-					      &src_attr, &mask_attr);
-    if (status)
-	return status;
-
-    operation = _recategorize_composite_operation (dst, op, src, &src_attr,
-						   mask_pattern != NULL);
-    if (operation == DO_UNSUPPORTED) {
-	status = CAIRO_INT_STATUS_UNSUPPORTED;
-	goto BAIL;
-    }
-
-    status = _cairo_xcb_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	goto BAIL;
-
-    status = _cairo_xcb_surface_set_attributes (src, &src_attr);
-    if (status)
-	goto BAIL;
-
-    switch (operation)
-    {
-    case DO_RENDER:
-	status = _cairo_xcb_surface_ensure_dst_picture (dst);
-	if (unlikely (status))
-	    goto BAIL;
-
-	if (mask) {
-	    status = _cairo_xcb_surface_set_attributes (mask, &mask_attr);
-	    if (unlikely (status))
-		goto BAIL;
-
-	    cookie = xcb_render_composite_checked (dst->dpy,
-						   _render_operator (op),
-						   src->src_picture,
-						   mask->src_picture,
-						   dst->dst_picture,
-						   src_x + src_attr.x_offset,
-						   src_y + src_attr.y_offset,
-						   mask_x + mask_attr.x_offset,
-						   mask_y + mask_attr.y_offset,
-						   dst_x, dst_y,
-						   width, height);
-	} else {
-	    static xcb_render_picture_t maskpict = { XCB_NONE };
-
-	    cookie = xcb_render_composite_checked (dst->dpy,
-						   _render_operator (op),
-						   src->src_picture,
-						   maskpict,
-						   dst->dst_picture,
-						   src_x + src_attr.x_offset,
-						   src_y + src_attr.y_offset,
-						   0, 0,
-						   dst_x, dst_y,
-						   width, height);
-	}
-	break;
-
-    case DO_XCOPYAREA:
-	status = _cairo_xcb_surface_ensure_gc (dst);
-	if (unlikely (status))
+    if (surface->fallback == NULL) {
+	status = _cairo_xcb_surface_cairo_paint (surface, op, source, clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
 	    return status;
 
-	cookie = xcb_copy_area_checked (dst->dpy,
-					src->drawable,
-					dst->drawable,
-					dst->gc,
-					src_x + src_attr.x_offset,
-					src_y + src_attr.y_offset,
-					dst_x, dst_y,
-					width, height);
-	break;
-
-    case DO_XTILE:
-	/* This case is only used for bug fallbacks, though it is theoretically
-	 * applicable to the case where we don't have the RENDER extension as
-	 * well.
-	 *
-	 * We've checked that we have a repeating unscaled source in
-	 * _recategorize_composite_operation.
-	 */
-
-	status = _cairo_xcb_surface_ensure_gc (dst);
-	if (unlikely (status))
+	status = _cairo_xcb_surface_render_paint (surface, op, source, clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
 	    return status;
 
-	is_integer_translation =
-	    _cairo_matrix_is_integer_translation (&src_attr.matrix, &itx, &ity);
-	assert (is_integer_translation == TRUE);
-	{
-	    uint32_t mask = XCB_GC_FILL_STYLE | XCB_GC_TILE
-	                  | XCB_GC_TILE_STIPPLE_ORIGIN_X
-	                  | XCB_GC_TILE_STIPPLE_ORIGIN_Y;
-	    uint32_t values[] = {
-		XCB_FILL_STYLE_TILED, src->drawable,
-		- (itx + src_attr.x_offset),
-		- (ity + src_attr.y_offset)
-	    };
-	    xcb_rectangle_t rect = { dst_x, dst_y, width, height };
-
-	    xcb_change_gc( dst->dpy, dst->gc, mask, values );
-	    cookie = xcb_poly_fill_rectangle_checked (dst->dpy,
-						      dst->drawable,
-						      dst->gc,
-						      1, &rect);
-	}
-	break;
-
-    case DO_UNSUPPORTED:
-    default:
-	ASSERT_NOT_REACHED;
+	surface->fallback = _cairo_xcb_surface_map_to_image (surface);
     }
 
-    status = _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-    if (unlikely (status))
-	goto BAIL;
-
-    if (!_cairo_operator_bounded_by_source (op)) {
-      status = _cairo_surface_composite_fixup_unbounded (&dst->base,
-							 &src_attr, src->width, src->height,
-							 mask ? &mask_attr : NULL,
-							 mask ? mask->width : 0,
-							 mask ? mask->height : 0,
-							 src_x, src_y,
-							 mask_x, mask_y,
-							 dst_x, dst_y, width, height,
-							 clip_region);
-    }
-
- BAIL:
-    if (mask)
-	_cairo_pattern_release_surface (mask_pattern, &mask->base, &mask_attr);
-
-    _cairo_pattern_release_surface (src_pattern, &src->base, &src_attr);
-
-    return status;
+    return _cairo_surface_paint (surface->fallback, op, source, clip);
 }
 
 static cairo_int_status_t
-_cairo_xcb_surface_fill_rectangles (void			     *abstract_surface,
-				     cairo_operator_t	      op,
-				     const cairo_color_t	*     color,
-				     cairo_rectangle_int_t *rects,
-				     int			      num_rects)
+_cairo_xcb_surface_mask (void			*abstract_surface,
+			 cairo_operator_t	 op,
+			 const cairo_pattern_t	*source,
+			 const cairo_pattern_t	*mask,
+			 cairo_clip_t		*clip)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
-    xcb_render_color_t render_color;
-    xcb_rectangle_t static_xrects[16];
-    xcb_rectangle_t *xrects = static_xrects;
-    cairo_status_t status;
-    xcb_void_cookie_t cookie;
-    int i;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLE (surface))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    render_color.red   = color->red_short;
-    render_color.green = color->green_short;
-    render_color.blue  = color->blue_short;
-    render_color.alpha = color->alpha_short;
-
-    status = _cairo_xcb_surface_set_clip_region (surface, NULL);
-    assert (status == CAIRO_STATUS_SUCCESS);
-
-    if (num_rects > ARRAY_LENGTH(static_xrects)) {
-        xrects = _cairo_malloc_ab (num_rects, sizeof(xcb_rectangle_t));
-	if (xrects == NULL)
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-    }
-
-    for (i = 0; i < num_rects; i++) {
-        xrects[i].x = rects[i].x;
-        xrects[i].y = rects[i].y;
-        xrects[i].width = rects[i].width;
-        xrects[i].height = rects[i].height;
-    }
-
-    status = _cairo_xcb_surface_ensure_dst_picture (surface);
-    if (unlikely (status)) {
-	if (xrects != static_xrects)
-	    free (xrects);
-	return status;
-    }
-
-    cookie = xcb_render_fill_rectangles_checked (surface->dpy,
-						 _render_operator (op),
-						 surface->dst_picture,
-						 render_color, num_rects, xrects);
-
-    if (xrects != static_xrects)
-        free (xrects);
-
-    return _cairo_xcb_add_cookie_to_be_checked (surface, cookie);
-}
-
-/* Creates an A8 picture of size @width x @height, initialized with @color
- */
-static cairo_status_t
-_create_a8_picture (cairo_xcb_surface_t *surface,
-		    xcb_render_color_t   *color,
-		    int                   width,
-		    int                   height,
-		    cairo_bool_t          repeat,
-		    xcb_render_picture_t    *out)
-{
-    uint32_t values[] = { TRUE };
-    uint32_t mask = repeat ? XCB_RENDER_CP_REPEAT : 0;
-
-    xcb_pixmap_t pixmap;
-    xcb_render_picture_t picture;
-    xcb_render_pictforminfo_t *format;
-    xcb_rectangle_t rect = { 0, 0, width, height };
-
-    cairo_xcb_cookie_t *cookie[3];
     cairo_status_t status;
 
-    status = _cairo_freepool_alloc_array (&surface->cookie_pool,
-					  ARRAY_LENGTH (cookie),
-					  (void **) cookie);
-    if (unlikely (status))
-	return status;
+    if (surface->drm != NULL && ! surface->marked_dirty)
+	return _cairo_surface_mask (surface->drm, op, source, mask, clip);
 
-    pixmap = xcb_generate_id (surface->dpy);
-    picture = xcb_generate_id (surface->dpy);
+    if (surface->fallback == NULL) {
+	status =  _cairo_xcb_surface_cairo_mask (surface,
+						 op, source, mask, clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
 
-    cookie[0]->xcb = xcb_create_pixmap_checked (surface->dpy, 8, pixmap, surface->drawable,
-						width <= 0 ? 1 : width,
-						height <= 0 ? 1 : height);
-    cairo_list_add_tail (&cookie[0]->link, &surface->to_be_checked);
+	status =  _cairo_xcb_surface_render_mask (surface,
+						  op, source, mask, clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
 
-    format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (surface->dpy, CAIRO_FORMAT_A8);
-    cookie[1]->xcb = xcb_render_create_picture_checked (surface->dpy,
-						picture, pixmap, format->id,
-						mask, values);
-    cairo_list_add_tail (&cookie[1]->link, &surface->to_be_checked);
-
-    cookie[2]->xcb = xcb_render_fill_rectangles_checked (surface->dpy,
-							 XCB_RENDER_PICT_OP_SRC,
-							 picture, *color, 1, &rect);
-    cairo_list_add_tail (&cookie[2]->link, &surface->to_be_checked);
-
-    xcb_free_pixmap (surface->dpy, pixmap);
-
-    *out = picture;
-    return CAIRO_STATUS_SUCCESS;
-}
-
-/* Creates a temporary mask for the trapezoids covering the area
- * [@dst_x, @dst_y, @width, @height] of the destination surface.
- */
-static cairo_status_t
-_create_trapezoid_mask (cairo_xcb_surface_t *dst,
-			cairo_trapezoid_t    *traps,
-			int                   num_traps,
-			int                   dst_x,
-			int                   dst_y,
-			int                   width,
-			int                   height,
-			xcb_render_pictforminfo_t *pict_format,
-			xcb_render_picture_t *mask_picture_out)
-{
-    xcb_render_color_t transparent = { 0, 0, 0, 0 };
-    xcb_render_color_t solid = { 0xffff, 0xffff, 0xffff, 0xffff };
-    xcb_render_picture_t mask_picture, solid_picture;
-    xcb_render_trapezoid_t *offset_traps;
-    xcb_void_cookie_t cookie;
-    cairo_status_t status;
-    int i;
-
-    /* This would be considerably simpler using XRenderAddTraps(), but since
-     * we are only using this in the unbounded-operator case, we stick with
-     * XRenderCompositeTrapezoids, which is available on older versions
-     * of RENDER rather than conditionalizing. We should still hit an
-     * optimization that avoids creating another intermediate surface on
-     * the servers that have XRenderAddTraps().
-     */
-    status = _create_a8_picture (dst, &transparent, width, height, FALSE, &mask_picture);
-    if (unlikely (status))
-	return status;
-
-    status = _create_a8_picture (dst, &solid, 1, 1, TRUE, &solid_picture);
-    if (unlikely (status)) {
-	xcb_render_free_picture (dst->dpy, mask_picture);
-	return status;
+	surface->fallback = _cairo_xcb_surface_map_to_image (surface);
     }
 
-    offset_traps = _cairo_malloc_ab (num_traps, sizeof (xcb_render_trapezoid_t));
-    if (offset_traps == NULL) {
-	xcb_render_free_picture (dst->dpy, solid_picture);
-	xcb_render_free_picture (dst->dpy, mask_picture);
-	return	_cairo_error (CAIRO_STATUS_NO_MEMORY);
-    }
-
-    for (i = 0; i < num_traps; i++) {
-	offset_traps[i].top = _cairo_fixed_to_16_16(traps[i].top) - 0x10000 * dst_y;
-	offset_traps[i].bottom = _cairo_fixed_to_16_16(traps[i].bottom) - 0x10000 * dst_y;
-	offset_traps[i].left.p1.x = _cairo_fixed_to_16_16(traps[i].left.p1.x) - 0x10000 * dst_x;
-	offset_traps[i].left.p1.y = _cairo_fixed_to_16_16(traps[i].left.p1.y) - 0x10000 * dst_y;
-	offset_traps[i].left.p2.x = _cairo_fixed_to_16_16(traps[i].left.p2.x) - 0x10000 * dst_x;
-	offset_traps[i].left.p2.y = _cairo_fixed_to_16_16(traps[i].left.p2.y) - 0x10000 * dst_y;
-	offset_traps[i].right.p1.x = _cairo_fixed_to_16_16(traps[i].right.p1.x) - 0x10000 * dst_x;
-	offset_traps[i].right.p1.y = _cairo_fixed_to_16_16(traps[i].right.p1.y) - 0x10000 * dst_y;
-	offset_traps[i].right.p2.x = _cairo_fixed_to_16_16(traps[i].right.p2.x) - 0x10000 * dst_x;
-        offset_traps[i].right.p2.y = _cairo_fixed_to_16_16(traps[i].right.p2.y) - 0x10000 * dst_y;
-    }
-
-    cookie = xcb_render_trapezoids_checked (dst->dpy, XCB_RENDER_PICT_OP_ADD,
-					    solid_picture, mask_picture,
-					    pict_format->id,
-					    0, 0,
-					    num_traps, offset_traps);
-
-    xcb_render_free_picture (dst->dpy, solid_picture);
-    free (offset_traps);
-
-    status = _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-    if (unlikely (status)) {
-	xcb_render_free_picture (dst->dpy, mask_picture);
-	return status;
-    }
-
-    *mask_picture_out = mask_picture;
-    return CAIRO_STATUS_SUCCESS;
+    return _cairo_surface_mask (surface->fallback,
+				op, source, mask,
+				clip);
 }
 
 static cairo_int_status_t
-_cairo_xcb_surface_composite_trapezoids (cairo_operator_t	op,
-					 const cairo_pattern_t	*pattern,
-					 void			*abstract_dst,
-					 cairo_antialias_t	antialias,
-					 int			src_x,
-					 int			src_y,
-					 int			dst_x,
-					 int			dst_y,
-					 unsigned int		width,
-					 unsigned int		height,
-					 cairo_trapezoid_t	*traps,
-					 int			num_traps,
-					 cairo_region_t		*clip_region)
-{
-    cairo_surface_attributes_t	attributes;
-    cairo_xcb_surface_t		*dst = abstract_dst;
-    cairo_xcb_surface_t		*src;
-    cairo_int_status_t		status;
-    composite_operation_t       operation;
-    int				render_reference_x, render_reference_y;
-    int				render_src_x, render_src_y;
-    int				cairo_format;
-    xcb_render_pictforminfo_t	*render_format;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS (dst))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    operation = _categorize_composite_operation (dst, op, pattern, TRUE);
-    if (operation == DO_UNSUPPORTED)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    status = _cairo_pattern_acquire_surface (pattern, &dst->base,
-					     src_x, src_y, width, height,
-					     CAIRO_PATTERN_ACQUIRE_NO_REFLECT,
-					     (cairo_surface_t **) &src,
-					     &attributes);
-    if (status)
-	return status;
-
-    operation = _recategorize_composite_operation (dst, op, src, &attributes, TRUE);
-    if (operation == DO_UNSUPPORTED) {
-	status = CAIRO_INT_STATUS_UNSUPPORTED;
-	goto BAIL;
-    }
-
-    switch (antialias) {
-    case CAIRO_ANTIALIAS_NONE:
-	cairo_format = CAIRO_FORMAT_A1;
-	break;
-    case CAIRO_ANTIALIAS_GRAY:
-    case CAIRO_ANTIALIAS_SUBPIXEL:
-    case CAIRO_ANTIALIAS_DEFAULT:
-    default:
-	cairo_format = CAIRO_FORMAT_A8;
-	break;
-    }
-    render_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (dst->dpy, cairo_format);
-    /* XXX: what to do if render_format is null? */
-
-    if (traps[0].left.p1.y < traps[0].left.p2.y) {
-	render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p1.x);
-	render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p1.y);
-    } else {
-	render_reference_x = _cairo_fixed_integer_floor (traps[0].left.p2.x);
-	render_reference_y = _cairo_fixed_integer_floor (traps[0].left.p2.y);
-    }
-
-    render_src_x = src_x + render_reference_x - dst_x;
-    render_src_y = src_y + render_reference_y - dst_y;
-
-    status = _cairo_xcb_surface_ensure_dst_picture (dst);
-    if (unlikely (status))
-	goto BAIL;
-
-    status = _cairo_xcb_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	goto BAIL;
-
-    status = _cairo_xcb_surface_set_attributes (src, &attributes);
-    if (status)
-	goto BAIL;
-
-    if (!_cairo_operator_bounded_by_mask (op)) {
-	xcb_void_cookie_t cookie;
-
-	/* xcb_render_composite+trapezoids() creates a mask only large enough for the
-	 * trapezoids themselves, but if the operator is unbounded, then we need
-	 * to actually composite all the way out to the bounds, so we create
-	 * the mask and composite ourselves. There actually would
-	 * be benefit to doing this in all cases, since RENDER implementations
-	 * will frequently create a too temporary big mask, ignoring destination
-	 * bounds and clip. (xcb_render_add_traps() could be used to make creating
-	 * the mask somewhat cheaper.)
-	 */
-	xcb_render_picture_t mask_picture = 0; /* silence compiler */
-
-	status = _create_trapezoid_mask (dst, traps, num_traps,
-		                         dst_x, dst_y, width, height,
-					 render_format,
-					 &mask_picture);
-	if (status)
-	    goto BAIL;
-
-	cookie = xcb_render_composite_checked (dst->dpy,
-					       _render_operator (op),
-					       src->src_picture,
-					       mask_picture,
-					       dst->dst_picture,
-					       src_x + attributes.x_offset,
-					       src_y + attributes.y_offset,
-					       0, 0,
-					       dst_x, dst_y,
-					       width, height);
-	xcb_render_free_picture (dst->dpy, mask_picture);
-
-	status = _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-	if (unlikely (status))
-	    goto BAIL;
-
-	status = _cairo_surface_composite_shape_fixup_unbounded (&dst->base,
-								 &attributes, src->width, src->height,
-								 width, height,
-								 src_x, src_y,
-								 0, 0,
-								 dst_x, dst_y, width, height,
-								 clip_region);
-
-    } else {
-        xcb_render_trapezoid_t xtraps_stack[CAIRO_STACK_ARRAY_LENGTH (xcb_render_trapezoid_t)];
-        xcb_render_trapezoid_t *xtraps = xtraps_stack;
-	xcb_void_cookie_t cookie;
-        int i;
-
-        if (num_traps > ARRAY_LENGTH(xtraps_stack)) {
-            xtraps = _cairo_malloc_ab (num_traps, sizeof(xcb_render_trapezoid_t));
-            if (xtraps == NULL) {
-                status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-                goto BAIL;
-            }
-        }
-
-        for (i = 0; i < num_traps; i++) {
-            xtraps[i].top = _cairo_fixed_to_16_16(traps[i].top);
-            xtraps[i].bottom = _cairo_fixed_to_16_16(traps[i].bottom);
-            xtraps[i].left.p1.x = _cairo_fixed_to_16_16(traps[i].left.p1.x);
-            xtraps[i].left.p1.y = _cairo_fixed_to_16_16(traps[i].left.p1.y);
-            xtraps[i].left.p2.x = _cairo_fixed_to_16_16(traps[i].left.p2.x);
-            xtraps[i].left.p2.y = _cairo_fixed_to_16_16(traps[i].left.p2.y);
-            xtraps[i].right.p1.x = _cairo_fixed_to_16_16(traps[i].right.p1.x);
-            xtraps[i].right.p1.y = _cairo_fixed_to_16_16(traps[i].right.p1.y);
-            xtraps[i].right.p2.x = _cairo_fixed_to_16_16(traps[i].right.p2.x);
-            xtraps[i].right.p2.y = _cairo_fixed_to_16_16(traps[i].right.p2.y);
-        }
-
-	cookie = xcb_render_trapezoids_checked (dst->dpy,
-						_render_operator (op),
-						src->src_picture, dst->dst_picture,
-						render_format->id,
-						render_src_x + attributes.x_offset,
-						render_src_y + attributes.y_offset,
-						num_traps, xtraps);
-
-        if (xtraps != xtraps_stack)
-            free (xtraps);
-
-	status = _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-    }
-
- BAIL:
-    _cairo_pattern_release_surface (pattern, &src->base, &attributes);
-
-    return status;
-}
-
-static cairo_bool_t
-_cairo_xcb_surface_get_extents (void		        *abstract_surface,
-				cairo_rectangle_int_t   *rectangle)
+_cairo_xcb_surface_stroke (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   cairo_path_fixed_t		*path,
+			   const cairo_stroke_style_t	*style,
+			   const cairo_matrix_t		*ctm,
+			   const cairo_matrix_t		*ctm_inverse,
+			   double			 tolerance,
+			   cairo_antialias_t		 antialias,
+			   cairo_clip_t			*clip)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
+    cairo_status_t status;
 
-    rectangle->x = 0;
-    rectangle->y = 0;
-
-    rectangle->width  = surface->width;
-    rectangle->height = surface->height;
-
-    return TRUE;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_flush (void		        *abstract_surface)
-{
-    cairo_xcb_surface_t *surface = abstract_surface;
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
-
-    while (! cairo_list_is_empty (&surface->to_be_checked)) {
-	cairo_xcb_cookie_t *cookie;
-	xcb_generic_error_t *error;
-
-	cookie = cairo_list_first_entry (&surface->to_be_checked,
-					 cairo_xcb_cookie_t,
-					 link);
-
-	error = xcb_request_check (surface->dpy, cookie->xcb);
-	if (error != NULL) {
-#if 0
-	    /* XXX */
-	    fprintf (stderr, "Delayed error detected: %d, major=%d, minor=%d, seqno=%d\n",
-		     error->error_code,
-		     error->major_code,
-		     error->minor_code,
-		     error->sequence);
-#endif
-	    if (status == CAIRO_STATUS_SUCCESS)
-		status = _cairo_error (CAIRO_STATUS_WRITE_ERROR); /* XXX CAIRO_STATUS_CONNECTION_ERROR */
-	}
-
-	cairo_list_del (&cookie->link);
-	_cairo_freepool_free (&surface->cookie_pool, cookie);
+    if (surface->drm != NULL && ! surface->marked_dirty) {
+	return _cairo_surface_stroke (surface->drm,
+				      op, source,
+				      path, style,
+				      ctm, ctm_inverse,
+				      tolerance, antialias,
+				      clip);
     }
 
-    return status;
+    if (surface->fallback == NULL) {
+	status = _cairo_xcb_surface_cairo_stroke (surface, op, source,
+						  path, style,
+						  ctm, ctm_inverse,
+						  tolerance, antialias,
+						  clip);
+
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
+
+	status = _cairo_xcb_surface_render_stroke (surface, op, source,
+						   path, style,
+						   ctm, ctm_inverse,
+						   tolerance, antialias,
+						   clip);
+
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
+
+	surface->fallback = _cairo_xcb_surface_map_to_image (surface);
+    }
+
+    return _cairo_surface_stroke (surface->fallback,
+				  op, source,
+				  path, style,
+				  ctm, ctm_inverse,
+				  tolerance, antialias,
+				  clip);
 }
 
-/* XXX: _cairo_xcb_surface_get_font_options */
-
-static void
-_cairo_xcb_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font);
-
-static void
-_cairo_xcb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
-				       cairo_scaled_font_t  *scaled_font);
-
 static cairo_int_status_t
-_cairo_xcb_surface_show_glyphs (void			*abstract_dst,
-				cairo_operator_t	 op,
-				const cairo_pattern_t	*src_pattern,
-				cairo_glyph_t		*glyphs,
-				int			 num_glyphs,
-				cairo_scaled_font_t	*scaled_font,
-				cairo_clip_t		*clip,
-				int			*remaining_glyphs);
-
-static cairo_bool_t
-_cairo_xcb_surface_is_similar (void *surface_a,
-	                       void *surface_b,
-			       cairo_content_t content)
+_cairo_xcb_surface_fill (void			*abstract_surface,
+			 cairo_operator_t	 op,
+			 const cairo_pattern_t	*source,
+			 cairo_path_fixed_t	*path,
+			 cairo_fill_rule_t	 fill_rule,
+			 double			 tolerance,
+			 cairo_antialias_t	 antialias,
+			 cairo_clip_t		*clip)
 {
-    cairo_xcb_surface_t *a = surface_a;
-    cairo_xcb_surface_t *b = surface_b;
-    xcb_render_pictforminfo_t *xrender_format;
+    cairo_xcb_surface_t *surface = abstract_surface;
+    cairo_status_t status;
 
-    /* XXX: disable caching by the solid pattern cache until we implement
-     * display notification to avoid issuing xcb calls from the wrong thread
-     * or accessing the surface after the Display has been closed.
-     */
-    return FALSE;
+    if (surface->drm != NULL && ! surface->marked_dirty) {
+	return _cairo_surface_fill (surface->drm,
+				    op, source,
+				    path, fill_rule,
+				    tolerance, antialias,
+				    clip);
+    }
 
-    if (! _cairo_xcb_surface_same_screen (a, b))
-	return FALSE;
+    if (surface->fallback == NULL) {
+	status = _cairo_xcb_surface_cairo_fill (surface, op, source,
+						path, fill_rule,
+						tolerance, antialias,
+						clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
 
-    /* now check that the target is a similar format */
-    xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (b->dpy,
-	    _cairo_format_from_content (content));
+	status = _cairo_xcb_surface_render_fill (surface, op, source,
+						 path, fill_rule,
+						 tolerance, antialias,
+						 clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
 
-    return a->xrender_format.id == xrender_format->id;
+	surface->fallback = _cairo_xcb_surface_map_to_image (surface);
+    }
+
+    return _cairo_surface_fill (surface->fallback,
+				op, source,
+				path, fill_rule,
+				tolerance, antialias,
+				clip);
 }
 
-/* XXX: move this to the bottom of the file, XCB and Xlib */
+static cairo_int_status_t
+_cairo_xcb_surface_glyphs (void				*abstract_surface,
+			   cairo_operator_t		 op,
+			   const cairo_pattern_t	*source,
+			   cairo_glyph_t		*glyphs,
+			   int				 num_glyphs,
+			   cairo_scaled_font_t		*scaled_font,
+			   cairo_clip_t			*clip,
+			   int *num_remaining)
+{
+    cairo_xcb_surface_t *surface = abstract_surface;
+    cairo_status_t status;
 
-static const cairo_surface_backend_t cairo_xcb_surface_backend = {
+    *num_remaining = 0;
+
+    if (surface->drm != NULL && ! surface->marked_dirty) {
+	return _cairo_surface_show_text_glyphs (surface->drm,
+						op, source,
+						NULL, 0,
+						glyphs, num_glyphs,
+						NULL, 0, 0,
+						scaled_font,
+						clip);
+    }
+
+    if (surface->fallback == NULL) {
+	status = _cairo_xcb_surface_cairo_glyphs (surface,
+						  op, source,
+						  scaled_font, glyphs, num_glyphs,
+						  clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
+
+	status = _cairo_xcb_surface_render_glyphs (surface,
+						   op, source,
+						   scaled_font, glyphs, num_glyphs,
+						   clip);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
+
+	surface->fallback = _cairo_xcb_surface_map_to_image (surface);
+    }
+
+    return _cairo_surface_show_text_glyphs (surface->fallback,
+					    op, source,
+					    NULL, 0,
+					    glyphs, num_glyphs,
+					    NULL, 0, 0,
+					    scaled_font,
+					    clip);
+}
+
+const cairo_surface_backend_t _cairo_xcb_surface_backend = {
     CAIRO_SURFACE_TYPE_XCB,
 
     _cairo_xcb_surface_create_similar,
     _cairo_xcb_surface_finish,
     _cairo_xcb_surface_acquire_source_image,
     _cairo_xcb_surface_release_source_image,
+    NULL, NULL, NULL, /* dest acquire/release/clone */
 
-    _cairo_xcb_surface_acquire_dest_image,
-    _cairo_xcb_surface_release_dest_image,
-
-    _cairo_xcb_surface_clone_similar,
-    _cairo_xcb_surface_composite,
-    _cairo_xcb_surface_fill_rectangles,
-    _cairo_xcb_surface_composite_trapezoids,
-    NULL, /* create_span_renderer */
-    NULL, /* check_span_renderer */
+    NULL, /* composite */
+    NULL, /* fill */
+    NULL, /* trapezoids */
+    NULL, /* span */
+    NULL, /* check-span */
 
     NULL, /* copy_page */
     NULL, /* show_page */
-
     _cairo_xcb_surface_get_extents,
-    NULL, /* old_show_glyphs */
-    NULL, /* get_font_options */
+    NULL, /* old-glyphs */
+    _cairo_xcb_surface_get_font_options,
+
     _cairo_xcb_surface_flush,
-    NULL, /* mark_dirty_rectangle */
+    _cairo_xcb_surface_mark_dirty,
     _cairo_xcb_surface_scaled_font_fini,
     _cairo_xcb_surface_scaled_glyph_fini,
 
-    NULL, /* paint */
-    NULL, /* mask */
-    NULL, /* stroke */
-    NULL, /* fill */
-    _cairo_xcb_surface_show_glyphs,
-
-    _cairo_xcb_surface_snapshot,
-
-    _cairo_xcb_surface_is_similar,
+    _cairo_xcb_surface_paint,
+    _cairo_xcb_surface_mask,
+    _cairo_xcb_surface_stroke,
+    _cairo_xcb_surface_fill,
+    _cairo_xcb_surface_glyphs,
 };
 
-/**
- * _cairo_surface_is_xcb:
- * @surface: a #cairo_surface_t
- *
- * Checks if a surface is a #cairo_xcb_surface_t
- *
- * Return value: True if the surface is an xcb surface
- **/
-static cairo_bool_t
-_cairo_surface_is_xcb (cairo_surface_t *surface)
+#if CAIRO_HAS_DRM_SURFACE && CAIRO_HAS_XCB_DRM_FUNCTIONS
+static cairo_surface_t *
+_xcb_drm_create_surface_for_drawable (cairo_xcb_connection_t *connection,
+				      cairo_xcb_screen_t *screen,
+				      xcb_drawable_t drawable,
+				      pixman_format_code_t pixman_format,
+				      int width, int height)
 {
-    return surface->backend == &cairo_xcb_surface_backend;
+    uint32_t attachments[] = { XCB_DRI2_ATTACHMENT_BUFFER_FRONT_LEFT };
+    xcb_dri2_get_buffers_reply_t *buffers;
+    xcb_dri2_dri2_buffer_t *buffer;
+    cairo_surface_t *surface;
+
+    if (! _cairo_drm_size_is_valid (screen->device, width, height))
+	return NULL;
+
+    xcb_dri2_create_drawable (connection->xcb_connection,
+			      drawable);
+
+    buffers = xcb_dri2_get_buffers_reply (connection->xcb_connection,
+					  xcb_dri2_get_buffers (connection->xcb_connection,
+								drawable, 1,
+								ARRAY_LENGTH (attachments),
+								attachments),
+					  0);
+    if (buffers == NULL) {
+	xcb_dri2_destroy_drawable (connection->xcb_connection,
+				   drawable);
+	return NULL;
+    }
+
+    /* If the drawable is a window, we expect to receive an extra fake front,
+     * which would involve copying on each flush - contrary to the user
+     * expectations. But that is likely to be preferable to mixing drm/xcb
+     * operations.
+     */
+    buffer = xcb_dri2_get_buffers_buffers (buffers);
+    if (buffers->count == 1 && buffer[0].attachment == XCB_DRI2_ATTACHMENT_BUFFER_FRONT_LEFT) {
+	assert (buffer[0].cpp == PIXMAN_FORMAT_BPP (pixman_format) / 8);
+	surface = cairo_drm_surface_create_for_name (screen->device,
+						     buffer[0].name,
+						     _cairo_format_from_pixman_format (pixman_format),
+						     width, height,
+						     buffer[0].pitch);
+    } else {
+	xcb_dri2_destroy_drawable (connection->xcb_connection,
+				   drawable);
+	surface = NULL;
+    }
+    free (buffers);
+
+    return surface;
 }
 
+#else
+
 static cairo_surface_t *
-_cairo_xcb_surface_create_internal (xcb_connection_t	     *dpy,
-				    xcb_drawable_t		      drawable,
-				    xcb_screen_t		     *screen,
-				    xcb_visualtype_t	     *visual,
-				    xcb_render_pictforminfo_t    *xrender_format,
-				    int			      width,
-				    int			      height,
-				    int			      depth)
+_xcb_drm_create_surface_for_drawable (cairo_xcb_connection_t *connection,
+				      cairo_xcb_screen_t *screen,
+				      xcb_drawable_t drawable,
+				      pixman_format_code_t pixman_format,
+				      int width, int height)
+{
+    return NULL;
+}
+
+#endif
+
+cairo_surface_t *
+_cairo_xcb_surface_create_internal (cairo_xcb_screen_t		*screen,
+				    xcb_drawable_t		 drawable,
+				    cairo_bool_t		 owns_pixmap,
+				    pixman_format_code_t	 pixman_format,
+				    xcb_render_pictformat_t	 xrender_format,
+				    int				 width,
+				    int				 height)
 {
     cairo_xcb_surface_t *surface;
-    const xcb_query_extension_reply_t *er;
-    const xcb_render_query_version_reply_t *r = NULL;
 
     surface = malloc (sizeof (cairo_xcb_surface_t));
-    if (surface == NULL)
+    if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    if (xrender_format) {
-	depth = xrender_format->depth;
-    } else if (visual) {
-	xcb_depth_iterator_t depths;
-	xcb_visualtype_iterator_t visuals;
+    _cairo_surface_init (&surface->base,
+			 &_cairo_xcb_surface_backend,
+			 &screen->connection->device,
+			 _cairo_content_from_pixman_format (pixman_format));
 
-	/* This is ugly, but we have to walk over all visuals
-	 * for the screen to find the depth.
-	 */
-	depths = xcb_screen_allowed_depths_iterator(screen);
-	for(; depths.rem; xcb_depth_next(&depths))
-	{
-	    visuals = xcb_depth_visuals_iterator(depths.data);
-	    for(; visuals.rem; xcb_visualtype_next(&visuals))
-	    {
-		if(visuals.data->visual_id == visual->visual_id)
-		{
-		    depth = depths.data->depth;
-		    goto found;
-		}
-	    }
-	}
-    found:
-	;
-    }
-
-    er = xcb_get_extension_data(dpy, &xcb_render_id);
-    if(er && er->present) {
-	r = xcb_render_util_query_version(dpy);
-    }
-    if (r) {
-	surface->render_major = r->major_version;
-	surface->render_minor = r->minor_version;
-    } else {
-	surface->render_major = -1;
-	surface->render_minor = -1;
-    }
-
-    if (CAIRO_SURFACE_RENDER_HAS_CREATE_PICTURE (surface)) {
-	if (!xrender_format) {
-	    if (visual) {
-		const xcb_render_query_pict_formats_reply_t *formats;
-		xcb_render_pictvisual_t *pict_visual;
-		formats = xcb_render_util_query_formats (dpy);
-		pict_visual = xcb_render_util_find_visual_format (formats, visual->visual_id);
-		if (pict_visual) {
-		    xcb_render_pictforminfo_t template;
-		    template.id = pict_visual->format;
-		    xrender_format = xcb_render_util_find_format (formats, XCB_PICT_FORMAT_ID, &template, 0);
-		}
-	    } else if (depth == 1) {
-		xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT (dpy, CAIRO_FORMAT_A1);
-	    }
-	}
-    } else {
-	xrender_format = NULL;
-    }
-
-    _cairo_surface_init (&surface->base, &cairo_xcb_surface_backend,
-			 _xcb_render_format_to_content (xrender_format));
-
-    surface->dpy = dpy;
-
-    surface->gc = XCB_NONE;
-    surface->drawable = drawable;
+    surface->connection = _cairo_xcb_connection_reference (screen->connection);
     surface->screen = screen;
-    surface->owns_pixmap = FALSE;
+    cairo_list_add (&surface->link, &screen->surfaces);
+
+    surface->fallback = NULL;
+
+    surface->drawable = drawable;
+    surface->owns_pixmap = owns_pixmap;
     surface->use_pixmap = 0;
-    surface->width = width;
+
+    surface->deferred_clear = FALSE;
+
+    surface->width  = width;
     surface->height = height;
+    surface->depth  = PIXMAN_FORMAT_DEPTH (pixman_format);
 
-    /* XXX: set buggy_repeat based on ServerVendor and VendorRelease */
+    surface->picture = XCB_NONE;
 
-    surface->dst_picture = XCB_NONE;
-    surface->src_picture = XCB_NONE;
+    surface->pixman_format = pixman_format;
+    surface->xrender_format = xrender_format;
 
-    surface->visual = visual;
-    surface->xrender_format.id = XCB_NONE;
-    if (xrender_format) surface->xrender_format = *xrender_format;
-    surface->depth = depth;
+    surface->flags = screen->connection->flags;
 
-    surface->have_clip_rects = FALSE;
-    surface->clip_rects = NULL;
-    surface->num_clip_rects = 0;
-    surface->clip_region = NULL;
-
-    cairo_list_init (&surface->to_be_checked);
-    _cairo_freepool_init (&surface->cookie_pool,
-			  sizeof (cairo_xcb_cookie_t));
+    surface->marked_dirty = FALSE;
+    surface->drm = NULL;
+    if (screen->device != NULL) {
+	surface->drm = _xcb_drm_create_surface_for_drawable (surface->connection,
+							     surface->screen,
+							     drawable,
+							     pixman_format,
+							     width, height);
+    }
 
     return &surface->base;
 }
 
 static xcb_screen_t *
-_cairo_xcb_screen_from_visual (xcb_connection_t *c, xcb_visualtype_t *visual)
+_cairo_xcb_screen_from_visual (xcb_connection_t *connection,
+			       xcb_visualtype_t *visual,
+			       int *depth)
 {
     xcb_depth_iterator_t d;
-    xcb_screen_iterator_t s = xcb_setup_roots_iterator(xcb_get_setup(c));
-    for (; s.rem; xcb_screen_next(&s))
-    {
-	if (s.data->root_visual == visual->visual_id)
+    xcb_screen_iterator_t s;
+
+    s = xcb_setup_roots_iterator (xcb_get_setup (connection));
+    for (; s.rem; xcb_screen_next (&s)) {
+	if (s.data->root_visual == visual->visual_id) {
+	    *depth = s.data->root_depth;
 	    return s.data;
+	}
 
 	d = xcb_screen_allowed_depths_iterator(s.data);
-	for (; d.rem; xcb_depth_next(&d))
-	{
-	    xcb_visualtype_iterator_t v = xcb_depth_visuals_iterator(d.data);
-	    for (; v.rem; xcb_visualtype_next(&v))
-	    {
-		if (v.data->visual_id == visual->visual_id)
+	for (; d.rem; xcb_depth_next (&d)) {
+	    xcb_visualtype_iterator_t v = xcb_depth_visuals_iterator (d.data);
+
+	    for (; v.rem; xcb_visualtype_next (&v)) {
+		if (v.data->visual_id == visual->visual_id) {
+		    *depth = d.data->depth;
 		    return s.data;
+		}
 	    }
 	}
     }
+
     return NULL;
 }
 
-/**
- * cairo_xcb_surface_create:
- * @c: an XCB connection
- * @drawable: an XCB drawable
- * @visual: the visual to use for drawing to @drawable. The depth
- *          of the visual must match the depth of the drawable.
- *          Currently, only TrueColor visuals are fully supported.
- * @width: the current width of @drawable.
- * @height: the current height of @drawable.
- *
- * Creates an XCB surface that draws to the given drawable.
- * The way that colors are represented in the drawable is specified
- * by the provided visual.
- *
- * Note: If @drawable is a window, then the function
- * cairo_xcb_surface_set_size() must be called whenever the size of the
- * window changes.
- *
- * Return value: the newly created surface
- **/
 cairo_surface_t *
-cairo_xcb_surface_create (xcb_connection_t *c,
-			  xcb_drawable_t	 drawable,
-			  xcb_visualtype_t *visual,
-			  int		 width,
-			  int		 height)
+cairo_xcb_surface_create (xcb_connection_t  *xcb_connection,
+			  xcb_drawable_t     drawable,
+			  xcb_visualtype_t  *visual,
+			  int		     width,
+			  int		     height)
 {
-    xcb_screen_t	*screen = _cairo_xcb_screen_from_visual (c, visual);
+    cairo_xcb_screen_t *screen;
+    xcb_screen_t *xcb_screen;
+    cairo_format_masks_t image_masks;
+    pixman_format_code_t pixman_format;
+    xcb_render_pictformat_t xrender_format;
+    int depth;
 
-    if (screen == NULL)
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_VISUAL));
+    if (xcb_connection_has_error (xcb_connection))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_WRITE_ERROR);
 
-    return _cairo_xcb_surface_create_internal (c, drawable, screen,
-					       visual, NULL,
-					       width, height, 0);
+    if (unlikely (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_INVALID_SIZE);
+
+    xcb_screen = _cairo_xcb_screen_from_visual (xcb_connection, visual, &depth);
+    if (unlikely (xcb_screen == NULL))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_INVALID_VISUAL);
+
+    image_masks.alpha_mask = 0;
+    image_masks.red_mask   = visual->red_mask;
+    image_masks.green_mask = visual->green_mask;
+    image_masks.blue_mask  = visual->blue_mask;
+    if (depth > 16)
+	image_masks.bpp = 32;
+    else if (depth > 8)
+	image_masks.bpp = 16;
+    else if (depth > 1)
+	image_masks.bpp = 8;
+    else
+	image_masks.bpp = 1;
+
+    if (! _pixman_format_from_masks (&image_masks, &pixman_format))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT));
+
+    screen = _cairo_xcb_screen_get (xcb_connection, xcb_screen);
+    if (unlikely (screen == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    xrender_format =
+	_cairo_xcb_connection_get_xrender_format_for_visual (screen->connection,
+							     visual->visual_id);
+
+    return _cairo_xcb_surface_create_internal (screen, drawable, FALSE,
+					       pixman_format,
+					       xrender_format,
+					       width, height);
 }
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_def (cairo_xcb_surface_create);
+#endif
 
-/**
- * cairo_xcb_surface_create_for_bitmap:
- * @c: an XCB connection
- * @bitmap: an XCB Pixmap (a depth-1 pixmap)
- * @screen: an XCB Screen
- * @width: the current width of @bitmap
- * @height: the current height of @bitmap
- *
- * Creates an XCB surface that draws to the given bitmap.
- * This will be drawn to as a %CAIRO_FORMAT_A1 object.
- *
- * Return value: the newly created surface
- **/
 cairo_surface_t *
-cairo_xcb_surface_create_for_bitmap (xcb_connection_t     *c,
-				     xcb_pixmap_t		bitmap,
-				     xcb_screen_t	       *screen,
-				     int		width,
-				     int		height)
+cairo_xcb_surface_create_for_bitmap (xcb_connection_t	*xcb_connection,
+				     xcb_screen_t	*xcb_screen,
+				     xcb_pixmap_t	 bitmap,
+				     int		 width,
+				     int		 height)
 {
-    return _cairo_xcb_surface_create_internal (c, bitmap, screen,
-					       NULL, NULL,
-					       width, height, 1);
+    cairo_xcb_screen_t *screen;
+
+    if (xcb_connection_has_error (xcb_connection))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_WRITE_ERROR);
+
+    if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
+	return _cairo_surface_create_in_error (CAIRO_STATUS_INVALID_SIZE);
+
+    screen = _cairo_xcb_screen_get (xcb_connection, xcb_screen);
+    if (unlikely (screen == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    return _cairo_xcb_surface_create_internal (screen, bitmap, FALSE,
+					       PIXMAN_a1,
+					       screen->connection->standard_formats[CAIRO_FORMAT_A1],
+					       width, height);
 }
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_def (cairo_xcb_surface_create_for_bitmap);
+#endif
 
 /**
  * cairo_xcb_surface_create_with_xrender_format:
- * @c: an XCB connection
+ * @connection: an XCB connection
  * @drawable: an XCB drawable
  * @screen: the XCB screen associated with @drawable
  * @format: the picture format to use for drawing to @drawable. The
@@ -2182,18 +1258,61 @@ cairo_xcb_surface_create_for_bitmap (xcb_connection_t     *c,
  * Return value: the newly created surface.
  **/
 cairo_surface_t *
-cairo_xcb_surface_create_with_xrender_format (xcb_connection_t	    *c,
+cairo_xcb_surface_create_with_xrender_format (xcb_connection_t	    *xcb_connection,
+					      xcb_screen_t	    *xcb_screen,
 					      xcb_drawable_t	     drawable,
-					      xcb_screen_t		    *screen,
 					      xcb_render_pictforminfo_t *format,
 					      int		     width,
 					      int		     height)
 {
-    return _cairo_xcb_surface_create_internal (c, drawable, screen,
-					       NULL, format,
-					       width, height, 0);
+    cairo_xcb_screen_t *screen;
+    cairo_format_masks_t image_masks;
+    pixman_format_code_t pixman_format;
+
+    if (xcb_connection_has_error (xcb_connection))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_WRITE_ERROR);
+
+    if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
+	return _cairo_surface_create_in_error (CAIRO_STATUS_INVALID_SIZE);
+
+    image_masks.alpha_mask =
+	(unsigned long) format->direct.alpha_mask << format->direct.alpha_shift;
+    image_masks.red_mask =
+	(unsigned long) format->direct.red_mask << format->direct.red_shift;
+    image_masks.green_mask =
+	(unsigned long) format->direct.green_mask << format->direct.green_shift;
+    image_masks.blue_mask =
+	(unsigned long) format->direct.blue_mask << format->direct.blue_shift;
+#if 0
+    image_masks.bpp = format->depth;
+#else
+    if (format->depth > 16)
+	image_masks.bpp = 32;
+    else if (format->depth > 8)
+	image_masks.bpp = 16;
+    else if (format->depth > 1)
+	image_masks.bpp = 8;
+    else
+	image_masks.bpp = 1;
+#endif
+
+    if (! _pixman_format_from_masks (&image_masks, &pixman_format))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_FORMAT));
+
+    screen = _cairo_xcb_screen_get (xcb_connection, xcb_screen);
+    if (unlikely (screen == NULL))
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    return _cairo_xcb_surface_create_internal (screen,
+					       drawable,
+					       FALSE,
+					       pixman_format,
+					       format->id,
+					       width, height);
 }
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
 slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
+#endif
 
 /**
  * cairo_xcb_surface_set_size:
@@ -2213,618 +1332,37 @@ slim_hidden_def (cairo_xcb_surface_create_with_xrender_format);
  **/
 void
 cairo_xcb_surface_set_size (cairo_surface_t *abstract_surface,
-			     int              width,
-			     int              height)
+			    int              width,
+			    int              height)
 {
-    cairo_xcb_surface_t *surface = (cairo_xcb_surface_t *) abstract_surface;
+    cairo_xcb_surface_t *surface;
     cairo_status_t status_ignored;
 
-    if (! _cairo_surface_is_xcb (abstract_surface)) {
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
 	status_ignored = _cairo_surface_set_error (abstract_surface,
-				  CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+						   _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
 	return;
     }
 
-    surface->width = width;
+
+    if (abstract_surface->type != CAIRO_SURFACE_TYPE_XCB) {
+	status_ignored = _cairo_surface_set_error (abstract_surface,
+						   _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
+	return;
+    }
+
+    if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX) {
+	status_ignored = _cairo_surface_set_error (abstract_surface,
+						   _cairo_error (CAIRO_STATUS_INVALID_SIZE));
+	return;
+    }
+
+    surface = (cairo_xcb_surface_t *) abstract_surface;
+    surface->width  = width;
     surface->height = height;
 }
-
-/*
- *  Glyph rendering support
- */
-
-typedef struct _cairo_xcb_surface_font_private {
-    xcb_connection_t		*dpy;
-    xcb_render_glyphset_t	glyphset;
-    cairo_format_t		format;
-    xcb_render_pictforminfo_t	*xrender_format;
-} cairo_xcb_surface_font_private_t;
-
-static cairo_status_t
-_cairo_xcb_surface_font_init (xcb_connection_t		    *dpy,
-			       cairo_scaled_font_t  *scaled_font,
-			       cairo_format_t	     format)
-{
-    cairo_xcb_surface_font_private_t	*font_private;
-
-    font_private = malloc (sizeof (cairo_xcb_surface_font_private_t));
-    if (!font_private)
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    font_private->dpy = dpy;
-    font_private->format = format;
-    font_private->xrender_format = _CAIRO_FORMAT_TO_XRENDER_FORMAT(dpy, format);
-    font_private->glyphset = xcb_generate_id(dpy);
-
-    /* XXX checking, adding to CloseDisplay */
-    xcb_render_create_glyph_set (dpy,
-				 font_private->glyphset,
-				 font_private->xrender_format->id);
-
-    scaled_font->surface_private = font_private;
-    scaled_font->surface_backend = &cairo_xcb_surface_backend;
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-_cairo_xcb_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
-{
-    cairo_xcb_surface_font_private_t	*font_private = scaled_font->surface_private;
-
-    if (font_private) {
-	xcb_render_free_glyph_set (font_private->dpy, font_private->glyphset);
-	free (font_private);
-    }
-}
-
-static void
-_cairo_xcb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
-				       cairo_scaled_font_t  *scaled_font)
-{
-    cairo_xcb_surface_font_private_t	*font_private = scaled_font->surface_private;
-
-    if (font_private != NULL && scaled_glyph->surface_private != NULL) {
-	xcb_render_glyph_t glyph_index = _cairo_scaled_glyph_index(scaled_glyph);
-	xcb_render_free_glyphs (font_private->dpy,
-				font_private->glyphset,
-				1, &glyph_index);
-    }
-}
-
-static cairo_bool_t
-_native_byte_order_lsb (void)
-{
-    int	x = 1;
-
-    return *((char *) &x) == 1;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_add_glyph (cairo_xcb_surface_t *dst,
-			      cairo_scaled_font_t  *scaled_font,
-			      cairo_scaled_glyph_t *scaled_glyph)
-{
-    xcb_render_glyphinfo_t glyph_info;
-    xcb_render_glyph_t glyph_index;
-    unsigned char *data;
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
-    cairo_xcb_surface_font_private_t *font_private;
-    cairo_image_surface_t *glyph_surface = scaled_glyph->surface;
-    xcb_void_cookie_t cookie;
-
-    if (scaled_font->surface_private == NULL) {
-	status = _cairo_xcb_surface_font_init (dst->dpy, scaled_font,
-					       glyph_surface->format);
-	if (status)
-	    return status;
-    }
-    font_private = scaled_font->surface_private;
-
-    /* If the glyph format does not match the font format, then we
-     * create a temporary surface for the glyph image with the font's
-     * format.
-     */
-    if (glyph_surface->format != font_private->format) {
-	cairo_surface_pattern_t pattern;
-	cairo_surface_t *tmp_surface;
-
-	tmp_surface = cairo_image_surface_create (font_private->format,
-						  glyph_surface->width,
-						  glyph_surface->height);
-	status = tmp_surface->status;
-	if (unlikely (status))
-	    goto BAIL;
-
-	tmp_surface->device_transform = glyph_surface->base.device_transform;
-	tmp_surface->device_transform_inverse = glyph_surface->base.device_transform_inverse;
-
-	_cairo_pattern_init_for_surface (&pattern, &glyph_surface->base);
-	status = _cairo_surface_paint (tmp_surface,
-				       CAIRO_OPERATOR_SOURCE, &pattern.base,
-				       NULL);
-	_cairo_pattern_fini (&pattern.base);
-
-	glyph_surface = (cairo_image_surface_t *) tmp_surface;
-
-	if (unlikely (status))
-	    goto BAIL;
-    }
-
-    /* XXX: FRAGILE: We're ignore device_transform scaling here. A bug? */
-    glyph_info.x = _cairo_lround (glyph_surface->base.device_transform.x0);
-    glyph_info.y = _cairo_lround (glyph_surface->base.device_transform.y0);
-    glyph_info.width = glyph_surface->width;
-    glyph_info.height = glyph_surface->height;
-    glyph_info.x_off = 0;
-    glyph_info.y_off = 0;
-
-    data = glyph_surface->data;
-
-    /* flip formats around */
-    switch (scaled_glyph->surface->format) {
-    case CAIRO_FORMAT_A1:
-	/* local bitmaps are always stored with bit == byte */
-	if (_native_byte_order_lsb() != (xcb_get_setup(dst->dpy)->bitmap_format_bit_order == XCB_IMAGE_ORDER_LSB_FIRST)) {
-	    int		    c = glyph_surface->stride * glyph_surface->height;
-	    unsigned char   *d;
-	    unsigned char   *new, *n;
-
-	    new = malloc (c);
-	    if (!new) {
-		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-		goto BAIL;
-	    }
-	    n = new;
-	    d = data;
-	    while (c--)
-	    {
-		char	b = *d++;
-		b = ((b << 1) & 0xaa) | ((b >> 1) & 0x55);
-		b = ((b << 2) & 0xcc) | ((b >> 2) & 0x33);
-		b = ((b << 4) & 0xf0) | ((b >> 4) & 0x0f);
-		*n++ = b;
-	    }
-	    data = new;
-	}
-	break;
-    case CAIRO_FORMAT_A8:
-	break;
-    case CAIRO_FORMAT_ARGB32:
-	if (_native_byte_order_lsb() != (xcb_get_setup(dst->dpy)->image_byte_order == XCB_IMAGE_ORDER_LSB_FIRST)) {
-	    unsigned int    c = glyph_surface->stride * glyph_surface->height;
-	    unsigned char   *d;
-	    unsigned char   *new, *n;
-
-	    new = malloc (c);
-	    if (new == NULL) {
-		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-		goto BAIL;
-	    }
-	    n = new;
-	    d = data;
-	    while (c >= 4)
-	    {
-		n[3] = d[0];
-		n[2] = d[1];
-		n[1] = d[2];
-		n[0] = d[3];
-		d += 4;
-		n += 4;
-		c -= 4;
-	    }
-	    data = new;
-	}
-	break;
-    case CAIRO_FORMAT_RGB24:
-    default:
-	ASSERT_NOT_REACHED;
-	break;
-    }
-    /* XXX assume X server wants pixman padding. Xft assumes this as well */
-
-    glyph_index = _cairo_scaled_glyph_index (scaled_glyph);
-
-    cookie = xcb_render_add_glyphs_checked (dst->dpy, font_private->glyphset,
-					    1, &glyph_index, &glyph_info,
-					    glyph_surface->stride * glyph_surface->height,
-					    data);
-
-    if (data != glyph_surface->data)
-	free (data);
-
-    status = _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-
- BAIL:
-    if (glyph_surface != scaled_glyph->surface)
-	cairo_surface_destroy (&glyph_surface->base);
-
-    return status;
-}
-
-#define N_STACK_BUF 1024
-
-static cairo_status_t
-_cairo_xcb_surface_show_glyphs_8  (cairo_xcb_surface_t *dst,
-                                   cairo_operator_t op,
-                                   cairo_xcb_surface_t *src,
-                                   int src_x_offset, int src_y_offset,
-                                   const cairo_glyph_t *glyphs,
-                                   int num_glyphs,
-                                   cairo_scaled_font_t *scaled_font)
-{
-    cairo_xcb_surface_font_private_t *font_private = scaled_font->surface_private;
-    xcb_render_util_composite_text_stream_t *stream;
-    xcb_void_cookie_t cookie;
-    int i;
-    int thisX, thisY;
-    int lastX = 0, lastY = 0;
-    uint8_t glyph;
-
-    stream = xcb_render_util_composite_text_stream (font_private->glyphset, num_glyphs, 0);
-
-    for (i = 0; i < num_glyphs; ++i) {
-	thisX = _cairo_lround (glyphs[i].x);
-	thisY = _cairo_lround (glyphs[i].y);
-	glyph = glyphs[i].index;
-	xcb_render_util_glyphs_8 (stream, thisX - lastX, thisY - lastY, 1, &glyph);
-	lastX = thisX;
-	lastY = thisY;
-    }
-
-    cookie = xcb_render_util_composite_text_checked (dst->dpy,
-						     _render_operator (op),
-						     src->src_picture,
-						     dst->dst_picture,
-						     font_private->xrender_format->id,
-						     src_x_offset + _cairo_lround (glyphs[0].x),
-						     src_y_offset + _cairo_lround (glyphs[0].y),
-						     stream);
-
-    xcb_render_util_composite_text_free (stream);
-
-    return _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_show_glyphs_16 (cairo_xcb_surface_t *dst,
-                                   cairo_operator_t op,
-                                   cairo_xcb_surface_t *src,
-                                   int src_x_offset, int src_y_offset,
-                                   const cairo_glyph_t *glyphs,
-                                   int num_glyphs,
-                                   cairo_scaled_font_t *scaled_font)
-{
-    cairo_xcb_surface_font_private_t *font_private = scaled_font->surface_private;
-    xcb_render_util_composite_text_stream_t *stream;
-    xcb_void_cookie_t cookie;
-    int i;
-    int thisX, thisY;
-    int lastX = 0, lastY = 0;
-    uint16_t glyph;
-
-    stream = xcb_render_util_composite_text_stream (font_private->glyphset, num_glyphs, 0);
-
-    for (i = 0; i < num_glyphs; ++i) {
-	thisX = _cairo_lround (glyphs[i].x);
-	thisY = _cairo_lround (glyphs[i].y);
-	glyph = glyphs[i].index;
-	xcb_render_util_glyphs_16 (stream, thisX - lastX, thisY - lastY, 1, &glyph);
-	lastX = thisX;
-	lastY = thisY;
-    }
-
-    cookie = xcb_render_util_composite_text_checked (dst->dpy,
-						     _render_operator (op),
-						     src->src_picture,
-						     dst->dst_picture,
-						     font_private->xrender_format->id,
-						     src_x_offset + _cairo_lround (glyphs[0].x),
-						     src_y_offset + _cairo_lround (glyphs[0].y),
-						     stream);
-
-    xcb_render_util_composite_text_free (stream);
-
-    return _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-}
-
-static cairo_status_t
-_cairo_xcb_surface_show_glyphs_32 (cairo_xcb_surface_t *dst,
-                                   cairo_operator_t op,
-                                   cairo_xcb_surface_t *src,
-                                   int src_x_offset, int src_y_offset,
-                                   const cairo_glyph_t *glyphs,
-                                   int num_glyphs,
-                                   cairo_scaled_font_t *scaled_font)
-{
-    cairo_xcb_surface_font_private_t *font_private = scaled_font->surface_private;
-    xcb_render_util_composite_text_stream_t *stream;
-    xcb_void_cookie_t cookie;
-    int i;
-    int thisX, thisY;
-    int lastX = 0, lastY = 0;
-    uint32_t glyph;
-
-    stream = xcb_render_util_composite_text_stream (font_private->glyphset, num_glyphs, 0);
-
-    for (i = 0; i < num_glyphs; ++i) {
-	thisX = _cairo_lround (glyphs[i].x);
-	thisY = _cairo_lround (glyphs[i].y);
-	glyph = glyphs[i].index;
-	xcb_render_util_glyphs_32 (stream, thisX - lastX, thisY - lastY, 1, &glyph);
-	lastX = thisX;
-	lastY = thisY;
-    }
-
-    cookie = xcb_render_util_composite_text_checked (dst->dpy,
-						     _render_operator (op),
-						     src->src_picture,
-						     dst->dst_picture,
-						     font_private->xrender_format->id,
-						     src_x_offset + _cairo_lround (glyphs[0].x),
-						     src_y_offset + _cairo_lround (glyphs[0].y),
-						     stream);
-
-    xcb_render_util_composite_text_free (stream);
-
-    return _cairo_xcb_add_cookie_to_be_checked (dst, cookie);
-}
-
-typedef cairo_status_t (*cairo_xcb_surface_show_glyphs_func_t)
-    (cairo_xcb_surface_t *, cairo_operator_t, cairo_xcb_surface_t *, int, int,
-     const cairo_glyph_t *, int, cairo_scaled_font_t *);
-
-static cairo_bool_t
-_cairo_xcb_surface_owns_font (cairo_xcb_surface_t *dst,
-			      cairo_scaled_font_t *scaled_font)
-{
-    cairo_xcb_surface_font_private_t *font_private;
-
-    font_private = scaled_font->surface_private;
-    if ((scaled_font->surface_backend != NULL &&
-	 scaled_font->surface_backend != &cairo_xcb_surface_backend) ||
-	(font_private != NULL && font_private->dpy != dst->dpy))
-    {
-	return FALSE;
-    }
-
-    return TRUE;
-}
-
-static cairo_status_t
-_cairo_xcb_surface_emit_glyphs (cairo_xcb_surface_t *dst,
-				cairo_glyph_t       *glyphs,
-				int                  num_glyphs,
-				cairo_scaled_font_t *scaled_font,
-				cairo_operator_t     op,
-				cairo_xcb_surface_t *src,
-				cairo_surface_attributes_t *attributes,
-				int                 *remaining_glyphs)
-{
-    cairo_scaled_glyph_t *scaled_glyph;
-    int i, o;
-    unsigned long max_index = 0;
-    cairo_status_t status;
-    cairo_glyph_t *output_glyphs;
-    const cairo_glyph_t *glyphs_chunk;
-    int glyphs_remaining, chunk_size, max_chunk_size;
-    cairo_xcb_surface_show_glyphs_func_t show_glyphs_func;
-
-    /* We make a copy of the glyphs so that we can elide any size-zero
-     * glyphs to workaround an X server bug, (present in at least Xorg
-     * 7.1 without EXA). */
-    output_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));
-    if (output_glyphs == NULL)
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    for (i = 0, o = 0; i < num_glyphs; i++) {
-	if (glyphs[i].index > max_index)
-	    max_index = glyphs[i].index;
-	status = _cairo_scaled_glyph_lookup (scaled_font,
-					     glyphs[i].index,
-					     CAIRO_SCALED_GLYPH_INFO_SURFACE,
-					     &scaled_glyph);
-	if (status) {
-	    free (output_glyphs);
-	    return status;
-	}
-
-	/* Don't put any size-zero glyphs into output_glyphs to avoid
-	 * an X server bug which stops rendering glyphs after the
-	 * first size-zero glyph. */
-	if (scaled_glyph->surface->width && scaled_glyph->surface->height) {
-	    output_glyphs[o++] = glyphs[i];
-	    if (scaled_glyph->surface_private == NULL) {
-		_cairo_xcb_surface_add_glyph (dst, scaled_font, scaled_glyph);
-		scaled_glyph->surface_private = (void *) 1;
-	    }
-	}
-    }
-    num_glyphs = o;
-
-    status = _cairo_xcb_surface_ensure_dst_picture (dst);
-    if (status) {
-	free (output_glyphs);
-	return status;
-    }
-
-    max_chunk_size = xcb_get_maximum_request_length (dst->dpy);
-    if (max_index < 256) {
-	/* XXX: these are all the same size! (28) */
-	max_chunk_size -= sizeof(xcb_render_composite_glyphs_8_request_t);
-	show_glyphs_func = _cairo_xcb_surface_show_glyphs_8;
-    } else if (max_index < 65536) {
-	max_chunk_size -= sizeof(xcb_render_composite_glyphs_16_request_t);
-	show_glyphs_func = _cairo_xcb_surface_show_glyphs_16;
-    } else {
-	max_chunk_size -= sizeof(xcb_render_composite_glyphs_32_request_t);
-	show_glyphs_func = _cairo_xcb_surface_show_glyphs_32;
-    }
-    /* XXX: I think this is wrong; this is only the header size (2 longs) */
-    /*      but should also include the glyph (1 long) */
-    /* max_chunk_size /= sz_xGlyphElt; */
-    max_chunk_size /= 3*sizeof(uint32_t);
-
-    for (glyphs_remaining = num_glyphs, glyphs_chunk = output_glyphs;
-	 glyphs_remaining;
-	 glyphs_remaining -= chunk_size, glyphs_chunk += chunk_size)
-    {
-	chunk_size = MIN (glyphs_remaining, max_chunk_size);
-
-	status = show_glyphs_func (dst, op, src,
-                                   attributes->x_offset, attributes->y_offset,
-                                   glyphs_chunk, chunk_size, scaled_font);
-	if (status) {
-	    free (output_glyphs);
-	    return status;
-	}
-    }
-
-    /* We wouldn't want to leak memory, would we? */
-    free(output_glyphs);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static cairo_int_status_t
-_cairo_xcb_surface_show_glyphs (void			*abstract_dst,
-				cairo_operator_t	 op,
-				const cairo_pattern_t	*src_pattern,
-				cairo_glyph_t		*glyphs,
-				int			 num_glyphs,
-				cairo_scaled_font_t	*scaled_font,
-				cairo_clip_t		*clip,
-				int			*remaining_glyphs)
-{
-    cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
-    cairo_xcb_surface_t *dst = abstract_dst;
-
-    composite_operation_t operation;
-    cairo_surface_attributes_t attributes;
-    cairo_xcb_surface_t *src = NULL;
-
-    cairo_solid_pattern_t solid_pattern;
-    cairo_region_t *clip_region = NULL;
-
-    if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (dst) || dst->xrender_format.id == XCB_NONE)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    /* Just let unbounded operators go through the fallback code
-     * instead of trying to do the fixups here */
-    if (!_cairo_operator_bounded_by_mask (op))
-        return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    /* Render <= 0.10 seems to have a bug with PictOpSrc and glyphs --
-     * the solid source seems to be multiplied by the glyph mask, and
-     * then the entire thing is copied to the destination surface,
-     * including the fully transparent "background" of the rectangular
-     * glyph surface. */
-    if (op == CAIRO_OPERATOR_SOURCE &&
-        !CAIRO_SURFACE_RENDER_AT_LEAST(dst, 0, 11))
-        return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    /* We can only use our code if we either have no clip or
-     * have a real native clip region set.  If we're using
-     * fallback clip masking, we have to go through the full
-     * fallback path.
-     */
-    if (clip != NULL) {
-	status = _cairo_clip_get_region (clip, &clip_region);
-	assert (status != CAIRO_INT_STATUS_NOTHING_TO_DO);
-	if (status)
-	    return status;
-    }
-
-    operation = _categorize_composite_operation (dst, op, src_pattern, TRUE);
-    if (operation == DO_UNSUPPORTED)
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    if (! _cairo_xcb_surface_owns_font (dst, scaled_font))
-	return CAIRO_INT_STATUS_UNSUPPORTED;
-
-    /* After passing all those tests, we're now committed to rendering
-     * these glyphs or to fail trying. We first upload any glyphs to
-     * the X server that it doesn't have already, then we draw
-     * them. We tie into the scaled_font's glyph cache and remove
-     * glyphs from the X server when they are ejected from the
-     * scaled_font cache.
-     */
-
-    /* PictOpClear doesn't seem to work with CompositeText; it seems to ignore
-     * the mask (the glyphs).  This code below was executed as a side effect
-     * of going through the _clip_and_composite fallback code for old_show_glyphs,
-     * so PictOpClear was never used with CompositeText before.
-     */
-    if (op == CAIRO_OPERATOR_CLEAR) {
-	_cairo_pattern_init_solid (&solid_pattern, CAIRO_COLOR_WHITE,
-				   CAIRO_CONTENT_COLOR);
-	src_pattern = &solid_pattern.base;
-	op = CAIRO_OPERATOR_DEST_OUT;
-    }
-
-    if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
-        status = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
-                                                 0, 0, 1, 1,
-						 CAIRO_PATTERN_ACQUIRE_NONE,
-                                                 (cairo_surface_t **) &src,
-                                                 &attributes);
-    } else {
-        cairo_rectangle_int_t glyph_extents;
-
-        status = _cairo_scaled_font_glyph_device_extents (scaled_font,
-                                                          glyphs,
-                                                          num_glyphs,
-                                                          &glyph_extents,
-							  NULL);
-        if (status)
-	    goto BAIL;
-
-        status = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
-                                                 glyph_extents.x, glyph_extents.y,
-                                                 glyph_extents.width, glyph_extents.height,
-						 CAIRO_PATTERN_ACQUIRE_NO_REFLECT,
-                                                 (cairo_surface_t **) &src,
-                                                 &attributes);
-    }
-
-    if (status)
-        goto BAIL;
-
-    operation = _recategorize_composite_operation (dst, op, src, &attributes, TRUE);
-    if (operation == DO_UNSUPPORTED) {
-	status = CAIRO_INT_STATUS_UNSUPPORTED;
-	goto BAIL;
-    }
-
-    status = _cairo_xcb_surface_set_clip_region (dst, clip_region);
-    if (unlikely (status))
-	goto BAIL;
-
-    status = _cairo_xcb_surface_set_attributes (src, &attributes);
-    if (status)
-        goto BAIL;
-
-    /* Send all unsent glyphs to the server, and count the max of the glyph indices */
-    _cairo_scaled_font_freeze_cache (scaled_font);
-
-    if (_cairo_xcb_surface_owns_font (dst, scaled_font)) {
-	status = _cairo_xcb_surface_emit_glyphs (dst,
-						 glyphs, num_glyphs,
-						 scaled_font,
-						 op,
-						 src,
-						 &attributes,
-						 remaining_glyphs);
-    } else {
-	status = CAIRO_INT_STATUS_UNSUPPORTED;
-    }
-    _cairo_scaled_font_thaw_cache (scaled_font);
-
-  BAIL:
-    if (src)
-        _cairo_pattern_release_surface (src_pattern, &src->base, &attributes);
-    if (src_pattern == &solid_pattern.base)
-	_cairo_pattern_fini (&solid_pattern.base);
-
-    return status;
-}
+#if CAIRO_HAS_XLIB_XCB_FUNCTIONS
+slim_hidden_def (cairo_xcb_surface_set_size);
+#endif
diff --git a/gfx/cairo/cairo/src/cairo-xcb.h b/gfx/cairo/cairo/src/cairo-xcb.h
index 1b6d2e69fed..3f64dcbdc5c 100644
--- a/gfx/cairo/cairo/src/cairo-xcb.h
+++ b/gfx/cairo/cairo/src/cairo-xcb.h
@@ -1,6 +1,7 @@
 /* cairo - a vector graphics library with display and print output
  *
  * Copyright © 2002 University of Southern California
+ * Copyright © 2009 Intel Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it either under the terms of the GNU Lesser General Public
@@ -12,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -32,6 +33,7 @@
  *
  * Contributor(s):
  *	Carl D. Worth <cworth@cworth.org>
+ *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #ifndef CAIRO_XCB_H
@@ -42,28 +44,49 @@
 #if CAIRO_HAS_XCB_SURFACE
 
 #include <xcb/xcb.h>
+#include <xcb/render.h>
 
 CAIRO_BEGIN_DECLS
 
 cairo_public cairo_surface_t *
-cairo_xcb_surface_create (xcb_connection_t *c,
+cairo_xcb_surface_create (xcb_connection_t	*connection,
 			  xcb_drawable_t	 drawable,
-			  xcb_visualtype_t *visual,
-			  int		 width,
-			  int		 height);
+			  xcb_visualtype_t	*visual,
+			  int			 width,
+			  int			 height);
 
 cairo_public cairo_surface_t *
-cairo_xcb_surface_create_for_bitmap (xcb_connection_t *c,
-				     xcb_pixmap_t	    bitmap,
-				     xcb_screen_t	   *screen,
-				     int	    width,
-				     int	    height);
+cairo_xcb_surface_create_for_bitmap (xcb_connection_t	*connection,
+				     xcb_screen_t	*screen,
+				     xcb_pixmap_t	 bitmap,
+				     int		 width,
+				     int		 height);
+
+cairo_public cairo_surface_t *
+cairo_xcb_surface_create_with_xrender_format (xcb_connection_t			*connection,
+					      xcb_screen_t			*screen,
+					      xcb_drawable_t			 drawable,
+					      xcb_render_pictforminfo_t		*format,
+					      int				 width,
+					      int				 height);
 
 cairo_public void
 cairo_xcb_surface_set_size (cairo_surface_t *surface,
 			    int		     width,
 			    int		     height);
 
+/* debug interface */
+
+cairo_public void
+cairo_xcb_device_debug_cap_xshm_version (cairo_device_t *device,
+                                         int major_version,
+                                         int minor_version);
+
+cairo_public void
+cairo_xcb_device_debug_cap_xrender_version (cairo_device_t *device,
+                                            int major_version,
+                                            int minor_version);
+
 CAIRO_END_DECLS
 
 #else  /* CAIRO_HAS_XCB_SURFACE */
diff --git a/gfx/cairo/cairo/src/cairo-xlib-display.c b/gfx/cairo/cairo/src/cairo-xlib-display.c
index e98560dbaa2..139e6314961 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-display.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-display.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,33 +37,11 @@
 
 #include "cairo-xlib-private.h"
 #include "cairo-xlib-xrender-private.h"
-
 #include "cairo-freelist-private.h"
+#include "cairo-error-private.h"
 
 #include <X11/Xlibint.h>	/* For XESetCloseDisplay */
 
-struct _cairo_xlib_display {
-    cairo_xlib_display_t *next;
-    cairo_reference_count_t ref_count;
-    cairo_mutex_t mutex;
-
-    Display *display;
-    cairo_xlib_screen_t *screens;
-
-    int render_major;
-    int render_minor;
-    XRenderPictFormat *cached_xrender_formats[CAIRO_FORMAT_RGB16_565 + 1];
-
-    cairo_xlib_job_t *workqueue;
-    cairo_freelist_t wq_freelist;
-
-    cairo_xlib_hook_t *close_display_hooks;
-    unsigned int buggy_gradients :1;
-    unsigned int buggy_pad_reflect :1;
-    unsigned int buggy_repeat :1;
-    unsigned int closed :1;
-};
-
 typedef int (*cairo_xlib_error_func_t) (Display     *display,
 					XErrorEvent *event);
 
@@ -95,14 +73,11 @@ _cairo_xlib_remove_close_display_hook_internal (cairo_xlib_display_t *display,
 static void
 _cairo_xlib_call_close_display_hooks (cairo_xlib_display_t *display)
 {
-    cairo_xlib_screen_t	    *screen;
-    cairo_xlib_hook_t		    *hook;
+    cairo_xlib_screen_t *screen;
+    cairo_xlib_hook_t *hook;
 
-    /* call all registered shutdown routines */
-    CAIRO_MUTEX_LOCK (display->mutex);
-
-    for (screen = display->screens; screen != NULL; screen = screen->next)
-	_cairo_xlib_screen_close_display (screen);
+    cairo_list_foreach_entry (screen, cairo_xlib_screen_t, &display->screens, link)
+	_cairo_xlib_screen_close_display (display, screen);
 
     while (TRUE) {
 	hook = display->close_display_hooks;
@@ -111,50 +86,23 @@ _cairo_xlib_call_close_display_hooks (cairo_xlib_display_t *display)
 
 	_cairo_xlib_remove_close_display_hook_internal (display, hook);
 
-	CAIRO_MUTEX_UNLOCK (display->mutex);
 	hook->func (display, hook);
-	CAIRO_MUTEX_LOCK (display->mutex);
     }
     display->closed = TRUE;
-
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 }
 
 static void
-_cairo_xlib_display_discard_screens (cairo_xlib_display_t *display)
+_cairo_xlib_display_finish (void *abstract_display)
 {
-    cairo_xlib_screen_t *screens;
+    cairo_xlib_display_t *display = abstract_display;
 
-    CAIRO_MUTEX_LOCK (display->mutex);
-    screens = display->screens;
-    display->screens = NULL;
-    CAIRO_MUTEX_UNLOCK (display->mutex);
-
-    while (screens != NULL) {
-	cairo_xlib_screen_t *screen = screens;
-	screens = screen->next;
-
-	_cairo_xlib_screen_destroy (screen);
-    }
+    display->display = NULL;
 }
 
-cairo_xlib_display_t *
-_cairo_xlib_display_reference (cairo_xlib_display_t *display)
+static void
+_cairo_xlib_display_destroy (void *abstract_display)
 {
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&display->ref_count));
-
-    _cairo_reference_count_inc (&display->ref_count);
-
-    return display;
-}
-
-void
-_cairo_xlib_display_destroy (cairo_xlib_display_t *display)
-{
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&display->ref_count));
-
-    if (! _cairo_reference_count_dec_and_test (&display->ref_count))
-	return;
+    cairo_xlib_display_t *display = abstract_display;
 
     /* destroy all outstanding notifies */
     while (display->workqueue != NULL) {
@@ -168,7 +116,11 @@ _cairo_xlib_display_destroy (cairo_xlib_display_t *display)
     }
     _cairo_freelist_fini (&display->wq_freelist);
 
-    CAIRO_MUTEX_FINI (display->mutex);
+    while (! cairo_list_is_empty (&display->screens)) {
+	_cairo_xlib_screen_destroy (cairo_list_first_entry (&display->screens,
+                                                            cairo_xlib_screen_t,
+                                                            link));
+    }
 
     free (display);
 }
@@ -179,6 +131,60 @@ _noop_error_handler (Display     *display,
 {
     return False;		/* return value is ignored */
 }
+
+static void
+_cairo_xlib_display_notify (cairo_xlib_display_t *display)
+{
+    cairo_xlib_job_t *jobs, *job, *freelist;
+    Display *dpy = display->display;
+
+    /* Optimistic atomic pointer read -- don't care if it is wrong due to
+     * contention as we will check again very shortly.
+     */
+    if (display->workqueue == NULL)
+	return;
+
+    jobs = display->workqueue;
+    while (jobs != NULL) {
+	display->workqueue = NULL;
+
+	/* reverse the list to obtain FIFO order */
+	job = NULL;
+	do {
+	    cairo_xlib_job_t *next = jobs->next;
+	    jobs->next = job;
+	    job = jobs;
+	    jobs = next;
+	} while (jobs != NULL);
+	freelist = jobs = job;
+
+	do {
+	    job = jobs;
+	    jobs = job->next;
+
+	    switch (job->type){
+	    case WORK:
+		job->func.work.notify (dpy, job->func.work.data);
+		if (job->func.work.destroy != NULL)
+		    job->func.work.destroy (job->func.work.data);
+		break;
+
+	    case RESOURCE:
+		job->func.resource.notify (dpy, job->func.resource.xid);
+		break;
+	    }
+	} while (jobs != NULL);
+
+	do {
+	    job = freelist;
+	    freelist = job->next;
+	    _cairo_freelist_free (&display->wq_freelist, job);
+	} while (freelist != NULL);
+
+	jobs = display->workqueue;
+    }
+}
+
 static int
 _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
 {
@@ -193,19 +199,22 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
     if (display == NULL)
 	return 0;
 
-    /* protect the notifies from triggering XErrors */
-    XSync (dpy, False);
-    old_handler = XSetErrorHandler (_noop_error_handler);
+    if (! cairo_device_acquire (&display->base)) {
+      /* protect the notifies from triggering XErrors */
+      XSync (dpy, False);
+      old_handler = XSetErrorHandler (_noop_error_handler);
 
-    _cairo_xlib_display_notify (display);
-    _cairo_xlib_call_close_display_hooks (display);
-    _cairo_xlib_display_discard_screens (display);
+      _cairo_xlib_display_notify (display);
+      _cairo_xlib_call_close_display_hooks (display);
 
-    /* catch any that arrived before marking the display as closed */
-    _cairo_xlib_display_notify (display);
+      /* catch any that arrived before marking the display as closed */
+      _cairo_xlib_display_notify (display);
 
-    XSync (dpy, False);
-    XSetErrorHandler (old_handler);
+      XSync (dpy, False);
+      XSetErrorHandler (old_handler);
+
+      cairo_device_release (&display->base);
+    }
 
     /*
      * Unhook from the global list
@@ -223,25 +232,47 @@ _cairo_xlib_close_display (Display *dpy, XExtCodes *codes)
     CAIRO_MUTEX_UNLOCK (_cairo_xlib_display_mutex);
 
     assert (display != NULL);
-    _cairo_xlib_display_destroy (display);
+
+    cairo_device_finish (&display->base);
+    cairo_device_destroy (&display->base);
 
     /* Return value in accordance with requirements of
      * XESetCloseDisplay */
     return 0;
 }
 
-cairo_status_t
-_cairo_xlib_display_get (Display *dpy,
-			 cairo_xlib_display_t **out)
+static const cairo_device_backend_t _cairo_xlib_device_backend = {
+    CAIRO_DEVICE_TYPE_XLIB,
+
+    NULL,
+    NULL,
+
+    NULL, /* flush */
+    _cairo_xlib_display_finish,
+    _cairo_xlib_display_destroy,
+};
+
+/**
+ * cairo_xlib_device_create:
+ * @dpy: the display to create the device for
+ *
+ * Gets the device belonging to @dpy, or creates it if it doesn't exist yet.
+ *
+ * Returns: the device belonging to @dpy
+ **/
+cairo_device_t *
+_cairo_xlib_device_create (Display *dpy)
 {
     cairo_xlib_display_t *display;
     cairo_xlib_display_t **prev;
+    cairo_device_t *device;
     XExtCodes *codes;
     const char *env;
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
     static int buggy_repeat_force = -1;
 
+    CAIRO_MUTEX_INITIALIZE ();
+
     /* There is an apparent deadlock between this mutex and the
      * mutex for the display, but it's actually safe. For the
      * app to call XCloseDisplay() while any other thread is
@@ -262,18 +293,14 @@ _cairo_xlib_display_get (Display *dpy,
 		display->next = _cairo_xlib_display_list;
 		_cairo_xlib_display_list = display;
 	    }
-	    break;
+            device = cairo_device_reference (&display->base);
+	    goto UNLOCK;
 	}
     }
 
-    if (display != NULL) {
-	display = _cairo_xlib_display_reference (display);
-	goto UNLOCK;
-    }
-
     display = malloc (sizeof (cairo_xlib_display_t));
     if (unlikely (display == NULL)) {
-	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	device = _cairo_device_create_in_error (CAIRO_STATUS_NO_MEMORY);
 	goto UNLOCK;
     }
 
@@ -304,20 +331,20 @@ _cairo_xlib_display_get (Display *dpy,
 
     codes = XAddExtension (dpy);
     if (unlikely (codes == NULL)) {
-	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	device = _cairo_device_create_in_error (CAIRO_STATUS_NO_MEMORY);
 	free (display);
-	display = NULL;
 	goto UNLOCK;
     }
 
+    _cairo_device_init (&display->base, &_cairo_xlib_device_backend);
+
     XESetCloseDisplay (dpy, codes->extension, _cairo_xlib_close_display);
 
     _cairo_freelist_init (&display->wq_freelist, sizeof (cairo_xlib_job_t));
 
-    CAIRO_REFERENCE_COUNT_INIT (&display->ref_count, 2); /* add one for the CloseDisplay */
-    CAIRO_MUTEX_INIT (display->mutex);
+    cairo_device_reference (&display->base); /* add one for the CloseDisplay */
     display->display = dpy;
-    display->screens = NULL;
+    cairo_list_init (&display->screens);
     display->workqueue = NULL;
     display->close_display_hooks = NULL;
     display->closed = FALSE;
@@ -434,26 +461,24 @@ _cairo_xlib_display_get (Display *dpy,
     display->next = _cairo_xlib_display_list;
     _cairo_xlib_display_list = display;
 
+    device = &display->base;
+
 UNLOCK:
     CAIRO_MUTEX_UNLOCK (_cairo_xlib_display_mutex);
-    *out = display;
-    return status;
+    return device;
 }
 
 void
 _cairo_xlib_add_close_display_hook (cairo_xlib_display_t	*display,
 				    cairo_xlib_hook_t		*hook)
 {
-    CAIRO_MUTEX_LOCK (display->mutex);
     hook->prev = NULL;
     hook->next = display->close_display_hooks;
     if (hook->next != NULL)
 	hook->next->prev = hook;
     display->close_display_hooks = hook;
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 }
 
-/* display->mutex must be held */
 static void
 _cairo_xlib_remove_close_display_hook_internal (cairo_xlib_display_t *display,
 						cairo_xlib_hook_t *hook)
@@ -474,9 +499,7 @@ void
 _cairo_xlib_remove_close_display_hook (cairo_xlib_display_t	*display,
 				       cairo_xlib_hook_t	*hook)
 {
-    CAIRO_MUTEX_LOCK (display->mutex);
     _cairo_xlib_remove_close_display_hook_internal (display, hook);
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 }
 
 cairo_status_t
@@ -487,7 +510,6 @@ _cairo_xlib_display_queue_resource (cairo_xlib_display_t *display,
     cairo_xlib_job_t *job;
     cairo_status_t status = CAIRO_STATUS_NO_MEMORY;
 
-    CAIRO_MUTEX_LOCK (display->mutex);
     if (display->closed == FALSE) {
 	job = _cairo_freelist_alloc (&display->wq_freelist);
 	if (job != NULL) {
@@ -501,7 +523,6 @@ _cairo_xlib_display_queue_resource (cairo_xlib_display_t *display,
 	    status = CAIRO_STATUS_SUCCESS;
 	}
     }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 
     return status;
 }
@@ -515,7 +536,6 @@ _cairo_xlib_display_queue_work (cairo_xlib_display_t *display,
     cairo_xlib_job_t *job;
     cairo_status_t status = CAIRO_STATUS_NO_MEMORY;
 
-    CAIRO_MUTEX_LOCK (display->mutex);
     if (display->closed == FALSE) {
 	job = _cairo_freelist_alloc (&display->wq_freelist);
 	if (job != NULL) {
@@ -530,66 +550,22 @@ _cairo_xlib_display_queue_work (cairo_xlib_display_t *display,
 	    status = CAIRO_STATUS_SUCCESS;
 	}
     }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 
     return status;
 }
 
-void
-_cairo_xlib_display_notify (cairo_xlib_display_t *display)
+cairo_status_t
+_cairo_xlib_display_acquire (cairo_device_t *device, cairo_xlib_display_t **display)
 {
-    cairo_xlib_job_t *jobs, *job, *freelist;
-    Display *dpy = display->display;
+    cairo_status_t status;
 
-    /* Optimistic atomic pointer read -- don't care if it is wrong due to
-     * contention as we will check again very shortly.
-     */
-    if (display->workqueue == NULL)
-	return;
+    status = cairo_device_acquire (device);
+    if (status)
+        return status;
 
-    CAIRO_MUTEX_LOCK (display->mutex);
-    jobs = display->workqueue;
-    while (jobs != NULL) {
-	display->workqueue = NULL;
-	CAIRO_MUTEX_UNLOCK (display->mutex);
-
-	/* reverse the list to obtain FIFO order */
-	job = NULL;
-	do {
-	    cairo_xlib_job_t *next = jobs->next;
-	    jobs->next = job;
-	    job = jobs;
-	    jobs = next;
-	} while (jobs != NULL);
-	freelist = jobs = job;
-
-	do {
-	    job = jobs;
-	    jobs = job->next;
-
-	    switch (job->type){
-	    case WORK:
-		job->func.work.notify (dpy, job->func.work.data);
-		if (job->func.work.destroy != NULL)
-		    job->func.work.destroy (job->func.work.data);
-		break;
-
-	    case RESOURCE:
-		job->func.resource.notify (dpy, job->func.resource.xid);
-		break;
-	    }
-	} while (jobs != NULL);
-
-	CAIRO_MUTEX_LOCK (display->mutex);
-	do {
-	    job = freelist;
-	    freelist = job->next;
-	    _cairo_freelist_free (&display->wq_freelist, job);
-	} while (freelist != NULL);
-
-	jobs = display->workqueue;
-    }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
+    *display = (cairo_xlib_display_t *) device;
+    _cairo_xlib_display_notify (*display);
+    return status;
 }
 
 XRenderPictFormat *
@@ -604,7 +580,6 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
 	return xrender_format;
 #endif
 
-    CAIRO_MUTEX_LOCK (display->mutex);
     xrender_format = display->cached_xrender_formats[format];
     if (xrender_format == NULL) {
 	int pict_format;
@@ -630,13 +605,12 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
 	            break;
 	        }
 	    }
-	    if (!visual) {
-	        CAIRO_MUTEX_UNLOCK (display->mutex);
+	    if (!visual)
 	        return NULL;
-	    }
 	    xrender_format = XRenderFindVisualFormat(display->display, visual);
 	    break;
 	}
+	case CAIRO_FORMAT_INVALID:
 	default:
 	    ASSERT_NOT_REACHED;
 	case CAIRO_FORMAT_ARGB32:
@@ -647,75 +621,25 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
 		                                        pict_format);
 	display->cached_xrender_formats[format] = xrender_format;
     }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 
     return xrender_format;
 }
 
-Display *
-_cairo_xlib_display_get_dpy (cairo_xlib_display_t *display)
-{
-    return display->display;
-}
-
-void
-_cairo_xlib_display_remove_screen (cairo_xlib_display_t *display,
-				   cairo_xlib_screen_t *screen)
-{
-    cairo_xlib_screen_t **prev;
-    cairo_xlib_screen_t *list;
-
-    CAIRO_MUTEX_LOCK (display->mutex);
-    for (prev = &display->screens; (list = *prev); prev = &list->next) {
-	if (list == screen) {
-	    *prev = screen->next;
-	    break;
-	}
-    }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
-}
-
-cairo_status_t
+cairo_xlib_screen_t *
 _cairo_xlib_display_get_screen (cairo_xlib_display_t *display,
-				Screen *screen,
-				cairo_xlib_screen_t **out)
+				Screen *screen)
 {
-    cairo_xlib_screen_t *info = NULL, **prev;
+    cairo_xlib_screen_t *info;
 
-    CAIRO_MUTEX_LOCK (display->mutex);
-    if (display->closed) {
-	CAIRO_MUTEX_UNLOCK (display->mutex);
-	return _cairo_error (CAIRO_STATUS_SURFACE_FINISHED);
-    }
-
-    for (prev = &display->screens; (info = *prev); prev = &(*prev)->next) {
+    cairo_list_foreach_entry (info, cairo_xlib_screen_t, &display->screens, link) {
 	if (info->screen == screen) {
-	    /*
-	     * MRU the list
-	     */
-	    if (prev != &display->screens) {
-		*prev = info->next;
-		info->next = display->screens;
-		display->screens = info;
-	    }
-	    break;
-	}
+            if (display->screens.next != &info->link)
+                cairo_list_move (&info->link, &display->screens);
+            return info;
+        }
     }
-    CAIRO_MUTEX_UNLOCK (display->mutex);
 
-    *out = info;
-    return CAIRO_STATUS_SUCCESS;
-}
-
-
-void
-_cairo_xlib_display_add_screen (cairo_xlib_display_t *display,
-				cairo_xlib_screen_t *screen)
-{
-    CAIRO_MUTEX_LOCK (display->mutex);
-    screen->next = display->screens;
-    display->screens = screen;
-    CAIRO_MUTEX_UNLOCK (display->mutex);
+    return NULL;
 }
 
 void
@@ -727,19 +651,19 @@ _cairo_xlib_display_get_xrender_version (cairo_xlib_display_t *display,
 }
 
 cairo_bool_t
-_cairo_xlib_display_has_repeat (cairo_xlib_display_t *display)
+_cairo_xlib_display_has_repeat (cairo_device_t *device)
 {
-    return ! display->buggy_repeat;
+    return ! ((cairo_xlib_display_t *) device)->buggy_repeat;
 }
 
 cairo_bool_t
-_cairo_xlib_display_has_reflect (cairo_xlib_display_t *display)
+_cairo_xlib_display_has_reflect (cairo_device_t *device)
 {
-    return ! display->buggy_pad_reflect;
+    return ! ((cairo_xlib_display_t *) device)->buggy_pad_reflect;
 }
 
 cairo_bool_t
-_cairo_xlib_display_has_gradients (cairo_xlib_display_t *display)
+_cairo_xlib_display_has_gradients (cairo_device_t *device)
 {
-    return ! display->buggy_gradients;
+    return ! ((cairo_xlib_display_t *) device)->buggy_gradients;
 }
diff --git a/gfx/cairo/cairo/src/cairo-xlib-private.h b/gfx/cairo/cairo/src/cairo-xlib-private.h
index afdf6a6bddb..bd260bc0ed4 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-private.h
+++ b/gfx/cairo/cairo/src/cairo-xlib-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -41,7 +41,9 @@
 #include "cairo-xlib-xrender-private.h"
 
 #include "cairo-compiler-private.h"
-#include "cairo-mutex-private.h"
+#include "cairo-device-private.h"
+#include "cairo-freelist-type-private.h"
+#include "cairo-list-private.h"
 #include "cairo-reference-count-private.h"
 #include "cairo-types-private.h"
 
@@ -63,7 +65,30 @@ struct _cairo_xlib_hook {
 /* size of gray ramp */
 #define RAMP_SIZE 16
 
+struct _cairo_xlib_display {
+    cairo_device_t base;
+
+    cairo_xlib_display_t *next;
+
+    Display *display;
+    cairo_list_t screens;
+
+    int render_major;
+    int render_minor;
+    XRenderPictFormat *cached_xrender_formats[CAIRO_FORMAT_RGB16_565 + 1];
+
+    cairo_xlib_job_t *workqueue;
+    cairo_freelist_t wq_freelist;
+
+    cairo_xlib_hook_t *close_display_hooks;
+    unsigned int buggy_gradients :1;
+    unsigned int buggy_pad_reflect :1;
+    unsigned int buggy_repeat :1;
+    unsigned int closed :1;
+};
+
 typedef struct _cairo_xlib_visual_info {
+    cairo_list_t link;
     VisualID visualid;
     struct { uint8_t a, r, g, b; } colors[256];
     uint8_t cube_to_pseudocolor[CUBE_SIZE][CUBE_SIZE][CUBE_SIZE];
@@ -73,13 +98,10 @@ typedef struct _cairo_xlib_visual_info {
 } cairo_xlib_visual_info_t;
 
 struct _cairo_xlib_screen {
-    cairo_xlib_screen_t *next;
-    cairo_reference_count_t ref_count;
-    cairo_mutex_t mutex;
+    cairo_list_t link;
 
-    cairo_xlib_display_t *display;
+    cairo_device_t *device;
     Screen *screen;
-    cairo_bool_t has_render;
 
     cairo_bool_t has_font_options;
     cairo_font_options_t font_options;
@@ -87,39 +109,15 @@ struct _cairo_xlib_screen {
     GC gc[4];
     cairo_atomic_int_t gc_depths; /* 4 x uint8_t */
 
-    cairo_array_t visuals;
+    cairo_list_t visuals;
 };
 
-cairo_private cairo_status_t
-_cairo_xlib_display_get (Display *display, cairo_xlib_display_t **out);
+cairo_private cairo_device_t *
+_cairo_xlib_device_create (Display *display);
 
-cairo_private cairo_xlib_display_t *
-_cairo_xlib_display_reference (cairo_xlib_display_t *info);
-
-cairo_private void
-_cairo_xlib_display_destroy (cairo_xlib_display_t *info);
-
-cairo_private void
-_cairo_xlib_display_lock (cairo_xlib_display_t *display);
-
-cairo_private void
-_cairo_xlib_display_unlock (cairo_xlib_display_t *display);
-
-cairo_private Display *
-_cairo_xlib_display_get_dpy (cairo_xlib_display_t *info);
-
-cairo_private void
-_cairo_xlib_display_add_screen (cairo_xlib_display_t *display,
-				cairo_xlib_screen_t *screen);
-
-cairo_private cairo_status_t
+cairo_private cairo_xlib_screen_t *
 _cairo_xlib_display_get_screen (cairo_xlib_display_t *display,
-				Screen *screen,
-				cairo_xlib_screen_t **out);
-
-cairo_private void
-_cairo_xlib_display_remove_screen (cairo_xlib_display_t *display,
-				   cairo_xlib_screen_t *screen);
+				Screen *screen);
 
 cairo_private void
 _cairo_xlib_add_close_display_hook (cairo_xlib_display_t *display, cairo_xlib_hook_t *hook);
@@ -136,21 +134,22 @@ cairo_private cairo_status_t
 _cairo_xlib_display_queue_resource (cairo_xlib_display_t *display,
 	                           cairo_xlib_notify_resource_func notify,
 				   XID resource);
-cairo_private void
-_cairo_xlib_display_notify (cairo_xlib_display_t *display);
+cairo_private cairo_status_t
+_cairo_xlib_display_acquire (cairo_device_t *device,
+                             cairo_xlib_display_t **display);
 
 cairo_private void
 _cairo_xlib_display_get_xrender_version (cairo_xlib_display_t *display,
 					 int *major, int *minor);
 
 cairo_private cairo_bool_t
-_cairo_xlib_display_has_repeat (cairo_xlib_display_t *display);
+_cairo_xlib_display_has_repeat (cairo_device_t *device);
 
 cairo_private cairo_bool_t
-_cairo_xlib_display_has_reflect (cairo_xlib_display_t *display);
+_cairo_xlib_display_has_reflect (cairo_device_t *device);
 
 cairo_private cairo_bool_t
-_cairo_xlib_display_has_gradients (cairo_xlib_display_t *display);
+_cairo_xlib_display_has_gradients (cairo_device_t *device);
 
 cairo_private XRenderPictFormat *
 _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t	*display,
@@ -161,21 +160,22 @@ _cairo_xlib_screen_get (Display *dpy,
 			Screen *screen,
 			cairo_xlib_screen_t **out);
 
-cairo_private cairo_xlib_screen_t *
-_cairo_xlib_screen_reference (cairo_xlib_screen_t *info);
 cairo_private void
 _cairo_xlib_screen_destroy (cairo_xlib_screen_t *info);
 
 cairo_private void
-_cairo_xlib_screen_close_display (cairo_xlib_screen_t *info);
+_cairo_xlib_screen_close_display (cairo_xlib_display_t *display,
+                                  cairo_xlib_screen_t *info);
 
 cairo_private GC
-_cairo_xlib_screen_get_gc (cairo_xlib_screen_t *info,
+_cairo_xlib_screen_get_gc (cairo_xlib_display_t *display,
+                           cairo_xlib_screen_t *info,
 			   int depth,
 			   Drawable drawable);
 
 cairo_private void
-_cairo_xlib_screen_put_gc (cairo_xlib_screen_t *info,
+_cairo_xlib_screen_put_gc (cairo_xlib_display_t *display,
+                           cairo_xlib_screen_t *info,
 			   int depth,
 			   GC gc);
 
@@ -183,7 +183,8 @@ cairo_private cairo_font_options_t *
 _cairo_xlib_screen_get_font_options (cairo_xlib_screen_t *info);
 
 cairo_private cairo_status_t
-_cairo_xlib_screen_get_visual_info (cairo_xlib_screen_t *info,
+_cairo_xlib_screen_get_visual_info (cairo_xlib_display_t *display,
+                                    cairo_xlib_screen_t *info,
 				    Visual *visual,
 				    cairo_xlib_visual_info_t **out);
 
@@ -194,6 +195,6 @@ _cairo_xlib_visual_info_create (Display *dpy,
 				cairo_xlib_visual_info_t **out);
 
 cairo_private void
-_cairo_xlib_visual_info_destroy (Display *dpy, cairo_xlib_visual_info_t *info);
+_cairo_xlib_visual_info_destroy (cairo_xlib_visual_info_t *info);
 
 #endif /* CAIRO_XLIB_PRIVATE_H */
diff --git a/gfx/cairo/cairo/src/cairo-xlib-screen.c b/gfx/cairo/cairo/src/cairo-xlib-screen.c
index 09a2a81077d..a0c3df84092 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-screen.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-screen.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -58,8 +58,9 @@
 #include "cairo-xlib-xrender-private.h"
 
 #include "cairo-xlib-surface-private.h"
+#include "cairo-error-private.h"
 
-#include <fontconfig/fontconfig.h>
+#include "cairo-fontconfig-private.h"
 
 static int
 parse_boolean (const char *v)
@@ -125,23 +126,6 @@ get_integer_default (Display    *dpy,
     return FALSE;
 }
 
-#ifndef FC_RGBA_UNKNOWN
-#define FC_RGBA_UNKNOWN	    0
-#define FC_RGBA_RGB	    1
-#define FC_RGBA_BGR	    2
-#define FC_RGBA_VRGB	    3
-#define FC_RGBA_VBGR	    4
-#define FC_RGBA_NONE	    5
-#endif
-
-#ifndef FC_HINT_NONE
-#define FC_HINT_NONE        0
-#define FC_HINT_SLIGHT      1
-#define FC_HINT_MEDIUM      2
-#define FC_HINT_FULL        3
-#endif
-
-
 static void
 _cairo_xlib_init_screen_font_options (Display *dpy,
 				      cairo_xlib_screen_t *info)
@@ -150,13 +134,22 @@ _cairo_xlib_init_screen_font_options (Display *dpy,
     cairo_bool_t xft_antialias;
     int xft_hintstyle;
     int xft_rgba;
+    int xft_lcdfilter;
     cairo_antialias_t antialias;
     cairo_subpixel_order_t subpixel_order;
+    cairo_lcd_filter_t lcd_filter;
     cairo_hint_style_t hint_style;
 
     if (!get_boolean_default (dpy, "antialias", &xft_antialias))
 	xft_antialias = TRUE;
 
+    if (!get_integer_default (dpy, "lcdfilter", &xft_lcdfilter)) {
+	/* -1 is an non-existant Fontconfig constant used to differentiate
+	 * the case when no lcdfilter property is available.
+	 */
+	xft_lcdfilter = -1;
+    }
+
     if (!get_boolean_default (dpy, "hinting", &xft_hinting))
 	xft_hinting = TRUE;
 
@@ -165,16 +158,16 @@ _cairo_xlib_init_screen_font_options (Display *dpy,
 
     if (!get_integer_default (dpy, "rgba", &xft_rgba))
     {
+        cairo_xlib_display_t *display = (cairo_xlib_display_t *) info->device;
+
 	xft_rgba = FC_RGBA_UNKNOWN;
 
 #if RENDER_MAJOR > 0 || RENDER_MINOR >= 6
-	if (info->has_render)
-	{
+        if (display->render_major > 0 || display->render_minor >= 6) {
 	    int render_order = XRenderQuerySubpixelOrder (dpy,
 							  XScreenNumberOfScreen (info->screen));
 
-	    switch (render_order)
-	    {
+	    switch (render_order) {
 	    default:
 	    case SubPixelUnknown:
 		xft_rgba = FC_RGBA_UNKNOWN;
@@ -239,6 +232,24 @@ _cairo_xlib_init_screen_font_options (Display *dpy,
 	subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
     }
 
+    switch (xft_lcdfilter) {
+    case FC_LCD_NONE:
+	lcd_filter = CAIRO_LCD_FILTER_NONE;
+	break;
+    case FC_LCD_DEFAULT:
+	lcd_filter = CAIRO_LCD_FILTER_FIR5;
+	break;
+    case FC_LCD_LIGHT:
+	lcd_filter = CAIRO_LCD_FILTER_FIR3;
+	break;
+    case FC_LCD_LEGACY:
+	lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL;
+	break;
+    default:
+	lcd_filter = CAIRO_LCD_FILTER_DEFAULT;
+	break;
+    }
+
     if (xft_antialias) {
 	if (subpixel_order == CAIRO_SUBPIXEL_ORDER_DEFAULT)
 	    antialias = CAIRO_ANTIALIAS_GRAY;
@@ -251,70 +262,36 @@ _cairo_xlib_init_screen_font_options (Display *dpy,
     cairo_font_options_set_hint_style (&info->font_options, hint_style);
     cairo_font_options_set_antialias (&info->font_options, antialias);
     cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order);
+    _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter);
     cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON);
 }
 
-cairo_xlib_screen_t *
-_cairo_xlib_screen_reference (cairo_xlib_screen_t *info)
-{
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&info->ref_count));
-
-    _cairo_reference_count_inc (&info->ref_count);
-
-    return info;
-}
-
 void
-_cairo_xlib_screen_close_display (cairo_xlib_screen_t *info)
+_cairo_xlib_screen_close_display (cairo_xlib_display_t *display,
+                                  cairo_xlib_screen_t  *info)
 {
-    cairo_xlib_visual_info_t **visuals;
     Display *dpy;
-    cairo_atomic_int_t old;
     int i;
 
-    CAIRO_MUTEX_LOCK (info->mutex);
-
-    dpy = _cairo_xlib_display_get_dpy (info->display);
-
-#if HAS_ATOMIC_OPS
-    do {
-	old = _cairo_atomic_int_get (&info->gc_depths);
-    } while (_cairo_atomic_int_cmpxchg (&info->gc_depths, old, 0) != old);
-#else
-    old = info->gc_depths;
-    info->gc_depths = 0;
-#endif
+    dpy = display->display;
 
     for (i = 0; i < ARRAY_LENGTH (info->gc); i++) {
-	if ((old >> (8*i)) & 0xff)
+	if ((info->gc_depths >> (8*i)) & 0xff)
 	    XFreeGC (dpy, info->gc[i]);
     }
-
-    visuals = _cairo_array_index (&info->visuals, 0);
-    for (i = 0; i < _cairo_array_num_elements (&info->visuals); i++)
-	_cairo_xlib_visual_info_destroy (dpy, visuals[i]);
-    _cairo_array_truncate (&info->visuals, 0);
-
-    CAIRO_MUTEX_UNLOCK (info->mutex);
+    info->gc_depths = 0;
 }
 
 void
 _cairo_xlib_screen_destroy (cairo_xlib_screen_t *info)
 {
-    assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&info->ref_count));
+    while (! cairo_list_is_empty (&info->visuals)) {
+        _cairo_xlib_visual_info_destroy (cairo_list_first_entry (&info->visuals,
+                                                                 cairo_xlib_visual_info_t,
+                                                                 link));
+    }
 
-    if (! _cairo_reference_count_dec_and_test (&info->ref_count))
-	return;
-
-    _cairo_xlib_display_remove_screen (info->display, info);
-
-    _cairo_xlib_screen_close_display (info);
-
-    _cairo_xlib_display_destroy (info->display);
-
-    _cairo_array_fini (&info->visuals);
-
-    CAIRO_MUTEX_FINI (info->mutex);
+    cairo_list_del (&info->link);
 
     free (info);
 }
@@ -325,17 +302,22 @@ _cairo_xlib_screen_get (Display *dpy,
 			cairo_xlib_screen_t **out)
 {
     cairo_xlib_display_t *display;
+    cairo_device_t *device;
     cairo_xlib_screen_t *info;
     cairo_status_t status;
 
-    status = _cairo_xlib_display_get (dpy, &display);
-    if (likely (status == CAIRO_STATUS_SUCCESS))
-	status = _cairo_xlib_display_get_screen (display, screen, &info);
+    device = _cairo_xlib_device_create (dpy);
+    status = device->status;
     if (unlikely (status))
-	goto CLEANUP_DISPLAY;
+        goto CLEANUP_DEVICE;
 
+    status =  _cairo_xlib_display_acquire (device, &display);
+    if (unlikely (status))
+        goto CLEANUP_DEVICE;
+
+    info = _cairo_xlib_display_get_screen (display, screen);
     if (info != NULL) {
-	*out = _cairo_xlib_screen_reference (info);
+	*out = info;
 	goto CLEANUP_DISPLAY;
     }
 
@@ -345,133 +327,34 @@ _cairo_xlib_screen_get (Display *dpy,
 	goto CLEANUP_DISPLAY;
     }
 
-    CAIRO_REFERENCE_COUNT_INIT (&info->ref_count, 2); /* Add one for display cache */
-    CAIRO_MUTEX_INIT (info->mutex);
-    info->display = display;
+    info->device = device;
     info->screen = screen;
-    info->has_render = FALSE;
     info->has_font_options = FALSE;
     info->gc_depths = 0;
     memset (info->gc, 0, sizeof (info->gc));
 
-    _cairo_array_init (&info->visuals,
-		       sizeof (cairo_xlib_visual_info_t*));
-
-    if (screen) {
-	int event_base, error_base;
-
-	info->has_render =
-	    XRenderQueryExtension (dpy, &event_base, &error_base) &&
-	    (XRenderFindVisualFormat (dpy, DefaultVisual (dpy, DefaultScreen (dpy))) != 0);
-    }
-
-    /* Small window of opportunity for two screen infos for the same
-     * Screen - just wastes a little bit of memory but should not cause
-     * any corruption.
-     */
-    _cairo_xlib_display_add_screen (display, info);
+    cairo_list_init (&info->visuals);
+    cairo_list_add (&info->link, &display->screens);
 
     *out = info;
-    return CAIRO_STATUS_SUCCESS;
 
   CLEANUP_DISPLAY:
-    _cairo_xlib_display_destroy (display);
+    cairo_device_release (&display->base);
+
+  CLEANUP_DEVICE:
+    cairo_device_destroy (device);
     return status;
 }
 
-#if HAS_ATOMIC_OPS
 GC
-_cairo_xlib_screen_get_gc (cairo_xlib_screen_t *info,
-			   int depth,
-			   Drawable drawable)
-{
-    XGCValues gcv;
-    cairo_atomic_int_t old, new;
-    int i;
-    GC gc;
-
-    do {
-	gc = NULL;
-	old = info->gc_depths;
-	if (old == 0)
-	    break;
-
-	if (((old >> 0) & 0xff) == depth)
-	    i = 0;
-	else if (((old >> 8) & 0xff) == depth)
-	    i = 1;
-	else if (((old >> 16) & 0xff) == depth)
-	    i = 2;
-	else if (((old >> 24) & 0xff) == depth)
-	    i = 3;
-	else
-	    break;
-
-	gc = info->gc[i];
-	new = old & ~(0xff << (8*i));
-    } while (_cairo_atomic_int_cmpxchg (&info->gc_depths, old, new) != old);
-
-    if (likely (gc != NULL)) {
-	(void) _cairo_atomic_ptr_cmpxchg (&info->gc[i], gc, NULL);
-	return gc;
-    }
-
-    gcv.graphics_exposures = False;
-    gcv.fill_style = FillTiled;
-    return XCreateGC (_cairo_xlib_display_get_dpy (info->display),
-		      drawable,
-		      GCGraphicsExposures | GCFillStyle, &gcv);
-}
-
-void
-_cairo_xlib_screen_put_gc (cairo_xlib_screen_t *info,
-			   int depth,
-			   GC gc)
-{
-    int i, old, new;
-
-    do {
-	do {
-	    i = -1;
-	    old = info->gc_depths;
-
-	    if (((old >> 0) & 0xff) == 0)
-		i = 0;
-	    else if (((old >> 8) & 0xff) == 0)
-		i = 1;
-	    else if (((old >> 16) & 0xff) == 0)
-		i = 2;
-	    else if (((old >> 24) & 0xff) == 0)
-		i = 3;
-	    else
-		goto out;
-
-	    new = old | (depth << (8*i));
-	} while (_cairo_atomic_ptr_cmpxchg (&info->gc[i], NULL, gc) != NULL);
-    } while (_cairo_atomic_int_cmpxchg (&info->gc_depths, old, new) != old);
-
-    return;
-
-out:
-    if (unlikely (_cairo_xlib_display_queue_work (info->display,
-				(cairo_xlib_notify_func) XFreeGC,
-				gc,
-				NULL)))
-    {
-	/* leak the server side resource... */
-	XFree ((char *) gc);
-    }
-}
-#else
-GC
-_cairo_xlib_screen_get_gc (cairo_xlib_screen_t *info,
+_cairo_xlib_screen_get_gc (cairo_xlib_display_t *display,
+                           cairo_xlib_screen_t *info,
 			   int depth,
 			   Drawable drawable)
 {
     GC gc = NULL;
     int i;
 
-    CAIRO_MUTEX_LOCK (info->mutex);
     for (i = 0; i < ARRAY_LENGTH (info->gc); i++) {
 	if (((info->gc_depths >> (8*i)) & 0xff) == depth) {
 	    info->gc_depths &= ~(0xff << (8*i));
@@ -479,14 +362,13 @@ _cairo_xlib_screen_get_gc (cairo_xlib_screen_t *info,
 	    break;
 	}
     }
-    CAIRO_MUTEX_UNLOCK (info->mutex);
 
     if (gc == NULL) {
 	XGCValues gcv;
 
 	gcv.graphics_exposures = False;
 	gcv.fill_style = FillTiled;
-	gc = XCreateGC (_cairo_xlib_display_get_dpy (info->display),
+	gc = XCreateGC (display->display,
 			drawable,
 			GCGraphicsExposures | GCFillStyle, &gcv);
     }
@@ -495,13 +377,13 @@ _cairo_xlib_screen_get_gc (cairo_xlib_screen_t *info,
 }
 
 void
-_cairo_xlib_screen_put_gc (cairo_xlib_screen_t *info,
+_cairo_xlib_screen_put_gc (cairo_xlib_display_t *display,
+                           cairo_xlib_screen_t *info,
 			   int depth,
 			   GC gc)
 {
     int i;
 
-    CAIRO_MUTEX_LOCK (info->mutex);
     for (i = 0; i < ARRAY_LENGTH (info->gc); i++) {
 	if (((info->gc_depths >> (8*i)) & 0xff) == 0)
 	    break;
@@ -513,7 +395,7 @@ _cairo_xlib_screen_put_gc (cairo_xlib_screen_t *info,
 	/* perform random substitution to ensure fair caching over depths */
 	i = rand () % ARRAY_LENGTH (info->gc);
 	status =
-	    _cairo_xlib_display_queue_work (info->display,
+	    _cairo_xlib_display_queue_work (display,
 					    (cairo_xlib_notify_func) XFreeGC,
 					    info->gc[i],
 					    NULL);
@@ -526,88 +408,59 @@ _cairo_xlib_screen_put_gc (cairo_xlib_screen_t *info,
     info->gc[i] = gc;
     info->gc_depths &= ~(0xff << (8*i));
     info->gc_depths |= depth << (8*i);
-    CAIRO_MUTEX_UNLOCK (info->mutex);
 }
-#endif
 
 cairo_status_t
-_cairo_xlib_screen_get_visual_info (cairo_xlib_screen_t *info,
-				    Visual *visual,
+_cairo_xlib_screen_get_visual_info (cairo_xlib_display_t *display,
+                                    cairo_xlib_screen_t *info,
+				    Visual *v,
 				    cairo_xlib_visual_info_t **out)
 {
-    Display *dpy = _cairo_xlib_display_get_dpy (info->display);
-    cairo_xlib_visual_info_t **visuals, *ret = NULL;
+    cairo_xlib_visual_info_t *visual;
     cairo_status_t status;
-    int i, n_visuals;
 
-    CAIRO_MUTEX_LOCK (info->mutex);
-    visuals = _cairo_array_index (&info->visuals, 0);
-    n_visuals = _cairo_array_num_elements (&info->visuals);
-    for (i = 0; i < n_visuals; i++) {
-	if (visuals[i]->visualid == visual->visualid) {
-	    ret = visuals[i];
-	    break;
+    cairo_list_foreach_entry (visual,
+                              cairo_xlib_visual_info_t,
+                              &info->visuals,
+                              link)
+    {
+	if (visual->visualid == v->visualid) {
+            *out = visual;
+            return CAIRO_STATUS_SUCCESS;
 	}
     }
-    CAIRO_MUTEX_UNLOCK (info->mutex);
 
-    if (ret != NULL) {
-	*out = ret;
-	return CAIRO_STATUS_SUCCESS;
-    }
-
-    status = _cairo_xlib_visual_info_create (dpy,
+    status = _cairo_xlib_visual_info_create (display->display,
 					     XScreenNumberOfScreen (info->screen),
-					     visual->visualid,
-					     &ret);
+					     v->visualid,
+					     &visual);
     if (unlikely (status))
 	return status;
 
-    CAIRO_MUTEX_LOCK (info->mutex);
-    if (n_visuals != _cairo_array_num_elements (&info->visuals)) {
-	/* check that another thread has not added our visual */
-	int new_visuals = _cairo_array_num_elements (&info->visuals);
-	visuals = _cairo_array_index (&info->visuals, 0);
-	for (i = n_visuals; i < new_visuals; i++) {
-	    if (visuals[i]->visualid == visual->visualid) {
-		_cairo_xlib_visual_info_destroy (dpy, ret);
-		ret = visuals[i];
-		break;
-	    }
-	}
-	if (i == new_visuals)
-	    status = _cairo_array_append (&info->visuals, &ret);
-    } else
-	status = _cairo_array_append (&info->visuals, &ret);
-    CAIRO_MUTEX_UNLOCK (info->mutex);
-
-    if (unlikely (status)) {
-	_cairo_xlib_visual_info_destroy (dpy, ret);
-	return status;
-    }
-
-    *out = ret;
+    cairo_list_add (&visual->link, &info->visuals);
+    *out = visual;
     return CAIRO_STATUS_SUCCESS;
 }
 
 cairo_font_options_t *
 _cairo_xlib_screen_get_font_options (cairo_xlib_screen_t *info)
 {
-    if (info->has_font_options)
-	return &info->font_options;
-
-    CAIRO_MUTEX_LOCK (info->mutex);
     if (! info->has_font_options) {
 	_cairo_font_options_init_default (&info->font_options);
+	_cairo_font_options_set_round_glyph_positions (&info->font_options, CAIRO_ROUND_GLYPH_POS_ON);
 
 	if (info->screen != NULL) {
-	    _cairo_xlib_init_screen_font_options (_cairo_xlib_display_get_dpy (info->display),
-						  info);
+            cairo_xlib_display_t *display;
+
+            if (! _cairo_xlib_display_acquire (info->device, &display)) {
+                _cairo_xlib_init_screen_font_options (display->display,
+                                                      info);
+                cairo_device_release (&display->base);
+            }
 	}
 
 	info->has_font_options = TRUE;
     }
-    CAIRO_MUTEX_UNLOCK (info->mutex);
 
     return &info->font_options;
 }
diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface-private.h b/gfx/cairo/cairo/src/cairo-xlib-surface-private.h
index b30848d57f9..34732b4f660 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-xlib-surface-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -44,8 +44,6 @@ typedef struct _cairo_xlib_surface cairo_xlib_surface_t;
 struct _cairo_xlib_surface {
     cairo_surface_t base;
 
-    Display *dpy;
-    cairo_xlib_display_t *display;
     cairo_xlib_screen_t *screen;
     cairo_xlib_hook_t close_display_hook;
 
@@ -96,6 +94,7 @@ struct _cairo_xlib_surface {
     cairo_filter_t filter;
     cairo_extend_t extend;
     cairo_bool_t has_component_alpha;
+    int precision;
     XTransform xtransform;
 
     uint32_t a_mask;
diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
index 80ce023be50..e6e19fed815 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -50,7 +50,10 @@
 #include "cairo-xlib-private.h"
 #include "cairo-xlib-surface-private.h"
 #include "cairo-clip-private.h"
+#include "cairo-error-private.h"
 #include "cairo-scaled-font-private.h"
+#include "cairo-surface-snapshot-private.h"
+#include "cairo-surface-subsurface-private.h"
 #include "cairo-region-private.h"
 
 #include <X11/Xutil.h> /* for XDestroyImage */
@@ -104,6 +107,46 @@ _x_bread_crumb (Display *dpy,
 #define X_DEBUG(x)
 #endif
 
+/**
+ * SECTION:cairo-xlib
+ * @Title: XLib Surfaces
+ * @Short_Description: X Window System rendering using XLib
+ * @See_Also: #cairo_surface_t
+ *
+ * The XLib surface is used to render cairo graphics to X Window System
+ * windows and pixmaps using the XLib library.
+ *
+ * Note that the XLib surface automatically takes advantage of X render extension
+ * if it is available.
+ */
+
+/**
+ * CAIRO_HAS_XLIB_SURFACE:
+ *
+ * Defined if the Xlib surface backend is available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
+/**
+ * SECTION:cairo-xlib-xrender
+ * @Title: XLib/XRender Backend
+ * @Short_Description: X Window System rendering using XLib and the X Render extension
+ * @See_Also: #cairo_surface_t
+ *
+ * The XLib surface is used to render cairo graphics to X Window System
+ * windows and pixmaps using the XLib and Xrender libraries.
+ *
+ * Note that the XLib surface automatically takes advantage of X Render extension
+ * if it is available.
+ */
+
+/**
+ * CAIRO_HAS_XLIB_XRENDER_SURFACE:
+ *
+ * Defined if the XLib/XRender surface functions are available.
+ * This macro can be used to conditionally compile backend-specific code.
+ */
+
 /* Xlib doesn't define a typedef, so define one ourselves */
 typedef int (*cairo_xlib_error_func_t) (Display     *display,
 					XErrorEvent *event);
@@ -117,18 +160,6 @@ _cairo_xlib_surface_create_internal (cairo_xlib_screen_t	*screen,
 				     int			height,
 				     int			depth);
 
-static cairo_status_t
-_cairo_xlib_surface_get_gc (cairo_xlib_surface_t *surface, GC *gc);
-
-static void
-_cairo_xlib_surface_put_gc (cairo_xlib_surface_t *surface, GC gc);
-
-static void
-_cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t *surface);
-
-static void
-_cairo_xlib_surface_ensure_dst_picture (cairo_xlib_surface_t *surface);
-
 static cairo_bool_t
 _cairo_surface_is_xlib (cairo_surface_t *surface);
 
@@ -145,10 +176,6 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 				 cairo_clip_t	     *clip,
 				 int		     *remaining_glyphs);
 
-/* XXX temporarily used by cairo-qt-surface.c */
-slim_hidden_proto (cairo_xlib_surface_create);
-slim_hidden_proto (cairo_xlib_surface_create_with_xrender_format);
-
 /*
  * Instead of taking two round trips for each blending request,
  * assume that if a particular drawable fails GetImage that it will
@@ -196,11 +223,17 @@ static const XTransform identity = { {
 
 static Visual *
 _visual_for_xrender_format(Screen *screen,
-			    XRenderPictFormat *xrender_format)
+			   XRenderPictFormat *xrender_format)
 {
     int d, v;
+
+    /* XXX Consider searching through the list of known cairo_visual_t for
+     * the reverse mapping.
+     */
+
     for (d = 0; d < screen->ndepths; d++) {
 	Depth *d_info = &screen->depths[d];
+
 	if (d_info->depth != xrender_format->depth)
 	    continue;
 
@@ -212,11 +245,14 @@ _visual_for_xrender_format(Screen *screen,
 		if (xrender_format->type != PictTypeDirect)
 		    continue;
 		break;
+
 	    case DirectColor:
 		/* Prefer TrueColor to DirectColor.
-		   (XRenderFindVisualFormat considers both TrueColor and
-		   DirectColor Visuals to match the same PictFormat.) */
+		 * (XRenderFindVisualFormat considers both TrueColor and DirectColor
+		 * Visuals to match the same PictFormat.)
+		 */
 		continue;
+
 	    case StaticGray:
 	    case GrayScale:
 	    case StaticColor:
@@ -325,6 +361,7 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
     cairo_xlib_surface_t *src = abstract_src;
     XRenderPictFormat *xrender_format;
     cairo_xlib_surface_t *surface;
+    cairo_xlib_display_t *display;
     Pixmap pix;
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
@@ -333,7 +370,8 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
     if (! CAIRO_SURFACE_RENDER_HAS_CREATE_PICTURE (src))
 	return NULL;
 
-    _cairo_xlib_display_notify (src->display);
+    if (_cairo_xlib_display_acquire (src->base.device, &display))
+        return NULL;
 
     /* If we never found an XRenderFormat or if it isn't compatible
      * with the content being requested, then we fallback to just
@@ -344,7 +382,7 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
     if ((xrender_format != NULL &&
 	_xrender_format_to_content (xrender_format) == content) ||
 	(xrender_format =
-	 _cairo_xlib_display_get_xrender_format (src->display,
+	 _cairo_xlib_display_get_xrender_format (display,
 						 _cairo_format_from_content (content))))
     {
 	Visual *visual;
@@ -352,11 +390,10 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
 	/* We've got a compatible XRenderFormat now, which means the
 	 * similar surface will match the existing surface as closely in
 	 * visual/depth etc. as possible. */
-	pix = XCreatePixmap (src->dpy, src->drawable,
+	pix = XCreatePixmap (display->display, src->drawable,
 			     width <= 0 ? 1 : width, height <= 0 ? 1 : height,
 			     xrender_format->depth);
 
-	visual = NULL;
 	if (xrender_format == src->xrender_format)
 	    visual = src->visual;
 	else
@@ -378,12 +415,14 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
 
 	/* No compatabile XRenderFormat, see if we can make an ordinary pixmap,
 	 * so that we can still accelerate blits with XCopyArea(). */
-	if (content != CAIRO_CONTENT_COLOR)
+	if (content != CAIRO_CONTENT_COLOR) {
+            cairo_device_release (&display->base);
 	    return NULL;
+        }
 
 	depth = DefaultDepthOfScreen (screen);
 
-	pix = XCreatePixmap (src->dpy, RootWindowOfScreen (screen),
+	pix = XCreatePixmap (display->display, RootWindowOfScreen (screen),
 			     width <= 0 ? 1 : width, height <= 0 ? 1 : height,
 			     depth);
 
@@ -394,17 +433,21 @@ _cairo_xlib_surface_create_similar (void	       *abstract_src,
 						       width, height, depth);
 #else
 	/* No compatabile XRenderFormat, just say no. */
+        cairo_device_release (&display->base);
 	return NULL;
 #endif
     }
 
     if (unlikely (surface->base.status)) {
-	XFreePixmap (src->dpy, pix);
+	XFreePixmap (display->display, pix);
+        cairo_device_release (&display->base);
 	return &surface->base;
     }
 
     surface->owns_pixmap = TRUE;
 
+    cairo_device_release (&display->base);
+
     return &surface->base;
 }
 
@@ -412,10 +455,14 @@ static cairo_status_t
 _cairo_xlib_surface_finish (void *abstract_surface)
 {
     cairo_xlib_surface_t *surface = abstract_surface;
-    cairo_xlib_display_t *display = surface->display;
-    cairo_status_t        status  = CAIRO_STATUS_SUCCESS;
+    cairo_status_t        status;
+    cairo_xlib_display_t *display;
 
-    X_DEBUG ((surface->dpy, "finish (drawable=%x)", (unsigned int) surface->drawable));
+    X_DEBUG ((display->display, "finish (drawable=%x)", (unsigned int) surface->drawable));
+
+    status = _cairo_xlib_display_acquire (surface->base.device, &display);
+    if (unlikely (status))
+        return status;
 
     if (surface->owns_pixmap) {
 	cairo_status_t status2;
@@ -443,28 +490,52 @@ _cairo_xlib_surface_finish (void *abstract_surface)
 	    status = status2;
     } else {
 	if (surface->dst_picture != None)
-	    XRenderFreePicture (surface->dpy, surface->dst_picture);
+	    XRenderFreePicture (display->display, surface->dst_picture);
 
 	if (surface->src_picture != None)
-	    XRenderFreePicture (surface->dpy, surface->src_picture);
+	    XRenderFreePicture (display->display, surface->src_picture);
     }
 
     if (surface->clip_rects != surface->embedded_clip_rects)
 	free (surface->clip_rects);
 
-    if (surface->dpy != NULL) {
-	_cairo_xlib_remove_close_display_hook (surface->display,
+    if (display->display != NULL)
+	_cairo_xlib_remove_close_display_hook (display,
 					       &surface->close_display_hook);
-	surface->dpy = NULL;
-    }
 
-    _cairo_xlib_screen_destroy (surface->screen);
+    cairo_device_release (&display->base);
 
     cairo_region_destroy (surface->clip_region);
 
     return status;
 }
 
+static cairo_status_t
+_cairo_xlib_surface_get_gc (cairo_xlib_display_t *display,
+                            cairo_xlib_surface_t *surface,
+                            GC                   *gc)
+{
+    *gc = _cairo_xlib_screen_get_gc (display,
+                                     surface->screen,
+				     surface->depth,
+				     surface->drawable);
+    if (unlikely (*gc == NULL))
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
+static void
+_cairo_xlib_surface_put_gc (cairo_xlib_display_t *display,
+                            cairo_xlib_surface_t *surface,
+                            GC                    gc)
+{
+    _cairo_xlib_screen_put_gc (display,
+                               surface->screen,
+			       surface->depth,
+			       gc);
+}
+
 static int
 _noop_error_handler (Display     *display,
 		     XErrorEvent *event)
@@ -751,6 +822,7 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
     cairo_rectangle_int_t extents;
     pixman_format_code_t pixman_format;
     cairo_format_masks_t xlib_masks;
+    cairo_xlib_display_t *display;
 
     extents.x = 0;
     extents.y = 0;
@@ -764,6 +836,10 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 	}
     }
 
+    status = _cairo_xlib_display_acquire (surface->base.device, &display);
+    if (status)
+        return status;
+
     if (image_rect)
 	*image_rect = extents;
 
@@ -775,7 +851,7 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 
 	old_handler = XSetErrorHandler (_noop_error_handler);
 
-	ximage = XGetImage (surface->dpy,
+	ximage = XGetImage (display->display,
 			    surface->drawable,
 			    extents.x, extents.y,
 			    extents.width, extents.height,
@@ -805,35 +881,37 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 	Pixmap pixmap;
 	GC gc;
 
-	status = _cairo_xlib_surface_get_gc (surface, &gc);
+	status = _cairo_xlib_surface_get_gc (display, surface, &gc);
 	if (unlikely (status))
-	    return status;
+            goto BAIL;
 
-	pixmap = XCreatePixmap (surface->dpy,
+	pixmap = XCreatePixmap (display->display,
 				surface->drawable,
 				extents.width <= 0 ? 1 : extents.width,
 				extents.height <= 0 ? 1 : extents.height,
 				surface->depth);
 	if (pixmap) {
-	    XCopyArea (surface->dpy, surface->drawable, pixmap, gc,
+	    XCopyArea (display->display, surface->drawable, pixmap, gc,
 		       extents.x, extents.y,
 		       extents.width, extents.height,
 		       0, 0);
 
-	    ximage = XGetImage (surface->dpy,
+	    ximage = XGetImage (display->display,
 				pixmap,
 				0, 0,
 				extents.width <= 0 ? 1 : extents.width,
 				extents.height <= 0 ? 1 : extents.height,
 				AllPlanes, ZPixmap);
 
-	    XFreePixmap (surface->dpy, pixmap);
+	    XFreePixmap (display->display, pixmap);
 	}
 
-	_cairo_xlib_surface_put_gc (surface, gc);
+	_cairo_xlib_surface_put_gc (display, surface, gc);
 
-	if (ximage == NULL)
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	if (ximage == NULL) {
+	    status =  _cairo_error (CAIRO_STATUS_NO_MEMORY);
+            goto BAIL;
+        }
     }
 
     _swap_ximage_to_native (ximage);
@@ -918,7 +996,8 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 	} else {
 	    format = CAIRO_FORMAT_RGB24;
 
-	    status = _cairo_xlib_screen_get_visual_info (surface->screen,
+	    status = _cairo_xlib_screen_get_visual_info (display,
+                                                         surface->screen,
 							 surface->visual,
 							 &visual_info);
 	    if (unlikely (status))
@@ -964,7 +1043,10 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
     }
 
  BAIL:
-    XDestroyImage (ximage);
+    if (ximage)
+        XDestroyImage (ximage);
+
+    cairo_device_release (&display->base);
 
     if (unlikely (status)) {
 	if (image) {
@@ -977,7 +1059,8 @@ _get_image_surface (cairo_xlib_surface_t    *surface,
 }
 
 static void
-_cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t    *surface)
+_cairo_xlib_surface_ensure_src_picture (cairo_xlib_display_t *display,
+                                        cairo_xlib_surface_t *surface)
 {
     if (!surface->src_picture) {
 	XRenderPictureAttributes pa;
@@ -986,7 +1069,7 @@ _cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t    *surface)
 	pa.subwindow_mode = IncludeInferiors;
 	mask |= CPSubwindowMode;
 
-	surface->src_picture = XRenderCreatePicture (surface->dpy,
+	surface->src_picture = XRenderCreatePicture (display->display,
 						     surface->drawable,
 						     surface->xrender_format,
 						     mask, &pa);
@@ -994,17 +1077,18 @@ _cairo_xlib_surface_ensure_src_picture (cairo_xlib_surface_t    *surface)
 }
 
 static void
-_cairo_xlib_surface_set_picture_clip_rects (cairo_xlib_surface_t *surface)
+_cairo_xlib_surface_set_picture_clip_rects (cairo_xlib_display_t *display,
+                                            cairo_xlib_surface_t *surface)
 {
     if (surface->clip_region != NULL) {
-	XRenderSetPictureClipRectangles (surface->dpy, surface->dst_picture,
+	XRenderSetPictureClipRectangles (display->display, surface->dst_picture,
 					 0, 0,
 					 surface->clip_rects,
 					 surface->num_clip_rects);
     } else {
 	XRenderPictureAttributes pa;
 	pa.clip_mask = None;
-	XRenderChangePicture (surface->dpy, surface->dst_picture,
+	XRenderChangePicture (display->display, surface->dst_picture,
 			      CPClipMask, &pa);
     }
 
@@ -1012,37 +1096,50 @@ _cairo_xlib_surface_set_picture_clip_rects (cairo_xlib_surface_t *surface)
 }
 
 static void
-_cairo_xlib_surface_ensure_dst_picture (cairo_xlib_surface_t    *surface)
+_cairo_xlib_surface_set_precision (cairo_xlib_display_t	*display,
+				   cairo_xlib_surface_t	*surface,
+				   cairo_antialias_t	 antialias)
+{
+    int precision;
+
+    switch (antialias) {
+    case CAIRO_ANTIALIAS_DEFAULT:
+    case CAIRO_ANTIALIAS_GRAY:
+	precision = PolyModeImprecise;
+	break;
+    case CAIRO_ANTIALIAS_NONE:
+    case CAIRO_ANTIALIAS_SUBPIXEL:
+	precision = PolyModePrecise;
+	break;
+    }
+
+    /* NVidia's driver version 190.42 is much slower when using PolyModeInprecise */
+    precision = PolyModePrecise;
+
+    if (surface->precision != precision) {
+	XRenderPictureAttributes pa;
+
+	pa.poly_mode = precision;
+	XRenderChangePicture (display->display, surface->dst_picture,
+			      CPPolyMode, &pa);
+
+	surface->precision = precision;
+    }
+}
+
+static void
+_cairo_xlib_surface_ensure_dst_picture (cairo_xlib_display_t    *display,
+                                        cairo_xlib_surface_t    *surface)
 {
     if (!surface->dst_picture) {
-	surface->dst_picture = XRenderCreatePicture (surface->dpy,
+	surface->dst_picture = XRenderCreatePicture (display->display,
 						     surface->drawable,
 						     surface->xrender_format,
 						     0, NULL);
     }
 
     if (surface->clip_dirty & CAIRO_XLIB_SURFACE_CLIP_DIRTY_PICTURE)
-	_cairo_xlib_surface_set_picture_clip_rects (surface);
-}
-
-static cairo_status_t
-_cairo_xlib_surface_get_gc (cairo_xlib_surface_t *surface, GC *gc)
-{
-    *gc = _cairo_xlib_screen_get_gc (surface->screen,
-				     surface->depth,
-				     surface->drawable);
-    if (unlikely (*gc == NULL))
-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-_cairo_xlib_surface_put_gc (cairo_xlib_surface_t *surface, GC gc)
-{
-    _cairo_xlib_screen_put_gc (surface->screen,
-			       surface->depth,
-			       gc);
+	_cairo_xlib_surface_set_picture_clip_rects (display, surface);
 }
 
 static cairo_status_t
@@ -1055,6 +1152,7 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
 		     int                    dst_x,
 		     int                    dst_y)
 {
+    cairo_xlib_display_t *display;
     XImage ximage;
     cairo_format_masks_t image_masks;
     int native_byte_order = _native_byte_order_lsb () ? LSBFirst : MSBFirst;
@@ -1076,6 +1174,10 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
     ximage.blue_mask = surface->b_mask;
     ximage.xoffset = 0;
 
+    status = _cairo_xlib_display_acquire (surface->base.device, &display);
+    if (unlikely (status))
+        return status;
+
     if (!_pixman_format_to_masks (image->pixman_format, &image_masks))
     {
         pixman_format_code_t intermediate_format;
@@ -1089,27 +1191,30 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
         ret = _pixman_format_from_masks (&image_masks, &intermediate_format);
         assert (ret);
 
+	own_data = FALSE;
+
         pixman_image = pixman_image_create_bits (intermediate_format,
                                                  image->width,
                                                  image->height,
                                                  NULL,
                                                  0);
-        if (pixman_image == NULL)
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+        if (pixman_image == NULL) {
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+            goto BAIL;
+        }
 
-        pixman_image_composite (PIXMAN_OP_SRC,
-                                image->pixman_image,
-                                NULL,
-                                pixman_image,
-                                0, 0,
-                                0, 0,
-                                0, 0,
-                                image->width, image->height);
+        pixman_image_composite32 (PIXMAN_OP_SRC,
+                                  image->pixman_image,
+                                  NULL,
+                                  pixman_image,
+                                  0, 0,
+                                  0, 0,
+                                  0, 0,
+                                  image->width, image->height);
 
 	ximage.bits_per_pixel = image_masks.bpp;
 	ximage.data = (char *) pixman_image_get_data (pixman_image);
 	ximage.bytes_per_line = pixman_image_get_stride (pixman_image);
-	own_data = FALSE;
 
 	ret = XInitImage (&ximage);
 	assert (ret != 0);
@@ -1154,8 +1259,11 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
 					     ximage.bits_per_pixel);
 	ximage.bytes_per_line = stride;
 	ximage.data = _cairo_malloc_ab (stride, ximage.height);
-	if (unlikely (ximage.data == NULL))
-	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	if (unlikely (ximage.data == NULL)) {
+            own_data = FALSE;
+	    status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+            goto BAIL;
+        }
 
 	own_data = TRUE;
 
@@ -1175,7 +1283,8 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
 	    _characterize_field (surface->g_mask, &o_g_width, &o_g_shift);
 	    _characterize_field (surface->b_mask, &o_b_width, &o_b_shift);
 	} else {
-	    status = _cairo_xlib_screen_get_visual_info (surface->screen,
+	    status = _cairo_xlib_screen_get_visual_info (display,
+                                                         surface->screen,
 							 surface->visual,
 							 &visual_info);
 	    if (unlikely (status))
@@ -1246,17 +1355,20 @@ _draw_image_surface (cairo_xlib_surface_t   *surface,
 	}
     }
 
-    status = _cairo_xlib_surface_get_gc (surface, &gc);
+    status = _cairo_xlib_surface_get_gc (display, surface, &gc);
     if (unlikely (status))
 	goto BAIL;
 
-    XPutImage (surface->dpy, surface->drawable, gc,
+    XPutImage (display->display, surface->drawable, gc,
 	       &ximage, src_x, src_y, dst_x, dst_y,
 	       width, height);
 
-    _cairo_xlib_surface_put_gc (surface, gc);
+    _cairo_xlib_surface_put_gc (display, surface, gc);
 
   BAIL:
+
+    cairo_device_release (&display->base);
+
     if (own_data)
 	free (ximage.data);
     if (pixman_image)
@@ -1274,8 +1386,6 @@ _cairo_xlib_surface_acquire_source_image (void                    *abstract_surf
     cairo_image_surface_t *image;
     cairo_status_t status;
 
-    _cairo_xlib_display_notify (surface->display);
-
     status = _get_image_surface (surface, NULL, &image, NULL);
     if (unlikely (status))
 	return status;
@@ -1293,8 +1403,6 @@ _cairo_xlib_surface_snapshot (void *abstract_surface)
     cairo_image_surface_t *image;
     cairo_status_t status;
 
-    _cairo_xlib_display_notify (surface->display);
-
     status = _get_image_surface (surface, NULL, &image, NULL);
     if (unlikely (status))
 	return _cairo_surface_create_in_error (status);
@@ -1321,8 +1429,6 @@ _cairo_xlib_surface_acquire_dest_image (void                    *abstract_surfac
     cairo_image_surface_t *image;
     cairo_status_t status;
 
-    _cairo_xlib_display_notify (surface->display);
-
     status = _get_image_surface (surface, interest_rect, &image, image_rect_out);
     if (unlikely (status))
 	return status;
@@ -1378,8 +1484,6 @@ _cairo_xlib_surface_clone_similar (void			*abstract_surface,
     cairo_xlib_surface_t *clone;
     cairo_status_t status;
 
-    _cairo_xlib_display_notify (surface->display);
-
     if (src->backend == surface->base.backend ) {
 	cairo_xlib_surface_t *xlib_src = (cairo_xlib_surface_t *)src;
 
@@ -1441,6 +1545,7 @@ _cairo_xlib_surface_create_solid_pattern_surface (void                  *abstrac
     cairo_image_surface_t *image;
     cairo_xlib_surface_t *surface = NULL;
     cairo_status_t status = CAIRO_STATUS_SUCCESS;
+    cairo_xlib_display_t *display;
 
     int width = ARRAY_LENGTH (dither_pattern[0]);
     int height = ARRAY_LENGTH (dither_pattern);
@@ -1451,16 +1556,21 @@ _cairo_xlib_surface_create_solid_pattern_surface (void                  *abstrac
 	return NULL;
 
     image = (cairo_image_surface_t *)
-	    _cairo_image_surface_create_with_content (solid_pattern->content,
-						      width, height);
+	_cairo_image_surface_create_with_content (_cairo_color_get_content (&solid_pattern->color),
+						  width, height);
     status = image->base.status;
     if (unlikely (status))
 	goto BAIL;
 
-    pixmap = XCreatePixmap (other->dpy,
+    status = _cairo_xlib_display_acquire (other->base.device, &display);
+    if (unlikely (status))
+        goto BAIL;
+
+    pixmap = XCreatePixmap (display->display,
 			    other->drawable,
 			    width, height,
 			    other->depth);
+    cairo_device_release (&display->base);
 
     surface = (cairo_xlib_surface_t *)
 	      _cairo_xlib_surface_create_internal (other->screen,
@@ -1490,12 +1600,16 @@ _cairo_xlib_surface_create_solid_pattern_surface (void                  *abstrac
   BAIL:
     cairo_surface_destroy (&image->base);
 
-    if (unlikely (status)) {
-	if (pixmap != None)
-	    XFreePixmap (other->dpy, pixmap);
-	cairo_surface_destroy (&surface->base);
+    if (status) {
+        if (pixmap != None) {
+            if (!_cairo_xlib_display_acquire (other->base.device, &display)) {
+              XFreePixmap (display->display, pixmap);
+              cairo_device_release (&display->base);
+            }
+        }
+        cairo_surface_destroy (&surface->base);
 
-	return _cairo_surface_create_in_error (status);
+        return _cairo_surface_create_in_error (status);
     }
 
     surface->owns_pixmap = TRUE;
@@ -1511,8 +1625,9 @@ _cairo_xlib_surface_can_repaint_solid_pattern_surface (void *abstract_surface,
 }
 
 static cairo_status_t
-_cairo_xlib_surface_set_matrix (cairo_xlib_surface_t *surface,
-				cairo_matrix_t	     *matrix,
+_cairo_xlib_surface_set_matrix (cairo_xlib_display_t *display,
+                                cairo_xlib_surface_t *surface,
+				const cairo_matrix_t *matrix,
 				double                xc,
 				double                yc)
 {
@@ -1531,14 +1646,15 @@ _cairo_xlib_surface_set_matrix (cairo_xlib_surface_t *surface,
     if (! CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM (surface))
 	return UNSUPPORTED ("XRender does not support picture transforms");
 
-    XRenderSetPictureTransform (surface->dpy, surface->src_picture, &xtransform);
+    XRenderSetPictureTransform (display->display, surface->src_picture, &xtransform);
     surface->xtransform = xtransform;
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_status_t
-_cairo_xlib_surface_set_filter (cairo_xlib_surface_t *surface,
+_cairo_xlib_surface_set_filter (cairo_xlib_display_t *display,
+                                cairo_xlib_surface_t *surface,
 				cairo_filter_t	     filter)
 {
     const char *render_filter;
@@ -1580,7 +1696,7 @@ _cairo_xlib_surface_set_filter (cairo_xlib_surface_t *surface,
 	break;
     }
 
-    XRenderSetPictureFilter (surface->dpy, surface->src_picture,
+    XRenderSetPictureFilter (display->display, surface->src_picture,
 			     (char *) render_filter, NULL, 0);
     surface->filter = filter;
 
@@ -1646,19 +1762,20 @@ _cairo_xlib_surface_set_component_alpha (cairo_xlib_surface_t *surface,
 }
 
 static cairo_int_status_t
-_cairo_xlib_surface_set_attributes (cairo_xlib_surface_t	    *surface,
-				    cairo_surface_attributes_t	    *attributes,
-				    double			     xc,
-				    double			     yc)
+_cairo_xlib_surface_set_attributes (cairo_xlib_display_t             *display,
+                                    cairo_xlib_surface_t	     *surface,
+				    const cairo_surface_attributes_t *attributes,
+				    double			      xc,
+				    double			      yc)
 {
     cairo_int_status_t status;
     XRenderPictureAttributes pa;
     unsigned long mask = 0;
 
-    _cairo_xlib_surface_ensure_src_picture (surface);
+    _cairo_xlib_surface_ensure_src_picture (display, surface);
 
-    status = _cairo_xlib_surface_set_matrix (surface, &attributes->matrix,
-					     xc, yc);
+    status = _cairo_xlib_surface_set_matrix (display, surface,
+                                             &attributes->matrix, xc, yc);
     if (unlikely (status))
 	return status;
 
@@ -1673,12 +1790,12 @@ _cairo_xlib_surface_set_attributes (cairo_xlib_surface_t	    *surface,
     if (unlikely (status))
 	return status;
 
-    status = _cairo_xlib_surface_set_filter (surface, attributes->filter);
+    status = _cairo_xlib_surface_set_filter (display, surface, attributes->filter);
     if (unlikely (status))
 	return status;
 
     if (mask)
-	XRenderChangePicture (surface->dpy, surface->src_picture, mask, &pa);
+	XRenderChangePicture (display->display, surface->src_picture, mask, &pa);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1849,11 +1966,8 @@ _recategorize_composite_operation (cairo_xlib_surface_t	      *dst,
 				   cairo_surface_attributes_t *src_attr,
 				   cairo_bool_t		       have_mask)
 {
-    /* Can we use the core protocol?  (If _surfaces_compatible, then src and
-     * dst have the same format and _surface_has_alpha is the same for each.)
-     */
+    /* Can we use the core protocol? */
     if (! have_mask &&
-        src->owns_pixmap &&
 	_surfaces_compatible (src, dst) &&
 	_cairo_matrix_is_integer_translation (&src_attr->matrix, NULL, NULL) &&
 	! _operator_needs_alpha_composite (op, _surface_has_alpha (dst)))
@@ -1952,7 +2066,8 @@ _render_operator (cairo_operator_t op)
 }
 
 static cairo_int_status_t
-_cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
+_cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_display_t *display,
+                                             cairo_xlib_surface_t *dst,
 					     const cairo_pattern_t *pattern,
 					     int x, int y,
 					     int width, int height,
@@ -2014,7 +2129,7 @@ _cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
 	     * XSync call here seems to avoid the issue so I'll keep it here
 	     * until it's solved.
 	     */
-	    XSync (dst->dpy, False);
+	    XSync (display->display, False);
 #endif
 
 	    if (pattern->type == CAIRO_PATTERN_TYPE_LINEAR) {
@@ -2062,7 +2177,7 @@ _cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
 		    grad.p2.y = _cairo_fixed_to_16_16 (linear->p2.y);
 		}
 
-		picture = XRenderCreateLinearGradient (dst->dpy, &grad,
+		picture = XRenderCreateLinearGradient (display->display, &grad,
 						       stops, colors,
 						       gradient->n_stops);
 	    } else {
@@ -2077,7 +2192,7 @@ _cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
 		grad.outer.y = _cairo_fixed_to_16_16 (radial->c2.y);
 		grad.outer.radius = _cairo_fixed_to_16_16 (radial->r2);
 
-		picture = XRenderCreateRadialGradient (dst->dpy, &grad,
+		picture = XRenderCreateRadialGradient (display->display, &grad,
 						       stops, colors,
 						       gradient->n_stops);
 
@@ -2090,15 +2205,16 @@ _cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
 		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
 	    /* Wrap the remote Picture in an xlib surface. */
-	    format = _cairo_xlib_display_get_xrender_format (dst->display,
+	    format = _cairo_xlib_display_get_xrender_format (display,
 							     CAIRO_FORMAT_ARGB32);
 
 	    surface = (cairo_xlib_surface_t *)
 		_cairo_xlib_surface_create_internal (dst->screen, None,
 						     NULL, format,
-						     0, 0, 32);
+                                                     /* what could possibly go wrong? */
+						     XLIB_COORD_MAX, XLIB_COORD_MAX, 32);
 	    if (unlikely (surface->base.status)) {
-		XRenderFreePicture (dst->dpy, picture);
+		XRenderFreePicture (display->display, picture);
 		return surface->base.status;
 	    }
 
@@ -2131,9 +2247,10 @@ _cairo_xlib_surface_acquire_pattern_surface (cairo_xlib_surface_t *dst,
 }
 
 static cairo_int_status_t
-_cairo_xlib_surface_acquire_pattern_surfaces (cairo_xlib_surface_t	 *dst,
-					      const cairo_pattern_t	         *src,
-					      const cairo_pattern_t	         *mask,
+_cairo_xlib_surface_acquire_pattern_surfaces (cairo_xlib_display_t       *display,
+                                              cairo_xlib_surface_t	 *dst,
+					      const cairo_pattern_t	 *src,
+					      const cairo_pattern_t	 *mask,
 					      int			 src_x,
 					      int			 src_y,
 					      int			 mask_x,
@@ -2153,7 +2270,8 @@ _cairo_xlib_surface_acquire_pattern_surfaces (cairo_xlib_surface_t	 *dst,
     {
 	cairo_int_status_t status;
 
-	status = _cairo_xlib_surface_acquire_pattern_surface (dst, src,
+	status = _cairo_xlib_surface_acquire_pattern_surface (display,
+                                                              dst, src,
 							      src_x, src_y,
 							      width, height,
 							      src_out,
@@ -2162,7 +2280,8 @@ _cairo_xlib_surface_acquire_pattern_surfaces (cairo_xlib_surface_t	 *dst,
 	    return status;
 
 	if (mask) {
-	    status = _cairo_xlib_surface_acquire_pattern_surface (dst, mask,
+	    status = _cairo_xlib_surface_acquire_pattern_surface (display,
+                                                                  dst, mask,
 								  mask_x,
 								  mask_y,
 								  width,
@@ -2194,6 +2313,108 @@ _cairo_xlib_surface_acquire_pattern_surfaces (cairo_xlib_surface_t	 *dst,
 					    src_attr, mask_attr);
 }
 
+static cairo_int_status_t
+_cairo_xlib_surface_upload(cairo_xlib_surface_t *surface,
+			   cairo_operator_t op,
+			   const cairo_pattern_t *pattern,
+			   int src_x, int src_y,
+			   int dst_x, int dst_y,
+			   unsigned int width,
+			   unsigned int height,
+			   cairo_region_t *clip_region)
+{
+    cairo_image_surface_t *image;
+    cairo_rectangle_int_t extents;
+    cairo_status_t status;
+    int tx, ty;
+
+    if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    image = (cairo_image_surface_t *) ((cairo_surface_pattern_t *) pattern)->surface;
+    if (image->base.type != CAIRO_SURFACE_TYPE_IMAGE)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (! (op == CAIRO_OPERATOR_SOURCE ||
+	   (op == CAIRO_OPERATOR_OVER &&
+	    (image->base.content & CAIRO_CONTENT_ALPHA) == 0)))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (image->base.backend->type != CAIRO_SURFACE_TYPE_IMAGE) {
+	if (image->base.backend->type == CAIRO_INTERNAL_SURFACE_TYPE_SNAPSHOT) {
+	    image = (cairo_image_surface_t *) ((cairo_surface_snapshot_t *) image)->target;
+	    extents.x = extents.y = 0;
+	    extents.width = image->width;
+	    extents.height = image->height;
+	} else if (image->base.backend->type == CAIRO_SURFACE_TYPE_SUBSURFACE) {
+	    cairo_surface_subsurface_t *sub = (cairo_surface_subsurface_t *) image;
+	    image = (cairo_image_surface_t *) sub->target;
+	    src_x += sub->extents.x;
+	    src_y += sub->extents.y;
+	    extents = sub->extents;
+	} else {
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+    } else {
+	extents.x = extents.y = 0;
+	extents.width = image->width;
+	extents.height = image->height;
+    }
+
+    if (image->format == CAIRO_FORMAT_INVALID)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    if (image->depth != surface->depth)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (! _cairo_matrix_is_integer_translation (&pattern->matrix, &tx, &ty))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    src_x += tx;
+    src_y += ty;
+
+    /* XXX for EXTEND_NONE perform unbounded fixups? */
+    if (src_x < extents.x ||
+	src_y < extents.y ||
+	src_x + width  > (unsigned) extents.width ||
+	src_y + height > (unsigned) extents.height)
+    {
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    status = cairo_device_acquire (surface->base.device);
+    if (unlikely (status))
+        return status;
+
+    if (clip_region != NULL) {
+	int n, num_rect;
+
+	src_x -= dst_x;
+	src_y -= dst_y;
+
+	num_rect = cairo_region_num_rectangles (clip_region);
+	for (n = 0; n < num_rect; n++) {
+	    cairo_rectangle_int_t rect;
+
+	    cairo_region_get_rectangle (clip_region, n, &rect);
+	    status = _draw_image_surface (surface, image,
+					  rect.x + src_x, rect.y + src_y,
+					  rect.width, rect.height,
+					  rect.x, rect.y);
+	    if (unlikely (status))
+		break;
+	}
+    } else {
+	status = _draw_image_surface (surface, image,
+				      src_x, src_y,
+				      width, height,
+				      dst_x, dst_y);
+    }
+
+    cairo_device_release (surface->base.device);
+
+    return status;
+}
+
 static cairo_int_status_t
 _cairo_xlib_surface_composite (cairo_operator_t		op,
 			       const cairo_pattern_t	*src_pattern,
@@ -2213,6 +2434,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
     cairo_xlib_surface_t	*dst = abstract_dst;
     cairo_xlib_surface_t	*src;
     cairo_xlib_surface_t	*mask;
+    cairo_xlib_display_t        *display;
     cairo_int_status_t		status;
     composite_operation_t       operation;
     int				itx, ity;
@@ -2227,12 +2449,25 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
     if (operation == DO_UNSUPPORTED)
 	return UNSUPPORTED ("unsupported operation");
 
-    X_DEBUG ((dst->dpy, "composite (dst=%x)", (unsigned int) dst->drawable));
+    X_DEBUG ((display->display, "composite (dst=%x)", (unsigned int) dst->drawable));
 
-    _cairo_xlib_display_notify (dst->display);
+    if (mask_pattern == NULL) {
+	/* Can we do a simple upload in-place? */
+	status = _cairo_xlib_surface_upload(dst, op, src_pattern,
+					    src_x, src_y,
+					    dst_x, dst_y,
+					    width, height,
+					    clip_region);
+	if (status != CAIRO_INT_STATUS_UNSUPPORTED)
+	    return status;
+    }
+
+    status = _cairo_xlib_display_acquire (dst-> base.device, &display);
+    if (unlikely (status))
+        return status;
 
     status =
-	_cairo_xlib_surface_acquire_pattern_surfaces (dst,
+	_cairo_xlib_surface_acquire_pattern_surfaces (display, dst,
 						      src_pattern, mask_pattern,
 						      src_x, src_y,
 						      mask_x, mask_y,
@@ -2240,7 +2475,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 						      &src, &mask,
 						      &src_attr, &mask_attr);
     if (unlikely (status))
-	return status;
+        goto BAIL0;
 
     /* check for fallback surfaces that we cannot handle ... */
     assert (_cairo_surface_is_xlib (&src->base));
@@ -2261,7 +2496,8 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
     switch (operation)
     {
     case DO_RENDER:
-	status = _cairo_xlib_surface_set_attributes (src, &src_attr,
+	status = _cairo_xlib_surface_set_attributes (display,
+                                                     src, &src_attr,
 						     dst_x + width / 2.,
 						     dst_y + height / 2.);
 	if (unlikely (status))
@@ -2271,15 +2507,16 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 	if (unlikely (status))
 	    goto BAIL;
 
-	_cairo_xlib_surface_ensure_dst_picture (dst);
+	_cairo_xlib_surface_ensure_dst_picture (display, dst);
 	if (mask) {
-	    status = _cairo_xlib_surface_set_attributes (mask, &mask_attr,
+	    status = _cairo_xlib_surface_set_attributes (display,
+                                                         mask, &mask_attr,
 							 dst_x + width / 2.,
 							 dst_y + height/ 2.);
 	    if (unlikely (status))
 		goto BAIL;
 
-	    XRenderComposite (dst->dpy,
+	    XRenderComposite (display->display,
 			      _render_operator (op),
 			      src->src_picture,
 			      mask->src_picture,
@@ -2291,7 +2528,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 			      dst_x, dst_y,
 			      width, height);
 	} else {
-	    XRenderComposite (dst->dpy,
+	    XRenderComposite (display->display,
 			      _render_operator (op),
 			      src->src_picture,
 			      0,
@@ -2306,7 +2543,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 	break;
 
     case DO_XCOPYAREA:
-	status = _cairo_xlib_surface_get_gc (dst, &gc);
+	status = _cairo_xlib_surface_get_gc (display, dst, &gc);
 	if (unlikely (status))
 	    goto BAIL;
 
@@ -2316,7 +2553,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 	assert (is_integer_translation);
 
 	if (clip_region == NULL) {
-	    XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
+	    XCopyArea (display->display, src->drawable, dst->drawable, gc,
 		       src_x + src_attr.x_offset + itx,
 		       src_y + src_attr.y_offset + ity,
 		       width, height,
@@ -2332,14 +2569,14 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 		cairo_rectangle_int_t rect;
 
 		cairo_region_get_rectangle (clip_region, n, &rect);
-		XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
+		XCopyArea (display->display, src->drawable, dst->drawable, gc,
 			   rect.x + x, rect.y + y,
 			   rect.width, rect.height,
 			   rect.x, rect.y);
 	    }
 	}
 
-	_cairo_xlib_surface_put_gc (dst, gc);
+	_cairo_xlib_surface_put_gc (display, dst, gc);
 	break;
 
     case DO_XTILE:
@@ -2351,7 +2588,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 	 * _recategorize_composite_operation.
 	 */
 
-	status = _cairo_xlib_surface_get_gc (dst, &gc);
+	status = _cairo_xlib_surface_get_gc (display, dst, &gc);
 	if (unlikely (status))
 	    goto BAIL;
 
@@ -2360,12 +2597,12 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 	/* This is a pre-condition for DO_XTILE. */
 	assert (is_integer_translation);
 
-	XSetTSOrigin (dst->dpy, gc,
+	XSetTSOrigin (display->display, gc,
 		      - (itx + src_attr.x_offset), - (ity + src_attr.y_offset));
-	XSetTile (dst->dpy, gc, src->drawable);
+	XSetTile (display->display, gc, src->drawable);
 
 	if (clip_region == NULL) {
-	    XFillRectangle (dst->dpy, dst->drawable, gc,
+	    XFillRectangle (display->display, dst->drawable, gc,
 			    dst_x, dst_y, width, height);
 	} else {
 	    int n, num_rects;
@@ -2375,12 +2612,12 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 		cairo_rectangle_int_t rect;
 
 		cairo_region_get_rectangle (clip_region, n, &rect);
-		XFillRectangle (dst->dpy, dst->drawable, gc,
+		XFillRectangle (display->display, dst->drawable, gc,
 				rect.x, rect.y, rect.width, rect.height);
 	    }
 	}
 
-	_cairo_xlib_surface_put_gc (dst, gc);
+	_cairo_xlib_surface_put_gc (display, dst, gc);
 	break;
 
     case DO_UNSUPPORTED:
@@ -2405,6 +2642,9 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 
     _cairo_pattern_release_surface (src_pattern, &src->base, &src_attr);
 
+ BAIL0:
+    cairo_device_release (&display->base);
+
     return status;
 }
 
@@ -2419,16 +2659,21 @@ _cairo_xlib_surface_solid_fill_rectangles (cairo_xlib_surface_t    *surface,
     cairo_solid_pattern_t solid;
     cairo_surface_t *solid_surface = NULL;
     cairo_surface_attributes_t attrs;
+    cairo_xlib_display_t *display;
     GC gc;
     int i;
 
-    _cairo_pattern_init_solid (&solid, color, CAIRO_CONTENT_COLOR);
+    _cairo_pattern_init_solid (&solid, color);
 
-    status = _cairo_xlib_surface_get_gc (surface, &gc);
+    status = _cairo_xlib_display_acquire (surface->base.device, &display);
     if (unlikely (status))
         return status;
 
-    X_DEBUG ((surface->dpy, "solid_fill_rectangles (dst=%x)", (unsigned int) surface->drawable));
+    status = _cairo_xlib_surface_get_gc (display, surface, &gc);
+    if (unlikely (status))
+        return status;
+
+    X_DEBUG ((display->display, "solid_fill_rectangles (dst=%x)", (unsigned int) surface->drawable));
 
     status = _cairo_pattern_acquire_surface (&solid.base, &surface->base,
 					     0, 0,
@@ -2438,27 +2683,30 @@ _cairo_xlib_surface_solid_fill_rectangles (cairo_xlib_surface_t    *surface,
 					     &solid_surface,
 					     &attrs);
     if (unlikely (status)) {
-	_cairo_xlib_surface_put_gc (surface, gc);
+	_cairo_xlib_surface_put_gc (display, surface, gc);
+        cairo_device_release (&display->base);
 	return status;
     }
 
     assert (_cairo_surface_is_xlib (solid_surface));
 
-    XSetTSOrigin (surface->dpy, gc,
+    XSetTSOrigin (display->display, gc,
 		  - (surface->base.device_transform.x0 + attrs.x_offset),
 		  - (surface->base.device_transform.y0 + attrs.y_offset));
-    XSetTile (surface->dpy, gc,
+    XSetTile (display->display, gc,
 	      ((cairo_xlib_surface_t *) solid_surface)->drawable);
 
     for (i = 0; i < num_rects; i++) {
-	XFillRectangle (surface->dpy, surface->drawable, gc,
+	XFillRectangle (display->display, surface->drawable, gc,
 			rects[i].x, rects[i].y,
 			rects[i].width, rects[i].height);
     }
 
-    _cairo_xlib_surface_put_gc (surface, gc);
+    _cairo_xlib_surface_put_gc (display, surface, gc);
 
     _cairo_pattern_release_surface (&solid.base, solid_surface, &attrs);
+    
+    cairo_device_release (&display->base);
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -2471,12 +2719,11 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
 				     int		      num_rects)
 {
     cairo_xlib_surface_t *surface = abstract_surface;
+    cairo_xlib_display_t *display;
     XRenderColor render_color;
     cairo_status_t status;
     int i;
 
-    _cairo_xlib_display_notify (surface->display);
-
     if (!CAIRO_SURFACE_RENDER_SUPPORTS_OPERATOR (surface, op))
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
@@ -2492,7 +2739,11 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
 	return UNSUPPORTED ("no support for FillRectangles with this op");
     }
 
-    X_DEBUG ((surface->dpy, "fill_rectangles (dst=%x)", (unsigned int) surface->drawable));
+    status = _cairo_xlib_display_acquire (surface->base.device, &display);
+    if (unlikely (status))
+        return status;
+
+    X_DEBUG ((display->display, "fill_rectangles (dst=%x)", (unsigned int) surface->drawable));
 
     render_color.red   = color->red_short;
     render_color.green = color->green_short;
@@ -2502,12 +2753,12 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
     status = _cairo_xlib_surface_set_clip_region (surface, NULL);
     assert (status == CAIRO_STATUS_SUCCESS);
 
-    _cairo_xlib_surface_ensure_dst_picture (surface);
+    _cairo_xlib_surface_ensure_dst_picture (display, surface);
     if (num_rects == 1) {
 	/* Take advantage of the protocol compaction that libXrender performs
 	 * to amalgamate sequences of XRenderFillRectangle().
 	 */
-	XRenderFillRectangle (surface->dpy,
+	XRenderFillRectangle (display->display,
 			      _render_operator (op),
 			      surface->dst_picture,
 			      &render_color,
@@ -2521,8 +2772,10 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
 
 	if (num_rects > ARRAY_LENGTH (static_xrects)) {
 	    xrects = _cairo_malloc_ab (num_rects, sizeof (XRectangle));
-	    if (unlikely (xrects == NULL))
-		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    if (unlikely (xrects == NULL)) {
+		status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+                goto BAIL;
+            }
 	}
 
 	for (i = 0; i < num_rects; i++) {
@@ -2532,7 +2785,7 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
 	    xrects[i].height = rects[i].height;
 	}
 
-	XRenderFillRectangles (surface->dpy,
+	XRenderFillRectangles (display->display,
 			       _render_operator (op),
 			       surface->dst_picture,
 			       &render_color, xrects, num_rects);
@@ -2541,7 +2794,9 @@ _cairo_xlib_surface_fill_rectangles (void		     *abstract_surface,
 	    free (xrects);
     }
 
-    return CAIRO_STATUS_SUCCESS;
+BAIL:
+    cairo_device_release (&display->base);
+    return status;
 }
 
 #define CAIRO_FIXED_16_16_MIN -32768
@@ -2599,6 +2854,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     cairo_surface_attributes_t	attributes;
     cairo_xlib_surface_t	*dst = abstract_dst;
     cairo_xlib_surface_t	*src;
+    cairo_xlib_display_t        *display;
     cairo_int_status_t		status;
     composite_operation_t       operation;
     int				render_reference_x, render_reference_y;
@@ -2608,8 +2864,6 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     XTrapezoid *xtraps = xtraps_stack;
     int i;
 
-    _cairo_xlib_display_notify (dst->display);
-
     if (! CAIRO_SURFACE_RENDER_HAS_TRAPEZOIDS (dst))
 	return UNSUPPORTED ("XRender does not support CompositeTrapezoids");
 
@@ -2617,15 +2871,20 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     if (operation == DO_UNSUPPORTED)
 	return UNSUPPORTED ("unsupported operation");
 
-    X_DEBUG ((dst->dpy, "composite_trapezoids (dst=%x)", (unsigned int) dst->drawable));
+    status = _cairo_xlib_display_acquire (dst->base.device, &display);
+    if (unlikely (status))
+        return status;
 
-    status = _cairo_xlib_surface_acquire_pattern_surface (dst,
+    X_DEBUG ((display->display, "composite_trapezoids (dst=%x)", (unsigned int) dst->drawable));
+
+    status = _cairo_xlib_surface_acquire_pattern_surface (display,
+                                                          dst,
 							  pattern,
 							  src_x, src_y,
 							  width, height,
 							  &src, &attributes);
     if (unlikely (status))
-	return status;
+	goto BAIL0;
 
     operation = _recategorize_composite_operation (dst, op, src,
 						   &attributes, TRUE);
@@ -2637,7 +2896,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     switch (antialias) {
     case CAIRO_ANTIALIAS_NONE:
 	pict_format =
-	    _cairo_xlib_display_get_xrender_format (dst->display,
+	    _cairo_xlib_display_get_xrender_format (display,
 						    CAIRO_FORMAT_A1);
 	break;
     case CAIRO_ANTIALIAS_GRAY:
@@ -2645,7 +2904,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     case CAIRO_ANTIALIAS_DEFAULT:
     default:
 	pict_format =
-	    _cairo_xlib_display_get_xrender_format (dst->display,
+	    _cairo_xlib_display_get_xrender_format (display,
 						    CAIRO_FORMAT_A8);
 	break;
     }
@@ -2654,9 +2913,11 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     if (unlikely (status))
 	goto BAIL;
 
-    _cairo_xlib_surface_ensure_dst_picture (dst);
+    _cairo_xlib_surface_ensure_dst_picture (display, dst);
+    _cairo_xlib_surface_set_precision (display, dst, antialias);
 
-    status = _cairo_xlib_surface_set_attributes (src, &attributes,
+    status = _cairo_xlib_surface_set_attributes (display,
+                                                 src, &attributes,
 						 dst_x + width / 2.,
 						 dst_y + height / 2.);
     if (unlikely (status))
@@ -2719,7 +2980,7 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
     render_src_x = src_x + render_reference_x - dst_x;
     render_src_y = src_y + render_reference_y - dst_y;
 
-    XRenderCompositeTrapezoids (dst->dpy,
+    XRenderCompositeTrapezoids (display->display,
 				_render_operator (op),
 				src->src_picture, dst->dst_picture,
 				pict_format,
@@ -2758,6 +3019,8 @@ _cairo_xlib_surface_composite_trapezoids (cairo_operator_t	op,
 
  BAIL:
     _cairo_pattern_release_surface (pattern, &src->base, &attributes);
+ BAIL0:
+    cairo_device_release (&display->base);
 
     return status;
 }
@@ -2795,30 +3058,9 @@ _cairo_xlib_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 
 static cairo_bool_t
 _cairo_xlib_surface_is_similar (void		*surface_a,
-	                        void		*surface_b,
-				cairo_content_t	 content)
+	                        void		*surface_b)
 {
-    cairo_xlib_surface_t *a = surface_a;
-    cairo_xlib_surface_t *b = surface_b;
-    XRenderPictFormat *xrender_format = b->xrender_format;
-
-    if (! _cairo_xlib_surface_same_screen (a, b))
-	return FALSE;
-
-    /* now inspect the content to check that a is similar to b */
-    if (xrender_format == NULL && b->visual != NULL)
-        xrender_format = XRenderFindVisualFormat (b->dpy, b->visual);
-
-    if (xrender_format == NULL ||
-	_xrender_format_to_content (xrender_format) != content)
-    {
-	xrender_format = _cairo_xlib_display_get_xrender_format (
-					  b->display,
-					  _cairo_format_from_content (content));
-    }
-
-
-    return a->xrender_format == xrender_format;
+    return _cairo_xlib_surface_same_screen (surface_a, surface_b);
 }
 
 static const cairo_surface_backend_t cairo_xlib_surface_backend = {
@@ -2883,8 +3125,7 @@ _cairo_xlib_surface_detach_display (cairo_xlib_display_t *display, void *data)
 							close_display_hook);
     Display *dpy;
 
-    dpy = surface->dpy;
-    surface->dpy = NULL;
+    dpy = display->display;
 
     X_DEBUG ((dpy, "detach (drawable=%x)", (unsigned int) surface->drawable));
 
@@ -2915,8 +3156,8 @@ _cairo_xlib_surface_create_internal (cairo_xlib_screen_t	*screen,
 				     int			 depth)
 {
     cairo_xlib_surface_t *surface;
-
-    CAIRO_MUTEX_INITIALIZE ();
+    cairo_xlib_display_t *display;
+    cairo_status_t status;
 
     if (depth == 0) {
 	if (xrender_format) {
@@ -2958,23 +3199,22 @@ found:
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    surface->dpy = _cairo_xlib_display_get_dpy (screen->display);
+    status = _cairo_xlib_display_acquire (screen->device, &display);
+    if (unlikely (status)) {
+        free (surface);
+        return _cairo_surface_create_in_error (_cairo_error (status));
+    }
 
-    /* initialize and hook into the CloseDisplay callback */
-    surface->close_display_hook.func = _cairo_xlib_surface_detach_display;
-    _cairo_xlib_add_close_display_hook (screen->display,
-					&surface->close_display_hook);
-
-    _cairo_xlib_display_get_xrender_version (screen->display,
+    _cairo_xlib_display_get_xrender_version (display,
 					     &surface->render_major,
 					     &surface->render_minor);
     if (CAIRO_SURFACE_RENDER_HAS_CREATE_PICTURE (surface)) {
 	if (!xrender_format) {
 	    if (visual) {
-		xrender_format = XRenderFindVisualFormat (surface->dpy, visual);
+		xrender_format = XRenderFindVisualFormat (display->display, visual);
 	    } else if (depth == 1) {
 		xrender_format =
-		    _cairo_xlib_display_get_xrender_format (screen->display,
+		    _cairo_xlib_display_get_xrender_format (display,
 							    CAIRO_FORMAT_A1);
 	    }
 	}
@@ -2984,11 +3224,19 @@ found:
 	surface->render_minor = -1;
     }
 
-    _cairo_surface_init (&surface->base, &cairo_xlib_surface_backend,
+    /* initialize and hook into the CloseDisplay callback */
+    surface->close_display_hook.func = _cairo_xlib_surface_detach_display;
+    _cairo_xlib_add_close_display_hook (display,
+					&surface->close_display_hook);
+
+    cairo_device_release (&display->base);
+
+    _cairo_surface_init (&surface->base,
+			 &cairo_xlib_surface_backend,
+			 screen->device,
 			 _xrender_format_to_content (xrender_format));
 
-    surface->screen = _cairo_xlib_screen_reference (screen);
-    surface->display = screen->display;
+    surface->screen = screen;
 
     surface->drawable = drawable;
     surface->owns_pixmap = FALSE;
@@ -2996,17 +3244,17 @@ found:
     surface->width = width;
     surface->height = height;
 
-    surface->buggy_repeat = ! _cairo_xlib_display_has_repeat (surface->display);
+    surface->buggy_repeat = ! _cairo_xlib_display_has_repeat (screen->device);
     if (! CAIRO_SURFACE_RENDER_HAS_FILL_RECTANGLES (surface)) {
 	/* so we can use the XTile fallback */
 	surface->buggy_repeat = TRUE;
     }
 
-    surface->buggy_pad_reflect = ! _cairo_xlib_display_has_reflect (surface->display);
+    surface->buggy_pad_reflect = ! _cairo_xlib_display_has_reflect (screen->device);
     if (! CAIRO_SURFACE_RENDER_HAS_EXTENDED_REPEAT (surface))
 	surface->buggy_pad_reflect = TRUE;
 
-    surface->buggy_gradients = ! _cairo_xlib_display_has_gradients (surface->display);
+    surface->buggy_gradients = ! _cairo_xlib_display_has_gradients (screen->device);
     if (! CAIRO_SURFACE_RENDER_HAS_GRADIENTS (surface))
 	surface->buggy_gradients = TRUE;
 
@@ -3019,6 +3267,7 @@ found:
     surface->filter = CAIRO_FILTER_NEAREST;
     surface->extend = CAIRO_EXTEND_NONE;
     surface->has_component_alpha = FALSE;
+    surface->precision = PolyModePrecise;
     surface->xtransform = identity;
 
     surface->clip_region = NULL;
@@ -3122,7 +3371,6 @@ cairo_xlib_surface_create (Display     *dpy,
 {
     Screen *scr;
     cairo_xlib_screen_t *screen;
-    cairo_surface_t *surface;
     cairo_status_t status;
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX) {
@@ -3140,14 +3388,10 @@ cairo_xlib_surface_create (Display     *dpy,
 
     X_DEBUG ((dpy, "create (drawable=%x)", (unsigned int) drawable));
 
-    surface = _cairo_xlib_surface_create_internal (screen, drawable,
-						   visual, NULL,
-						   width, height, 0);
-    _cairo_xlib_screen_destroy (screen);
-
-    return surface;
+    return _cairo_xlib_surface_create_internal (screen, drawable,
+                                                visual, NULL,
+                                                width, height, 0);
 }
-slim_hidden_def (cairo_xlib_surface_create);
 
 /**
  * cairo_xlib_surface_create_for_bitmap:
@@ -3170,7 +3414,6 @@ cairo_xlib_surface_create_for_bitmap (Display  *dpy,
 				      int	height)
 {
     cairo_xlib_screen_t *screen;
-    cairo_surface_t *surface;
     cairo_status_t status;
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
@@ -3182,12 +3425,9 @@ cairo_xlib_surface_create_for_bitmap (Display  *dpy,
 
     X_DEBUG ((dpy, "create_for_bitmap (drawable=%x)", (unsigned int) bitmap));
 
-    surface = _cairo_xlib_surface_create_internal (screen, bitmap,
-						   NULL, NULL,
-						   width, height, 1);
-    _cairo_xlib_screen_destroy (screen);
-
-    return surface;
+    return _cairo_xlib_surface_create_internal (screen, bitmap,
+                                                NULL, NULL,
+                                                width, height, 1);
 }
 
 #if CAIRO_HAS_XLIB_XRENDER_SURFACE
@@ -3220,9 +3460,7 @@ cairo_xlib_surface_create_with_xrender_format (Display		    *dpy,
 					       int		    height)
 {
     cairo_xlib_screen_t *screen;
-    cairo_surface_t *surface;
     cairo_status_t status;
-    Visual *visual;
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX)
 	return _cairo_surface_create_in_error (CAIRO_STATUS_INVALID_SIZE);
@@ -3233,17 +3471,10 @@ cairo_xlib_surface_create_with_xrender_format (Display		    *dpy,
 
     X_DEBUG ((dpy, "create_with_xrender_format (drawable=%x)", (unsigned int) drawable));
 
-    if (format)
-    visual = _visual_for_xrender_format (scr, format);
-
-    surface = _cairo_xlib_surface_create_internal (screen, drawable,
-						   visual, format,
-						   width, height, 0);
-    _cairo_xlib_screen_destroy (screen);
-
-    return surface;
+    return _cairo_xlib_surface_create_internal (screen, drawable,
+						_visual_for_xrender_format (scr, format),
+                                                format, width, height, 0);
 }
-slim_hidden_def (cairo_xlib_surface_create_with_xrender_format);
 
 /**
  * cairo_xlib_surface_get_xrender_format:
@@ -3299,15 +3530,23 @@ cairo_xlib_surface_set_size (cairo_surface_t *abstract_surface,
     cairo_xlib_surface_t *surface = (cairo_xlib_surface_t *) abstract_surface;
     cairo_status_t status;
 
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
+	status = _cairo_surface_set_error (abstract_surface,
+		                           _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return;
+    }
+
     if (! _cairo_surface_is_xlib (abstract_surface)) {
 	status = _cairo_surface_set_error (abstract_surface,
-		                           CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+		                           _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
 	return;
     }
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX) {
 	status = _cairo_surface_set_error (abstract_surface,
-		                           CAIRO_STATUS_INVALID_SIZE);
+		                           _cairo_error (CAIRO_STATUS_INVALID_SIZE));
 	return;
     }
 
@@ -3337,15 +3576,23 @@ cairo_xlib_surface_set_drawable (cairo_surface_t   *abstract_surface,
     cairo_xlib_surface_t *surface = (cairo_xlib_surface_t *)abstract_surface;
     cairo_status_t status;
 
+    if (unlikely (abstract_surface->status))
+	return;
+    if (unlikely (abstract_surface->finished)) {
+	status = _cairo_surface_set_error (abstract_surface,
+		                           _cairo_error (CAIRO_STATUS_SURFACE_FINISHED));
+	return;
+    }
+
     if (! _cairo_surface_is_xlib (abstract_surface)) {
 	status = _cairo_surface_set_error (abstract_surface,
-		                           CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
+		                           _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH));
 	return;
     }
 
     if (width > XLIB_COORD_MAX || height > XLIB_COORD_MAX) {
 	status = _cairo_surface_set_error (abstract_surface,
-		                           CAIRO_STATUS_INVALID_SIZE);
+		                           _cairo_error (CAIRO_STATUS_INVALID_SIZE));
 	return;
     }
 
@@ -3354,11 +3601,17 @@ cairo_xlib_surface_set_drawable (cairo_surface_t   *abstract_surface,
 	return;
 
     if (surface->drawable != drawable) {
-	X_DEBUG ((surface->dpy, "set_drawable (drawable=%x)", (unsigned int) drawable));
+        cairo_xlib_display_t *display;
+
+        status = _cairo_xlib_display_acquire (surface->base.device, &display);
+        if (unlikely (status))
+            return;
+
+	X_DEBUG ((display->display, "set_drawable (drawable=%x)", (unsigned int) drawable));
 
 	if (surface->dst_picture != None) {
 	    status = _cairo_xlib_display_queue_resource (
-		                                  surface->display,
+		                                  display,
 						  XRenderFreePicture,
 						  surface->dst_picture);
 	    if (unlikely (status)) {
@@ -3371,7 +3624,7 @@ cairo_xlib_surface_set_drawable (cairo_surface_t   *abstract_surface,
 
 	if (surface->src_picture != None) {
 	    status = _cairo_xlib_display_queue_resource (
-		                                  surface->display,
+		                                  display,
 						  XRenderFreePicture,
 						  surface->src_picture);
 	    if (unlikely (status)) {
@@ -3382,6 +3635,8 @@ cairo_xlib_surface_set_drawable (cairo_surface_t   *abstract_surface,
 	    surface->src_picture = None;
 	}
 
+        cairo_device_release (&display->base);
+
 	surface->drawable = drawable;
     }
     surface->width = width;
@@ -3401,14 +3656,12 @@ cairo_xlib_surface_set_drawable (cairo_surface_t   *abstract_surface,
 Display *
 cairo_xlib_surface_get_display (cairo_surface_t *abstract_surface)
 {
-    cairo_xlib_surface_t *surface = (cairo_xlib_surface_t *) abstract_surface;
-
     if (! _cairo_surface_is_xlib (abstract_surface)) {
 	_cairo_error_throw (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
 	return NULL;
     }
 
-    return surface->dpy;
+    return ((cairo_xlib_display_t *) abstract_surface->device)->display;
 }
 
 /**
@@ -3577,7 +3830,7 @@ typedef struct _cairo_xlib_surface_font_private {
     cairo_scaled_font_t		    *scaled_font;
     cairo_scaled_font_t         *grayscale_font;
     cairo_xlib_hook_t                close_display_hook;
-    cairo_xlib_display_t	    *display;
+    cairo_device_t                  *device;
     cairo_xlib_font_glyphset_info_t  glyphset_info[NUM_GLYPHSETS];
 } cairo_xlib_surface_font_private_t;
 
@@ -3602,36 +3855,33 @@ _cairo_xlib_surface_remove_scaled_font (cairo_xlib_display_t	*display,
     CAIRO_MUTEX_UNLOCK (scaled_font->mutex);
 
     if (font_private != NULL) {
-	Display *dpy;
 	int i;
 
-    if (font_private->grayscale_font) {
-        cairo_scaled_font_destroy (font_private->grayscale_font);
-    }
+	if (font_private->grayscale_font) {
+	    cairo_scaled_font_destroy (font_private->grayscale_font);
+	}
 
-	dpy = _cairo_xlib_display_get_dpy (display);
 	for (i = 0; i < NUM_GLYPHSETS; i++) {
 	    cairo_xlib_font_glyphset_info_t *glyphset_info;
 
 	    glyphset_info = &font_private->glyphset_info[i];
 	    if (glyphset_info->glyphset)
-		XRenderFreeGlyphSet (dpy, glyphset_info->glyphset);
+		XRenderFreeGlyphSet (display->display, glyphset_info->glyphset);
 
 	    if (glyphset_info->pending_free_glyphs != NULL)
 		free (glyphset_info->pending_free_glyphs);
 	}
 
-	_cairo_xlib_display_destroy (font_private->display);
+	cairo_device_destroy (font_private->device);
 	free (font_private);
     }
 }
 
 static cairo_status_t
-_cairo_xlib_surface_font_init (Display		    *dpy,
+_cairo_xlib_surface_font_init (cairo_xlib_display_t *display,
 			       cairo_scaled_font_t  *scaled_font)
 {
     cairo_xlib_surface_font_private_t	*font_private;
-    cairo_status_t status;
     int i;
 
     font_private = malloc (sizeof (cairo_xlib_surface_font_private_t));
@@ -3640,16 +3890,12 @@ _cairo_xlib_surface_font_init (Display		    *dpy,
 
     font_private->scaled_font = scaled_font;
     font_private->grayscale_font = NULL;
-    status = _cairo_xlib_display_get (dpy, &font_private->display);
-    if (unlikely (status)) {
-	free (font_private);
-	return status;
-    }
+    font_private->device = cairo_device_reference (&display->base);
 
     /* initialize and hook into the CloseDisplay callback */
     font_private->close_display_hook.func =
 	_cairo_xlib_surface_remove_scaled_font;
-    _cairo_xlib_add_close_display_hook (font_private->display,
+    _cairo_xlib_add_close_display_hook (display,
 					&font_private->close_display_hook);
 
 
@@ -3676,6 +3922,7 @@ static void
 _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 {
     cairo_xlib_surface_font_private_t *font_private;
+    cairo_status_t status;
 
     font_private = scaled_font->surface_private;
     if (font_private != NULL) {
@@ -3683,10 +3930,12 @@ _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 	int i;
 
 	if (font_private->grayscale_font) {
-        cairo_scaled_font_destroy (font_private->grayscale_font);
+	    cairo_scaled_font_destroy (font_private->grayscale_font);
 	}
+        status = _cairo_xlib_display_acquire (font_private->device, &display);
+        if (status)
+            goto BAIL;
 
-	display = font_private->display;
 	_cairo_xlib_remove_close_display_hook (display,
 					       &font_private->close_display_hook);
 
@@ -3699,8 +3948,6 @@ _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 		free (glyphset_info->pending_free_glyphs);
 
 	    if (glyphset_info->glyphset) {
-		cairo_status_t status;
-
 		status = _cairo_xlib_display_queue_resource (display,
 							     XRenderFreeGlyphSet,
 							     glyphset_info->glyphset);
@@ -3708,7 +3955,9 @@ _cairo_xlib_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 	    }
 	}
 
-	_cairo_xlib_display_destroy (display);
+	cairo_device_release (&display->base);
+BAIL:
+	cairo_device_destroy (&display->base);
 	free (font_private);
     }
 }
@@ -3756,10 +4005,16 @@ _cairo_xlib_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
 	if (to_free != NULL &&
 	    to_free->glyph_count == ARRAY_LENGTH (to_free->glyph_indices))
 	{
-	    status = _cairo_xlib_display_queue_work (font_private->display,
-		    (cairo_xlib_notify_func) _cairo_xlib_render_free_glyphs,
-		    to_free,
-		    free);
+            cairo_xlib_display_t *display;
+
+            status = _cairo_xlib_display_acquire (font_private->device, &display);
+            if (status == CAIRO_STATUS_SUCCESS) {
+                status = _cairo_xlib_display_queue_work (display,
+                        (cairo_xlib_notify_func) _cairo_xlib_render_free_glyphs,
+                        to_free,
+                        free);
+                cairo_device_release (&display->base);
+            }
 	    /* XXX cannot propagate failure */
 	    if (unlikely (status))
 		free (to_free);
@@ -3792,6 +4047,18 @@ _native_byte_order_lsb (void)
     return *((char *) &x) == 1;
 }
 
+static int
+_cairo_xlib_get_glyphset_index_for_format (cairo_format_t format)
+{
+    if (format == CAIRO_FORMAT_A8)
+        return GLYPHSET_INDEX_A8;
+    if (format == CAIRO_FORMAT_A1)
+        return GLYPHSET_INDEX_A1;
+
+    assert (format == CAIRO_FORMAT_ARGB32);
+    return GLYPHSET_INDEX_ARGB32;
+}
+
 static cairo_xlib_font_glyphset_info_t *
 _cairo_xlib_scaled_font_get_glyphset_info_for_format (cairo_scaled_font_t *scaled_font,
 						      cairo_format_t       format)
@@ -3800,24 +4067,22 @@ _cairo_xlib_scaled_font_get_glyphset_info_for_format (cairo_scaled_font_t *scale
     cairo_xlib_font_glyphset_info_t *glyphset_info;
     int glyphset_index;
 
-    switch (format) {
-    default:
-    case CAIRO_FORMAT_RGB24:
-    case CAIRO_FORMAT_ARGB32: glyphset_index = GLYPHSET_INDEX_ARGB32; break;
-    case CAIRO_FORMAT_A8:     glyphset_index = GLYPHSET_INDEX_A8;     break;
-    case CAIRO_FORMAT_A1:     glyphset_index = GLYPHSET_INDEX_A1;     break;
-    }
-
+    glyphset_index = _cairo_xlib_get_glyphset_index_for_format (format);
     font_private = scaled_font->surface_private;
     glyphset_info = &font_private->glyphset_info[glyphset_index];
     if (glyphset_info->glyphset == None) {
-	cairo_xlib_display_t *display = font_private->display;
+	cairo_xlib_display_t *display;
+        
+        if (_cairo_xlib_display_acquire (font_private->device, &display))
+            return NULL;
 
 	glyphset_info->xrender_format =
 	    _cairo_xlib_display_get_xrender_format (display,
 		                                    glyphset_info->format);
-	glyphset_info->glyphset = XRenderCreateGlyphSet (_cairo_xlib_display_get_dpy (display),
+	glyphset_info->glyphset = XRenderCreateGlyphSet (display->display,
 							 glyphset_info->xrender_format);
+
+        cairo_device_release (&display->base);
     }
 
     return glyphset_info;
@@ -3861,13 +4126,7 @@ _cairo_xlib_scaled_font_get_glyphset_info_for_pending_free_glyph (
 	return NULL;
 
     if (surface != NULL) {
-	switch (surface->format) {
-	default:
-	case CAIRO_FORMAT_RGB24:
-	case CAIRO_FORMAT_ARGB32: i = GLYPHSET_INDEX_ARGB32; break;
-	case CAIRO_FORMAT_A8:     i = GLYPHSET_INDEX_A8;     break;
-	case CAIRO_FORMAT_A1:     i = GLYPHSET_INDEX_A1;     break;
-	}
+	i = _cairo_xlib_get_glyphset_index_for_format (surface->format);
 	if (_cairo_xlib_glyphset_info_has_pending_free_glyph (
 						&font_private->glyphset_info[i],
 						glyph_index))
@@ -3889,7 +4148,7 @@ _cairo_xlib_scaled_font_get_glyphset_info_for_pending_free_glyph (
 }
 
 static cairo_status_t
-_cairo_xlib_surface_add_glyph (Display *dpy,
+_cairo_xlib_surface_add_glyph (cairo_xlib_display_t *display,
 			       cairo_scaled_font_t   *scaled_font,
 			       cairo_scaled_glyph_t **pscaled_glyph)
 {
@@ -3928,7 +4187,7 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
     }
 
     if (scaled_font->surface_private == NULL) {
-	status = _cairo_xlib_surface_font_init (dpy, scaled_font);
+	status = _cairo_xlib_surface_font_init (display, scaled_font);
 	if (unlikely (status))
 	    return status;
     }
@@ -3939,7 +4198,8 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
     /* XRenderAddGlyph does not handle a glyph surface larger than the extended maximum XRequest size.  */
     {
 	int len = cairo_format_stride_for_width (glyphset_info->format, glyph_surface->width) * glyph_surface->height;
-	int max_request_size = (XExtendedMaxRequestSize (dpy) ? XExtendedMaxRequestSize (dpy) : XMaxRequestSize (dpy)) * 4 -
+	int max_request_size = (XExtendedMaxRequestSize (display->display) ? XExtendedMaxRequestSize (display->display)
+                                                                           : XMaxRequestSize (display->display)) * 4 -
 	                       sz_xRenderAddGlyphsReq -
 	                       sz_xGlyphInfo          -
 			       8;
@@ -4005,10 +4265,10 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
     data = glyph_surface->data;
 
     /* flip formats around */
-    switch (scaled_glyph->surface->format) {
-    case CAIRO_FORMAT_A1:
+    switch (_cairo_xlib_get_glyphset_index_for_format (scaled_glyph->surface->format)) {
+    case GLYPHSET_INDEX_A1:
 	/* local bitmaps are always stored with bit == byte */
-	if (_native_byte_order_lsb() != (BitmapBitOrder (dpy) == LSBFirst)) {
+	if (_native_byte_order_lsb() != (BitmapBitOrder (display->display) == LSBFirst)) {
 	    int		    c = glyph_surface->stride * glyph_surface->height;
 	    unsigned char   *d;
 	    unsigned char   *new, *n;
@@ -4030,10 +4290,10 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
 	    data = new;
 	}
 	break;
-    case CAIRO_FORMAT_A8:
+    case GLYPHSET_INDEX_A8:
 	break;
-    case CAIRO_FORMAT_ARGB32:
-	if (_native_byte_order_lsb() != (ImageByteOrder (dpy) == LSBFirst)) {
+    case GLYPHSET_INDEX_ARGB32:
+	if (_native_byte_order_lsb() != (ImageByteOrder (display->display) == LSBFirst)) {
 	    unsigned int c = glyph_surface->stride * glyph_surface->height / 4;
 	    const uint32_t *d;
 	    uint32_t *new, *n;
@@ -4046,19 +4306,19 @@ _cairo_xlib_surface_add_glyph (Display *dpy,
 	    n = new;
 	    d = (uint32_t *) data;
 	    do {
-		*n++ = bswap_32 (*d++);
+		*n++ = bswap_32 (*d);
+		d++;
 	    } while (--c);
 	    data = (uint8_t *) new;
 	}
 	break;
-    case CAIRO_FORMAT_RGB24:
     default:
 	ASSERT_NOT_REACHED;
 	break;
     }
     /* XXX assume X server wants pixman padding. Xft assumes this as well */
 
-    XRenderAddGlyphs (dpy, glyphset_info->glyphset,
+    XRenderAddGlyphs (display->display, glyphset_info->glyphset,
 		      &glyph_index, &glyph_info, 1,
 		      (char *) data,
 		      glyph_surface->stride * glyph_surface->height);
@@ -4125,7 +4385,8 @@ COMPILE_TIME_ASSERT (sizeof (cairo_xlib_glyph_t) == sizeof (cairo_glyph_t));
     (((count) & 127) == 0 || (glyph)->i.x || (glyph)->i.y)
 
 static cairo_status_t
-_emit_glyphs_chunk (cairo_xlib_surface_t *dst,
+_emit_glyphs_chunk (cairo_xlib_display_t *display,
+                    cairo_xlib_surface_t *dst,
 		    cairo_xlib_glyph_t *glyphs,
 		    int num_glyphs,
 		    cairo_scaled_font_t *scaled_font,
@@ -4224,7 +4485,7 @@ _emit_glyphs_chunk (cairo_xlib_surface_t *dst,
      * expected number of xGlyphElts.  */
     assert (nelt == num_elts);
 
-    composite_text_func (dst->dpy,
+    composite_text_func (display->display,
 			 _render_operator (op),
 			 src->src_picture,
 			 dst->dst_picture,
@@ -4246,7 +4507,8 @@ _emit_glyphs_chunk (cairo_xlib_surface_t *dst,
 #define _cairo_sz_xGlyphElt (sz_xGlyphElt + 4)
 
 static cairo_status_t
-_cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
+_cairo_xlib_surface_emit_glyphs (cairo_xlib_display_t *display,
+                                 cairo_xlib_surface_t *dst,
 				 cairo_xlib_glyph_t *glyphs,
 				 int num_glyphs,
 				 cairo_scaled_font_t *scaled_font,
@@ -4266,14 +4528,13 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
     int num_elts = 0;
     int num_out_glyphs = 0;
 
-    int max_request_size = XMaxRequestSize (dst->dpy) * 4
+    int max_request_size = XMaxRequestSize (display->display) * 4
 			 - MAX (sz_xRenderCompositeGlyphs8Req,
 				MAX(sz_xRenderCompositeGlyphs16Req,
 				    sz_xRenderCompositeGlyphs32Req));
     int request_size = 0;
 
-    _cairo_xlib_surface_ensure_dst_picture (dst);
-    _cairo_xlib_display_notify (dst->display);
+    _cairo_xlib_surface_ensure_dst_picture (display, dst);
 
     for (i = 0; i < num_glyphs; i++) {
 	int this_x, this_y;
@@ -4313,7 +4574,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
 
 	/* Send unsent glyphs to the server */
 	if (_cairo_xlib_scaled_glyph_get_glyphset_info (scaled_glyph) == NULL) {
-	    status = _cairo_xlib_surface_add_glyph (dst->dpy,
+	    status = _cairo_xlib_surface_add_glyph (display,
 		                                    scaled_font,
 						    &scaled_glyph);
 	    if (unlikely (status)) {
@@ -4360,7 +4621,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
 	 */
 	if (request_size + width > max_request_size - _cairo_sz_xGlyphElt ||
 	    (this_glyphset_info != glyphset_info)) {
-	    status = _emit_glyphs_chunk (dst, glyphs, i,
+	    status = _emit_glyphs_chunk (display, dst, glyphs, i,
 					 scaled_font, op, src, attributes,
 					 num_elts, old_width, glyphset_info);
 	    if (unlikely (status))
@@ -4403,7 +4664,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst,
     }
 
     if (num_elts) {
-	status = _emit_glyphs_chunk (dst, glyphs, i,
+	status = _emit_glyphs_chunk (display, dst, glyphs, i,
 				     scaled_font, op, src, attributes,
 				     num_elts, width, glyphset_info);
     }
@@ -4424,7 +4685,7 @@ _cairo_xlib_surface_owns_font (cairo_xlib_surface_t *dst,
     font_private = scaled_font->surface_private;
     if ((scaled_font->surface_backend != NULL &&
 	 scaled_font->surface_backend != &cairo_xlib_surface_backend) ||
-	(font_private != NULL && font_private->display != dst->display))
+	(font_private != NULL && font_private->device != dst->base.device))
     {
 	return FALSE;
     }
@@ -4436,14 +4697,14 @@ _cairo_xlib_surface_owns_font (cairo_xlib_surface_t *dst,
  * in our surface_private data.
  */
 static cairo_scaled_font_t *
-_cairo_xlib_get_grayscale_font (cairo_xlib_surface_t *dst,
+_cairo_xlib_get_grayscale_font (cairo_xlib_display_t *display,
                                 cairo_scaled_font_t *scaled_font)
 {
     cairo_xlib_surface_font_private_t *font_private = scaled_font->surface_private;
     cairo_bool_t needs_font;
 
     if (font_private == NULL) {
-        cairo_status_t status = _cairo_xlib_surface_font_init (dst->dpy, scaled_font);
+        cairo_status_t status = _cairo_xlib_surface_font_init (display, scaled_font);
         if (unlikely (status))
             return _cairo_scaled_font_create_in_error (status);
         font_private = scaled_font->surface_private;
@@ -4490,13 +4751,11 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 {
     cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
     cairo_xlib_surface_t *dst = (cairo_xlib_surface_t*) abstract_dst;
-
     composite_operation_t operation;
     cairo_surface_attributes_t attributes;
     cairo_xlib_surface_t *src = NULL;
     cairo_region_t *clip_region = NULL;
-
-    cairo_solid_pattern_t solid_pattern;
+    cairo_xlib_display_t *display;
 
     if (! CAIRO_SURFACE_RENDER_HAS_COMPOSITE_TEXT (dst))
 	return UNSUPPORTED ("XRender does not support CompositeText");
@@ -4536,12 +4795,17 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
     if (! _cairo_xlib_surface_owns_font (dst, scaled_font))
 	return UNSUPPORTED ("unowned font");
 
+
+    status = _cairo_xlib_display_acquire (dst->base.device, &display);
+    if (unlikely (status))
+        return status;
+
     if (!dst->base.permit_subpixel_antialiasing &&
         scaled_font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL) {
-        scaled_font = _cairo_xlib_get_grayscale_font (dst, scaled_font);
+        scaled_font = _cairo_xlib_get_grayscale_font (display, scaled_font);
     }
 
-    X_DEBUG ((dst->dpy, "show_glyphs (dst=%x)", (unsigned int) dst->drawable));
+    X_DEBUG ((display->display, "show_glyphs (dst=%x)", (unsigned int) dst->drawable));
 
     if (clip_region != NULL &&
 	cairo_region_num_rectangles (clip_region) == 1)
@@ -4568,7 +4832,7 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 
     status = _cairo_xlib_surface_set_clip_region (dst, clip_region);
     if (unlikely (status))
-	return status;
+        goto BAIL0;
 
     /* After passing all those tests, we're now committed to rendering
      * these glyphs or to fail trying. We first upload any glyphs to
@@ -4582,9 +4846,7 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
      * so PictOpClear was never used with CompositeText before.
      */
     if (op == CAIRO_OPERATOR_CLEAR) {
-	_cairo_pattern_init_solid (&solid_pattern, CAIRO_COLOR_WHITE,
-				   CAIRO_CONTENT_COLOR);
-	src_pattern = &solid_pattern.base;
+	src_pattern = &_cairo_pattern_white.base;
 	op = CAIRO_OPERATOR_DEST_OUT;
     }
 
@@ -4615,7 +4877,8 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 	    }
 	}
 
-        status = _cairo_xlib_surface_acquire_pattern_surface (dst, src_pattern,
+        status = _cairo_xlib_surface_acquire_pattern_surface (display,
+                                                              dst, src_pattern,
 							      glyph_extents.x,
 							      glyph_extents.y,
 							      glyph_extents.width,
@@ -4632,13 +4895,14 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
 	goto BAIL1;
     }
 
-    status = _cairo_xlib_surface_set_attributes (src, &attributes, 0, 0);
+    status = _cairo_xlib_surface_set_attributes (display, src, &attributes, 0, 0);
     if (unlikely (status))
         goto BAIL1;
 
     _cairo_scaled_font_freeze_cache (scaled_font);
     if (_cairo_xlib_surface_owns_font (dst, scaled_font)) {
-	status = _cairo_xlib_surface_emit_glyphs (dst,
+	status = _cairo_xlib_surface_emit_glyphs (display,
+                                                  dst,
 						  (cairo_xlib_glyph_t *) glyphs,
 						  num_glyphs,
 						  scaled_font,
@@ -4655,7 +4919,7 @@ _cairo_xlib_surface_show_glyphs (void                *abstract_dst,
     if (src)
         _cairo_pattern_release_surface (src_pattern, &src->base, &attributes);
   BAIL0:
-    _cairo_xlib_display_notify (dst->display);
+    cairo_device_release (&display->base);
 
     return status;
 }
diff --git a/gfx/cairo/cairo/src/cairo-xlib-visual.c b/gfx/cairo/cairo/src/cairo-xlib-visual.c
index 7dbe86c287b..e076ed01e45 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-visual.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-visual.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -37,6 +37,8 @@
 
 #include "cairo-xlib-private.h"
 
+#include "cairo-error-private.h"
+
 /* A perceptual distance metric between two colors. No sqrt needed
  * since the square of the distance is still a valid metric. */
 
@@ -178,7 +180,7 @@ _cairo_xlib_visual_info_create (Display *dpy,
 }
 
 void
-_cairo_xlib_visual_info_destroy (Display *dpy, cairo_xlib_visual_info_t *info)
+_cairo_xlib_visual_info_destroy (cairo_xlib_visual_info_t *info)
 {
     /* No need for XFreeColors() whilst using DefaultColormap */
     free (info);
diff --git a/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h b/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
index 63a0ecbdc65..52f41591591 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
+++ b/gfx/cairo/cairo/src/cairo-xlib-xrender-private.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -38,13 +38,6 @@
 
 #include <X11/Xlib.h>
 
-#if CAIRO_HAS_XLIB_XRENDER_SURFACE
-
-#include "cairo-xlib-xrender.h"
-
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/renderproto.h>
-
 /* These prototypes are used when defining interfaces missing from the
  * render headers.  As it happens, it is the case that all libxrender
  * functions take a pointer as first argument. */
@@ -55,6 +48,13 @@ __attribute__((__unused__)) static int    _int_consume         (void *p, ...)
 __attribute__((__unused__)) static void   _void_consume_free   (Display *p, XID n) { }
 
 
+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
+
+#include "cairo-xlib-xrender.h"
+
+#include <X11/extensions/Xrender.h>
+#include <X11/extensions/renderproto.h>
+
 /* We require Render >= 0.6.  The following defines were only added in
  * 0.10.  Make sure they are defined.
  */
diff --git a/gfx/cairo/cairo/src/cairo-xlib-xrender.h b/gfx/cairo/cairo/src/cairo-xlib-xrender.h
index c1c4c621729..b34b057de4c 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-xrender.h
+++ b/gfx/cairo/cairo/src/cairo-xlib-xrender.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-xlib.h b/gfx/cairo/cairo/src/cairo-xlib.h
index 29e9f100e55..4ee592ce49c 100644
--- a/gfx/cairo/cairo/src/cairo-xlib.h
+++ b/gfx/cairo/cairo/src/cairo-xlib.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/cairo-xml-surface.c b/gfx/cairo/cairo/src/cairo-xml-surface.c
index 25e0bb224a3..b323d03c43c 100644
--- a/gfx/cairo/cairo/src/cairo-xml-surface.c
+++ b/gfx/cairo/cairo/src/cairo-xml-surface.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -45,6 +45,8 @@
 #include "cairo-xml.h"
 
 #include "cairo-clip-private.h"
+#include "cairo-device-private.h"
+#include "cairo-error-private.h"
 #include "cairo-output-stream-private.h"
 #include "cairo-recording-surface-private.h"
 
@@ -52,43 +54,23 @@
 
 typedef struct _cairo_xml_surface cairo_xml_surface_t;
 
-struct _cairo_xml {
-    cairo_status_t status;
-
-    int ref;
+typedef struct _cairo_xml {
+    cairo_device_t base;
 
     cairo_output_stream_t *stream;
     int indent;
-};
+} cairo_xml_t;
 
 struct _cairo_xml_surface {
     cairo_surface_t base;
 
-    cairo_xml_t *xml;
-
     double width, height;
 };
 
 slim_hidden_proto (cairo_xml_for_recording_surface);
 
-static const cairo_xml_t _nil_xml = {
-    CAIRO_STATUS_NO_MEMORY,
-    -1
-};
-
 static const cairo_surface_backend_t _cairo_xml_surface_backend;
 
-static const char *
-_direction_to_string (cairo_bool_t backward)
-{
-    static const char *names[] = {
-	"FORWARD",
-	"BACKWARD"
-    };
-    assert (backward < ARRAY_LENGTH (names));
-    return names[backward];
-}
-
 static const char *
 _operator_to_string (cairo_operator_t op)
 {
@@ -221,35 +203,67 @@ _content_to_string (cairo_content_t content)
 static const char *
 _format_to_string (cairo_format_t format)
 {
-    static const char *names[] = {
-	"ARGB32",	/* CAIRO_FORMAT_ARGB32 */
-	"RGB24",	/* CAIRO_FORMAT_RGB24 */
-	"A8",		/* CAIRO_FORMAT_A8 */
-	"A1"		/* CAIRO_FORMAT_A1 */
-    };
-    assert (format < ARRAY_LENGTH (names));
-    return names[format];
+    switch (format) {
+    case CAIRO_FORMAT_ARGB32:  return "ARGB32";
+    case CAIRO_FORMAT_RGB24:   return "RGB24";
+    case CAIRO_FORMAT_RGB16_565:   return "RGB16_565";
+    case CAIRO_FORMAT_A8:      return "A8";
+    case CAIRO_FORMAT_A1:      return "A1";
+    case CAIRO_FORMAT_INVALID: return "INVALID";
+    }
+    ASSERT_NOT_REACHED;
+    return "INVALID";
 }
 
-static cairo_xml_t *
+static cairo_status_t
+_device_flush (void *abstract_device)
+{
+    cairo_xml_t *xml = abstract_device;
+    cairo_status_t status;
+
+    status = _cairo_output_stream_flush (xml->stream);
+
+    return status;
+}
+
+static void
+_device_destroy (void *abstract_device)
+{
+    cairo_xml_t *xml = abstract_device;
+    cairo_status_t status;
+
+    status = _cairo_output_stream_destroy (xml->stream);
+
+    free (xml);
+}
+
+static const cairo_device_backend_t _cairo_xml_device_backend = {
+    CAIRO_DEVICE_TYPE_XML,
+
+    NULL, NULL, /* lock, unlock */
+
+    _device_flush,
+    NULL,  /* finish */
+    _device_destroy
+};
+
+static cairo_device_t *
 _cairo_xml_create_internal (cairo_output_stream_t *stream)
 {
     cairo_xml_t *xml;
 
     xml = malloc (sizeof (cairo_xml_t));
-    if (unlikely (xml == NULL)) {
-	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-	return (cairo_xml_t *) &_nil_xml;
-    }
+    if (unlikely (xml == NULL))
+	return _cairo_device_create_in_error (CAIRO_STATUS_NO_MEMORY);
 
     memset (xml, 0, sizeof (cairo_xml_t));
-    xml->status = CAIRO_STATUS_SUCCESS;
-    xml->ref = 1;
-    xml->indent = 0;
 
+    _cairo_device_init (&xml->base, &_cairo_xml_device_backend);
+
+    xml->indent = 0;
     xml->stream = stream;
 
-    return xml;
+    return &xml->base;
 }
 
 static void
@@ -320,22 +334,6 @@ _cairo_xml_printf_end (cairo_xml_t *xml, const char *fmt, ...)
     _cairo_output_stream_write (xml->stream, "\n", 1);
 }
 
-static cairo_status_t
-_cairo_xml_destroy_internal (cairo_xml_t *xml)
-{
-    cairo_status_t status;
-
-    assert (xml->ref > 0);
-    if (--xml->ref)
-	return _cairo_output_stream_flush (xml->stream);
-
-    status = _cairo_output_stream_destroy (xml->stream);
-
-    free (xml);
-
-    return status;
-}
-
 static cairo_surface_t *
 _cairo_xml_surface_create_similar (void			*abstract_surface,
 				   cairo_content_t	 content,
@@ -351,14 +349,6 @@ _cairo_xml_surface_create_similar (void			*abstract_surface,
     return cairo_recording_surface_create (content, &extents);
 }
 
-static cairo_status_t
-_cairo_xml_surface_finish (void *abstract_surface)
-{
-    cairo_xml_surface_t *surface = abstract_surface;
-
-    return _cairo_xml_destroy_internal (surface->xml);
-}
-
 static cairo_bool_t
 _cairo_xml_surface_get_extents (void *abstract_surface,
 				cairo_rectangle_int_t *rectangle)
@@ -381,8 +371,8 @@ _cairo_xml_move_to (void *closure,
 		    const cairo_point_t *p1)
 {
     _cairo_xml_printf_continue (closure, " %f %f m",
-			      _cairo_fixed_to_double (p1->x),
-			      _cairo_fixed_to_double (p1->y));
+				_cairo_fixed_to_double (p1->x),
+				_cairo_fixed_to_double (p1->y));
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -392,8 +382,8 @@ _cairo_xml_line_to (void *closure,
 		    const cairo_point_t *p1)
 {
     _cairo_xml_printf_continue (closure, " %f %f l",
-			      _cairo_fixed_to_double (p1->x),
-			      _cairo_fixed_to_double (p1->y));
+				_cairo_fixed_to_double (p1->x),
+				_cairo_fixed_to_double (p1->y));
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -405,12 +395,13 @@ _cairo_xml_curve_to (void *closure,
 		     const cairo_point_t *p3)
 {
     _cairo_xml_printf_continue (closure, " %f %f %f %f %f %f c",
-			      _cairo_fixed_to_double (p1->x),
-			      _cairo_fixed_to_double (p1->y),
-			      _cairo_fixed_to_double (p2->x),
-			      _cairo_fixed_to_double (p2->y),
-			      _cairo_fixed_to_double (p3->x),
-			      _cairo_fixed_to_double (p3->y));
+				_cairo_fixed_to_double (p1->x),
+				_cairo_fixed_to_double (p1->y),
+				_cairo_fixed_to_double (p2->x),
+				_cairo_fixed_to_double (p2->y),
+				_cairo_fixed_to_double (p3->x),
+				_cairo_fixed_to_double (p3->y));
+
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -418,6 +409,7 @@ static cairo_status_t
 _cairo_xml_close_path (void *closure)
 {
     _cairo_xml_printf_continue (closure, " h");
+
     return CAIRO_STATUS_SUCCESS;
 }
 
@@ -436,7 +428,7 @@ _cairo_xml_emit_path (cairo_xml_t *xml,
 					_cairo_xml_close_path,
 					xml);
     assert (status == CAIRO_STATUS_SUCCESS);
-    _cairo_xml_printf_start (xml, "</path>");
+    _cairo_xml_printf_end (xml, "</path>");
 }
 
 static void
@@ -455,12 +447,19 @@ _cairo_xml_emit_double (cairo_xml_t *xml,
     _cairo_xml_printf (xml, "<%s>%f</%s>", node, data, node);
 }
 
+static cairo_xml_t *
+to_xml (cairo_xml_surface_t *surface)
+{
+    return (cairo_xml_t *) surface->base.device;
+}
+
 static cairo_status_t
 _cairo_xml_surface_emit_clip_path (cairo_xml_surface_t *surface,
 				   cairo_clip_path_t *clip_path)
 {
     cairo_box_t box;
     cairo_status_t status;
+    cairo_xml_t *xml;
 
     if (clip_path->prev != NULL) {
 	status = _cairo_xml_surface_emit_clip_path (surface, clip_path->prev);
@@ -481,18 +480,20 @@ _cairo_xml_surface_emit_clip_path (cairo_xml_surface_t *surface,
 	}
     }
 
-    _cairo_xml_printf_start (surface->xml, "<clip>");
-    _cairo_xml_indent (surface->xml, 2);
+    xml = to_xml (surface);
 
-    _cairo_xml_emit_path (surface->xml, &clip_path->path);
-    _cairo_xml_emit_double (surface->xml, "tolerance", clip_path->tolerance);
-    _cairo_xml_emit_string (surface->xml, "antialias",
+    _cairo_xml_printf_start (xml, "<clip>");
+    _cairo_xml_indent (xml, 2);
+
+    _cairo_xml_emit_path (xml, &clip_path->path);
+    _cairo_xml_emit_double (xml, "tolerance", clip_path->tolerance);
+    _cairo_xml_emit_string (xml, "antialias",
 			    _antialias_to_string (clip_path->antialias));
-    _cairo_xml_emit_string (surface->xml, "fill-rule",
+    _cairo_xml_emit_string (xml, "fill-rule",
 			    _fill_rule_to_string (clip_path->fill_rule));
 
-    _cairo_xml_indent (surface->xml, -2);
-    _cairo_xml_printf_end (surface->xml, "</clip>");
+    _cairo_xml_indent (xml, -2);
+    _cairo_xml_printf_end (xml, "</clip>");
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -624,7 +625,7 @@ _cairo_xml_emit_surface (cairo_xml_t *xml,
     cairo_status_t status;
 
     if (_cairo_surface_is_recording (source)) {
-	status = cairo_xml_for_recording_surface (xml, source);
+	status = cairo_xml_for_recording_surface (&xml->base, source);
     } else {
 	cairo_image_surface_t *image;
 	void *image_extra;
@@ -694,7 +695,7 @@ _cairo_xml_surface_paint (void			*abstract_surface,
 			  cairo_clip_t		*clip)
 {
     cairo_xml_surface_t *surface = abstract_surface;
-    cairo_xml_t *xml = surface->xml;
+    cairo_xml_t *xml = to_xml (surface);
     cairo_status_t status;
 
     _cairo_xml_printf (xml, "<paint>");
@@ -724,7 +725,7 @@ _cairo_xml_surface_mask (void			*abstract_surface,
 			  cairo_clip_t		*clip)
 {
     cairo_xml_surface_t *surface = abstract_surface;
-    cairo_xml_t *xml = surface->xml;
+    cairo_xml_t *xml = to_xml (surface);
     cairo_status_t status;
 
     _cairo_xml_printf (xml, "<mask>");
@@ -755,15 +756,15 @@ _cairo_xml_surface_stroke (void				*abstract_surface,
 			   cairo_operator_t		 op,
 			   const cairo_pattern_t	*source,
 			   cairo_path_fixed_t		*path,
-			   cairo_stroke_style_t		*style,
-			   cairo_matrix_t		*ctm,
-			   cairo_matrix_t		*ctm_inverse,
+			   const cairo_stroke_style_t		*style,
+			   const cairo_matrix_t		*ctm,
+			   const cairo_matrix_t		*ctm_inverse,
 			   double			 tolerance,
 			   cairo_antialias_t		 antialias,
 			   cairo_clip_t			*clip)
 {
     cairo_xml_surface_t *surface = abstract_surface;
-    cairo_xml_t *xml = surface->xml;
+    cairo_xml_t *xml = to_xml (surface);
     cairo_status_t status;
 
     _cairo_xml_printf (xml, "<stroke>");
@@ -794,7 +795,7 @@ _cairo_xml_surface_stroke (void				*abstract_surface,
 	_cairo_xml_printf_end (xml, "</dash>");
     }
 
-    _cairo_xml_emit_path (surface->xml, path);
+    _cairo_xml_emit_path (xml, path);
     _cairo_xml_emit_double (xml, "tolerance", tolerance);
     _cairo_xml_emit_string (xml, "antialias", _antialias_to_string (antialias));
 
@@ -817,7 +818,7 @@ _cairo_xml_surface_fill (void			*abstract_surface,
 			 cairo_clip_t		*clip)
 {
     cairo_xml_surface_t *surface = abstract_surface;
-    cairo_xml_t *xml = surface->xml;
+    cairo_xml_t *xml = to_xml (surface);
     cairo_status_t status;
 
     _cairo_xml_printf (xml, "<fill>");
@@ -833,7 +834,7 @@ _cairo_xml_surface_fill (void			*abstract_surface,
     if (unlikely (status))
 	return status;
 
-    _cairo_xml_emit_path (surface->xml, path);
+    _cairo_xml_emit_path (xml, path);
     _cairo_xml_emit_double (xml, "tolerance", tolerance);
     _cairo_xml_emit_string (xml, "antialias", _antialias_to_string (antialias));
     _cairo_xml_emit_string (xml, "fill-rule", _fill_rule_to_string (fill_rule));
@@ -957,7 +958,7 @@ _cairo_xml_surface_glyphs (void			    *abstract_surface,
 			   int			    *remaining_glyphs)
 {
     cairo_xml_surface_t *surface = abstract_surface;
-    cairo_xml_t *xml = surface->xml;
+    cairo_xml_t *xml = to_xml (surface);
     cairo_status_t status;
     int i;
 
@@ -996,7 +997,7 @@ static const cairo_surface_backend_t
 _cairo_xml_surface_backend = {
     CAIRO_SURFACE_TYPE_XML,
     _cairo_xml_surface_create_similar,
-    _cairo_xml_surface_finish,
+    NULL,
     NULL, NULL, /* source image */
     NULL, NULL, /* dst image */
     NULL, /* clone_similar */
@@ -1033,81 +1034,88 @@ _cairo_xml_surface_backend = {
 };
 
 static cairo_surface_t *
-_cairo_xml_surface_create_internal (cairo_xml_t *xml,
+_cairo_xml_surface_create_internal (cairo_device_t *device,
 				    cairo_content_t content,
 				    double width,
 				    double height)
 {
     cairo_xml_surface_t *surface;
 
-    if (unlikely (xml == NULL))
-	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NULL_POINTER));
-
     surface = malloc (sizeof (cairo_xml_surface_t));
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
     _cairo_surface_init (&surface->base,
 			 &_cairo_xml_surface_backend,
+			 device,
 			 content);
 
-    surface->xml = xml;
-    xml->ref++;
-
     surface->width = width;
     surface->height = height;
 
     return &surface->base;
 }
 
-cairo_xml_t *
+cairo_device_t *
 cairo_xml_create (const char *filename)
 {
     cairo_output_stream_t *stream;
+    cairo_status_t status;
 
     stream = _cairo_output_stream_create_for_filename (filename);
-    if (_cairo_output_stream_get_status (stream))
-	return (cairo_xml_t *) &_nil_xml;
+    if ((status = _cairo_output_stream_get_status (stream)))
+	return _cairo_device_create_in_error (status);
 
     return _cairo_xml_create_internal (stream);
 }
 
-cairo_xml_t *
+cairo_device_t *
 cairo_xml_create_for_stream (cairo_write_func_t	 write_func,
 			     void		*closure)
 {
     cairo_output_stream_t *stream;
+    cairo_status_t status;
 
     stream = _cairo_output_stream_create (write_func, NULL, closure);
-    if (_cairo_output_stream_get_status (stream))
-	return (cairo_xml_t *) &_nil_xml;
+    if ((status = _cairo_output_stream_get_status (stream)))
+	return _cairo_device_create_in_error (status);
 
     return _cairo_xml_create_internal (stream);
 }
 
 cairo_surface_t *
-cairo_xml_surface_create (cairo_xml_t *xml,
+cairo_xml_surface_create (cairo_device_t *device,
 			  cairo_content_t content,
 			  double width, double height)
 {
-    return _cairo_xml_surface_create_internal (xml, content, width, height);
+    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_XML))
+	return _cairo_surface_create_in_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+
+    if (unlikely (device->status))
+	return _cairo_surface_create_in_error (device->status);
+
+    return _cairo_xml_surface_create_internal (device, content, width, height);
 }
 
 cairo_status_t
-cairo_xml_for_recording_surface (cairo_xml_t 	 *xml,
+cairo_xml_for_recording_surface (cairo_device_t	 *device,
 				 cairo_surface_t *recording_surface)
 {
     cairo_box_t bbox;
     cairo_rectangle_int_t extents;
     cairo_surface_t *surface;
+    cairo_xml_t *xml;
     cairo_status_t status;
 
-    if (unlikely (xml->status))
-	return xml->status;
+    if (unlikely (device->status))
+	return device->status;
 
     if (unlikely (recording_surface->status))
 	return recording_surface->status;
 
+    if (unlikely (device->backend->type != CAIRO_DEVICE_TYPE_XML))
+	return _cairo_error (CAIRO_STATUS_DEVICE_TYPE_MISMATCH);
+
     if (unlikely (! _cairo_surface_is_recording (recording_surface)))
 	return _cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
 
@@ -1117,13 +1125,15 @@ cairo_xml_for_recording_surface (cairo_xml_t 	 *xml,
 	return status;
 
     _cairo_box_round_to_rectangle (&bbox, &extents);
-    surface = _cairo_xml_surface_create_internal (xml,
+    surface = _cairo_xml_surface_create_internal (device,
 						  recording_surface->content,
 						  extents.width,
 						  extents.height);
     if (unlikely (surface->status))
 	return surface->status;
 
+    xml = (cairo_xml_t *) device;
+
     _cairo_xml_printf (xml,
 		       "<surface content='%s' width='%d' height='%d'>",
 		       _content_to_string (recording_surface->content),
@@ -1140,14 +1150,3 @@ cairo_xml_for_recording_surface (cairo_xml_t 	 *xml,
     return status;
 }
 slim_hidden_def (cairo_xml_for_recording_surface);
-
-void
-cairo_xml_destroy (cairo_xml_t *xml)
-{
-    cairo_status_t status_ignored;
-
-    if (xml == NULL || xml->ref < 0)
-	return;
-
-    status_ignored = _cairo_xml_destroy_internal (xml);
-}
diff --git a/gfx/cairo/cairo/src/cairo-xml.h b/gfx/cairo/cairo/src/cairo-xml.h
index bba8adc0411..9ae76e90aae 100644
--- a/gfx/cairo/cairo/src/cairo-xml.h
+++ b/gfx/cairo/cairo/src/cairo-xml.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -42,25 +42,20 @@
 
 CAIRO_BEGIN_DECLS
 
-typedef struct _cairo_xml cairo_xml_t;
-
-cairo_public cairo_xml_t *
+cairo_public cairo_device_t *
 cairo_xml_create (const char *filename);
 
-cairo_public cairo_xml_t *
+cairo_public cairo_device_t *
 cairo_xml_create_for_stream (cairo_write_func_t	 write_func,
 			     void		*closure);
 
-cairo_public void
-cairo_xml_destroy (cairo_xml_t *context);
-
 cairo_public cairo_surface_t *
-cairo_xml_surface_create (cairo_xml_t *xml,
+cairo_xml_surface_create (cairo_device_t *xml,
 			  cairo_content_t content,
 			  double width, double height);
 
 cairo_public cairo_status_t
-cairo_xml_for_recording_surface (cairo_xml_t *context,
+cairo_xml_for_recording_surface (cairo_device_t *xml,
 				 cairo_surface_t *surface);
 
 CAIRO_END_DECLS
diff --git a/gfx/cairo/cairo/src/cairo.c b/gfx/cairo/cairo/src/cairo.c
index 69ec04ccf48..770669cdc97 100644
--- a/gfx/cairo/cairo/src/cairo.c
+++ b/gfx/cairo/cairo/src/cairo.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -40,8 +40,66 @@
 #include "cairo-private.h"
 
 #include "cairo-arc-private.h"
+#include "cairo-error-private.h"
 #include "cairo-path-private.h"
 
+/**
+ * SECTION:cairo
+ * @Title: cairo_t
+ * @Short_Description: The cairo drawing context
+ * @See_Also: #cairo_surface_t
+ *
+ * #cairo_t is the main object used when drawing with cairo. To
+ * draw with cairo, you create a #cairo_t, set the target surface,
+ * and drawing options for the #cairo_t, create shapes with
+ * functions like cairo_move_to() and cairo_line_to(), and then
+ * draw shapes with cairo_stroke() or cairo_fill().
+ *
+ * #cairo_t<!-- -->'s can be pushed to a stack via cairo_save().
+ * They may then safely be changed, without loosing the current state.
+ * Use cairo_restore() to restore to the saved state.
+ */
+
+/**
+ * SECTION:cairo-text
+ * @Title: text
+ * @Short_Description: Rendering text and glyphs
+ * @See_Also: #cairo_font_face_t, #cairo_scaled_font_t, cairo_text_path(),
+ *            cairo_glyph_path()
+ *
+ * The functions with <emphasis>text</emphasis> in their name form cairo's
+ * <firstterm>toy</firstterm> text API.  The toy API takes UTF-8 encoded
+ * text and is limited in its functionality to rendering simple
+ * left-to-right text with no advanced features.  That means for example
+ * that most complex scripts like Hebrew, Arabic, and Indic scripts are
+ * out of question.  No kerning or correct positioning of diacritical marks
+ * either.  The font selection is pretty limited too and doesn't handle the
+ * case that the selected font does not cover the characters in the text.
+ * This set of functions are really that, a toy text API, for testing and
+ * demonstration purposes.  Any serious application should avoid them.
+ *
+ * The functions with <emphasis>glyphs</emphasis> in their name form cairo's
+ * <firstterm>low-level</firstterm> text API.  The low-level API relies on
+ * the user to convert text to a set of glyph indexes and positions.  This
+ * is a very hard problem and is best handled by external libraries, like
+ * the pangocairo that is part of the Pango text layout and rendering library.
+ * Pango is available from <ulink
+ * url="http://www.pango.org/">http://www.pango.org/</ulink>.
+ */
+
+/**
+ * SECTION:cairo-transforms
+ * @Title: Transformations
+ * @Short_Description: Manipulating the current transformation matrix
+ * @See_Also: #cairo_matrix_t
+ *
+ * The current transformation matrix, <firstterm>ctm</firstterm>, is a
+ * two-dimensional affine transformation that maps all coordinates and other
+ * drawing instruments from the <firstterm>user space</firstterm> into the
+ * surface's canonical coordinate system, also known as the <firstterm>device
+ * space</firstterm>.
+ */
+
 #define CAIRO_TOLERANCE_MINIMUM	_cairo_fixed_to_double(1)
 
 #if !defined(INFINITY)
@@ -59,14 +117,36 @@ static const cairo_t _cairo_nil = {
     { 0, 0 },			/* last_move_point */
     { 0, 0 },			/* current point */
     FALSE,			/* has_current_point */
+    FALSE,			/* has_last_move_point */
     FALSE,			/* has_curve_to */
     FALSE,			/* is_box */
     FALSE,			/* maybe_fill_region */
     TRUE,			/* is_empty_fill */
+    { {0, 0}, {0, 0}},		/* extents */
     {{{NULL,NULL}}}		/* link */
   }}
 };
 
+static const cairo_t _cairo_nil__null_pointer = {
+  CAIRO_REFERENCE_COUNT_INVALID,	/* ref_count */
+  CAIRO_STATUS_NULL_POINTER,	/* status */
+  { 0, 0, 0, NULL },		/* user_data */
+  NULL,				/* gstate */
+  {{ 0 }, { 0 }},		/* gstate_tail */
+  NULL,				/* gstate_freelist */
+  {{				/* path */
+    { 0, 0 },			/* last_move_point */
+    { 0, 0 },			/* current point */
+    FALSE,			/* has_current_point */
+    FALSE,			/* has_last_move_point */
+    FALSE,			/* has_curve_to */
+    FALSE,			/* is_box */
+    FALSE,			/* maybe_fill_region */
+    TRUE,			/* is_empty_fill */
+    { {0, 0}, {0, 0}},		/* extents */
+    {{{NULL,NULL}}}		/* link */
+  }}
+};
 #include <assert.h>
 
 /**
@@ -119,25 +199,9 @@ _cairo_set_error (cairo_t *cr, cairo_status_t status)
     _cairo_status_set_error (&cr->status, _cairo_error (status));
 }
 
-#if defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-static __forceinline int
-ffs(int x)
-{
-    unsigned long i;
-
-    if (_BitScanForward(&i, x) != 0)
-	return i + 1;
-
-    return 0;
-}
-#endif
-
-
-#if CAIRO_NO_MUTEX
 /* We keep a small stash of contexts to reduce malloc pressure */
 #define CAIRO_STASH_SIZE 4
+#if CAIRO_NO_MUTEX
 static struct {
     cairo_t pool[CAIRO_STASH_SIZE];
     int occupied;
@@ -146,24 +210,19 @@ static struct {
 static cairo_t *
 _context_get (void)
 {
-    int avail, old, new;
+    int avail;
 
-    old = _context_stash.occupied;
-    avail = ffs (~old) - 1;
+    avail = ffs (~_context_stash.occupied) - 1;
     if (avail >= CAIRO_STASH_SIZE)
 	return malloc (sizeof (cairo_t));
 
-    new = old | (1 << avail);
-    _context_stash.occupied = new;
-
+    _context_stash.occupied |= 1 << avail;
     return &_context_stash.pool[avail];
 }
 
 static void
 _context_put (cairo_t *cr)
 {
-    int old, new, avail;
-
     if (cr < &_context_stash.pool[0] ||
 	cr >= &_context_stash.pool[CAIRO_STASH_SIZE])
     {
@@ -171,14 +230,9 @@ _context_put (cairo_t *cr)
 	return;
     }
 
-    avail = ~(1 << (cr - &_context_stash.pool[0]));
-    old = _context_stash.occupied;
-    new = old & avail;
-    _context_stash.occupied = new;
+    _context_stash.occupied &= ~(1 << (cr - &_context_stash.pool[0]));
 }
 #elif HAS_ATOMIC_OPS
-/* We keep a small stash of contexts to reduce malloc pressure */
-#define CAIRO_STASH_SIZE 4
 static struct {
     cairo_t pool[CAIRO_STASH_SIZE];
     cairo_atomic_int_t occupied;
@@ -196,7 +250,7 @@ _context_get (void)
 	    return malloc (sizeof (cairo_t));
 
 	new = old | (1 << avail);
-    } while (_cairo_atomic_int_cmpxchg (&_context_stash.occupied, old, new) != old);
+    } while (! _cairo_atomic_int_cmpxchg (&_context_stash.occupied, old, new));
 
     return &_context_stash.pool[avail];
 }
@@ -217,13 +271,68 @@ _context_put (cairo_t *cr)
     do {
 	old = _cairo_atomic_int_get (&_context_stash.occupied);
 	new = old & avail;
-    } while (_cairo_atomic_int_cmpxchg (&_context_stash.occupied, old, new) != old);
+    } while (! _cairo_atomic_int_cmpxchg (&_context_stash.occupied, old, new));
 }
 #else
 #define _context_get() malloc (sizeof (cairo_t))
 #define _context_put(cr) free (cr)
 #endif
 
+/* XXX This should disappear in favour of a common pool of error objects. */
+static cairo_t *_cairo_nil__objects[CAIRO_STATUS_LAST_STATUS + 1];
+
+static cairo_t *
+_cairo_create_in_error (cairo_status_t status)
+{
+    cairo_t *cr;
+
+    assert (status != CAIRO_STATUS_SUCCESS);
+
+    /* special case OOM in order to avoid another allocation */
+    switch ((int) status) {
+    case CAIRO_STATUS_NO_MEMORY:
+	return (cairo_t *) &_cairo_nil;
+    case CAIRO_STATUS_NULL_POINTER:
+	return (cairo_t *) &_cairo_nil__null_pointer;
+    }
+
+    CAIRO_MUTEX_LOCK (_cairo_error_mutex);
+    cr = _cairo_nil__objects[status];
+    if (cr == NULL) {
+	cr = malloc (sizeof (cairo_t));
+	if (unlikely (cr == NULL)) {
+	    CAIRO_MUTEX_UNLOCK (_cairo_error_mutex);
+	    _cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
+	    return (cairo_t *) &_cairo_nil;
+	}
+
+	*cr = _cairo_nil;
+	cr->status = status;
+	_cairo_nil__objects[status] = cr;
+    }
+    CAIRO_MUTEX_UNLOCK (_cairo_error_mutex);
+
+    return cr;
+}
+
+void
+_cairo_reset_static_data (void)
+{
+    int status;
+
+    CAIRO_MUTEX_LOCK (_cairo_error_mutex);
+    for (status = CAIRO_STATUS_SUCCESS;
+	 status <= CAIRO_STATUS_LAST_STATUS;
+	 status++)
+    {
+	if (_cairo_nil__objects[status] != NULL) {
+	    free (_cairo_nil__objects[status]);
+	    _cairo_nil__objects[status] = NULL;
+	}
+    }
+    CAIRO_MUTEX_UNLOCK (_cairo_error_mutex);
+}
+
 /**
  * cairo_create:
  * @target: target surface for the context
@@ -253,15 +362,14 @@ cairo_create (cairo_surface_t *target)
     cairo_t *cr;
     cairo_status_t status;
 
-    /* special case OOM in order to avoid another allocation */
-    if (target && target->status == CAIRO_STATUS_NO_MEMORY)
-	return (cairo_t *) &_cairo_nil;
+    if (unlikely (target == NULL))
+	return _cairo_create_in_error (_cairo_error (CAIRO_STATUS_NULL_POINTER));
+    if (unlikely (target->status))
+	return _cairo_create_in_error (target->status);
 
     cr = _context_get ();
-    if (unlikely (cr == NULL)) {
-	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-	return (cairo_t *) &_cairo_nil;
-    }
+    if (unlikely (cr == NULL))
+	return _cairo_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
     CAIRO_REFERENCE_COUNT_INIT (&cr->ref_count, 1);
 
@@ -275,8 +383,10 @@ cairo_create (cairo_surface_t *target)
     cr->gstate_tail[1].next = NULL;
 
     status = _cairo_gstate_init (cr->gstate, target);
-    if (unlikely (status))
-	_cairo_set_error (cr, status);
+    if (unlikely (status)) {
+	_context_put (cr);
+	cr = _cairo_create_in_error (status);
+    }
 
     return cr;
 }
@@ -355,6 +465,9 @@ cairo_destroy (cairo_t *cr)
 
     _cairo_user_data_array_fini (&cr->user_data);
 
+    /* mark the context as invalid to protect against misuse */
+    cr->status = CAIRO_STATUS_NULL_POINTER;
+
     _context_put (cr);
 }
 slim_hidden_def (cairo_destroy);
@@ -556,54 +669,59 @@ cairo_push_group (cairo_t *cr)
 void
 cairo_push_group_with_content (cairo_t *cr, cairo_content_t content)
 {
+    cairo_surface_t *group_surface;
+    cairo_clip_t *clip;
     cairo_status_t status;
-    cairo_rectangle_int_t extents;
-    const cairo_rectangle_int_t *clip_extents;
-    cairo_surface_t *parent_surface, *group_surface = NULL;
-    cairo_bool_t is_empty;
 
     if (unlikely (cr->status))
 	return;
 
-    parent_surface = _cairo_gstate_get_target (cr->gstate);
-
-    /* Get the extents that we'll use in creating our new group surface */
-    _cairo_surface_get_extents (parent_surface, &extents);
-
-    if (_cairo_gstate_get_clip (cr->gstate)->all_clipped) {
-	extents.width = 0;
-	extents.height = 0;
+    clip = _cairo_gstate_get_clip (cr->gstate);
+    if (clip->all_clipped) {
+	group_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 0, 0);
+	status = group_surface->status;
+	if (unlikely (status))
+	    goto bail;
     } else {
+	cairo_surface_t *parent_surface;
+	const cairo_rectangle_int_t *clip_extents;
+	cairo_rectangle_int_t extents;
+        cairo_matrix_t matrix;
+	cairo_bool_t is_empty;
+
+	parent_surface = _cairo_gstate_get_target (cr->gstate);
+
+	/* Get the extents that we'll use in creating our new group surface */
+	is_empty = _cairo_surface_get_extents (parent_surface, &extents);
 	clip_extents = _cairo_clip_get_extents (_cairo_gstate_get_clip (cr->gstate));
 	if (clip_extents != NULL)
-	    _cairo_rectangle_intersect (&extents, clip_extents);
+	    is_empty = _cairo_rectangle_intersect (&extents, clip_extents);
+
+	group_surface = _cairo_surface_create_similar_solid (parent_surface,
+							     content,
+							     extents.width,
+							     extents.height,
+							     CAIRO_COLOR_TRANSPARENT,
+							     TRUE);
+	status = group_surface->status;
+	if (unlikely (status))
+	    goto bail;
+
+	/* Set device offsets on the new surface so that logically it appears at
+	 * the same location on the parent surface -- when we pop_group this,
+	 * the source pattern will get fixed up for the appropriate target surface
+	 * device offsets, so we want to set our own surface offsets from /that/,
+	 * and not from the device origin. */
+	cairo_surface_set_device_offset (group_surface,
+					 parent_surface->device_transform.x0 - extents.x,
+					 parent_surface->device_transform.y0 - extents.y);
+
+	/* If we have a current path, we need to adjust it to compensate for
+	 * the device offset just applied. */
+        cairo_matrix_init_translate (&matrix, -extents.x, -extents.y);
+	_cairo_path_fixed_transform (cr->path, &matrix);
     }
 
-    group_surface = _cairo_surface_create_similar_solid (parent_surface,
-							 content,
-							 extents.width,
-							 extents.height,
-							 CAIRO_COLOR_TRANSPARENT,
-							 TRUE);
-
-    status = group_surface->status;
-    if (unlikely (status))
-	goto bail;
-
-    /* Set device offsets on the new surface so that logically it appears at
-     * the same location on the parent surface -- when we pop_group this,
-     * the source pattern will get fixed up for the appropriate target surface
-     * device offsets, so we want to set our own surface offsets from /that/,
-     * and not from the device origin. */
-    cairo_surface_set_device_offset (group_surface,
-                                     parent_surface->device_transform.x0 - extents.x,
-                                     parent_surface->device_transform.y0 - extents.y);
-
-    /* If we have a current path, we need to adjust it to compensate for
-     * the device offset just applied. */
-    _cairo_path_fixed_transform (cr->path,
-				 &group_surface->device_transform);
-
     /* create a new gstate for the redirect */
     cairo_save (cr);
     if (unlikely (cr->status))
@@ -644,7 +762,7 @@ cairo_pop_group (cairo_t *cr)
 {
     cairo_surface_t *group_surface, *parent_target;
     cairo_pattern_t *group_pattern;
-    cairo_matrix_t group_matrix;
+    cairo_matrix_t group_matrix, device_transform_matrix;
     cairo_status_t status;
 
     if (unlikely (cr->status))
@@ -693,8 +811,10 @@ cairo_pop_group (cairo_t *cr)
 
     /* If we have a current path, we need to adjust it to compensate for
      * the device offset just removed. */
-    _cairo_path_fixed_transform (cr->path,
-				 &group_surface->device_transform_inverse);
+    cairo_matrix_multiply (&device_transform_matrix, 
+                           &_cairo_gstate_get_target (cr->gstate)->device_transform,
+			   &group_surface->device_transform_inverse);
+    _cairo_path_fixed_transform (cr->path, &device_transform_matrix);
 
 done:
     cairo_surface_destroy (group_surface);
@@ -880,7 +1000,7 @@ cairo_set_source_rgba (cairo_t *cr,
  * The @x and @y parameters give the user-space coordinate at which
  * the surface origin should appear. (The surface origin is its
  * upper-left corner before any transformation has been applied.) The
- * @x and @y patterns are negated and then set as translation values
+ * @x and @y parameters are negated and then set as translation values
  * in the pattern matrix.
  *
  * Other than the initial translation pattern matrix, as described
@@ -2147,12 +2267,13 @@ cairo_paint_with_alpha (cairo_t *cr,
 	return;
     }
 
-    if (CAIRO_ALPHA_IS_ZERO (alpha)) {
+    if (CAIRO_ALPHA_IS_ZERO (alpha) &&
+        _cairo_operator_bounded_by_mask (cr->gstate->op)) {
 	return;
     }
 
-    _cairo_color_init_rgba (&color, 1., 1., 1., alpha);
-    _cairo_pattern_init_solid (&pattern, &color, CAIRO_CONTENT_ALPHA);
+    _cairo_color_init_rgba (&color, 0., 0., 0., alpha);
+    _cairo_pattern_init_solid (&pattern, &color);
 
     status = _cairo_gstate_mask (cr->gstate, &pattern.base);
     if (unlikely (status))
@@ -3454,7 +3575,6 @@ cairo_show_text_glyphs (cairo_t			   *cr,
 {
     cairo_status_t status;
 
-
     if (unlikely (cr->status))
 	return;
 
diff --git a/gfx/cairo/cairo/src/cairo.h b/gfx/cairo/cairo/src/cairo.h
index b149bd7ecea..6abc60016ef 100644
--- a/gfx/cairo/cairo/src/cairo.h
+++ b/gfx/cairo/cairo/src/cairo.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -146,6 +146,24 @@ typedef struct _cairo cairo_t;
  **/
 typedef struct _cairo_surface cairo_surface_t;
 
+/**
+ * cairo_device_t:
+ *
+ * A #cairo_device_t represents the driver interface for drawing
+ * operations to a #cairo_surface_t.  There are different subtypes of
+ * #cairo_device_t for different drawing backends; for example,
+ * cairo_xcb_device_create() creates a device that wraps the connection
+ * to an X Windows System using the XCB library.
+ *
+ * The type of a device can be queried with cairo_device_get_type().
+ *
+ * Memory management of #cairo_device_t is done with
+ * cairo_device_reference() and cairo_device_destroy().
+ *
+ * Since: 1.10
+ **/
+typedef struct _cairo_device cairo_device_t;
+
 /**
  * cairo_matrix_t:
  * @xx: xx component of the affine transformation
@@ -250,6 +268,8 @@ typedef struct _cairo_user_data_key {
  * @CAIRO_STATUS_INVALID_WEIGHT: invalid value for an input #cairo_font_weight_t (Since 1.8)
  * @CAIRO_STATUS_INVALID_SIZE: invalid value (typically too big) for the size of the input (surface, pattern, etc.) (Since 1.10)
  * @CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED: user-font method not implemented (Since 1.10)
+ * @CAIRO_STATUS_DEVICE_TYPE_MISMATCH: the device type is not appropriate for the operation (Since 1.10)
+ * @CAIRO_STATUS_DEVICE_ERROR: an operation to the device caused an unspecified error (Since 1.10)
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
  *   status values defined in this enumeration.  When using this value, note
  *   that the version of cairo at run-time may have additional status values
@@ -299,6 +319,8 @@ typedef enum _cairo_status {
     CAIRO_STATUS_INVALID_WEIGHT,
     CAIRO_STATUS_INVALID_SIZE,
     CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED,
+    CAIRO_STATUS_DEVICE_TYPE_MISMATCH,
+    CAIRO_STATUS_DEVICE_ERROR,
     CAIRO_STATUS_NO_DEVICE,
 
     CAIRO_STATUS_LAST_STATUS
@@ -1914,6 +1936,83 @@ cairo_status (cairo_t *cr);
 cairo_public const char *
 cairo_status_to_string (cairo_status_t status);
 
+/* Backend device manipulation */
+
+cairo_public cairo_device_t *
+cairo_device_reference (cairo_device_t *device);
+
+/**
+ * cairo_device_type_t:
+ * @CAIRO_DEVICE_TYPE_DRM: The surface is of type Direct Render Manager
+ * @CAIRO_DEVICE_TYPE_GL: The surface is of type OpenGL
+ * @CAIRO_DEVICE_TYPE_SCRIPT: The surface is of type script
+ * @CAIRO_DEVICE_TYPE_XCB: The surface is of type xcb
+ * @CAIRO_DEVICE_TYPE_XLIB: The surface is of type xlib
+ * @CAIRO_DEVICE_TYPE_XML: The surface is of type XML
+ *   cairo_surface_create_for_rectangle()
+ *
+ * #cairo_device_type_t is used to describe the type of a given
+ * device. The devices types are also known as "backends" within cairo.
+ *
+ * The device type can be queried with cairo_device_get_type()
+ *
+ * The various #cairo_device_t functions can be used with surfaces of
+ * any type, but some backends also provide type-specific functions
+ * that must only be called with a device of the appropriate
+ * type. These functions have names that begin with
+ * cairo_<emphasis>type</emphasis>_device<!-- --> such as cairo_xcb_device_debug_set_render_version().
+ *
+ * The behavior of calling a type-specific function with a surface of
+ * the wrong type is undefined.
+ *
+ * New entries may be added in future versions.
+ *
+ * Since: 1.10
+ **/
+typedef enum _cairo_device_type {
+    CAIRO_DEVICE_TYPE_DRM,
+    CAIRO_DEVICE_TYPE_GL,
+    CAIRO_DEVICE_TYPE_SCRIPT,
+    CAIRO_DEVICE_TYPE_XCB,
+    CAIRO_DEVICE_TYPE_XLIB,
+    CAIRO_DEVICE_TYPE_XML
+} cairo_device_type_t;
+
+cairo_public cairo_device_type_t
+cairo_device_get_type (cairo_device_t *device);
+
+cairo_public cairo_status_t
+cairo_device_status (cairo_device_t *device);
+
+cairo_public cairo_status_t
+cairo_device_acquire (cairo_device_t *device);
+
+cairo_public void
+cairo_device_release (cairo_device_t *device);
+
+cairo_public void
+cairo_device_flush (cairo_device_t *device);
+
+cairo_public void
+cairo_device_finish (cairo_device_t *device);
+
+cairo_public void
+cairo_device_destroy (cairo_device_t *device);
+
+cairo_public unsigned int
+cairo_device_get_reference_count (cairo_device_t *device);
+
+cairo_public void *
+cairo_device_get_user_data (cairo_device_t		 *device,
+			    const cairo_user_data_key_t *key);
+
+cairo_public cairo_status_t
+cairo_device_set_user_data (cairo_device_t		 *device,
+			    const cairo_user_data_key_t *key,
+			    void			 *user_data,
+			    cairo_destroy_func_t	  destroy);
+
+
 /* Surface manipulation */
 
 cairo_public cairo_surface_t *
@@ -1922,6 +2021,13 @@ cairo_surface_create_similar (cairo_surface_t  *other,
 			      int		width,
 			      int		height);
 
+cairo_public cairo_surface_t *
+cairo_surface_create_for_rectangle (cairo_surface_t	*target,
+                                    double		 x,
+                                    double		 y,
+                                    double		 width,
+                                    double		 height);
+
 cairo_public cairo_surface_t *
 cairo_surface_reference (cairo_surface_t *surface);
 
@@ -1931,6 +2037,9 @@ cairo_surface_finish (cairo_surface_t *surface);
 cairo_public void
 cairo_surface_destroy (cairo_surface_t *surface);
 
+cairo_public cairo_device_t *
+cairo_surface_get_device (cairo_surface_t *surface);
+
 cairo_public unsigned int
 cairo_surface_get_reference_count (cairo_surface_t *surface);
 
@@ -1962,6 +2071,9 @@ cairo_surface_status (cairo_surface_t *surface);
  * @CAIRO_SURFACE_TYPE_TEE: The surface is of type 'tee' (a multiplexing surface), since 1.10
  * @CAIRO_SURFACE_TYPE_XML: The surface is of type XML (for debugging), since 1.10
  * @CAIRO_SURFACE_TYPE_SKIA: The surface is of type Skia, since 1.10
+ * @CAIRO_SURFACE_TYPE_SUBSURFACE: The surface is a subsurface created with
+ *   cairo_surface_create_for_rectangle(), since 1.10
+ * @CAIRO_SURFACE_TYPE_D2D: The surface is of type Direct2D
  *
  * #cairo_surface_type_t is used to describe the type of a given
  * surface. The surface types are also known as "backends" or "surface
@@ -2010,6 +2122,7 @@ typedef enum _cairo_surface_type {
     CAIRO_SURFACE_TYPE_TEE,
     CAIRO_SURFACE_TYPE_XML,
     CAIRO_SURFACE_TYPE_SKIA,
+    CAIRO_SURFACE_TYPE_SUBSURFACE,
     CAIRO_SURFACE_TYPE_D2D
 } cairo_surface_type_t;
 
@@ -2045,18 +2158,19 @@ cairo_surface_set_user_data (cairo_surface_t		 *surface,
 #define CAIRO_MIME_TYPE_JPEG "image/jpeg"
 #define CAIRO_MIME_TYPE_PNG "image/png"
 #define CAIRO_MIME_TYPE_JP2 "image/jp2"
+#define CAIRO_MIME_TYPE_URI "text/x-uri"
 
 cairo_public void
 cairo_surface_get_mime_data (cairo_surface_t		*surface,
                              const char			*mime_type,
                              const unsigned char       **data,
-                             unsigned int		*length);
+                             unsigned long		*length);
 
 cairo_public cairo_status_t
 cairo_surface_set_mime_data (cairo_surface_t		*surface,
                              const char			*mime_type,
                              const unsigned char	*data,
-                             unsigned int		 length,
+                             unsigned long		 length,
 			     cairo_destroy_func_t	 destroy,
 			     void			*closure);
 
@@ -2129,6 +2243,7 @@ cairo_surface_get_subpixel_antialiasing (cairo_surface_t *surface);
 
 /**
  * cairo_format_t:
+ * @CAIRO_FORMAT_INVALID: no such format exists or is supported.
  * @CAIRO_FORMAT_ARGB32: each pixel is a 32-bit quantity, with
  *   alpha in the upper 8 bits, then red, then green, then blue.
  *   The 32-bit quantities are stored native-endian. Pre-multiplied
@@ -2145,9 +2260,9 @@ cairo_surface_get_subpixel_antialiasing (cairo_surface_t *surface);
  *   endianess of the platform. On a big-endian machine, the
  *   first pixel is in the uppermost bit, on a little-endian
  *   machine the first pixel is in the least-significant bit.
- * @CAIRO_FORMAT_RGB16_565: This format value is deprecated. It has
- *   never been properly implemented in cairo and should not be used
- *   by applications. (since 1.2)
+ * @CAIRO_FORMAT_RGB16_565: each pixel is a 16-bit quantity
+ *   with red in the upper 5 bits, then green in the middle
+ *   6 bits, and blue in the lower 5 bits.
  *
  * #cairo_format_t is used to identify the memory format of
  * image data.
@@ -2155,11 +2270,12 @@ cairo_surface_get_subpixel_antialiasing (cairo_surface_t *surface);
  * New entries may be added in future versions.
  **/
 typedef enum _cairo_format {
-    CAIRO_FORMAT_ARGB32,
-    CAIRO_FORMAT_RGB24,
-    CAIRO_FORMAT_A8,
-    CAIRO_FORMAT_A1,
-    CAIRO_FORMAT_RGB16_565
+    CAIRO_FORMAT_INVALID   = -1,
+    CAIRO_FORMAT_ARGB32    = 0,
+    CAIRO_FORMAT_RGB24     = 1,
+    CAIRO_FORMAT_A8        = 2,
+    CAIRO_FORMAT_A1        = 3,
+    CAIRO_FORMAT_RGB16_565 = 4
 } cairo_format_t;
 
 cairo_public cairo_surface_t *
@@ -2217,23 +2333,6 @@ cairo_recording_surface_ink_extents (cairo_surface_t *surface,
                                      double *width,
                                      double *height);
 
-/* Tee-surface functions */
-
-cairo_public cairo_surface_t *
-cairo_tee_surface_create (cairo_surface_t *master);
-
-cairo_public void
-cairo_tee_surface_add (cairo_surface_t *surface,
-		       cairo_surface_t *target);
-
-cairo_public void
-cairo_tee_surface_remove (cairo_surface_t *surface,
-			  cairo_surface_t *target);
-
-cairo_public cairo_surface_t *
-cairo_tee_surface_index (cairo_surface_t *surface,
-			 int index);
-
 /* Pattern creation functions */
 
 cairo_public cairo_pattern_t *
@@ -2482,8 +2581,33 @@ cairo_matrix_transform_point (const cairo_matrix_t *matrix,
 
 /* Region functions */
 
+/**
+ * cairo_region_t:
+ *
+ * A #cairo_region_t represents a set of integer-aligned rectangles.
+ *
+ * It allows set-theoretical operations like cairo_region_union() and
+ * cairo_region_intersect() to be performed on them.
+ *
+ * Memory management of #cairo_region_t is done with
+ * cairo_region_reference() and cairo_region_destroy().
+ *
+ * Since: 1.10
+ **/
 typedef struct _cairo_region cairo_region_t;
 
+/**
+ * cairo_rectangle_int_t:
+ * @x: X coordinate of the left side of the rectangle
+ * @y: Y coordinate of the the top side of the rectangle
+ * @width: width of the rectangle
+ * @height: height of the rectangle
+ *
+ * A data structure for holding a rectangle with integer coordinates.
+ *
+ * Since: 1.10
+ **/
+
 typedef struct _cairo_rectangle_int {
     int x, y;
     int width, height;
@@ -2509,7 +2633,7 @@ cairo_public cairo_region_t *
 cairo_region_copy (const cairo_region_t *original);
 
 cairo_public cairo_region_t *
-cairo_region_reference (cairo_region_t *);
+cairo_region_reference (cairo_region_t *region);
 
 cairo_public void
 cairo_region_destroy (cairo_region_t *region);
@@ -2528,8 +2652,8 @@ cairo_public int
 cairo_region_num_rectangles (const cairo_region_t *region);
 
 cairo_public void
-cairo_region_get_rectangle (const cairo_region_t        *region,
-			    int                    nth_rectangle,
+cairo_region_get_rectangle (const cairo_region_t  *region,
+			    int                    nth,
 			    cairo_rectangle_int_t *rectangle);
 
 cairo_public cairo_bool_t
@@ -2553,19 +2677,25 @@ cairo_region_subtract_rectangle (cairo_region_t *dst,
 				 const cairo_rectangle_int_t *rectangle);
 
 cairo_public cairo_status_t
-cairo_region_intersect (cairo_region_t *dst, cairo_region_t *other);
+cairo_region_intersect (cairo_region_t *dst, const cairo_region_t *other);
 
 cairo_public cairo_status_t
 cairo_region_intersect_rectangle (cairo_region_t *dst,
 				  const cairo_rectangle_int_t *rectangle);
 
 cairo_public cairo_status_t
-cairo_region_union (cairo_region_t *dst, cairo_region_t *other);
+cairo_region_union (cairo_region_t *dst, const cairo_region_t *other);
 
 cairo_public cairo_status_t
 cairo_region_union_rectangle (cairo_region_t *dst,
 			      const cairo_rectangle_int_t *rectangle);
 
+cairo_public cairo_status_t
+cairo_region_xor (cairo_region_t *dst, const cairo_region_t *other);
+
+cairo_public cairo_status_t
+cairo_region_xor_rectangle (cairo_region_t *dst,
+			    const cairo_rectangle_int_t *rectangle);
 
 /* Functions to be used while debugging (not intended for use in production code) */
 cairo_public void
diff --git a/gfx/cairo/cairo/src/cairoint.h b/gfx/cairo/cairo/src/cairoint.h
index e0127e8c90f..594c91d3c58 100644
--- a/gfx/cairo/cairo/src/cairoint.h
+++ b/gfx/cairo/cairo/src/cairoint.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -139,33 +139,27 @@ _cairo_win32_tmpfile (void);
 })
 #else
 #define cairo_container_of(ptr, type, member) \
-    (type *)((char *) (ptr) - (char *) &((type *)0)->member)
+    ((type *)((char *) (ptr) - (char *) &((type *)0)->member))
 #endif
 
 
-/* Size in bytes of buffer to use off the stack per functions.
- * Mostly used by text functions.  For larger allocations, they'll
- * malloc(). */
-#ifndef CAIRO_STACK_BUFFER_SIZE
-#define CAIRO_STACK_BUFFER_SIZE (512 * sizeof (int))
-#endif
-
-#define CAIRO_STACK_ARRAY_LENGTH(T) (CAIRO_STACK_BUFFER_SIZE / sizeof(T))
-
 #define ASSERT_NOT_REACHED		\
 do {					\
-    static const int NOT_REACHED = 0;	\
-    assert (NOT_REACHED);		\
+    assert (!"reached");		\
 } while (0)
 #define COMPILE_TIME_ASSERT1(condition, line)		\
     typedef int compile_time_assertion_at_line_##line##_failed [(condition)?1:-1]
 #define COMPILE_TIME_ASSERT0(condition, line)	COMPILE_TIME_ASSERT1(condition, line)
 #define COMPILE_TIME_ASSERT(condition)		COMPILE_TIME_ASSERT0(condition, __LINE__)
 
+#define CAIRO_ALPHA_IS_CLEAR(alpha) ((alpha) <= ((double)0x00ff / (double)0xffff))
+#define CAIRO_ALPHA_SHORT_IS_CLEAR(alpha) ((alpha) <= 0x00ff)
+
 #define CAIRO_ALPHA_IS_OPAQUE(alpha) ((alpha) >= ((double)0xff00 / (double)0xffff))
 #define CAIRO_ALPHA_SHORT_IS_OPAQUE(alpha) ((alpha) >= 0xff00)
 #define CAIRO_ALPHA_IS_ZERO(alpha) ((alpha) <= 0.0)
 
+#define CAIRO_COLOR_IS_CLEAR(color) CAIRO_ALPHA_SHORT_IS_CLEAR ((color)->alpha_short)
 #define CAIRO_COLOR_IS_OPAQUE(color) CAIRO_ALPHA_SHORT_IS_OPAQUE ((color)->alpha_short)
 
 /* Reverse the bits in a byte with 7 operations (no 64-bit):
@@ -305,13 +299,6 @@ cairo_private cairo_bool_t
 _cairo_box_contains_point (cairo_box_t *box,
 	                   const cairo_point_t *point) cairo_pure;
 
-cairo_private void
-_cairo_composite_rectangles_init (cairo_composite_rectangles_t	*rects,
-                                  int				 all_x,
-                                  int				 all_y,
-                                  int				 width,
-                                  int				 height);
-
 /* cairo-array.c structures and functions */
 
 cairo_private void
@@ -398,32 +385,6 @@ _cairo_hash_bytes (unsigned long hash,
 		   const void *bytes,
 		   unsigned int length);
 
-/*
- * A #cairo_unscaled_font_t is just an opaque handle we use in the
- * glyph cache.
- */
-typedef struct _cairo_unscaled_font {
-    cairo_hash_entry_t			 hash_entry;
-    cairo_reference_count_t		 ref_count;
-    const cairo_unscaled_font_backend_t	*backend;
-} cairo_unscaled_font_t;
-
-typedef struct _cairo_scaled_glyph {
-    cairo_hash_entry_t hash_entry;
-
-    cairo_text_extents_t    metrics;		/* user-space metrics */
-    cairo_text_extents_t    fs_metrics;		/* font-space metrics */
-    cairo_box_t		    bbox;		/* device-space bounds */
-    int16_t                 x_advance;		/* device-space rounded X advance */
-    int16_t                 y_advance;		/* device-space rounded Y advance */
-
-    cairo_image_surface_t   *surface;		/* device-space image */
-    cairo_path_fixed_t	    *path;		/* device-space outline */
-    cairo_surface_t         *recording_surface;	/* device-space recording-surface */
-
-    void		    *surface_private;	/* for the surface backend */
-} cairo_scaled_glyph_t;
-
 #define _cairo_scaled_glyph_index(g) ((g)->hash_entry.hash)
 #define _cairo_scaled_glyph_set_index(g, i)  ((g)->hash_entry.hash = (i))
 
@@ -438,6 +399,9 @@ struct _cairo_font_face {
     const cairo_font_face_backend_t *backend;
 };
 
+cairo_private void
+_cairo_reset_static_data (void);
+
 cairo_private void
 _cairo_toy_font_face_reset_static_data (void);
 
@@ -797,9 +761,9 @@ struct _cairo_surface_backend {
 				 cairo_operator_t	 op,
 				 const cairo_pattern_t	*source,
 				 cairo_path_fixed_t	*path,
-				 cairo_stroke_style_t	*style,
-				 cairo_matrix_t		*ctm,
-				 cairo_matrix_t		*ctm_inverse,
+				 const cairo_stroke_style_t	*style,
+				 const cairo_matrix_t	*ctm,
+				 const cairo_matrix_t	*ctm_inverse,
 				 double			 tolerance,
 				 cairo_antialias_t	 antialias,
 				 cairo_clip_t		*clip);
@@ -829,8 +793,7 @@ struct _cairo_surface_backend {
 
     cairo_bool_t
     (*is_similar)		(void			*surface_a,
-	                         void			*surface_b,
-				 cairo_content_t         content);
+	                         void			*surface_b);
 
     cairo_warn cairo_int_status_t
     (*fill_stroke)		(void			*surface,
@@ -842,9 +805,9 @@ struct _cairo_surface_backend {
 				 cairo_path_fixed_t	*path,
 				 cairo_operator_t	 stroke_op,
 				 const cairo_pattern_t	*stroke_source,
-				 cairo_stroke_style_t	*stroke_style,
-				 cairo_matrix_t		*stroke_ctm,
-				 cairo_matrix_t		*stroke_ctm_inverse,
+				 const cairo_stroke_style_t	*stroke_style,
+				 const cairo_matrix_t	*stroke_ctm,
+				 const cairo_matrix_t	*stroke_ctm_inverse,
 				 double			 stroke_tolerance,
 				 cairo_antialias_t	 stroke_antialias,
 				 cairo_clip_t		*clip);
@@ -892,7 +855,6 @@ struct _cairo_image_surface {
     int depth;
 
     pixman_image_t *pixman_image;
-    cairo_region_t *clip_region;
 
     unsigned owns_data : 1;
     unsigned transparency : 2;
@@ -904,8 +866,9 @@ extern const cairo_private cairo_surface_backend_t _cairo_image_surface_backend;
 #define CAIRO_EXTEND_GRADIENT_DEFAULT CAIRO_EXTEND_PAD
 #define CAIRO_FILTER_DEFAULT CAIRO_FILTER_GOOD
 
+extern const cairo_private cairo_solid_pattern_t _cairo_pattern_clear;
 extern const cairo_private cairo_solid_pattern_t _cairo_pattern_black;
-
+extern const cairo_private cairo_solid_pattern_t _cairo_pattern_white;
 
 typedef struct _cairo_surface_attributes {
     cairo_matrix_t matrix;
@@ -1011,303 +974,15 @@ _cairo_round (double r)
     return floor (r + .5);
 }
 
+#if DISABLE_SOME_FLOATING_POINT
 cairo_private int
 _cairo_lround (double d) cairo_const;
+#else
+#define _cairo_lround lround
+#endif
 
-/* cairo-gstate.c */
-cairo_private cairo_status_t
-_cairo_gstate_init (cairo_gstate_t  *gstate,
-		    cairo_surface_t *target);
-
-cairo_private void
-_cairo_gstate_fini (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_save (cairo_gstate_t **gstate, cairo_gstate_t **freelist);
-
-cairo_private cairo_status_t
-_cairo_gstate_restore (cairo_gstate_t **gstate, cairo_gstate_t **freelist);
-
-cairo_private cairo_bool_t
-_cairo_gstate_is_redirected (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_redirect_target (cairo_gstate_t *gstate, cairo_surface_t *child);
-
-cairo_private cairo_surface_t *
-_cairo_gstate_get_target (cairo_gstate_t *gstate);
-
-cairo_private cairo_surface_t *
-_cairo_gstate_get_parent_target (cairo_gstate_t *gstate);
-
-cairo_private cairo_surface_t *
-_cairo_gstate_get_original_target (cairo_gstate_t *gstate);
-
-cairo_private cairo_clip_t *
-_cairo_gstate_get_clip (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_source (cairo_gstate_t *gstate, cairo_pattern_t *source);
-
-cairo_private cairo_pattern_t *
-_cairo_gstate_get_source (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t op);
-
-cairo_private cairo_operator_t
-_cairo_gstate_get_operator (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_tolerance (cairo_gstate_t *gstate, double tolerance);
-
-cairo_private double
-_cairo_gstate_get_tolerance (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_fill_rule (cairo_gstate_t *gstate, cairo_fill_rule_t fill_rule);
-
-cairo_private cairo_fill_rule_t
-_cairo_gstate_get_fill_rule (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_line_width (cairo_gstate_t *gstate, double width);
-
-cairo_private double
-_cairo_gstate_get_line_width (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_line_cap (cairo_gstate_t *gstate, cairo_line_cap_t line_cap);
-
-cairo_private cairo_line_cap_t
-_cairo_gstate_get_line_cap (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_line_join (cairo_gstate_t *gstate, cairo_line_join_t line_join);
-
-cairo_private cairo_line_join_t
-_cairo_gstate_get_line_join (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_dash (cairo_gstate_t *gstate, const double *dash, int num_dashes, double offset);
-
-cairo_private void
-_cairo_gstate_get_dash (cairo_gstate_t *gstate, double *dash, int *num_dashes, double *offset);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_miter_limit (cairo_gstate_t *gstate, double limit);
-
-cairo_private double
-_cairo_gstate_get_miter_limit (cairo_gstate_t *gstate);
-
-cairo_private void
-_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix);
-
-cairo_private cairo_status_t
-_cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty);
-
-cairo_private cairo_status_t
-_cairo_gstate_scale (cairo_gstate_t *gstate, double sx, double sy);
-
-cairo_private cairo_status_t
-_cairo_gstate_rotate (cairo_gstate_t *gstate, double angle);
-
-cairo_private cairo_status_t
-_cairo_gstate_transform (cairo_gstate_t	      *gstate,
-			 const cairo_matrix_t *matrix);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_matrix (cairo_gstate_t       *gstate,
-			  const cairo_matrix_t *matrix);
-
-cairo_private void
-_cairo_gstate_identity_matrix (cairo_gstate_t *gstate);
-
-cairo_private void
-_cairo_gstate_user_to_device (cairo_gstate_t *gstate, double *x, double *y);
-
-cairo_private void
-_cairo_gstate_user_to_device_distance (cairo_gstate_t *gstate, double *dx, double *dy);
-
-cairo_private void
-_cairo_gstate_device_to_user (cairo_gstate_t *gstate, double *x, double *y);
-
-cairo_private void
-_cairo_gstate_device_to_user_distance (cairo_gstate_t *gstate, double *dx, double *dy);
-
-cairo_private void
-_cairo_gstate_user_to_backend (cairo_gstate_t *gstate, double *x, double *y);
-
-cairo_private void
-_cairo_gstate_backend_to_user (cairo_gstate_t *gstate, double *x, double *y);
-
-cairo_private void
-_cairo_gstate_backend_to_user_rectangle (cairo_gstate_t *gstate,
-                                         double *x1, double *y1,
-                                         double *x2, double *y2,
-                                         cairo_bool_t *is_tight);
-
-cairo_private void
-_cairo_gstate_path_extents (cairo_gstate_t     *gstate,
-			    cairo_path_fixed_t *path,
-			    double *x1, double *y1,
-			    double *x2, double *y2);
-
-cairo_private cairo_status_t
-_cairo_gstate_paint (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_mask (cairo_gstate_t  *gstate,
-		    cairo_pattern_t *mask);
-
-cairo_private cairo_status_t
-_cairo_gstate_stroke (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
-
-cairo_private cairo_status_t
-_cairo_gstate_fill (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
-
-cairo_private cairo_status_t
-_cairo_gstate_copy_page (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_show_page (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_stroke_extents (cairo_gstate_t	 *gstate,
-			      cairo_path_fixed_t *path,
-                              double *x1, double *y1,
-			      double *x2, double *y2);
-
-cairo_private cairo_status_t
-_cairo_gstate_fill_extents (cairo_gstate_t     *gstate,
-			    cairo_path_fixed_t *path,
-                            double *x1, double *y1,
-			    double *x2, double *y2);
-
-cairo_private cairo_status_t
-_cairo_gstate_in_stroke (cairo_gstate_t	    *gstate,
-			 cairo_path_fixed_t *path,
-			 double		     x,
-			 double		     y,
-			 cairo_bool_t	    *inside_ret);
-
-cairo_private cairo_bool_t
-_cairo_gstate_in_fill (cairo_gstate_t	  *gstate,
-		       cairo_path_fixed_t *path,
-		       double		   x,
-		       double		   y);
-
-cairo_private cairo_bool_t
-_cairo_gstate_in_clip (cairo_gstate_t	  *gstate,
-		       double		   x,
-		       double		   y);
-
-cairo_private cairo_status_t
-_cairo_gstate_clip (cairo_gstate_t *gstate, cairo_path_fixed_t *path);
-
-cairo_private cairo_status_t
-_cairo_gstate_reset_clip (cairo_gstate_t *gstate);
-
-cairo_private cairo_bool_t
-_cairo_gstate_clip_extents (cairo_gstate_t *gstate,
-		            double         *x1,
-		            double         *y1,
-			    double         *x2,
-			    double         *y2);
-
-cairo_private cairo_rectangle_list_t*
-_cairo_gstate_copy_clip_rectangle_list (cairo_gstate_t *gstate);
-
-cairo_private cairo_status_t
-_cairo_gstate_show_surface (cairo_gstate_t	*gstate,
-			    cairo_surface_t	*surface,
-			    double		 x,
-			    double		 y,
-			    double		width,
-			    double		height);
-
-cairo_private cairo_status_t
-_cairo_gstate_select_font_face (cairo_gstate_t *gstate,
-				const char *family,
-				cairo_font_slant_t slant,
-				cairo_font_weight_t weight);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_font_size (cairo_gstate_t *gstate,
-			     double          size);
-
-cairo_private void
-_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
-			       cairo_matrix_t *matrix);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate,
-			       const cairo_matrix_t *matrix);
-
-cairo_private void
-_cairo_gstate_get_font_options (cairo_gstate_t       *gstate,
-				cairo_font_options_t *options);
-
-cairo_private void
-_cairo_gstate_set_font_options (cairo_gstate_t	           *gstate,
-				const cairo_font_options_t *options);
-
-cairo_private cairo_status_t
-_cairo_gstate_get_font_face (cairo_gstate_t     *gstate,
-			     cairo_font_face_t **font_face);
-
-cairo_private cairo_status_t
-_cairo_gstate_get_scaled_font (cairo_gstate_t       *gstate,
-			       cairo_scaled_font_t **scaled_font);
-
-cairo_private cairo_status_t
-_cairo_gstate_get_font_extents (cairo_gstate_t *gstate,
-				cairo_font_extents_t *extents);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
-			     cairo_font_face_t *font_face);
-
-cairo_private cairo_status_t
-_cairo_gstate_text_to_glyphs (cairo_gstate_t	         *gstate,
-			      double		          x,
-			      double		          y,
-			      const char	         *utf8,
-			      int		          utf8_len,
-			      cairo_glyph_t	        **glyphs,
-			      int		         *num_glyphs,
-			      cairo_text_cluster_t      **clusters,
-			      int		         *num_clusters,
-			      cairo_text_cluster_flags_t *cluster_flags);
-
-cairo_private cairo_status_t
-_cairo_gstate_glyph_extents (cairo_gstate_t *gstate,
-			     const cairo_glyph_t *glyphs,
-			     int num_glyphs,
-			     cairo_text_extents_t *extents);
-
-cairo_private cairo_status_t
-_cairo_gstate_show_text_glyphs (cairo_gstate_t		   *gstate,
-				const char		   *utf8,
-				int			    utf8_len,
-				const cairo_glyph_t	   *glyphs,
-				int			    num_glyphs,
-				const cairo_text_cluster_t *clusters,
-				int			    num_clusters,
-			        cairo_text_cluster_flags_t  cluster_flags);
-
-cairo_private cairo_status_t
-_cairo_gstate_glyph_path (cairo_gstate_t      *gstate,
-			  const cairo_glyph_t *glyphs,
-			  int		       num_glyphs,
-			  cairo_path_fixed_t  *path);
-
-cairo_private cairo_status_t
-_cairo_gstate_set_antialias (cairo_gstate_t *gstate,
-			     cairo_antialias_t antialias);
-
-cairo_private cairo_antialias_t
-_cairo_gstate_get_antialias (cairo_gstate_t *gstate);
+cairo_private uint16_t
+_cairo_half_from_float (float f) cairo_const;
 
 cairo_private cairo_bool_t
 _cairo_operator_bounded_by_mask (cairo_operator_t op) cairo_const;
@@ -1315,6 +990,13 @@ _cairo_operator_bounded_by_mask (cairo_operator_t op) cairo_const;
 cairo_private cairo_bool_t
 _cairo_operator_bounded_by_source (cairo_operator_t op) cairo_const;
 
+enum {
+    CAIRO_OPERATOR_BOUND_BY_MASK = 1 << 1,
+    CAIRO_OPERATOR_BOUND_BY_SOURCE = 1 << 2,
+};
+
+cairo_private uint32_t
+_cairo_operator_bounded_by_either (cairo_operator_t op) cairo_const;
 /* cairo-color.c */
 cairo_private const cairo_color_t *
 _cairo_stock_color (cairo_stock_t stock) cairo_pure;
@@ -1360,6 +1042,13 @@ cairo_private cairo_bool_t
 _cairo_color_equal (const cairo_color_t *color_a,
                     const cairo_color_t *color_b) cairo_pure;
 
+cairo_private cairo_bool_t
+_cairo_color_stop_equal (const cairo_color_stop_t *color_a,
+			 const cairo_color_stop_t *color_b) cairo_pure;
+
+cairo_private cairo_content_t
+_cairo_color_get_content (const cairo_color_t *color) cairo_pure;
+
 /* cairo-font-face.c */
 
 extern const cairo_private cairo_font_face_t _cairo_font_face_nil;
@@ -1405,6 +1094,20 @@ cairo_private void
 _cairo_font_options_init_copy (cairo_font_options_t		*options,
 			       const cairo_font_options_t	*other);
 
+cairo_private void
+_cairo_font_options_set_lcd_filter (cairo_font_options_t   *options,
+				   cairo_lcd_filter_t  lcd_filter);
+
+cairo_private cairo_lcd_filter_t
+_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options);
+
+cairo_private void
+_cairo_font_options_set_round_glyph_positions (cairo_font_options_t   *options,
+					       cairo_round_glyph_positions_t  round);
+
+cairo_private cairo_round_glyph_positions_t
+_cairo_font_options_get_round_glyph_positions (const cairo_font_options_t *options);
+
 /* cairo-hull.c */
 cairo_private cairo_status_t
 _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices);
@@ -1528,6 +1231,10 @@ _cairo_path_fixed_interpret_flat (const cairo_path_fixed_t *path,
 		       void				  *closure,
 		       double				  tolerance);
 
+cairo_private cairo_bool_t
+_cairo_path_fixed_extents (const cairo_path_fixed_t *path,
+			   cairo_box_t *box);
+
 cairo_private void
 _cairo_path_fixed_approximate_clip_extents (const cairo_path_fixed_t	*path,
 					    cairo_rectangle_int_t *extents);
@@ -1544,23 +1251,18 @@ _cairo_path_fixed_fill_extents (const cairo_path_fixed_t	*path,
 
 cairo_private void
 _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path,
-					      cairo_stroke_style_t *style,
+					      const cairo_stroke_style_t *style,
 					      const cairo_matrix_t *ctm,
 					      cairo_rectangle_int_t *extents);
 
 cairo_private cairo_status_t
 _cairo_path_fixed_stroke_extents (const cairo_path_fixed_t *path,
-				  cairo_stroke_style_t *style,
+				  const cairo_stroke_style_t *style,
 				  const cairo_matrix_t *ctm,
 				  const cairo_matrix_t *ctm_inverse,
 				  double tolerance,
 				  cairo_rectangle_int_t *extents);
 
-cairo_private void
-_cairo_path_fixed_bounds (const cairo_path_fixed_t *path,
-			  double *x1, double *y1,
-			  double *x2, double *y2);
-
 cairo_private void
 _cairo_path_fixed_transform (cairo_path_fixed_t	*path,
 			     const cairo_matrix_t	*matrix);
@@ -1592,6 +1294,11 @@ _cairo_path_fixed_fill_rectilinear_to_traps (const cairo_path_fixed_t *path,
 					     cairo_fill_rule_t fill_rule,
 					     cairo_traps_t *traps);
 
+cairo_private cairo_status_t
+_cairo_path_fixed_fill_rectilinear_to_boxes (const cairo_path_fixed_t *path,
+					     cairo_fill_rule_t fill_rule,
+					     cairo_boxes_t *boxes);
+
 cairo_private cairo_region_t *
 _cairo_path_fixed_fill_rectilinear_to_region (const cairo_path_fixed_t	*path,
 					      cairo_fill_rule_t	 fill_rule,
@@ -1606,7 +1313,7 @@ _cairo_path_fixed_fill_to_traps (const cairo_path_fixed_t   *path,
 /* cairo-path-stroke.c */
 cairo_private cairo_status_t
 _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t	*path,
-				     cairo_stroke_style_t	*stroke_style,
+				     const cairo_stroke_style_t	*stroke_style,
 				     const cairo_matrix_t	*ctm,
 				     const cairo_matrix_t	*ctm_inverse,
 				     double		 tolerance,
@@ -1614,12 +1321,19 @@ _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t	*path,
 
 cairo_private cairo_int_status_t
 _cairo_path_fixed_stroke_rectilinear_to_traps (const cairo_path_fixed_t	*path,
-					       cairo_stroke_style_t	*stroke_style,
+					       const cairo_stroke_style_t	*stroke_style,
 					       const cairo_matrix_t	*ctm,
 					       cairo_traps_t		*traps);
+
+cairo_private cairo_int_status_t
+_cairo_path_fixed_stroke_rectilinear_to_boxes (const cairo_path_fixed_t	*path,
+					       const cairo_stroke_style_t	*stroke_style,
+					       const cairo_matrix_t	*ctm,
+					       cairo_boxes_t		*boxes);
+
 cairo_private cairo_status_t
 _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t	*path,
-				   cairo_stroke_style_t	*stroke_style,
+				   const cairo_stroke_style_t	*stroke_style,
 				   const cairo_matrix_t	*ctm,
 				   const cairo_matrix_t	*ctm_inverse,
 				   double		 tolerance,
@@ -1627,9 +1341,9 @@ _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t	*path,
 
 cairo_private cairo_status_t
 _cairo_path_fixed_stroke_to_shaper (cairo_path_fixed_t	*path,
-				   cairo_stroke_style_t	*stroke_style,
-				   cairo_matrix_t	*ctm,
-				   cairo_matrix_t	*ctm_inverse,
+				   const cairo_stroke_style_t	*stroke_style,
+				   const cairo_matrix_t	*ctm,
+				   const cairo_matrix_t	*ctm_inverse,
 				   double		 tolerance,
 				   cairo_status_t (*add_triangle) (void *closure,
 								   const cairo_point_t triangle[3]),
@@ -1761,7 +1475,7 @@ _cairo_stroke_style_init (cairo_stroke_style_t *style);
 
 cairo_private cairo_status_t
 _cairo_stroke_style_init_copy (cairo_stroke_style_t *style,
-			       cairo_stroke_style_t *other);
+			       const cairo_stroke_style_t *other);
 
 cairo_private void
 _cairo_stroke_style_fini (cairo_stroke_style_t *style);
@@ -1835,6 +1549,7 @@ _cairo_surface_repaint_solid_pattern_surface (cairo_surface_t	    *other,
 cairo_private void
 _cairo_surface_init (cairo_surface_t			*surface,
 		     const cairo_surface_backend_t	*backend,
+		     cairo_device_t			*device,
 		     cairo_content_t			 content);
 
 cairo_private void
@@ -1901,9 +1616,9 @@ _cairo_surface_fill_stroke (cairo_surface_t	    *surface,
 			    cairo_path_fixed_t	    *path,
 			    cairo_operator_t	     stroke_op,
 			    const cairo_pattern_t   *stroke_source,
-			    cairo_stroke_style_t    *stroke_style,
-			    cairo_matrix_t	    *stroke_ctm,
-			    cairo_matrix_t	    *stroke_ctm_inverse,
+			    const cairo_stroke_style_t    *stroke_style,
+			    const cairo_matrix_t	    *stroke_ctm,
+			    const cairo_matrix_t	    *stroke_ctm_inverse,
 			    double		     stroke_tolerance,
 			    cairo_antialias_t	     stroke_antialias,
 			    cairo_clip_t	    *clip);
@@ -1913,9 +1628,9 @@ _cairo_surface_stroke (cairo_surface_t		*surface,
 		       cairo_operator_t		 op,
 		       const cairo_pattern_t	*source,
 		       cairo_path_fixed_t	*path,
-		       cairo_stroke_style_t	*style,
-		       cairo_matrix_t		*ctm,
-		       cairo_matrix_t		*ctm_inverse,
+		       const cairo_stroke_style_t	*style,
+		       const cairo_matrix_t		*ctm,
+		       const cairo_matrix_t		*ctm_inverse,
 		       double			 tolerance,
 		       cairo_antialias_t	 antialias,
 		       cairo_clip_t		*clip);
@@ -1964,7 +1679,7 @@ _cairo_surface_stroke_extents (cairo_surface_t *surface,
 			       cairo_operator_t op,
 			       const cairo_pattern_t *source,
 			       cairo_path_fixed_t	*path,
-			       cairo_stroke_style_t *style,
+			       const cairo_stroke_style_t *style,
 			       const cairo_matrix_t *ctm,
 			       const cairo_matrix_t *ctm_inverse,
 			       double tolerance,
@@ -2008,18 +1723,6 @@ _cairo_surface_composite_trapezoids (cairo_operator_t	op,
 				     int		ntraps,
 				     cairo_region_t	*clip_region);
 
-cairo_private cairo_status_t
-_cairo_surface_composite_trapezoids_as_polygon (cairo_surface_t	*surface,
-						cairo_operator_t	 op,
-						const cairo_pattern_t	*pattern,
-						cairo_antialias_t	antialias,
-						int src_x, int src_y,
-						int dst_x, int dst_y,
-						int width, int height,
-						cairo_trapezoid_t	*traps,
-						int num_traps,
-						cairo_region_t	*clip_region);
-
 cairo_private cairo_span_renderer_t *
 _cairo_surface_create_span_renderer (cairo_operator_t			 op,
 				     const cairo_pattern_t		*pattern,
@@ -2072,23 +1775,21 @@ _cairo_surface_clone_similar (cairo_surface_t  *surface,
 cairo_private cairo_surface_t *
 _cairo_surface_snapshot (cairo_surface_t *surface);
 
-cairo_private cairo_status_t
+cairo_private void
 _cairo_surface_attach_snapshot (cairo_surface_t *surface,
 				cairo_surface_t *snapshot,
 				cairo_surface_func_t detach_func);
 
 cairo_private cairo_surface_t *
 _cairo_surface_has_snapshot (cairo_surface_t *surface,
-			     const cairo_surface_backend_t *backend,
-			     cairo_content_t content);
+			     const cairo_surface_backend_t *backend);
 
 cairo_private void
 _cairo_surface_detach_snapshot (cairo_surface_t *snapshot);
 
 cairo_private cairo_bool_t
 _cairo_surface_is_similar (cairo_surface_t *surface_a,
-	                   cairo_surface_t *surface_b,
-			   cairo_content_t  content);
+	                   cairo_surface_t *surface_b);
 
 cairo_private cairo_bool_t
 _cairo_surface_get_extents (cairo_surface_t         *surface,
@@ -2158,6 +1859,9 @@ _cairo_surface_set_device_scale (cairo_surface_t *surface,
 cairo_private cairo_bool_t
 _cairo_surface_has_device_transform (cairo_surface_t *surface) cairo_pure;
 
+cairo_private void
+_cairo_surface_release_device_reference (cairo_surface_t *surface);
+
 /* cairo-image-surface.c */
 
 /* XXX: In cairo 1.2.0 we added a new %CAIRO_FORMAT_RGB16_565 but
@@ -2190,8 +1894,8 @@ _cairo_surface_has_device_transform (cairo_surface_t *surface) cairo_pure;
  * to support it (at least cairo_surface_write_to_png() and a few spots
  * in cairo-xlib-surface.c--again see -Wswitch-enum).
  */
-#define CAIRO_FORMAT_INVALID ((unsigned int) -1)
-#define CAIRO_FORMAT_VALID(format) ((format) <= CAIRO_FORMAT_RGB16_565)
+#define CAIRO_FORMAT_VALID(format) ((format) >= CAIRO_FORMAT_ARGB32 &&		\
+                                    (format) <= CAIRO_FORMAT_RGB16_565)
 
 /* pixman-required stride alignment in bytes. */
 #define CAIRO_STRIDE_ALIGNMENT (sizeof (uint32_t))
@@ -2210,13 +1914,22 @@ _cairo_format_bits_per_pixel (cairo_format_t format) cairo_const;
 cairo_private cairo_format_t
 _cairo_format_from_content (cairo_content_t content) cairo_const;
 
+cairo_private cairo_format_t
+_cairo_format_from_pixman_format (pixman_format_code_t pixman_format);
+
 cairo_private cairo_content_t
 _cairo_content_from_format (cairo_format_t format) cairo_const;
 
+cairo_private cairo_content_t
+_cairo_content_from_pixman_format (pixman_format_code_t pixman_format);
+
 cairo_private cairo_surface_t *
 _cairo_image_surface_create_for_pixman_image (pixman_image_t		*pixman_image,
 					      pixman_format_code_t	 pixman_format);
 
+cairo_private pixman_format_code_t
+_cairo_format_to_pixman_format_code (cairo_format_t format);
+
 cairo_private cairo_bool_t
 _pixman_format_from_masks (cairo_format_masks_t *masks,
 			   pixman_format_code_t *format_ret);
@@ -2225,6 +1938,9 @@ cairo_private cairo_bool_t
 _pixman_format_to_masks (pixman_format_code_t	 pixman_format,
 			 cairo_format_masks_t	*masks);
 
+cairo_private void
+_cairo_image_reset_static_data (void);
+
 cairo_private cairo_surface_t *
 _cairo_image_surface_create_with_pixman_format (unsigned char		*data,
 						pixman_format_code_t	 pixman_format,
@@ -2232,31 +1948,21 @@ _cairo_image_surface_create_with_pixman_format (unsigned char		*data,
 						int			 height,
 						int			 stride);
 
-cairo_private cairo_surface_t *
-_cairo_image_surface_create_with_masks (unsigned char	       *data,
-					cairo_format_masks_t   *format,
-					int			width,
-					int			height,
-					int			stride);
-
 cairo_private cairo_surface_t *
 _cairo_image_surface_create_with_content (cairo_content_t	content,
 					  int			width,
 					  int			height);
 
-cairo_private cairo_surface_t *
-_cairo_image_surface_create_for_data_with_content (unsigned char	*data,
-						   cairo_content_t	 content,
-						   int			 width,
-						   int			 height,
-						   int			 stride);
-
 cairo_private void
 _cairo_image_surface_assume_ownership_of_data (cairo_image_surface_t *surface);
 
 cairo_private cairo_image_surface_t *
-_cairo_image_surface_coerce (cairo_image_surface_t	*surface,
-			     cairo_format_t		 format);
+_cairo_image_surface_coerce (cairo_image_surface_t	*surface);
+
+cairo_private cairo_image_surface_t *
+_cairo_image_surface_coerce_to_format (cairo_image_surface_t	*surface,
+			               cairo_format_t		 format);
+
 cairo_private void
 _cairo_image_surface_span_render_row (int				 y,
 				      const cairo_half_open_span_t	 *spans,
@@ -2381,6 +2087,9 @@ _cairo_matrix_transform_bounding_box_fixed (const cairo_matrix_t *matrix,
 cairo_private cairo_bool_t
 _cairo_matrix_is_invertible (const cairo_matrix_t *matrix) cairo_pure;
 
+cairo_private cairo_bool_t
+_cairo_matrix_is_scale_0 (const cairo_matrix_t *matrix) cairo_pure;
+
 cairo_private double
 _cairo_matrix_compute_determinant (const cairo_matrix_t *matrix) cairo_pure;
 
@@ -2425,8 +2134,7 @@ _cairo_traps_limit (cairo_traps_t	*traps,
 
 cairo_private cairo_status_t
 _cairo_traps_init_boxes (cairo_traps_t	    *traps,
-			 const cairo_box_t    *boxes,
-			 int		     num_boxes);
+		         const cairo_boxes_t *boxes);
 
 cairo_private void
 _cairo_traps_clear (cairo_traps_t *traps);
@@ -2467,10 +2175,20 @@ cairo_private cairo_status_t
 _cairo_bentley_ottmann_tessellate_rectangular_traps (cairo_traps_t *traps,
 						     cairo_fill_rule_t fill_rule);
 
+cairo_private cairo_status_t
+_cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in,
+					 cairo_fill_rule_t fill_rule,
+					 cairo_boxes_t *out);
+
 cairo_private cairo_status_t
 _cairo_bentley_ottmann_tessellate_rectilinear_traps (cairo_traps_t *traps,
 						     cairo_fill_rule_t fill_rule);
 
+cairo_private cairo_status_t
+_cairo_bentley_ottmann_tessellate_rectilinear_polygon_to_boxes (const cairo_polygon_t *polygon,
+								cairo_fill_rule_t fill_rule,
+								cairo_boxes_t *boxes);
+
 cairo_private int
 _cairo_traps_contain (const cairo_traps_t *traps,
 		      double x, double y);
@@ -2517,8 +2235,7 @@ _cairo_pattern_init_snapshot (cairo_pattern_t       *pattern,
 
 cairo_private void
 _cairo_pattern_init_solid (cairo_solid_pattern_t	*pattern,
-			   const cairo_color_t		*color,
-			   cairo_content_t		 content);
+			   const cairo_color_t		*color);
 
 cairo_private void
 _cairo_pattern_init_for_surface (cairo_surface_pattern_t *pattern,
@@ -2536,22 +2253,31 @@ _cairo_pattern_init_radial (cairo_radial_pattern_t *pattern,
 cairo_private void
 _cairo_pattern_fini (cairo_pattern_t *pattern);
 
-cairo_private void
-_cairo_pattern_fini_snapshot (cairo_pattern_t *pattern);
-
 cairo_private cairo_pattern_t *
-_cairo_pattern_create_solid (const cairo_color_t	*color,
-			     cairo_content_t		 content);
+_cairo_pattern_create_solid (const cairo_color_t	*color);
 
 cairo_private void
 _cairo_pattern_transform (cairo_pattern_t      *pattern,
 			  const cairo_matrix_t *ctm_inverse);
 
+cairo_private cairo_bool_t
+_cairo_gradient_pattern_is_solid (const cairo_gradient_pattern_t *gradient,
+				  const cairo_rectangle_int_t *extents,
+				  cairo_color_t *color);
+
 cairo_private cairo_bool_t
 _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern);
 
 cairo_private cairo_bool_t
-_cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern);
+_cairo_pattern_is_opaque (const cairo_pattern_t *pattern,
+			  const cairo_rectangle_int_t *extents);
+
+cairo_private cairo_bool_t
+_cairo_pattern_is_clear (const cairo_pattern_t *pattern);
+
+cairo_private_no_warn cairo_filter_t
+_cairo_pattern_analyze_filter (const cairo_pattern_t	*pattern,
+			       double			*pad_out);
 
 enum {
     CAIRO_PATTERN_ACQUIRE_NONE = 0x0,
@@ -2596,9 +2322,25 @@ _cairo_pattern_get_extents (const cairo_pattern_t	    *pattern,
 cairo_private unsigned long
 _cairo_pattern_hash (const cairo_pattern_t *pattern);
 
+cairo_private unsigned long
+_cairo_linear_pattern_hash (unsigned long hash,
+			    const cairo_linear_pattern_t *linear);
+
+cairo_private unsigned long
+_cairo_radial_pattern_hash (unsigned long hash,
+			    const cairo_radial_pattern_t *radial);
+
+cairo_private cairo_bool_t
+_cairo_linear_pattern_equal (const cairo_linear_pattern_t *a,
+			     const cairo_linear_pattern_t *b);
+
 cairo_private unsigned long
 _cairo_pattern_size (const cairo_pattern_t *pattern);
 
+cairo_private cairo_bool_t
+_cairo_radial_pattern_equal (const cairo_radial_pattern_t *a,
+			     const cairo_radial_pattern_t *b);
+
 cairo_private cairo_bool_t
 _cairo_pattern_equal (const cairo_pattern_t *a,
 		      const cairo_pattern_t *b);
@@ -2643,17 +2385,10 @@ _cairo_utf8_to_utf16 (const char *str,
 		      int	 *items_written);
 #endif
 
-#define _cairo_status_is_error(status) \
-    (status != CAIRO_STATUS_SUCCESS && status <= CAIRO_STATUS_LAST_STATUS)
+/* cairo-observer.c */
 
-cairo_private cairo_status_t
-_cairo_error (cairo_status_t status);
-
-/* hide compiler warnings when discarding the return value */
-#define _cairo_error_throw(status) do { \
-    cairo_status_t status__ = _cairo_error (status); \
-    (void) status__; \
-} while (0)
+cairo_private void
+_cairo_observers_notify (cairo_list_t *observers, void *arg);
 
 /* Avoid unnecessary PLT entries.  */
 slim_hidden_proto (cairo_clip_preserve);
@@ -2757,6 +2492,7 @@ slim_hidden_proto (cairo_surface_get_type);
 slim_hidden_proto (cairo_surface_has_show_text_glyphs);
 slim_hidden_proto (cairo_surface_set_subpixel_antialiasing);
 slim_hidden_proto (cairo_surface_get_subpixel_antialiasing);
+slim_hidden_proto (cairo_surface_mark_dirty);
 slim_hidden_proto (cairo_surface_mark_dirty_rectangle);
 slim_hidden_proto_no_warn (cairo_surface_reference);
 slim_hidden_proto (cairo_surface_set_device_offset);
@@ -2799,6 +2535,8 @@ slim_hidden_proto (cairo_region_intersect);
 slim_hidden_proto (cairo_region_intersect_rectangle);
 slim_hidden_proto (cairo_region_union);
 slim_hidden_proto (cairo_region_union_rectangle);
+slim_hidden_proto (cairo_region_xor);
+slim_hidden_proto (cairo_region_xor_rectangle);
 
 #if CAIRO_HAS_PNG_FUNCTIONS
 
@@ -2806,6 +2544,10 @@ slim_hidden_proto (cairo_surface_write_to_png_stream);
 
 #endif
 
+cairo_private_no_warn cairo_filter_t
+_cairo_pattern_analyze_filter (const cairo_pattern_t	*pattern,
+			       double			*pad_out);
+
 CAIRO_END_DECLS
 
 #include "cairo-mutex-private.h"
diff --git a/gfx/cairo/cairo/src/test-fallback-surface.c b/gfx/cairo/cairo/src/test-fallback-surface.c
index 3b62e55bb93..66399d4abbb 100644
--- a/gfx/cairo/cairo/src/test-fallback-surface.c
+++ b/gfx/cairo/cairo/src/test-fallback-surface.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -54,6 +54,7 @@
 #include "cairoint.h"
 
 #include "test-fallback-surface.h"
+#include "cairo-error-private.h"
 
 typedef struct _test_fallback_surface {
     cairo_surface_t base;
@@ -84,7 +85,9 @@ _cairo_test_fallback_surface_create (cairo_content_t	content,
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
     }
 
-    _cairo_surface_init (&surface->base, &test_fallback_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &test_fallback_surface_backend,
+			 NULL, /* device */
 			 content);
 
     surface->backing = backing;
diff --git a/gfx/cairo/cairo/src/test-fallback-surface.h b/gfx/cairo/cairo/src/test-fallback-surface.h
index 744b303a1e0..e7071511395 100644
--- a/gfx/cairo/cairo/src/test-fallback-surface.h
+++ b/gfx/cairo/cairo/src/test-fallback-surface.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/cairo/src/test-paginated-surface.c b/gfx/cairo/cairo/src/test-paginated-surface.c
index 164d4a7147f..e06cbed719c 100644
--- a/gfx/cairo/cairo/src/test-paginated-surface.c
+++ b/gfx/cairo/cairo/src/test-paginated-surface.c
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
@@ -49,6 +49,7 @@
 
 #include "test-paginated-surface.h"
 
+#include "cairo-error-private.h"
 #include "cairo-paginated-private.h"
 
 typedef struct _test_paginated_surface {
@@ -75,7 +76,9 @@ _cairo_test_paginated_surface_create (cairo_surface_t *target)
     if (unlikely (surface == NULL))
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
-    _cairo_surface_init (&surface->base, &test_paginated_surface_backend,
+    _cairo_surface_init (&surface->base,
+			 &test_paginated_surface_backend,
+			 NULL, /* device */
 			 target->content);
 
     surface->target = cairo_surface_reference (target);
@@ -149,9 +152,9 @@ _test_paginated_surface_stroke (void				*abstract_surface,
 				cairo_operator_t		 op,
 				const cairo_pattern_t		*source,
 				cairo_path_fixed_t		*path,
-				cairo_stroke_style_t		*style,
-				cairo_matrix_t			*ctm,
-				cairo_matrix_t			*ctm_inverse,
+				const cairo_stroke_style_t		*style,
+				const cairo_matrix_t			*ctm,
+				const cairo_matrix_t			*ctm_inverse,
 				double				 tolerance,
 				cairo_antialias_t		 antialias,
 				cairo_clip_t			*clip)
diff --git a/gfx/cairo/cairo/src/test-paginated-surface.h b/gfx/cairo/cairo/src/test-paginated-surface.h
index 76ce6890e74..2bd98aa5eee 100644
--- a/gfx/cairo/cairo/src/test-paginated-surface.h
+++ b/gfx/cairo/cairo/src/test-paginated-surface.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the LGPL along with this library
  * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
  * You should have received a copy of the MPL along with this library
  * in the file COPYING-MPL-1.1
  *
diff --git a/gfx/cairo/win32-logical-font-scale.patch b/gfx/cairo/win32-logical-font-scale.patch
index b1135c41d19..02d812be371 100644
--- a/gfx/cairo/win32-logical-font-scale.patch
+++ b/gfx/cairo/win32-logical-font-scale.patch
@@ -1,12 +1,12 @@
-diff -r e10a8066a62c gfx/cairo/cairo/src/cairo-win32-private.h
---- a/gfx/cairo/cairo/src/cairo-win32-private.h	Fri Jun 08 17:39:38 2007 -0700
-+++ b/gfx/cairo/cairo/src/cairo-win32-private.h	Fri Jun 29 09:14:35 2007 +0200
-@@ -46,7 +46,7 @@
- #define SB_NONE 0
- #endif
- 
--#define WIN32_FONT_LOGICAL_SCALE 32
-+#define WIN32_FONT_LOGICAL_SCALE 1
- 
- typedef struct _cairo_win32_surface {
-     cairo_surface_t base;
+diff -r e10a8066a62c gfx/cairo/cairo/src/cairo-win32-private.h
+--- a/gfx/cairo/cairo/src/cairo-win32-private.h	Fri Jun 08 17:39:38 2007 -0700
++++ b/gfx/cairo/cairo/src/cairo-win32-private.h	Fri Jun 29 09:14:35 2007 +0200
+@@ -46,7 +46,7 @@
+ #define SB_NONE 0
+ #endif
+ 
+-#define WIN32_FONT_LOGICAL_SCALE 32
++#define WIN32_FONT_LOGICAL_SCALE 1
+ 
+ typedef struct _cairo_win32_surface {
+     cairo_surface_t base;
diff --git a/gfx/harfbuzz/src/hb-ot-head-private.hh b/gfx/harfbuzz/src/hb-ot-head-private.hh
index 520f48ba292..56a58612241 100644
--- a/gfx/harfbuzz/src/hb-ot-head-private.hh
+++ b/gfx/harfbuzz/src/hb-ot-head-private.hh
@@ -1,140 +1,140 @@
-/*
- * Copyright (C) 2010  Red Hat, Inc.
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * Red Hat Author(s): Behdad Esfahbod
- */
-
-#ifndef HB_OT_HEAD_PRIVATE_HH
-#define HB_OT_HEAD_PRIVATE_HH
-
-#include "hb-open-type-private.hh"
-
-HB_BEGIN_DECLS
-
-
-/*
- * head
- */
-
-#define HB_OT_TAG_head HB_TAG('h','e','a','d')
-
-struct head
-{
-  static const hb_tag_t Tag	= HB_OT_TAG_head;
-
-  inline unsigned int get_upem (void) const {
-    unsigned int upem = unitsPerEm;
-    /* If no valid head table found, assume 1000, which matches typicaly Type1 usage. */
-    return 16 <= upem && upem <= 16384 ? upem : 1000;
-  }
-
-  inline bool sanitize (hb_sanitize_context_t *c) {
-    TRACE_SANITIZE ();
-    /* Shall we check for magicNumber here?  Who cares? */
-    return c->check_struct (this) && likely (version.major == 1);
-  }
-
-  private:
-  FixedVersion	version;		/* Version of the head table--currently
-					 * 0x00010000 for version 1.0. */
-  FixedVersion	fontRevision;		/* Set by font manufacturer. */
-  ULONG		checkSumAdjustment;	/* To compute: set it to 0, sum the
-					 * entire font as ULONG, then store
-					 * 0xB1B0AFBA - sum. */
-  ULONG		magicNumber;		/* Set to 0x5F0F3CF5. */
-  USHORT	flags;			/* Bit 0: Baseline for font at y=0;
-					 * Bit 1: Left sidebearing point at x=0;
-					 * Bit 2: Instructions may depend on point size;
-					 * Bit 3: Force ppem to integer values for all
-					 *   internal scaler math; may use fractional
-					 *   ppem sizes if this bit is clear;
-					 * Bit 4: Instructions may alter advance width
-					 *   (the advance widths might not scale linearly);
-
-					 * Bits 5-10: These should be set according to
-					 *   Apple's specification. However, they are not
-					 *   implemented in OpenType.
-					 * Bit 5: This bit should be set in fonts that are
-					 *   intended to e laid out vertically, and in
-					 *   which the glyphs have been drawn such that an
-					 *   x-coordinate of 0 corresponds to the desired
-					 *   vertical baseline.
-					 * Bit 6: This bit must be set to zero.
-					 * Bit 7: This bit should be set if the font
-					 *   requires layout for correct linguistic
-					 *   rendering (e.g. Arabic fonts).
-					 * Bit 8: This bit should be set for a GX font
-					 *   which has one or more metamorphosis effects
-					 *   designated as happening by default.
-					 * Bit 9: This bit should be set if the font
-					 *   contains any strong right-to-left glyphs.
-					 * Bit 10: This bit should be set if the font
-					 *   contains Indic-style rearrangement effects.
-
-					 * Bit 11: Font data is 'lossless,' as a result
-					 *   of having been compressed and decompressed
-					 *   with the Agfa MicroType Express engine.
-					 * Bit 12: Font converted (produce compatible metrics)
-					 * Bit 13: Font optimized for ClearTypeâ„¢.
-					 *   Note, fonts that rely on embedded bitmaps (EBDT)
-					 *   for rendering should not be considered optimized
-					 *   for ClearType, and therefore should keep this bit
-					 *   cleared.
-					 * Bit 14: Reserved, set to 0
-					 * Bit 15: Reserved, set to 0. */
-  USHORT	unitsPerEm;		/* Valid range is from 16 to 16384. This value
-					 * should be a power of 2 for fonts that have
-					 * TrueType outlines. */
-  LONGDATETIME	created;		/* Number of seconds since 12:00 midnight,
-					   January 1, 1904. 64-bit integer */
-  LONGDATETIME	modified;		/* Number of seconds since 12:00 midnight,
-					   January 1, 1904. 64-bit integer */
-  SHORT		xMin;			/* For all glyph bounding boxes. */
-  SHORT		yMin;			/* For all glyph bounding boxes. */
-  SHORT		xMax;			/* For all glyph bounding boxes. */
-  SHORT		yMax;			/* For all glyph bounding boxes. */
-  USHORT	macStyle;		/* Bit 0: Bold (if set to 1);
-					 * Bit 1: Italic (if set to 1)
-					 * Bit 2: Underline (if set to 1)
-					 * Bit 3: Outline (if set to 1)
-					 * Bit 4: Shadow (if set to 1)
-					 * Bit 5: Condensed (if set to 1)
-					 * Bit 6: Extended (if set to 1)
-					 * Bits 7-15: Reserved (set to 0). */
-  USHORT	lowestRecPPEM;		/* Smallest readable size in pixels. */
-  SHORT		fontDirectionHint;	/* Deprecated (Set to 2).
-					 * 0: Fully mixed directional glyphs;
-					 * 1: Only strongly left to right;
-					 * 2: Like 1 but also contains neutrals;
-					 * -1: Only strongly right to left;
-					 * -2: Like -1 but also contains neutrals. */
-  SHORT		indexToLocFormat;	/* 0 for short offsets, 1 for long. */
-  SHORT		glyphDataFormat;	/* 0 for current format. */
-  public:
-  DEFINE_SIZE_STATIC (54);
-};
-
-
-HB_END_DECLS
-
-#endif /* HB_OT_HEAD_PRIVATE_HH */
+/*
+ * Copyright (C) 2010  Red Hat, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Red Hat Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_HEAD_PRIVATE_HH
+#define HB_OT_HEAD_PRIVATE_HH
+
+#include "hb-open-type-private.hh"
+
+HB_BEGIN_DECLS
+
+
+/*
+ * head
+ */
+
+#define HB_OT_TAG_head HB_TAG('h','e','a','d')
+
+struct head
+{
+  static const hb_tag_t Tag	= HB_OT_TAG_head;
+
+  inline unsigned int get_upem (void) const {
+    unsigned int upem = unitsPerEm;
+    /* If no valid head table found, assume 1000, which matches typicaly Type1 usage. */
+    return 16 <= upem && upem <= 16384 ? upem : 1000;
+  }
+
+  inline bool sanitize (hb_sanitize_context_t *c) {
+    TRACE_SANITIZE ();
+    /* Shall we check for magicNumber here?  Who cares? */
+    return c->check_struct (this) && likely (version.major == 1);
+  }
+
+  private:
+  FixedVersion	version;		/* Version of the head table--currently
+					 * 0x00010000 for version 1.0. */
+  FixedVersion	fontRevision;		/* Set by font manufacturer. */
+  ULONG		checkSumAdjustment;	/* To compute: set it to 0, sum the
+					 * entire font as ULONG, then store
+					 * 0xB1B0AFBA - sum. */
+  ULONG		magicNumber;		/* Set to 0x5F0F3CF5. */
+  USHORT	flags;			/* Bit 0: Baseline for font at y=0;
+					 * Bit 1: Left sidebearing point at x=0;
+					 * Bit 2: Instructions may depend on point size;
+					 * Bit 3: Force ppem to integer values for all
+					 *   internal scaler math; may use fractional
+					 *   ppem sizes if this bit is clear;
+					 * Bit 4: Instructions may alter advance width
+					 *   (the advance widths might not scale linearly);
+
+					 * Bits 5-10: These should be set according to
+					 *   Apple's specification. However, they are not
+					 *   implemented in OpenType.
+					 * Bit 5: This bit should be set in fonts that are
+					 *   intended to e laid out vertically, and in
+					 *   which the glyphs have been drawn such that an
+					 *   x-coordinate of 0 corresponds to the desired
+					 *   vertical baseline.
+					 * Bit 6: This bit must be set to zero.
+					 * Bit 7: This bit should be set if the font
+					 *   requires layout for correct linguistic
+					 *   rendering (e.g. Arabic fonts).
+					 * Bit 8: This bit should be set for a GX font
+					 *   which has one or more metamorphosis effects
+					 *   designated as happening by default.
+					 * Bit 9: This bit should be set if the font
+					 *   contains any strong right-to-left glyphs.
+					 * Bit 10: This bit should be set if the font
+					 *   contains Indic-style rearrangement effects.
+
+					 * Bit 11: Font data is 'lossless,' as a result
+					 *   of having been compressed and decompressed
+					 *   with the Agfa MicroType Express engine.
+					 * Bit 12: Font converted (produce compatible metrics)
+					 * Bit 13: Font optimized for ClearTypeâ„¢.
+					 *   Note, fonts that rely on embedded bitmaps (EBDT)
+					 *   for rendering should not be considered optimized
+					 *   for ClearType, and therefore should keep this bit
+					 *   cleared.
+					 * Bit 14: Reserved, set to 0
+					 * Bit 15: Reserved, set to 0. */
+  USHORT	unitsPerEm;		/* Valid range is from 16 to 16384. This value
+					 * should be a power of 2 for fonts that have
+					 * TrueType outlines. */
+  LONGDATETIME	created;		/* Number of seconds since 12:00 midnight,
+					   January 1, 1904. 64-bit integer */
+  LONGDATETIME	modified;		/* Number of seconds since 12:00 midnight,
+					   January 1, 1904. 64-bit integer */
+  SHORT		xMin;			/* For all glyph bounding boxes. */
+  SHORT		yMin;			/* For all glyph bounding boxes. */
+  SHORT		xMax;			/* For all glyph bounding boxes. */
+  SHORT		yMax;			/* For all glyph bounding boxes. */
+  USHORT	macStyle;		/* Bit 0: Bold (if set to 1);
+					 * Bit 1: Italic (if set to 1)
+					 * Bit 2: Underline (if set to 1)
+					 * Bit 3: Outline (if set to 1)
+					 * Bit 4: Shadow (if set to 1)
+					 * Bit 5: Condensed (if set to 1)
+					 * Bit 6: Extended (if set to 1)
+					 * Bits 7-15: Reserved (set to 0). */
+  USHORT	lowestRecPPEM;		/* Smallest readable size in pixels. */
+  SHORT		fontDirectionHint;	/* Deprecated (Set to 2).
+					 * 0: Fully mixed directional glyphs;
+					 * 1: Only strongly left to right;
+					 * 2: Like 1 but also contains neutrals;
+					 * -1: Only strongly right to left;
+					 * -2: Like -1 but also contains neutrals. */
+  SHORT		indexToLocFormat;	/* 0 for short offsets, 1 for long. */
+  SHORT		glyphDataFormat;	/* 0 for current format. */
+  public:
+  DEFINE_SIZE_STATIC (54);
+};
+
+
+HB_END_DECLS
+
+#endif /* HB_OT_HEAD_PRIVATE_HH */
diff --git a/gfx/ipc/SharedDIBSurface.cpp b/gfx/ipc/SharedDIBSurface.cpp
index 466d3ba8ca1..29d24ef06e9 100644
--- a/gfx/ipc/SharedDIBSurface.cpp
+++ b/gfx/ipc/SharedDIBSurface.cpp
@@ -1,97 +1,97 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Firefox.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation <http://www.mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * 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 ***** */
-
-#include "SharedDIBSurface.h"
-
-#include "cairo.h"
-
-namespace mozilla {
-namespace gfx {
-
-static const cairo_user_data_key_t SHAREDDIB_KEY = {0};
-
-static const long kBytesPerPixel = 4;
-
-bool
-SharedDIBSurface::Create(HDC adc, PRUint32 aWidth, PRUint32 aHeight,
-                         bool aTransparent)
-{
-  nsresult rv = mSharedDIB.Create(adc, aWidth, aHeight, aTransparent);
-  if (NS_FAILED(rv) || !mSharedDIB.IsValid())
-    return false;
-
-  InitSurface(aWidth, aHeight, aTransparent);
-  return true;
-}
-
-bool
-SharedDIBSurface::Attach(Handle aHandle, PRUint32 aWidth, PRUint32 aHeight,
-                         bool aTransparent)
-{
-  nsresult rv = mSharedDIB.Attach(aHandle, aWidth, aHeight, aTransparent);
-  if (NS_FAILED(rv) || !mSharedDIB.IsValid())
-    return false;
-
-  InitSurface(aWidth, aHeight, aTransparent);
-  return true;
-}
-
-void
-SharedDIBSurface::InitSurface(PRUint32 aWidth, PRUint32 aHeight,
-                              bool aTransparent)
-{
-  long stride = long(aWidth * kBytesPerPixel);
-  unsigned char* data = reinterpret_cast<unsigned char*>(mSharedDIB.GetBits());
-
-  gfxImageFormat format = aTransparent ? ImageFormatARGB32 : ImageFormatRGB24;
-
-  gfxImageSurface::InitWithData(data, gfxIntSize(aWidth, aHeight),
-                                stride, format);
-
-  cairo_surface_set_user_data(mSurface, &SHAREDDIB_KEY, this, NULL);
-}
-
-bool
-SharedDIBSurface::IsSharedDIBSurface(gfxASurface* aSurface)
-{
-  return aSurface &&
-    aSurface->GetType() == gfxASurface::SurfaceTypeImage &&
-    aSurface->GetData(&SHAREDDIB_KEY);
-}
-
-} // namespace gfx
-} // namespace mozilla
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 ***** */
+
+#include "SharedDIBSurface.h"
+
+#include "cairo.h"
+
+namespace mozilla {
+namespace gfx {
+
+static const cairo_user_data_key_t SHAREDDIB_KEY = {0};
+
+static const long kBytesPerPixel = 4;
+
+bool
+SharedDIBSurface::Create(HDC adc, PRUint32 aWidth, PRUint32 aHeight,
+                         bool aTransparent)
+{
+  nsresult rv = mSharedDIB.Create(adc, aWidth, aHeight, aTransparent);
+  if (NS_FAILED(rv) || !mSharedDIB.IsValid())
+    return false;
+
+  InitSurface(aWidth, aHeight, aTransparent);
+  return true;
+}
+
+bool
+SharedDIBSurface::Attach(Handle aHandle, PRUint32 aWidth, PRUint32 aHeight,
+                         bool aTransparent)
+{
+  nsresult rv = mSharedDIB.Attach(aHandle, aWidth, aHeight, aTransparent);
+  if (NS_FAILED(rv) || !mSharedDIB.IsValid())
+    return false;
+
+  InitSurface(aWidth, aHeight, aTransparent);
+  return true;
+}
+
+void
+SharedDIBSurface::InitSurface(PRUint32 aWidth, PRUint32 aHeight,
+                              bool aTransparent)
+{
+  long stride = long(aWidth * kBytesPerPixel);
+  unsigned char* data = reinterpret_cast<unsigned char*>(mSharedDIB.GetBits());
+
+  gfxImageFormat format = aTransparent ? ImageFormatARGB32 : ImageFormatRGB24;
+
+  gfxImageSurface::InitWithData(data, gfxIntSize(aWidth, aHeight),
+                                stride, format);
+
+  cairo_surface_set_user_data(mSurface, &SHAREDDIB_KEY, this, NULL);
+}
+
+bool
+SharedDIBSurface::IsSharedDIBSurface(gfxASurface* aSurface)
+{
+  return aSurface &&
+    aSurface->GetType() == gfxASurface::SurfaceTypeImage &&
+    aSurface->GetData(&SHAREDDIB_KEY);
+}
+
+} // namespace gfx
+} // namespace mozilla
diff --git a/gfx/ipc/SharedDIBSurface.h b/gfx/ipc/SharedDIBSurface.h
index fce7ca9ceb8..8f3d30ffb2c 100644
--- a/gfx/ipc/SharedDIBSurface.h
+++ b/gfx/ipc/SharedDIBSurface.h
@@ -1,94 +1,94 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Firefox.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation <http://www.mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * 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 ***** */
-
-#ifndef mozilla_gfx_SharedDIBSurface_h
-#define mozilla_gfx_SharedDIBSurface_h
-
-#include "gfxImageSurface.h"
-#include "SharedDIBWin.h"
-
-#include <windows.h>
-
-namespace mozilla {
-namespace gfx {
-
-/**
- * A SharedDIBSurface owns an underlying SharedDIBWin.
- */
-class SharedDIBSurface : public gfxImageSurface
-{
-public:
-  typedef base::SharedMemoryHandle Handle;
-
-  SharedDIBSurface() { }
-  ~SharedDIBSurface() { }
-
-  /**
-   * Create this image surface backed by shared memory.
-   */
-  bool Create(HDC adc, PRUint32 aWidth, PRUint32 aHeight, bool aTransparent);
-
-  /**
-   * Attach this surface to shared memory from another process.
-   */
-  bool Attach(Handle aHandle, PRUint32 aWidth, PRUint32 aHeight,
-              bool aTransparent);
-
-  /**
-   * After drawing to a surface via GDI, GDI must be flushed before the bitmap
-   * is valid.
-   */
-  void Flush() { ::GdiFlush(); }
-
-  HDC GetHDC() { return mSharedDIB.GetHDC(); }
-
-  nsresult ShareToProcess(base::ProcessHandle aChildProcess, Handle* aChildHandle) {
-    return mSharedDIB.ShareToProcess(aChildProcess, aChildHandle);
-  }
-
-  static bool IsSharedDIBSurface(gfxASurface* aSurface);
-
-private:
-  SharedDIBWin mSharedDIB;
-
-  void InitSurface(PRUint32 aWidth, PRUint32 aHeight, bool aTransparent);
-};
-
-} // namespace gfx
-} // namespace mozilla
-
-#endif // mozilla_gfx_SharedDIBSurface_h
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 ***** */
+
+#ifndef mozilla_gfx_SharedDIBSurface_h
+#define mozilla_gfx_SharedDIBSurface_h
+
+#include "gfxImageSurface.h"
+#include "SharedDIBWin.h"
+
+#include <windows.h>
+
+namespace mozilla {
+namespace gfx {
+
+/**
+ * A SharedDIBSurface owns an underlying SharedDIBWin.
+ */
+class SharedDIBSurface : public gfxImageSurface
+{
+public:
+  typedef base::SharedMemoryHandle Handle;
+
+  SharedDIBSurface() { }
+  ~SharedDIBSurface() { }
+
+  /**
+   * Create this image surface backed by shared memory.
+   */
+  bool Create(HDC adc, PRUint32 aWidth, PRUint32 aHeight, bool aTransparent);
+
+  /**
+   * Attach this surface to shared memory from another process.
+   */
+  bool Attach(Handle aHandle, PRUint32 aWidth, PRUint32 aHeight,
+              bool aTransparent);
+
+  /**
+   * After drawing to a surface via GDI, GDI must be flushed before the bitmap
+   * is valid.
+   */
+  void Flush() { ::GdiFlush(); }
+
+  HDC GetHDC() { return mSharedDIB.GetHDC(); }
+
+  nsresult ShareToProcess(base::ProcessHandle aChildProcess, Handle* aChildHandle) {
+    return mSharedDIB.ShareToProcess(aChildProcess, aChildHandle);
+  }
+
+  static bool IsSharedDIBSurface(gfxASurface* aSurface);
+
+private:
+  SharedDIBWin mSharedDIB;
+
+  void InitSurface(PRUint32 aWidth, PRUint32 aHeight, bool aTransparent);
+};
+
+} // namespace gfx
+} // namespace mozilla
+
+#endif // mozilla_gfx_SharedDIBSurface_h
diff --git a/gfx/layers/ThebesLayerBuffer.cpp b/gfx/layers/ThebesLayerBuffer.cpp
index c4103ff990c..fdded026eab 100644
--- a/gfx/layers/ThebesLayerBuffer.cpp
+++ b/gfx/layers/ThebesLayerBuffer.cpp
@@ -247,7 +247,7 @@ ThebesLayerBuffer::BeginPaint(ThebesLayer* aLayer, ContentType aContentType,
     neededRegion = aLayer->GetVisibleRegion();
     destBufferDims = ScaledSize(neededRegion.GetBounds().Size(),
                                 aXResolution, aYResolution);
-    canReuseBuffer = BufferSizeOkFor(destBufferDims);
+    canReuseBuffer = mBuffer && BufferSizeOkFor(destBufferDims);
 
     if (canReuseBuffer) {
       if (mBufferRect.Contains(neededRegion.GetBounds())) {
diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp
index 68d1572ad09..d952b7164e0 100644
--- a/gfx/layers/basic/BasicLayers.cpp
+++ b/gfx/layers/basic/BasicLayers.cpp
@@ -92,7 +92,7 @@ class ShadowableLayer;
  */
 class BasicImplData {
 public:
-  BasicImplData() : mHidden(PR_FALSE)
+  BasicImplData() : mHidden(PR_FALSE), mOperator(gfxContext::OPERATOR_OVER)
   {
     MOZ_COUNT_CTOR(BasicImplData);
   }
@@ -136,13 +136,45 @@ public:
   virtual void ClearCachedResources() {}
 
   /**
-   * This variable is set by MarkLeafLayersHidden() before painting.
+   * This variable is set by MarkLayersHidden() before painting. It indicates
+   * that the layer should not be composited during this transaction.
    */
   void SetHidden(PRBool aCovered) { mHidden = aCovered; }
   PRBool IsHidden() const { return PR_FALSE; }
+  /**
+   * This variable is set by MarkLayersHidden() before painting. This is
+   * the operator to be used when compositing the layer in this transaction. It must
+   * be OVER or SOURCE.
+   */
+  void SetOperator(gfxContext::GraphicsOperator aOperator)
+  {
+    NS_ASSERTION(aOperator == gfxContext::OPERATOR_OVER ||
+                 aOperator == gfxContext::OPERATOR_SOURCE,
+                 "Bad composition operator");
+    mOperator = aOperator;
+  }
+  gfxContext::GraphicsOperator GetOperator() const { return mOperator; }
 
 protected:
   PRPackedBool mHidden;
+  gfxContext::GraphicsOperator mOperator;
+};
+
+class AutoSetOperator {
+public:
+  AutoSetOperator(gfxContext* aContext, gfxContext::GraphicsOperator aOperator) {
+    if (aOperator != gfxContext::OPERATOR_OVER) {
+      aContext->SetOperator(aOperator);
+      mContext = aContext;
+    }
+  }
+  ~AutoSetOperator() {
+    if (mContext) {
+      mContext->SetOperator(gfxContext::OPERATOR_OVER);
+    }
+  }
+private:
+  nsRefPtr<gfxContext> mContext;
 };
 
 static BasicImplData*
@@ -156,7 +188,7 @@ static void ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aConta
 template<class Container>
 static void ContainerRemoveChild(Layer* aChild, Container* aContainer);
 
-class BasicContainerLayer : public ContainerLayer, BasicImplData {
+class BasicContainerLayer : public ContainerLayer, public BasicImplData {
   template<class Container>
   friend void ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer);
   template<class Container>
@@ -210,6 +242,23 @@ public:
     mUseIntermediateSurface = GetEffectiveOpacity() != 1.0 && HasMultipleChildren();
   }
 
+  /**
+   * Returns true when:
+   * a) no (non-hidden) childrens' visible areas overlap in
+   * (aInRect intersected with this layer's visible region).
+   * b) the (non-hidden) childrens' visible areas cover
+   * (aInRect intersected with this layer's visible region).
+   * c) this layer and all (non-hidden) children have transforms that are translations
+   * by integers.
+   * aInRect is in the root coordinate system.
+   * Child layers with opacity do not contribute to the covered area in check b).
+   * This method can be conservative; it's OK to return false under any
+   * circumstances.
+   */
+  PRBool ChildrenPartitionVisibleRegion(const nsIntRect& aInRect);
+
+  void ForceIntermediateSurface() { mUseIntermediateSurface = PR_TRUE; }
+
 protected:
   BasicLayerManager* BasicManager()
   {
@@ -226,6 +275,43 @@ BasicContainerLayer::~BasicContainerLayer()
   MOZ_COUNT_DTOR(BasicContainerLayer);
 }
 
+PRBool
+BasicContainerLayer::ChildrenPartitionVisibleRegion(const nsIntRect& aInRect)
+{
+  gfxMatrix transform;
+  if (!GetEffectiveTransform().Is2D(&transform) ||
+      transform.HasNonIntegerTranslation())
+    return PR_FALSE;
+
+  nsIntPoint offset(PRInt32(transform.x0), PRInt32(transform.y0));
+  nsIntRect rect = aInRect.Intersect(GetEffectiveVisibleRegion().GetBounds() + offset);
+  nsIntRegion covered;
+
+  for (Layer* l = mFirstChild; l; l = l->GetNextSibling()) {
+    if (ToData(l)->IsHidden())
+      continue;
+
+    gfxMatrix childTransform;
+    if (!l->GetEffectiveTransform().Is2D(&childTransform) ||
+        childTransform.HasNonIntegerTranslation() ||
+        l->GetEffectiveOpacity() != 1.0)
+      return PR_FALSE;
+    nsIntRegion childRegion = l->GetEffectiveVisibleRegion();
+    childRegion.MoveBy(PRInt32(childTransform.x0), PRInt32(childTransform.y0));
+    childRegion.And(childRegion, rect);
+    if (l->GetClipRect()) {
+      childRegion.And(childRegion, *l->GetClipRect() + offset);
+    }
+    nsIntRegion intersection;
+    intersection.And(covered, childRegion);
+    if (!intersection.IsEmpty())
+      return PR_FALSE;
+    covered.Or(covered, childRegion);
+  }
+
+  return covered.Contains(rect);
+}
+
 template<class Container>
 static void
 ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer)
@@ -358,7 +444,7 @@ private:
   BasicThebesLayer* mLayer;
 };
 
-class BasicThebesLayer : public ThebesLayer, BasicImplData {
+class BasicThebesLayer : public ThebesLayer, public BasicImplData {
 public:
   typedef BasicThebesLayerBuffer Buffer;
 
@@ -497,15 +583,16 @@ SetAntialiasingFlags(Layer* aLayer, gfxContext* aTarget)
         aTarget->UserToDevice(gfxRect(bounds.x, bounds.y, bounds.width, bounds.height))));
 }
 
-static PRBool
-PushGroupForLayer(gfxContext* aContext, Layer* aLayer, const nsIntRegion& aRegion)
+already_AddRefed<gfxContext>
+BasicLayerManager::PushGroupForLayer(gfxContext* aContext, Layer* aLayer,
+                                     const nsIntRegion& aRegion,
+                                     PRBool* aNeedsClipToVisibleRegion)
 {
   // If we need to call PushGroup, we should clip to the smallest possible
   // area first to minimize the size of the temporary surface.
   PRBool didCompleteClip = ClipToContain(aContext, aRegion.GetBounds());
 
-  gfxASurface::gfxContentType contentType = gfxASurface::CONTENT_COLOR_ALPHA;
-  PRBool needsClipToVisibleRegion = PR_FALSE;
+  nsRefPtr<gfxContext> result;
   if (aLayer->CanUseOpaqueSurface() &&
       ((didCompleteClip && aRegion.GetNumRects() == 1) ||
        !aContext->CurrentMatrix().HasNonIntegerTranslation())) {
@@ -513,11 +600,14 @@ PushGroupForLayer(gfxContext* aContext, Layer* aLayer, const nsIntRegion& aRegio
     // group. We need to make sure that only pixels inside the layer's visible
     // region are copied back to the destination. Remember if we've already
     // clipped precisely to the visible region.
-    needsClipToVisibleRegion = !didCompleteClip || aRegion.GetNumRects() > 1;
-    contentType = gfxASurface::CONTENT_COLOR;
+    *aNeedsClipToVisibleRegion = !didCompleteClip || aRegion.GetNumRects() > 1;
+    result = PushGroupWithCachedSurface(aContext, gfxASurface::CONTENT_COLOR);
+  } else {
+    *aNeedsClipToVisibleRegion = PR_FALSE;
+    result = aContext;
+    aContext->PushGroupAndCopyBackground(gfxASurface::CONTENT_COLOR_ALPHA);
   }
-  aContext->PushGroupAndCopyBackground(contentType);
-  return needsClipToVisibleRegion;
+  return result.forget();
 }
 
 void
@@ -550,7 +640,7 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
     mValidRegion.SetEmpty();
     mBuffer.Clear();
 
-    nsIntRegion toDraw = IntersectWithClip(mVisibleRegion, aContext);
+    nsIntRegion toDraw = IntersectWithClip(GetEffectiveVisibleRegion(), aContext);
     if (!toDraw.IsEmpty() && !IsHidden()) {
       if (!aCallback) {
         BasicManager()->SetTransactionIncomplete();
@@ -560,16 +650,27 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
       aContext->Save();
 
       PRBool needsClipToVisibleRegion = PR_FALSE;
-      if (opacity != 1.0) {
-        needsClipToVisibleRegion = PushGroupForLayer(aContext, this, toDraw);
+      PRBool needsGroup =
+          opacity != 1.0 || GetOperator() != gfxContext::OPERATOR_OVER;
+      nsRefPtr<gfxContext> groupContext;
+      if (needsGroup) {
+        groupContext =
+          BasicManager()->PushGroupForLayer(aContext, this, toDraw,
+                                            &needsClipToVisibleRegion);
+        if (GetOperator() != gfxContext::OPERATOR_OVER) {
+          needsClipToVisibleRegion = PR_TRUE;
+        }
+      } else {
+        groupContext = aContext;
       }
-      SetAntialiasingFlags(this, aContext);
-      aCallback(this, aContext, toDraw, nsIntRegion(), aCallbackData);
-      if (opacity != 1.0) {
-        aContext->PopGroupToSource();
+      SetAntialiasingFlags(this, groupContext);
+      aCallback(this, groupContext, toDraw, nsIntRegion(), aCallbackData);
+      if (needsGroup) {
+        BasicManager()->PopGroupToSourceWithCachedSurface(aContext, groupContext);
         if (needsClipToVisibleRegion) {
           gfxUtils::ClipToRegion(aContext, toDraw);
         }
+        AutoSetOperator setOperator(aContext, GetOperator());
         aContext->Paint(opacity);
       }
 
@@ -598,7 +699,8 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
       // (this could be the whole visible area if our buffer switched
       // from RGB to RGBA, because we might need to repaint with
       // subpixel AA)
-      state.mRegionToInvalidate.And(state.mRegionToInvalidate, mVisibleRegion);
+      state.mRegionToInvalidate.And(state.mRegionToInvalidate,
+                                    GetEffectiveVisibleRegion());
       nsIntRegion extendedDrawRegion = state.mRegionToDraw;
       extendedDrawRegion.ExtendForScaling(paintXRes, paintYRes);
       mXResolution = paintXRes;
@@ -618,6 +720,7 @@ BasicThebesLayer::PaintThebes(gfxContext* aContext,
   }
 
   if (!IsHidden()) {
+    AutoSetOperator setOperator(aContext, GetOperator());
     mBuffer.DrawTo(this, aContext, opacity);
   }
 
@@ -655,13 +758,13 @@ BasicThebesLayerBuffer::DrawTo(ThebesLayer* aLayer,
   // no need to clip. But we'll still clip if clipping is cheap ---
   // that might let us copy a smaller region of the buffer.
   if (!aLayer->GetValidRegion().Contains(BufferRect()) ||
-      IsClippingCheap(aTarget, aLayer->GetVisibleRegion())) {
+      IsClippingCheap(aTarget, aLayer->GetEffectiveVisibleRegion())) {
     // We don't want to draw invalid stuff, so we need to clip. Might as
     // well clip to the smallest area possible --- the visible region.
     // Bug 599189 if there is a non-integer-translation transform in aTarget,
-    // we might sample pixels outside GetVisibleRegion(), which is wrong
+    // we might sample pixels outside GetEffectiveVisibleRegion(), which is wrong
     // and may cause gray lines.
-    gfxUtils::ClipToRegionSnapped(aTarget, aLayer->GetVisibleRegion());
+    gfxUtils::ClipToRegionSnapped(aTarget, aLayer->GetEffectiveVisibleRegion());
   }
   DrawBufferWithRotation(aTarget, aOpacity,
                          aLayer->GetXResolution(), aLayer->GetYResolution());
@@ -694,7 +797,7 @@ BasicThebesLayerBuffer::SetBackingBufferAndUpdateFrom(
   srcBuffer.DrawBufferWithRotation(destCtx, 1.0, aXResolution, aYResolution);
 }
 
-class BasicImageLayer : public ImageLayer, BasicImplData {
+class BasicImageLayer : public ImageLayer, public BasicImplData {
 public:
   BasicImageLayer(BasicLayerManager* aLayerManager) :
     ImageLayer(aLayerManager, static_cast<BasicImplData*>(this)),
@@ -769,6 +872,7 @@ BasicImageLayer::GetAndPaintCurrentImage(gfxContext* aContext,
   // tiling, we don't want to draw into that area, so just draw within
   // the image bounds.
   const nsIntRect* tileSrcRect = GetTileSourceRect();
+  AutoSetOperator setOperator(aContext, GetOperator());
   PaintContext(pat,
                tileSrcRect ? GetVisibleRegion() : nsIntRegion(nsIntRect(0, 0, mSize.width, mSize.height)),
                tileSrcRect,
@@ -830,7 +934,7 @@ BasicImageLayer::PaintContext(gfxPattern* aPattern,
   aPattern->SetExtend(extend);
 }
 
-class BasicColorLayer : public ColorLayer, BasicImplData {
+class BasicColorLayer : public ColorLayer, public BasicImplData {
 public:
   BasicColorLayer(BasicLayerManager* aLayerManager) :
     ColorLayer(aLayerManager, static_cast<BasicImplData*>(this))
@@ -853,6 +957,7 @@ public:
   {
     if (IsHidden())
       return;
+    AutoSetOperator setOperator(aContext, GetOperator());
     PaintColorTo(mColor, GetEffectiveOpacity(), aContext);
   }
 
@@ -875,7 +980,7 @@ BasicColorLayer::PaintColorTo(gfxRGBA aColor, float aOpacity,
 }
 
 class BasicCanvasLayer : public CanvasLayer,
-                         BasicImplData
+                         public BasicImplData
 {
 public:
   BasicCanvasLayer(BasicLayerManager* aLayerManager) :
@@ -1023,6 +1128,7 @@ BasicCanvasLayer::PaintWithOpacity(gfxContext* aContext,
     aContext->Scale(1.0, -1.0);
   }
 
+  AutoSetOperator setOperator(aContext, GetOperator());
   aContext->NewPath();
   // No need to snap here; our transform is already set up to snap our rect
   aContext->Rectangle(gfxRect(0, 0, mBounds.width, mBounds.height));
@@ -1035,7 +1141,7 @@ BasicCanvasLayer::PaintWithOpacity(gfxContext* aContext,
 }
 
 class BasicReadbackLayer : public ReadbackLayer,
-                           BasicImplData
+                           public BasicImplData
 {
 public:
   BasicReadbackLayer(BasicLayerManager* aLayerManager) :
@@ -1078,69 +1184,6 @@ ToInsideIntRect(const gfxRect& aRect)
   return nsIntRect(r.X(), r.Y(), r.Width(), r.Height());
 }
 
-/**
- * Returns false if there is at most one leaf layer overlapping aBounds
- * and that layer is opaque.
- * aDirtyVisibleRegionInContainer is filled in only if we return false.
- * It contains the union of the visible regions of leaf layers under aLayer.
- */
-static PRBool
-MayHaveOverlappingOrTransparentLayers(Layer* aLayer,
-                                      const nsIntRect& aBounds,
-                                      nsIntRegion* aDirtyVisibleRegionInContainer)
-{
-  if (static_cast<BasicImplData*>(aLayer->ImplData())->IsHidden()) {
-    // This layer won't be painted, so just ignore it.
-    return PR_FALSE;
-  }
-
-  if (!(aLayer->GetContentFlags() & Layer::CONTENT_OPAQUE)) {
-    return PR_TRUE;
-  }
-
-  gfxMatrix matrix;
-  if (!aLayer->GetTransform().Is2D(&matrix) ||
-      matrix.HasNonIntegerTranslation()) {
-    return PR_TRUE;
-  }
-
-  nsIntPoint translation = nsIntPoint(PRInt32(matrix.x0), PRInt32(matrix.y0));
-  nsIntRect bounds = aBounds - translation;
-
-  nsIntRect clippedDirtyRect = bounds;
-  const nsIntRect* clipRect = aLayer->GetClipRect();
-  if (clipRect) {
-    clippedDirtyRect.IntersectRect(clippedDirtyRect, *clipRect - translation);
-  }
-  aDirtyVisibleRegionInContainer->And(aLayer->GetVisibleRegion(), clippedDirtyRect);
-  aDirtyVisibleRegionInContainer->MoveBy(translation);
-
-  /* Ignore layers outside the clip rect */
-  if (aDirtyVisibleRegionInContainer->IsEmpty()) {
-    return PR_FALSE;
-  }
-
-  nsIntRegion region;
-
-  for (Layer* child = aLayer->GetFirstChild(); child;
-       child = child->GetNextSibling()) {
-    nsIntRegion childRegion;
-    if (MayHaveOverlappingOrTransparentLayers(child, bounds, &childRegion)) {
-      return PR_TRUE;
-    }
-
-    nsIntRegion tmp;
-    tmp.And(region, childRegion);
-    if (!tmp.IsEmpty()) {
-      return PR_TRUE;
-    }
-
-    region.Or(region, childRegion);
-  }
-
-  return PR_FALSE;
-}
-
 BasicLayerManager::BasicLayerManager(nsIWidget* aWidget) :
 #ifdef DEBUG
   mPhase(PHASE_NONE),
@@ -1149,6 +1192,7 @@ BasicLayerManager::BasicLayerManager(nsIWidget* aWidget) :
   , mYResolution(1.0)
   , mWidget(aWidget)
   , mDoubleBuffering(BUFFER_NONE), mUsingDefaultTarget(PR_FALSE)
+  , mCachedSurfaceInUse(PR_FALSE)
   , mTransactionIncomplete(false)
 {
   MOZ_COUNT_CTOR(BasicLayerManager);
@@ -1195,9 +1239,15 @@ BasicLayerManager::BeginTransaction()
 
 already_AddRefed<gfxContext>
 BasicLayerManager::PushGroupWithCachedSurface(gfxContext *aTarget,
-                                              gfxASurface::gfxContentType aContent,
-                                              gfxPoint *aSavedOffset)
+                                              gfxASurface::gfxContentType aContent)
 {
+  if (mCachedSurfaceInUse) {
+    aTarget->PushGroup(aContent);
+    nsRefPtr<gfxContext> result = aTarget;
+    return result.forget();
+  }
+  mCachedSurfaceInUse = PR_TRUE;
+
   gfxContextMatrixAutoSaveRestore saveMatrix(aTarget);
   aTarget->IdentityMatrix();
 
@@ -1205,29 +1255,26 @@ BasicLayerManager::PushGroupWithCachedSurface(gfxContext *aTarget,
   gfxRect clip = aTarget->GetClipExtents();
   clip.RoundOut();
 
-  nsRefPtr<gfxContext> ctx =
-    mCachedSurface.Get(aContent,
-                       gfxIntSize(clip.Width(), clip.Height()),
-                       currentSurf);
+  nsRefPtr<gfxContext> ctx = mCachedSurface.Get(aContent, clip, currentSurf);
   /* Align our buffer for the original surface */
-  ctx->Translate(-clip.TopLeft());
-  *aSavedOffset = clip.TopLeft();
-  ctx->Multiply(saveMatrix.Matrix());
+  ctx->SetMatrix(saveMatrix.Matrix());
   return ctx.forget();
 }
 
 void
-BasicLayerManager::PopGroupWithCachedSurface(gfxContext *aTarget,
-                                             const gfxPoint& aSavedOffset)
+BasicLayerManager::PopGroupToSourceWithCachedSurface(gfxContext *aTarget, gfxContext *aPushed)
 {
-  if (!mTarget)
+  if (!aTarget)
     return;
-
-  gfxContextMatrixAutoSaveRestore saveMatrix(aTarget);
-  aTarget->IdentityMatrix();
-
-  aTarget->SetSource(mTarget->OriginalSurface(), aSavedOffset);
-  aTarget->Paint();
+  nsRefPtr<gfxASurface> current = aPushed->CurrentSurface();
+  if (mCachedSurface.IsSurface(current)) {
+    gfxContextMatrixAutoSaveRestore saveMatrix(aTarget);
+    aTarget->IdentityMatrix();
+    aTarget->SetSource(current);
+    mCachedSurfaceInUse = PR_FALSE;
+  } else {
+    aTarget->PopGroupToSource();
+  }
 }
 
 void
@@ -1259,6 +1306,7 @@ TransformIntRect(nsIntRect& aRect, const gfxMatrix& aMatrix,
  * all layers to the same coordinate system (the "root coordinate system").
  * It can't be used as is by accelerated layers because of intermediate surfaces.
  * This must set the hidden flag to true or false on *all* layers in the subtree.
+ * It also sets the operator for all layers to "OVER".
  * @param aClipRect the cliprect, in the root coordinate system. We assume
  * that any layer drawing is clipped to this rect. It is therefore not
  * allowed to add to the opaque region outside that rect.
@@ -1267,22 +1315,22 @@ TransformIntRect(nsIntRect& aRect, const gfxMatrix& aMatrix,
  * @param aOpaqueRegion the opaque region covering aLayer, in the
  * root coordinate system.
  */
+enum {
+    ALLOW_OPAQUE = 0x01,
+};
 static void
-MarkLeafLayersHidden(Layer* aLayer, const nsIntRect& aClipRect,
-                     const nsIntRect& aDirtyRect,
-                     nsIntRegion& aOpaqueRegion)
+MarkLayersHidden(Layer* aLayer, const nsIntRect& aClipRect,
+                 const nsIntRect& aDirtyRect,
+                 nsIntRegion& aOpaqueRegion,
+                 PRUint32 aFlags)
 {
-  Layer* child = aLayer->GetLastChild();
-  BasicImplData* data = ToData(aLayer);
-  data->SetHidden(PR_FALSE);
-
   nsIntRect newClipRect(aClipRect);
+  PRUint32 newFlags = aFlags;
 
   // Allow aLayer or aLayer's descendants to cover underlying layers
-  // only if it's opaque. GetEffectiveOpacity() could be used instead,
-  // but it does extra passes from descendant to ancestor.
+  // only if it's opaque.
   if (aLayer->GetOpacity() != 1.0f) {
-    newClipRect.SetRect(0, 0, 0, 0);
+    newFlags &= ~ALLOW_OPAQUE;
   }
 
   {
@@ -1305,9 +1353,13 @@ MarkLeafLayersHidden(Layer* aLayer, const nsIntRect& aClipRect,
     }
   }
 
-  if (!child) {
+  BasicImplData* data = ToData(aLayer);
+  data->SetOperator(gfxContext::OPERATOR_OVER);
+
+  if (!aLayer->AsContainerLayer()) {
     gfxMatrix transform;
     if (!aLayer->GetEffectiveTransform().Is2D(&transform)) {
+      data->SetHidden(PR_FALSE);
       return;
     }
 
@@ -1319,23 +1371,84 @@ MarkLeafLayersHidden(Layer* aLayer, const nsIntRect& aClipRect,
 
     // Allow aLayer to cover underlying layers only if aLayer's
     // content is opaque
-    if (!(aLayer->GetContentFlags() & Layer::CONTENT_OPAQUE)) {
-      return;
-    }
+    if ((aLayer->GetContentFlags() & Layer::CONTENT_OPAQUE) &&
+        (newFlags & ALLOW_OPAQUE)) {
+      nsIntRegionRectIterator it(region);
+      while (const nsIntRect* sr = it.Next()) {
+        r = *sr;
+        TransformIntRect(r, transform, ToInsideIntRect);
 
-    nsIntRegionRectIterator it(region);
-    while (const nsIntRect* sr = it.Next()) {
-      r = *sr;
-      TransformIntRect(r, transform, ToInsideIntRect);
-
-      r.IntersectRect(r, newClipRect);
-      if (!r.IsEmpty()) {
+        r.IntersectRect(r, newClipRect);
         aOpaqueRegion.Or(aOpaqueRegion, r);
       }
     }
   } else {
+    Layer* child = aLayer->GetLastChild();
+    PRBool allHidden = PR_TRUE;
     for (; child; child = child->GetPrevSibling()) {
-      MarkLeafLayersHidden(child, newClipRect, aDirtyRect, aOpaqueRegion);
+      MarkLayersHidden(child, newClipRect, aDirtyRect, aOpaqueRegion, newFlags);
+      if (!ToData(child)->IsHidden()) {
+        allHidden = PR_FALSE;
+      }
+    }
+    data->SetHidden(allHidden);
+  }
+}
+
+/**
+ * This function assumes that GetEffectiveTransform transforms
+ * all layers to the same coordinate system (the "root coordinate system").
+ * MarkLayersHidden must be called before calling this.
+ * @param aVisibleRect the rectangle of aLayer that is visible (i.e. not
+ * clipped and in the dirty rect), in the root coordinate system.
+ */
+static void
+ApplyDoubleBuffering(Layer* aLayer, const nsIntRect& aVisibleRect)
+{
+  BasicImplData* data = ToData(aLayer);
+  if (data->IsHidden())
+    return;
+
+  nsIntRect newVisibleRect(aVisibleRect);
+
+  {
+    const nsIntRect* clipRect = aLayer->GetEffectiveClipRect();
+    if (clipRect) {
+      nsIntRect cr = *clipRect;
+      // clipRect is in the container's coordinate system. Get it into the
+      // global coordinate system.
+      if (aLayer->GetParent()) {
+        gfxMatrix tr;
+        if (aLayer->GetParent()->GetEffectiveTransform().Is2D(&tr)) {
+          NS_ASSERTION(!tr.HasNonIntegerTranslation(),
+                       "Parent can only have an integer translation");
+          cr += nsIntPoint(PRInt32(tr.x0), PRInt32(tr.y0));
+        } else {
+          NS_ERROR("Parent can only have an integer translation");
+        }
+      }
+      newVisibleRect.IntersectRect(newVisibleRect, cr);
+    }
+  }
+
+  BasicContainerLayer* container =
+    static_cast<BasicContainerLayer*>(aLayer->AsContainerLayer());
+  // Layers that act as their own backbuffers should be drawn to the destination
+  // using OPERATOR_SOURCE to ensure that alpha values in a transparent window
+  // are cleared. This can also be faster than OPERATOR_OVER.
+  if (!container) {
+    data->SetOperator(gfxContext::OPERATOR_SOURCE);
+  } else {
+    if (container->UseIntermediateSurface() ||
+        !container->ChildrenPartitionVisibleRegion(newVisibleRect)) {
+      // We need to double-buffer this container.
+      data->SetOperator(gfxContext::OPERATOR_SOURCE);
+      container->ForceIntermediateSurface();
+    } else {
+      for (Layer* child = aLayer->GetFirstChild(); child;
+           child = child->GetNextSibling()) {
+        ApplyDoubleBuffering(child, newVisibleRect);
+      }
     }
   }
 }
@@ -1378,55 +1491,25 @@ BasicLayerManager::EndTransactionInternal(DrawThebesLayerCallback aCallback,
       clipRect = ToOutsideIntRect(mTarget->GetClipExtents());
     }
 
-    // Need to do this before we call MarkLeafLayersHidden,
+    // Need to do this before we call ApplyDoubleBuffering,
     // which depends on correct effective transforms
     mSnapEffectiveTransforms =
       !(mTarget->GetFlags() & gfxContext::FLAG_DISABLE_SNAPPING);
     mRoot->ComputeEffectiveTransforms(gfx3DMatrix::From2D(mTarget->CurrentMatrix()));
 
-    // Need to do this before we call MayHaveOverlappingOrTransparentLayers,
-    // which uses information about which layers are going to be drawn.
     if (IsRetained()) {
       nsIntRegion region;
-      MarkLeafLayersHidden(mRoot, clipRect, clipRect, region);
+      MarkLayersHidden(mRoot, clipRect, clipRect, region, ALLOW_OPAQUE);
+      if (mUsingDefaultTarget && mDoubleBuffering != BUFFER_NONE) {
+        ApplyDoubleBuffering(mRoot, clipRect);
+      }
     }
 
-    nsRefPtr<gfxContext> finalTarget = mTarget;
-    gfxPoint cachedSurfaceOffset;
-    nsIntRegion rootRegion;
-    PRBool useDoubleBuffering = mUsingDefaultTarget &&
-      mDoubleBuffering != BUFFER_NONE &&
-      MayHaveOverlappingOrTransparentLayers(mRoot, clipRect, &rootRegion);
-
-    if (useDoubleBuffering) {
-      nsRefPtr<gfxASurface> targetSurface = mTarget->CurrentSurface();
-      mTarget = PushGroupWithCachedSurface(mTarget, targetSurface->GetContentType(),
-                                           &cachedSurfaceOffset);
-      // Recompute effective transforms since the gfxContext matrix has changed
-      mRoot->ComputeEffectiveTransforms(gfx3DMatrix::From2D(mTarget->CurrentMatrix()));
-    }
-
-    PaintLayer(mRoot, aCallback, aCallbackData, nsnull);
-
-    // If we're doing manual double-buffering, we need to avoid drawing
-    // the results of an incomplete transaction to the destination surface.
-    // If the transaction is incomplete and we're not double-buffering then
-    // either the system is double-buffering our window (in which case the
-    // followup EndTransaction will be drawn over the top of our incomplete
-    // transaction before the system updates the window), or we have no
-    // overlapping or transparent layers in the update region, in which case
-    // our partial transaction drawing will look fine.
-    if (useDoubleBuffering && !mTransactionIncomplete) {
-      finalTarget->SetOperator(gfxContext::OPERATOR_SOURCE);
-      PopGroupWithCachedSurface(finalTarget, cachedSurfaceOffset);
-    }
+    PaintLayer(mTarget, mRoot, aCallback, aCallbackData, nsnull);
 
     if (!mTransactionIncomplete) {
       // Clear out target if we have a complete transaction.
       mTarget = nsnull;
-    } else {
-      // If we don't have a complete transaction set back to the old mTarget.
-      mTarget = finalTarget;
     }
   }
 
@@ -1475,30 +1558,36 @@ BasicLayerManager::SetRoot(Layer* aLayer)
 }
 
 void
-BasicLayerManager::PaintLayer(Layer* aLayer,
+BasicLayerManager::PaintLayer(gfxContext* aTarget,
+                              Layer* aLayer,
                               DrawThebesLayerCallback aCallback,
                               void* aCallbackData,
                               ReadbackProcessor* aReadback)
 {
   const nsIntRect* clipRect = aLayer->GetEffectiveClipRect();
   const gfx3DMatrix& effectiveTransform = aLayer->GetEffectiveTransform();
+  BasicContainerLayer* container = static_cast<BasicContainerLayer*>(aLayer);
   PRBool needsGroup = aLayer->GetFirstChild() &&
-      static_cast<BasicContainerLayer*>(aLayer)->UseIntermediateSurface();
+    container->UseIntermediateSurface();
+  NS_ASSERTION(needsGroup || !aLayer->GetFirstChild() ||
+               container->GetOperator() == gfxContext::OPERATOR_OVER,
+               "non-OVER operator should have forced UseIntermediateSurface");
+
   // If needsSaveRestore is false, we should still save and restore
   // the CTM
   PRBool needsSaveRestore = needsGroup || clipRect;
 
   gfxMatrix savedMatrix;
   if (needsSaveRestore) {
-    mTarget->Save();
+    aTarget->Save();
 
     if (clipRect) {
-      mTarget->NewPath();
-      mTarget->Rectangle(gfxRect(clipRect->x, clipRect->y, clipRect->width, clipRect->height), PR_TRUE);
-      mTarget->Clip();
+      aTarget->NewPath();
+      aTarget->Rectangle(gfxRect(clipRect->x, clipRect->y, clipRect->width, clipRect->height), PR_TRUE);
+      aTarget->Clip();
     }
   } else {
-    savedMatrix = mTarget->CurrentMatrix();
+    savedMatrix = aTarget->CurrentMatrix();
   }
 
   gfxMatrix transform;
@@ -1507,11 +1596,11 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
   NS_ASSERTION(effectiveTransform.Is2D(),
                "Only 2D transforms supported currently");
   effectiveTransform.Is2D(&transform);
-  mTarget->SetMatrix(transform);
+  aTarget->SetMatrix(transform);
 
   PRBool pushedTargetOpaqueRect = PR_FALSE;
   const nsIntRegion& visibleRegion = aLayer->GetEffectiveVisibleRegion();
-  nsRefPtr<gfxASurface> currentSurface = mTarget->CurrentSurface();
+  nsRefPtr<gfxASurface> currentSurface = aTarget->CurrentSurface();
   const gfxRect& targetOpaqueRect = currentSurface->GetOpaqueRect();
 
   // Try to annotate currentSurface with a region of pixels that have been
@@ -1521,14 +1610,17 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
       !transform.HasNonAxisAlignedTransform()) {
     const nsIntRect& bounds = visibleRegion.GetBounds();
     currentSurface->SetOpaqueRect(
-        mTarget->UserToDevice(gfxRect(bounds.x, bounds.y, bounds.width, bounds.height)));
+        aTarget->UserToDevice(gfxRect(bounds.x, bounds.y, bounds.width, bounds.height)));
     pushedTargetOpaqueRect = PR_TRUE;
   }
 
   PRBool needsClipToVisibleRegion = PR_FALSE;
+  nsRefPtr<gfxContext> groupTarget;
   if (needsGroup) {
-    needsClipToVisibleRegion =
-        PushGroupForLayer(mTarget, aLayer, aLayer->GetEffectiveVisibleRegion());
+    groupTarget = PushGroupForLayer(aTarget, aLayer, aLayer->GetEffectiveVisibleRegion(),
+                                    &needsClipToVisibleRegion);
+  } else {
+    groupTarget = aTarget;
   }
 
   /* Only paint ourself, or our children - This optimization relies on this! */
@@ -1540,9 +1632,9 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
                    (void*)aLayer, data->IsHidden()));
 #endif
     if (aLayer->AsThebesLayer()) {
-      data->PaintThebes(mTarget, aCallback, aCallbackData, aReadback);
+      data->PaintThebes(groupTarget, aCallback, aCallbackData, aReadback);
     } else {
-      data->Paint(mTarget);
+      data->Paint(groupTarget);
     }
   } else {
     ReadbackProcessor readback;
@@ -1552,18 +1644,30 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
     }
 
     for (; child; child = child->GetNextSibling()) {
-      PaintLayer(child, aCallback, aCallbackData, &readback);
+      PaintLayer(groupTarget, child, aCallback, aCallbackData, &readback);
       if (mTransactionIncomplete)
         break;
     }
   }
 
   if (needsGroup) {
-    mTarget->PopGroupToSource();
-    if (needsClipToVisibleRegion) {
-      gfxUtils::ClipToRegion(mTarget, aLayer->GetEffectiveVisibleRegion());
+    PopGroupToSourceWithCachedSurface(aTarget, groupTarget);
+    // If we're doing our own double-buffering, we need to avoid drawing
+    // the results of an incomplete transaction to the destination surface ---
+    // that could cause flicker. Double-buffering is implemented using a
+    // temporary surface for one or more container layers, so we need to stop
+    // those temporary surfaces from being composited to aTarget.
+    // ApplyDoubleBuffering guarantees that this container layer can't
+    // intersect any other leaf layers, so if the transaction is not yet marked
+    // incomplete, the contents of this container layer are the final contents
+    // for the window.
+    if (!mTransactionIncomplete) {
+      if (needsClipToVisibleRegion) {
+        gfxUtils::ClipToRegion(aTarget, aLayer->GetEffectiveVisibleRegion());
+      }
+      AutoSetOperator setOperator(aTarget, container->GetOperator());
+      aTarget->Paint(aLayer->GetEffectiveOpacity());
     }
-    mTarget->Paint(aLayer->GetEffectiveOpacity());
   }
 
   if (pushedTargetOpaqueRect) {
@@ -1571,9 +1675,9 @@ BasicLayerManager::PaintLayer(Layer* aLayer,
   }
 
   if (needsSaveRestore) {
-    mTarget->Restore();
+    aTarget->Restore();
   } else {
-    mTarget->SetMatrix(savedMatrix);
+    aTarget->SetMatrix(savedMatrix);
   }
 }
 
@@ -2334,7 +2438,7 @@ protected:
 };
 
 
-class BasicShadowThebesLayer : public ShadowThebesLayer, BasicImplData {
+class BasicShadowThebesLayer : public ShadowThebesLayer, public BasicImplData {
 public:
   BasicShadowThebesLayer(BasicShadowLayerManager* aLayerManager)
     : ShadowThebesLayer(aLayerManager, static_cast<BasicImplData*>(this))
@@ -2502,13 +2606,10 @@ BasicShadowThebesLayer::PaintThebes(gfxContext* aContext,
     return;
   }
 
-  gfxContext* target = BasicManager()->GetTarget();
-  NS_ASSERTION(target, "We shouldn't be called if there's no target");
-
-  mFrontBuffer.DrawTo(this, target, GetEffectiveOpacity());
+  mFrontBuffer.DrawTo(this, aContext, GetEffectiveOpacity());
 }
 
-class BasicShadowContainerLayer : public ShadowContainerLayer, BasicImplData {
+class BasicShadowContainerLayer : public ShadowContainerLayer, public BasicImplData {
   template<class Container>
   friend void ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer);
   template<class Container>
@@ -2554,7 +2655,7 @@ public:
   }
 };
 
-class BasicShadowImageLayer : public ShadowImageLayer, BasicImplData {
+class BasicShadowImageLayer : public ShadowImageLayer, public BasicImplData {
 public:
   BasicShadowImageLayer(BasicShadowLayerManager* aLayerManager) :
     ShadowImageLayer(aLayerManager, static_cast<BasicImplData*>(this))
@@ -2627,6 +2728,7 @@ BasicShadowImageLayer::Paint(gfxContext* aContext)
   // tiling, we don't want to draw into that area, so just draw within
   // the image bounds.
   const nsIntRect* tileSrcRect = GetTileSourceRect();
+  AutoSetOperator setOperator(aContext, GetOperator());
   BasicImageLayer::PaintContext(pat,
                                 tileSrcRect ? GetEffectiveVisibleRegion() : nsIntRegion(nsIntRect(0, 0, mSize.width, mSize.height)),
                                 tileSrcRect,
@@ -2634,7 +2736,7 @@ BasicShadowImageLayer::Paint(gfxContext* aContext)
 }
 
 class BasicShadowColorLayer : public ShadowColorLayer,
-                              BasicImplData
+                              public BasicImplData
 {
 public:
   BasicShadowColorLayer(BasicShadowLayerManager* aLayerManager) :
@@ -2649,12 +2751,13 @@ public:
 
   virtual void Paint(gfxContext* aContext)
   {
+    AutoSetOperator setOperator(aContext, GetOperator());
     BasicColorLayer::PaintColorTo(mColor, GetEffectiveOpacity(), aContext);
   }
 };
 
 class BasicShadowCanvasLayer : public ShadowCanvasLayer,
-                               BasicImplData
+                               public BasicImplData
 {
 public:
   BasicShadowCanvasLayer(BasicShadowLayerManager* aLayerManager) :
diff --git a/gfx/layers/basic/BasicLayers.h b/gfx/layers/basic/BasicLayers.h
index 41c684ffa88..2704b9c30bf 100644
--- a/gfx/layers/basic/BasicLayers.h
+++ b/gfx/layers/basic/BasicLayers.h
@@ -180,6 +180,13 @@ public:
 
   void SetTransactionIncomplete() { mTransactionIncomplete = true; }
 
+  already_AddRefed<gfxContext> PushGroupForLayer(gfxContext* aContext, Layer* aLayer,
+                                                 const nsIntRegion& aRegion,
+                                                 PRBool* aNeedsClipToVisibleRegion);
+  already_AddRefed<gfxContext> PushGroupWithCachedSurface(gfxContext *aTarget,
+                                                          gfxASurface::gfxContentType aContent);
+  void PopGroupToSourceWithCachedSurface(gfxContext *aTarget, gfxContext *aPushed);
+
   virtual PRBool IsCompositingCheap() { return PR_FALSE; }
   virtual bool HasShadowManagerInternal() const { return false; }
   bool HasShadowManager() const { return HasShadowManagerInternal(); }
@@ -193,7 +200,8 @@ protected:
 #endif
 
   // Paints aLayer to mTarget.
-  void PaintLayer(Layer* aLayer,
+  void PaintLayer(gfxContext* aTarget,
+                  Layer* aLayer,
                   DrawThebesLayerCallback aCallback,
                   void* aCallbackData,
                   ReadbackProcessor* aReadback);
@@ -201,12 +209,6 @@ protected:
   // Clear the contents of a layer
   void ClearLayer(Layer* aLayer);
 
-  already_AddRefed<gfxContext> PushGroupWithCachedSurface(gfxContext *aTarget,
-                                                          gfxASurface::gfxContentType aContent,
-                                                          gfxPoint *aSavedOffset);
-  void PopGroupWithCachedSurface(gfxContext *aTarget,
-                                 const gfxPoint& aSavedOffset);
-
   bool EndTransactionInternal(DrawThebesLayerCallback aCallback,
                               void* aCallbackData);
 
@@ -227,6 +229,7 @@ protected:
 
   BufferMode   mDoubleBuffering;
   PRPackedBool mUsingDefaultTarget;
+  PRPackedBool mCachedSurfaceInUse;
   bool         mTransactionIncomplete;
 };
  
diff --git a/gfx/layers/d3d10/LayerManagerD3D10Effect.h b/gfx/layers/d3d10/LayerManagerD3D10Effect.h
index 6fbfc923562..eb4ad7ff7fa 100644
--- a/gfx/layers/d3d10/LayerManagerD3D10Effect.h
+++ b/gfx/layers/d3d10/LayerManagerD3D10Effect.h
@@ -1,7222 +1,7222 @@
-#if 0
-//
-// FX Version: fx_4_0
-// Child effect (requires effect pool): false
-//
-// 3 local buffer(s)
-//
-cbuffer PerLayer
-{
-    float4  vTextureCoords;             // Offset:    0, size:   16
-    float4  vLayerQuad;                 // Offset:   16, size:   16
-    float   fLayerOpacity;              // Offset:   32, size:    4
-    float4x4 mLayerTransform;           // Offset:   48, size:   64
-}
-
-cbuffer PerOccasionalLayer
-{
-    float4  vRenderTargetOffset;        // Offset:    0, size:   16
-    float4  fLayerColor;                // Offset:   16, size:   16
-}
-
-cbuffer PerLayerManager
-{
-    float4x4 mProjection;               // Offset:    0, size:   64
-}
-
-//
-// 11 local object(s)
-//
-BlendState Premul
-{
-    AlphaToCoverageEnable = bool(FALSE /* 0 */);
-    BlendEnable[0] = bool(TRUE /* 1 */);
-    SrcBlend[0] = uint(ONE /* 2 */);
-    DestBlend[0] = uint(INV_SRC_ALPHA /* 6 */);
-    BlendOp[0] = uint(ADD /* 1 */);
-    SrcBlendAlpha[0] = uint(ONE /* 2 */);
-    DestBlendAlpha[0] = uint(INV_SRC_ALPHA /* 6 */);
-    BlendOpAlpha[0] = uint(ADD /* 1 */);
-    RenderTargetWriteMask[0] = byte(0x0f);
-};
-BlendState NonPremul
-{
-    AlphaToCoverageEnable = bool(FALSE /* 0 */);
-    BlendEnable[0] = bool(TRUE /* 1 */);
-    SrcBlend[0] = uint(SRC_ALPHA /* 5 */);
-    DestBlend[0] = uint(INV_SRC_ALPHA /* 6 */);
-    BlendOp[0] = uint(ADD /* 1 */);
-    SrcBlendAlpha[0] = uint(ONE /* 2 */);
-    DestBlendAlpha[0] = uint(INV_SRC_ALPHA /* 6 */);
-    BlendOpAlpha[0] = uint(ADD /* 1 */);
-    RenderTargetWriteMask[0] = byte(0x0f);
-};
-BlendState ComponentAlphaBlend
-{
-    AlphaToCoverageEnable = bool(FALSE /* 0 */);
-    BlendEnable[0] = bool(TRUE /* 1 */);
-    SrcBlend[0] = uint(ONE /* 2 */);
-    DestBlend[0] = uint(INV_SRC1_COLOR /* 17 */);
-    BlendOp[0] = uint(ADD /* 1 */);
-    SrcBlendAlpha[0] = uint(ZERO /* 1 */);
-    DestBlendAlpha[0] = uint(ONE /* 2 */);
-    BlendOpAlpha[0] = uint(ADD /* 1 */);
-    RenderTargetWriteMask[0] = byte(0x0f);
-};
-RasterizerState LayerRast
-{
-    ScissorEnable = bool(TRUE /* 1 */);
-    CullMode = uint(NONE /* 1 */);
-};
-Texture2D tRGB;
-Texture2D tY;
-Texture2D tCb;
-Texture2D tCr;
-Texture2D tRGBWhite;
-SamplerState LayerTextureSamplerLinear
-{
-    Filter   = uint(MIN_MAG_MIP_LINEAR /* 21 */);
-    AddressU = uint(CLAMP /* 3 */);
-    AddressV = uint(CLAMP /* 3 */);
-};
-SamplerState LayerTextureSamplerPoint
-{
-    Filter   = uint(MIN_MAG_MIP_POINT /* 0 */);
-    AddressU = uint(CLAMP /* 3 */);
-    AddressV = uint(CLAMP /* 3 */);
-};
-
-//
-// 9 technique(s)
-//
-technique10 RenderRGBLayerPremul
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0.xyz, r0, c0.x
-                mov r0.w, c0.x
-                mov oC0, r0
-            
-            // approximately 4 instruction slots used (1 texture, 3 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyz, r0.xyzx, cb0[2].xxxx
-            mov o0.w, cb0[2].x
-            ret 
-            // Approximately 4 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderRGBLayerPremulPoint
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0.xyz, r0, c0.x
-                mov r0.w, c0.x
-                mov oC0, r0
-            
-            // approximately 4 instruction slots used (1 texture, 3 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyz, r0.xyzx, cb0[2].xxxx
-            mov o0.w, cb0[2].x
-            ret 
-            // Approximately 4 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderRGBALayerPremul
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0, r0, c0.x
-                mov oC0, r0
-            
-            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 3 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderRGBALayerNonPremul
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = NonPremul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0, r0, c0.x
-                mov oC0, r0
-            
-            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 3 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderRGBALayerPremulPoint
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0, r0, c0.x
-                mov oC0, r0
-            
-            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 3 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderRGBALayerNonPremulPoint
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = NonPremul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                dcl t0.xy
-                dcl_2d s0
-                texld r0, t0, s0
-                mul r0, r0, c0.x
-                mov oC0, r0
-            
-            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 1
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 3 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderYCbCrLayer
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
-            // tY                                texture  float4          2d    0        1
-            // tCb                               texture  float4          2d    1        1
-            // tCr                               texture  float4          2d    2        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            // s1             s0              t1               
-            // s2             s0              t2               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                def c1, -0.5, -0.0625, 1.59599996, 0.813000023
-                def c2, 1.16400003, 2.01799989, 0.391000003, 1
-                dcl t0.xy
-                dcl_2d s0
-                dcl_2d s1
-                dcl_2d s2
-                texld r0, t0, s0
-                texld r1, t0, s2
-                add r0.y, r1.x, c1.x
-                mul r0.yz, r0.y, c1.xzww
-                add r0.x, r0.x, c1.y
-                mad r0.z, r0.x, c2.x, -r0.z
-                mad r1.x, r0.x, c2.x, r0.y
-                texld r2, t0, s1
-                add r0.y, r2.x, c1.x
-                mad r1.y, r0.y, -c2.z, r0.z
-                mul r0.y, r0.y, c2.y
-                mad r1.z, r0.x, c2.x, r0.y
-                mov r1.w, c2.w
-                mul r0, r1, c0.x
-                mov oC0, r0
-            
-            // approximately 15 instruction slots used (3 texture, 12 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_resource_texture2d (float,float,float,float) t1
-            dcl_resource_texture2d (float,float,float,float) t2
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_temps 3
-            sample r0.xyzw, v1.xyxx, t2.xyzw, s0
-            add r0.x, r0.x, l(-0.500000)
-            mul r0.xy, r0.xxxx, l(1.596000, 0.813000, 0.000000, 0.000000)
-            sample r1.xyzw, v1.xyxx, t0.xyzw, s0
-            add r0.z, r1.x, l(-0.062500)
-            mad r0.y, r0.z, l(1.164000), -r0.y
-            mad r1.x, r0.z, l(1.164000), r0.x
-            sample r2.xyzw, v1.xyxx, t1.xyzw, s0
-            add r0.x, r2.x, l(-0.500000)
-            mad r1.y, -r0.x, l(0.391000), r0.y
-            mul r0.x, r0.x, l(2.018000)
-            mad r1.z, r0.z, l(1.164000), r0.x
-            mov r1.w, l(1.000000)
-            mul o0.xyzw, r1.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 15 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderComponentAlphaLayer
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = ComponentAlphaBlend;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
-            //   float fLayerOpacity;               // Offset:   32 Size:     4
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
-            // tRGB                              texture  float4          2d    0        1
-            // tRGBWhite                         texture  float4          2d    1        1
-            // PerLayer                          cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            // SV_Target                1   xyzw        1   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Sampler/Resource to DX9 shader sampler mappings:
-            //
-            // Target Sampler Source Sampler  Source Resource
-            // -------------- --------------- ----------------
-            // s0             s0              t0               
-            // s1             s0              t1               
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                def c1, 1, 0, 0, 0
-                dcl t0.xy
-                dcl_2d s0
-                dcl_2d s1
-                texld r0, t0, s1
-                texld r1, t0, s0
-                mul r2, r1, c0.x
-                mov oC0, r2
-                add r0, -r0, r1
-                add r0, r0, c1.x
-                mul r0, r0, c0.x
-                mov oC1, r0
-            
-            // approximately 8 instruction slots used (2 texture, 6 arithmetic)
-            ps_4_0
-            dcl_constantbuffer cb0[3], immediateIndexed
-            dcl_sampler s0, mode_default
-            dcl_resource_texture2d (float,float,float,float) t0
-            dcl_resource_texture2d (float,float,float,float) t1
-            dcl_input_ps linear v1.xy
-            dcl_output o0.xyzw
-            dcl_output o1.xyzw
-            dcl_temps 2
-            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
-            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
-            sample r1.xyzw, v1.xyxx, t1.xyzw, s0
-            add r0.xyzw, r0.xyzw, -r1.xyzw
-            add r0.xyzw, r0.xyzw, l(1.000000, 1.000000, 1.000000, 1.000000)
-            mul o1.xyzw, r0.xyzw, cb0[2].xxxx
-            ret 
-            // Approximately 7 instruction slots used
-                    
-        };
-    }
-
-}
-
-technique10 RenderSolidColorLayer
-{
-    pass P0
-    {
-        RasterizerState = LayerRast;
-        AB_BlendFactor = float4(0, 0, 0, 0);
-        AB_SampleMask = uint(0xffffffff);
-        BlendState = Premul;
-        VertexShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerLayer
-            // {
-            //
-            //   float4 vTextureCoords;             // Offset:    0 Size:    16
-            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
-            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
-            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
-            //
-            // }
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
-            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
-            //
-            // }
-            //
-            // cbuffer PerLayerManager
-            // {
-            //
-            //   float4x4 mProjection;              // Offset:    0 Size:    64
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerLayer                          cbuffer      NA          NA    0        1
-            // PerOccasionalLayer                cbuffer      NA          NA    1        1
-            // PerLayerManager                   cbuffer      NA          NA    2        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // POSITION                 0   xy          0     NONE  float   xy  
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float   xyzw
-            // TEXCOORD                 0   xy          1     NONE  float   xy  
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
-            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
-            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
-            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
-            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Runtime generated constant mappings:
-            //
-            // Target Reg                               Constant Description
-            // ---------- --------------------------------------------------
-            // c0                              Vertex Shader position offset
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                vs_2_x
-                dcl_texcoord v0
-                mad oT0.xy, v0, c1.zwzw, c1
-                mad r0.x, v0.y, c2.w, c2.y
-                mul r0, r0.x, c4
-                mad r1.x, v0.x, c2.z, c2.x
-                mad r0, c3, r1.x, r0
-                add r0, r0, c5
-                add r0, r0, -c6
-                mul r1, r0.y, c8
-                mad r1, c7, r0.x, r1
-                mad r1, c9, r0.z, r1
-                mad r0, c10, r0.w, r1
-                mad oPos.xy, r0.w, c0, r0
-                mov oPos.zw, r0
-            
-            // approximately 13 instruction slots used
-            vs_4_0
-            dcl_constantbuffer cb0[7], immediateIndexed
-            dcl_constantbuffer cb1[1], immediateIndexed
-            dcl_constantbuffer cb2[4], immediateIndexed
-            dcl_input v0.xy
-            dcl_output_siv o0.xyzw, position
-            dcl_output o1.xy
-            dcl_temps 2
-            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
-            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
-            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
-            add r0.xyzw, r0.xyzw, cb0[6].xyzw
-            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
-            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
-            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
-            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
-            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
-            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
-            ret 
-            // Approximately 11 instruction slots used
-                    
-        };
-        GeometryShader = NULL;
-        PixelShader = asm {
-            //
-            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
-            //
-            //
-            // Buffer Definitions: 
-            //
-            // cbuffer PerOccasionalLayer
-            // {
-            //
-            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16 [unused]
-            //   float4 fLayerColor;                // Offset:   16 Size:    16
-            //
-            // }
-            //
-            //
-            // Resource Bindings:
-            //
-            // Name                                 Type  Format         Dim Slot Elements
-            // ------------------------------ ---------- ------- ----------- ---- --------
-            // PerOccasionalLayer                cbuffer      NA          NA    0        1
-            //
-            //
-            //
-            // Input signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Position              0   xyzw        0      POS  float       
-            // TEXCOORD                 0   xy          1     NONE  float       
-            //
-            //
-            // Output signature:
-            //
-            // Name                 Index   Mask Register SysValue Format   Used
-            // -------------------- ----- ------ -------- -------- ------ ------
-            // SV_Target                0   xyzw        0   TARGET  float   xyzw
-            //
-            //
-            // Constant buffer to DX9 shader constant mappings:
-            //
-            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
-            // ---------- ------- --------- --------- ----------------------
-            // c0         cb0             1         1  ( FLT, FLT, FLT, FLT)
-            //
-            //
-            // Level9 shader bytecode:
-            //
-                ps_2_x
-                mov oC0, c0
-            
-            // approximately 1 instruction slot used
-            ps_4_0
-            dcl_constantbuffer cb0[2], immediateIndexed
-            dcl_output o0.xyzw
-            mov o0.xyzw, cb0[1].xyzw
-            ret 
-            // Approximately 2 instruction slots used
-                    
-        };
-    }
-
-}
-
-#endif
-
-const BYTE g_main[] =
-{
-     68,  88,  66,  67, 105, 120, 
-    157,  39, 125,  94,  29,  78, 
-     15, 169,  65, 191,  70, 115, 
-    164,  88,   1,   0,   0,   0, 
-    231, 121,   0,   0,   1,   0, 
-      0,   0,  36,   0,   0,   0, 
-     70,  88,  49,  48, 187, 121, 
-      0,   0,   1,  16, 255, 254, 
-      3,   0,   0,   0,   7,   0, 
-      0,   0,  11,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      9,   0,   0,   0, 119, 112, 
-      0,   0,   0,   0,   0,   0, 
-      5,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  18,   0, 
-      0,   0,  18,   0,   0,   0, 
-      0,   0,   0,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0, 102, 108, 111,  97, 116, 
-     52,   0,  13,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,  10,  33,   0,   0, 
-    118,  84, 101, 120, 116, 117, 
-    114, 101,  67, 111, 111, 114, 
-    100, 115,   0, 118,  76,  97, 
-    121, 101, 114,  81, 117,  97, 
-    100,   0, 102, 108, 111,  97, 
-    116,   0,  74,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   4,   0,   0,   0, 
-     16,   0,   0,   0,   4,   0, 
-      0,   0,   9,   9,   0,   0, 
-    102,  76,  97, 121, 101, 114, 
-     79, 112,  97,  99, 105, 116, 
-    121,   0, 102, 108, 111,  97, 
-    116,  52, 120,  52,   0, 122, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,  64, 
-      0,   0,   0,  64,   0,   0, 
-      0,  64,   0,   0,   0,  11, 
-    100,   0,   0, 109,  76,  97, 
-    121, 101, 114,  84, 114,  97, 
-    110, 115, 102, 111, 114, 109, 
-      0,  80, 101, 114,  79,  99, 
-     99,  97, 115, 105, 111, 110, 
-     97, 108,  76,  97, 121, 101, 
-    114,   0, 118,  82, 101, 110, 
-    100, 101, 114,  84,  97, 114, 
-    103, 101, 116,  79, 102, 102, 
-    115, 101, 116,   0, 102,  76, 
-     97, 121, 101, 114,  67, 111, 
-    108, 111, 114,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-     77,  97, 110,  97, 103, 101, 
-    114,   0, 109,  80, 114, 111, 
-    106, 101,  99, 116, 105, 111, 
-    110,   0,  66, 108, 101, 110, 
-    100,  83, 116,  97, 116, 101, 
-      0, 254,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,  80, 
-    114, 101, 109, 117, 108,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   6,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   6,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0,  15,   0,   0,   0, 
-     78, 111, 110,  80, 114, 101, 
-    109, 117, 108,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      5,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      6,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      6,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-     15,   0,   0,   0,  67, 111, 
-    109, 112, 111, 110, 101, 110, 
-    116,  65, 108, 112, 104,  97, 
-     66, 108, 101, 110, 100,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,  17,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0,  15,   0,   0,   0, 
-     82,  97, 115, 116, 101, 114, 
-    105, 122, 101, 114,  83, 116, 
-     97, 116, 101,   0, 142,   2, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   4,   0, 
-      0,   0,  76,  97, 121, 101, 
-    114,  82,  97, 115, 116,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-     84, 101, 120, 116, 117, 114, 
-    101,  50,  68,   0, 220,   2, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  12,   0, 
-      0,   0, 116,  82,  71,  66, 
-      0, 116,  89,   0, 116,  67, 
-     98,   0, 116,  67, 114,   0, 
-    116,  82,  71,  66,  87, 104, 
-    105, 116, 101,   0,  83,  97, 
-    109, 112, 108, 101, 114,  83, 
-    116,  97, 116, 101,   0,  28, 
-      3,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  21, 
-      0,   0,   0,  76,  97, 121, 
-    101, 114,  84, 101, 120, 116, 
-    117, 114, 101,  83,  97, 109, 
-    112, 108, 101, 114,  76, 105, 
-    110, 101,  97, 114,   0,   1, 
-      0,   0,   0,   2,   0,   0, 
-      0,  21,   0,   0,   0,   1, 
-      0,   0,   0,   2,   0,   0, 
-      0,   3,   0,   0,   0,   1, 
-      0,   0,   0,   2,   0,   0, 
-      0,   3,   0,   0,   0,  76, 
-     97, 121, 101, 114,  84, 101, 
-    120, 116, 117, 114, 101,  83, 
-     97, 109, 112, 108, 101, 114, 
-     80, 111, 105, 110, 116,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   3,   0,   0,   0, 
-     82, 101, 110, 100, 101, 114, 
-     82,  71,  66,  76,  97, 121, 
-    101, 114,  80, 114, 101, 109, 
-    117, 108,   0,  80,  48,   0, 
-      4,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0, 255, 255, 255, 255, 
-     24,   7,   0,   0,  68,  88, 
-     66,  67, 254, 249,  65, 252, 
-     64,  46, 192, 119,  73, 197, 
-    161, 234,  24,   1, 194, 131, 
-      1,   0,   0,   0,  24,   7, 
-      0,   0,   6,   0,   0,   0, 
-     56,   0,   0,   0, 164,   1, 
-      0,   0, 148,   3,   0,   0, 
-     16,   4,   0,   0, 140,   6, 
-      0,   0, 192,   6,   0,   0, 
-     65, 111, 110,  57, 100,   1, 
-      0,   0, 100,   1,   0,   0, 
-      0,   2, 254, 255,   0,   1, 
-      0,   0, 100,   0,   0,   0, 
-      5,   0,  36,   0,   0,   0, 
-     96,   0,   0,   0,  96,   0, 
-      0,   0,  36,   0,   1,   0, 
-     96,   0,   0,   0,   0,   0, 
-      2,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      2,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   6,   0, 
-      1,   0,   5,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   6,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      4,   0,   7,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   2, 254, 255,  31,   0, 
-      0,   2,   5,   0,   0, 128, 
-      0,   0,  15, 144,   4,   0, 
-      0,   4,   0,   0,   3, 224, 
-      0,   0, 228, 144,   1,   0, 
-    238, 160,   1,   0, 228, 160, 
-      4,   0,   0,   4,   0,   0, 
-      1, 128,   0,   0,  85, 144, 
-      2,   0, 255, 160,   2,   0, 
-     85, 160,   5,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-      0, 128,   4,   0, 228, 160, 
-      4,   0,   0,   4,   1,   0, 
-      1, 128,   0,   0,   0, 144, 
-      2,   0, 170, 160,   2,   0, 
-      0, 160,   4,   0,   0,   4, 
-      0,   0,  15, 128,   3,   0, 
-    228, 160,   1,   0,   0, 128, 
-      0,   0, 228, 128,   2,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 128,   5,   0, 
-    228, 160,   2,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   6,   0, 228, 161, 
-      5,   0,   0,   3,   1,   0, 
-     15, 128,   0,   0,  85, 128, 
-      8,   0, 228, 160,   4,   0, 
-      0,   4,   1,   0,  15, 128, 
-      7,   0, 228, 160,   0,   0, 
-      0, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   1,   0, 
-     15, 128,   9,   0, 228, 160, 
-      0,   0, 170, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      0,   0,  15, 128,  10,   0, 
-    228, 160,   0,   0, 255, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   0,   0,   3, 192, 
-      0,   0, 255, 128,   0,   0, 
-    228, 160,   0,   0, 228, 128, 
-      1,   0,   0,   2,   0,   0, 
-     12, 192,   0,   0, 228, 128, 
-    255, 255,   0,   0,  83,  72, 
-     68,  82, 232,   1,   0,   0, 
-     64,   0,   1,   0, 122,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   7,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      2,   0,   0,   0,   4,   0, 
-      0,   0,  95,   0,   0,   3, 
-     50,  16,  16,   0,   0,   0, 
-      0,   0, 103,   0,   0,   4, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-    101,   0,   0,   3,  50,  32, 
-     16,   0,   1,   0,   0,   0, 
-    104,   0,   0,   2,   2,   0, 
-      0,   0,  50,   0,   0,  11, 
-     50,   0,  16,   0,   0,   0, 
-      0,   0,  70,  16,  16,   0, 
-      0,   0,   0,   0, 230, 138, 
-     32,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,  70, 128, 
-     32,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,  56,   0, 
-      0,   8, 242,   0,  16,   0, 
-      1,   0,   0,   0,  86,   5, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   4,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      6,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   8, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   6,   0,   0,   0, 
-      0,   0,   0,   9, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32, 128, 
-     65,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     56,   0,   0,   8, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     86,   5,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,   6,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-    166,  10,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  10, 242,  32,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      3,   0,   0,   0, 246,  15, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,  50,   0,   0,  11, 
-     50,  32,  16,   0,   1,   0, 
-      0,   0,  70,  16,  16,   0, 
-      0,   0,   0,   0, 230, 138, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  70, 128, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  62,   0, 
-      0,   1,  83,  84,  65,  84, 
-    116,   0,   0,   0,  11,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     82,  68,  69,  70, 116,   2, 
-      0,   0,   3,   0,   0,   0, 
-    168,   0,   0,   0,   3,   0, 
-      0,   0,  28,   0,   0,   0, 
-      0,   4, 254, 255,   0,   1, 
-      0,   0,  64,   2,   0,   0, 
-    124,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 133,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 152,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     80, 101, 114,  76,  97, 121, 
-    101, 114,   0,  80, 101, 114, 
-     79,  99,  99,  97, 115, 105, 
-    111, 110,  97, 108,  76,  97, 
-    121, 101, 114,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-     77,  97, 110,  97, 103, 101, 
-    114,   0, 124,   0,   0,   0, 
-      4,   0,   0,   0, 240,   0, 
-      0,   0, 112,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 133,   0,   0,   0, 
-      2,   0,   0,   0, 188,   1, 
-      0,   0,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 152,   0,   0,   0, 
-      1,   0,   0,   0,  28,   2, 
-      0,   0,  64,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  80,   1,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-     96,   1,   0,   0,   0,   0, 
-      0,   0, 112,   1,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-     96,   1,   0,   0,   0,   0, 
-      0,   0, 123,   1,   0,   0, 
-     32,   0,   0,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-    140,   1,   0,   0,   0,   0, 
-      0,   0, 156,   1,   0,   0, 
-     48,   0,   0,   0,  64,   0, 
-      0,   0,   2,   0,   0,   0, 
-    172,   1,   0,   0,   0,   0, 
-      0,   0, 118,  84, 101, 120, 
-    116, 117, 114, 101,  67, 111, 
-    111, 114, 100, 115,   0, 171, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 118,  76, 
-     97, 121, 101, 114,  81, 117, 
-     97, 100,   0, 102,  76,  97, 
-    121, 101, 114,  79, 112,  97, 
-     99, 105, 116, 121,   0, 171, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    109,  76,  97, 121, 101, 114, 
-     84, 114,  97, 110, 115, 102, 
-    111, 114, 109,   0,   3,   0, 
-      3,   0,   4,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 236,   1,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,  16,   2,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0, 118,  82, 101, 110, 
-    100, 101, 114,  84,  97, 114, 
-    103, 101, 116,  79, 102, 102, 
-    115, 101, 116,   0,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 102,  76,  97, 121, 
-    101, 114,  67, 111, 108, 111, 
-    114,   0,  52,   2,   0,   0, 
-      0,   0,   0,   0,  64,   0, 
-      0,   0,   2,   0,   0,   0, 
-    172,   1,   0,   0,   0,   0, 
-      0,   0, 109,  80, 114, 111, 
-    106, 101,  99, 116, 105, 111, 
-    110,   0,  77, 105,  99, 114, 
-    111, 115, 111, 102, 116,  32, 
-     40,  82,  41,  32,  72,  76, 
-     83,  76,  32,  83, 104,  97, 
-    100, 101, 114,  32,  67, 111, 
-    109, 112, 105, 108, 101, 114, 
-     32,  57,  46,  50,  55,  46, 
-     57,  53,  50,  46,  51,  48, 
-     50,  50,   0, 171, 171, 171, 
-     73,  83,  71,  78,  44,   0, 
-      0,   0,   1,   0,   0,   0, 
-      8,   0,   0,   0,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   3,   0,   0,  80,  79, 
-     83,  73,  84,  73,  79,  78, 
-      0, 171, 171, 171,  79,  83, 
-     71,  78,  80,   0,   0,   0, 
-      2,   0,   0,   0,   8,   0, 
-      0,   0,  56,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,  15,   0, 
-      0,   0,  68,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   3,  12, 
-      0,   0,  83,  86,  95,  80, 
-    111, 115, 105, 116, 105, 111, 
-    110,   0,  84,  69,  88,  67, 
-     79,  79,  82,  68,   0, 171, 
-    171, 171,   8,   4,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,  84,   4, 
-      0,   0,  68,  88,  66,  67, 
-    170, 213,  87, 132, 192, 216, 
-     64,  34, 189,  70,  85, 214, 
-    198,   9, 122, 139,   1,   0, 
-      0,   0,  84,   4,   0,   0, 
-      6,   0,   0,   0,  56,   0, 
-      0,   0, 204,   0,   0,   0, 
-    136,   1,   0,   0,   4,   2, 
-      0,   0, 200,   3,   0,   0, 
-     32,   4,   0,   0,  65, 111, 
-    110,  57, 140,   0,   0,   0, 
-    140,   0,   0,   0,   0,   2, 
-    255, 255,  88,   0,   0,   0, 
-     52,   0,   0,   0,   1,   0, 
-     40,   0,   0,   0,  52,   0, 
-      0,   0,  52,   0,   1,   0, 
-     36,   0,   0,   0,  52,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   2, 
-    255, 255,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-      5,   0,   0,   3,   0,   0, 
-      7, 128,   0,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   0,   8, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0,  83,  72,  68,  82, 
-    180,   0,   0,   0,  64,   0, 
-      0,   0,  45,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,  90,   0, 
-      0,   3,   0,  96,  16,   0, 
-      0,   0,   0,   0,  88,  24, 
-      0,   4,   0, 112,  16,   0, 
-      0,   0,   0,   0,  85,  85, 
-      0,   0,  98,  16,   0,   3, 
-     50,  16,  16,   0,   1,   0, 
-      0,   0, 101,   0,   0,   3, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0, 104,   0,   0,   2, 
-      1,   0,   0,   0,  69,   0, 
-      0,   9, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  16, 
-     16,   0,   1,   0,   0,   0, 
-     70, 126,  16,   0,   0,   0, 
-      0,   0,   0,  96,  16,   0, 
-      0,   0,   0,   0,  56,   0, 
-      0,   8, 114,  32,  16,   0, 
-      0,   0,   0,   0,  70,   2, 
-     16,   0,   0,   0,   0,   0, 
-      6, 128,  32,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-     54,   0,   0,   6, 130,  32, 
-     16,   0,   0,   0,   0,   0, 
-     10, 128,  32,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-     62,   0,   0,   1,  83,  84, 
-     65,  84, 116,   0,   0,   0, 
-      4,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  82,  68,  69,  70, 
-    188,   1,   0,   0,   1,   0, 
-      0,   0, 164,   0,   0,   0, 
-      3,   0,   0,   0,  28,   0, 
-      0,   0,   0,   4, 255, 255, 
-      0,   1,   0,   0, 136,   1, 
-      0,   0, 124,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 150,   0, 
-      0,   0,   2,   0,   0,   0, 
-      5,   0,   0,   0,   4,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  12,   0,   0,   0, 
-    155,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  76,  97, 121, 101, 
-    114,  84, 101, 120, 116, 117, 
-    114, 101,  83,  97, 109, 112, 
-    108, 101, 114,  76, 105, 110, 
-    101,  97, 114,   0, 116,  82, 
-     71,  66,   0,  80, 101, 114, 
-     76,  97, 121, 101, 114,   0, 
-    155,   0,   0,   0,   4,   0, 
-      0,   0, 188,   0,   0,   0, 
-    112,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     28,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,  44,   1, 
-      0,   0,   0,   0,   0,   0, 
-     60,   1,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,  44,   1, 
-      0,   0,   0,   0,   0,   0, 
-     71,   1,   0,   0,  32,   0, 
-      0,   0,   4,   0,   0,   0, 
-      2,   0,   0,   0,  88,   1, 
-      0,   0,   0,   0,   0,   0, 
-    104,   1,   0,   0,  48,   0, 
-      0,   0,  64,   0,   0,   0, 
-      0,   0,   0,   0, 120,   1, 
-      0,   0,   0,   0,   0,   0, 
-    118,  84, 101, 120, 116, 117, 
-    114, 101,  67, 111, 111, 114, 
-    100, 115,   0, 171,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 118,  76,  97, 121, 
-    101, 114,  81, 117,  97, 100, 
-      0, 102,  76,  97, 121, 101, 
-    114,  79, 112,  97,  99, 105, 
-    116, 121,   0, 171, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 109,  76, 
-     97, 121, 101, 114,  84, 114, 
-     97, 110, 115, 102, 111, 114, 
-    109,   0,   3,   0,   3,   0, 
-      4,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  57, 
-     46,  50,  55,  46,  57,  53, 
-     50,  46,  51,  48,  50,  50, 
-      0, 171, 171, 171,  73,  83, 
-     71,  78,  80,   0,   0,   0, 
-      2,   0,   0,   0,   8,   0, 
-      0,   0,  56,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,  15,   0, 
-      0,   0,  68,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   3,   3, 
-      0,   0,  83,  86,  95,  80, 
-    111, 115, 105, 116, 105, 111, 
-    110,   0,  84,  69,  88,  67, 
-     79,  79,  82,  68,   0, 171, 
-    171, 171,  79,  83,  71,  78, 
-     44,   0,   0,   0,   1,   0, 
-      0,   0,   8,   0,   0,   0, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     83,  86,  95,  84,  97, 114, 
-    103, 101, 116,   0, 171, 171, 
-     56,  11,   0,   0,   0,   0, 
-      0,   0,  82, 101, 110, 100, 
-    101, 114,  82,  71,  66,  76, 
-     97, 121, 101, 114,  80, 114, 
-    101, 109, 117, 108,  80, 111, 
-    105, 110, 116,   0,   4,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-    255, 255, 255, 255,  24,   7, 
-      0,   0,  68,  88,  66,  67, 
-    254, 249,  65, 252,  64,  46, 
-    192, 119,  73, 197, 161, 234, 
-     24,   1, 194, 131,   1,   0, 
-      0,   0,  24,   7,   0,   0, 
-      6,   0,   0,   0,  56,   0, 
-      0,   0, 164,   1,   0,   0, 
-    148,   3,   0,   0,  16,   4, 
-      0,   0, 140,   6,   0,   0, 
-    192,   6,   0,   0,  65, 111, 
-    110,  57, 100,   1,   0,   0, 
-    100,   1,   0,   0,   0,   2, 
-    254, 255,   0,   1,   0,   0, 
-    100,   0,   0,   0,   5,   0, 
-     36,   0,   0,   0,  96,   0, 
-      0,   0,  96,   0,   0,   0, 
-     36,   0,   1,   0,  96,   0, 
-      0,   0,   0,   0,   2,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   2,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,   6,   0,   1,   0, 
-      5,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      6,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   4,   0, 
-      7,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   2, 
-    254, 255,  31,   0,   0,   2, 
-      5,   0,   0, 128,   0,   0, 
-     15, 144,   4,   0,   0,   4, 
-      0,   0,   3, 224,   0,   0, 
-    228, 144,   1,   0, 238, 160, 
-      1,   0, 228, 160,   4,   0, 
-      0,   4,   0,   0,   1, 128, 
-      0,   0,  85, 144,   2,   0, 
-    255, 160,   2,   0,  85, 160, 
-      5,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0,   0, 128, 
-      4,   0, 228, 160,   4,   0, 
-      0,   4,   1,   0,   1, 128, 
-      0,   0,   0, 144,   2,   0, 
-    170, 160,   2,   0,   0, 160, 
-      4,   0,   0,   4,   0,   0, 
-     15, 128,   3,   0, 228, 160, 
-      1,   0,   0, 128,   0,   0, 
-    228, 128,   2,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   5,   0, 228, 160, 
-      2,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
-      6,   0, 228, 161,   5,   0, 
-      0,   3,   1,   0,  15, 128, 
-      0,   0,  85, 128,   8,   0, 
-    228, 160,   4,   0,   0,   4, 
-      1,   0,  15, 128,   7,   0, 
-    228, 160,   0,   0,   0, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   1,   0,  15, 128, 
-      9,   0, 228, 160,   0,   0, 
-    170, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   0,   0, 
-     15, 128,  10,   0, 228, 160, 
-      0,   0, 255, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      0,   0,   3, 192,   0,   0, 
-    255, 128,   0,   0, 228, 160, 
-      0,   0, 228, 128,   1,   0, 
-      0,   2,   0,   0,  12, 192, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0,  83,  72,  68,  82, 
-    232,   1,   0,   0,  64,   0, 
-      1,   0, 122,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      7,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   4,   0,   0,   0, 
-     95,   0,   0,   3,  50,  16, 
-     16,   0,   0,   0,   0,   0, 
-    103,   0,   0,   4, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0, 101,   0, 
-      0,   3,  50,  32,  16,   0, 
-      1,   0,   0,   0, 104,   0, 
-      0,   2,   2,   0,   0,   0, 
-     50,   0,   0,  11,  50,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  16,  16,   0,   0,   0, 
-      0,   0, 230, 138,  32,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  70, 128,  32,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  56,   0,   0,   8, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  86,   5,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      4,   0,   0,   0,  50,   0, 
-      0,  10, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   6,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,   0,   0,   0,   8, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      6,   0,   0,   0,   0,   0, 
-      0,   9, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32, 128,  65,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  56,   0, 
-      0,   8, 242,   0,  16,   0, 
-      1,   0,   0,   0,  86,   5, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      6,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  10, 242,   0,  16,   0, 
-      1,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      2,   0,   0,   0, 166,  10, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   3,   0, 
-      0,   0, 246,  15,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-     50,   0,   0,  11,  50,  32, 
-     16,   0,   1,   0,   0,   0, 
-     70,  16,  16,   0,   0,   0, 
-      0,   0, 230, 138,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  70, 128,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  62,   0,   0,   1, 
-     83,  84,  65,  84, 116,   0, 
-      0,   0,  11,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  82,  68, 
-     69,  70, 116,   2,   0,   0, 
-      3,   0,   0,   0, 168,   0, 
-      0,   0,   3,   0,   0,   0, 
-     28,   0,   0,   0,   0,   4, 
-    254, 255,   0,   1,   0,   0, 
-     64,   2,   0,   0, 124,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    133,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 152,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0,  80, 101, 114,  79,  99, 
-     99,  97, 115, 105, 111, 110, 
-     97, 108,  76,  97, 121, 101, 
-    114,   0,  80, 101, 114,  76, 
-     97, 121, 101, 114,  77,  97, 
-    110,  97, 103, 101, 114,   0, 
-    124,   0,   0,   0,   4,   0, 
-      0,   0, 240,   0,   0,   0, 
-    112,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    133,   0,   0,   0,   2,   0, 
-      0,   0, 188,   1,   0,   0, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    152,   0,   0,   0,   1,   0, 
-      0,   0,  28,   2,   0,   0, 
-     64,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     80,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,  96,   1, 
-      0,   0,   0,   0,   0,   0, 
-    112,   1,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,  96,   1, 
-      0,   0,   0,   0,   0,   0, 
-    123,   1,   0,   0,  32,   0, 
-      0,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0, 140,   1, 
-      0,   0,   0,   0,   0,   0, 
-    156,   1,   0,   0,  48,   0, 
-      0,   0,  64,   0,   0,   0, 
-      2,   0,   0,   0, 172,   1, 
-      0,   0,   0,   0,   0,   0, 
-    118,  84, 101, 120, 116, 117, 
-    114, 101,  67, 111, 111, 114, 
-    100, 115,   0, 171,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 118,  76,  97, 121, 
-    101, 114,  81, 117,  97, 100, 
-      0, 102,  76,  97, 121, 101, 
-    114,  79, 112,  97,  99, 105, 
-    116, 121,   0, 171, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 109,  76, 
-     97, 121, 101, 114,  84, 114, 
-     97, 110, 115, 102, 111, 114, 
-    109,   0,   3,   0,   3,   0, 
-      4,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    236,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-     16,   2,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-    118,  82, 101, 110, 100, 101, 
-    114,  84,  97, 114, 103, 101, 
-    116,  79, 102, 102, 115, 101, 
-    116,   0,   1,   0,   3,   0, 
-      1,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    102,  76,  97, 121, 101, 114, 
-     67, 111, 108, 111, 114,   0, 
-     52,   2,   0,   0,   0,   0, 
-      0,   0,  64,   0,   0,   0, 
-      2,   0,   0,   0, 172,   1, 
-      0,   0,   0,   0,   0,   0, 
-    109,  80, 114, 111, 106, 101, 
-     99, 116, 105, 111, 110,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  57, 
-     46,  50,  55,  46,  57,  53, 
-     50,  46,  51,  48,  50,  50, 
-      0, 171, 171, 171,  73,  83, 
-     71,  78,  44,   0,   0,   0, 
-      1,   0,   0,   0,   8,   0, 
-      0,   0,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   3,   3, 
-      0,   0,  80,  79,  83,  73, 
-     84,  73,  79,  78,   0, 171, 
-    171, 171,  79,  83,  71,  78, 
-     80,   0,   0,   0,   2,   0, 
-      0,   0,   8,   0,   0,   0, 
-     56,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     68,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   1,   0, 
-      0,   0,   3,  12,   0,   0, 
-     83,  86,  95,  80, 111, 115, 
-    105, 116, 105, 111, 110,   0, 
-     84,  69,  88,  67,  79,  79, 
-     82,  68,   0, 171, 171, 171, 
-    226,  15,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,  84,   4,   0,   0, 
-     68,  88,  66,  67, 146,   3, 
-    215,  66, 245, 177,   6,  57, 
-     16,  82, 147, 232,  61, 101, 
-    156, 116,   1,   0,   0,   0, 
-     84,   4,   0,   0,   6,   0, 
-      0,   0,  56,   0,   0,   0, 
-    204,   0,   0,   0, 136,   1, 
-      0,   0,   4,   2,   0,   0, 
-    200,   3,   0,   0,  32,   4, 
-      0,   0,  65, 111, 110,  57, 
-    140,   0,   0,   0, 140,   0, 
-      0,   0,   0,   2, 255, 255, 
-     88,   0,   0,   0,  52,   0, 
-      0,   0,   1,   0,  40,   0, 
-      0,   0,  52,   0,   0,   0, 
-     52,   0,   1,   0,  36,   0, 
-      0,   0,  52,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   2, 255, 255, 
-     31,   0,   0,   2,   0,   0, 
-      0, 128,   0,   0,   3, 176, 
-     31,   0,   0,   2,   0,   0, 
-      0, 144,   0,   8,  15, 160, 
-     66,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 176, 
-      0,   8, 228, 160,   5,   0, 
-      0,   3,   0,   0,   7, 128, 
-      0,   0, 228, 128,   0,   0, 
-      0, 160,   1,   0,   0,   2, 
-      0,   0,   8, 128,   0,   0, 
-      0, 160,   1,   0,   0,   2, 
-      0,   8,  15, 128,   0,   0, 
-    228, 128, 255, 255,   0,   0, 
-     83,  72,  68,  82, 180,   0, 
-      0,   0,  64,   0,   0,   0, 
-     45,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,  90,   0,   0,   3, 
-      0,  96,  16,   0,   0,   0, 
-      0,   0,  88,  24,   0,   4, 
-      0, 112,  16,   0,   0,   0, 
-      0,   0,  85,  85,   0,   0, 
-     98,  16,   0,   3,  50,  16, 
-     16,   0,   1,   0,   0,   0, 
-    101,   0,   0,   3, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-    104,   0,   0,   2,   1,   0, 
-      0,   0,  69,   0,   0,   9, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70,  16,  16,   0, 
-      1,   0,   0,   0,  70, 126, 
-     16,   0,   0,   0,   0,   0, 
-      0,  96,  16,   0,   0,   0, 
-      0,   0,  56,   0,   0,   8, 
-    114,  32,  16,   0,   0,   0, 
-      0,   0,  70,   2,  16,   0, 
-      0,   0,   0,   0,   6, 128, 
-     32,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,  54,   0, 
-      0,   6, 130,  32,  16,   0, 
-      0,   0,   0,   0,  10, 128, 
-     32,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,  62,   0, 
-      0,   1,  83,  84,  65,  84, 
-    116,   0,   0,   0,   4,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     82,  68,  69,  70, 188,   1, 
-      0,   0,   1,   0,   0,   0, 
-    164,   0,   0,   0,   3,   0, 
-      0,   0,  28,   0,   0,   0, 
-      0,   4, 255, 255,   0,   1, 
-      0,   0, 136,   1,   0,   0, 
-    124,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 149,   0,   0,   0, 
-      2,   0,   0,   0,   5,   0, 
-      0,   0,   4,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-     12,   0,   0,   0, 154,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     76,  97, 121, 101, 114,  84, 
-    101, 120, 116, 117, 114, 101, 
-     83,  97, 109, 112, 108, 101, 
-    114,  80, 111, 105, 110, 116, 
-      0, 116,  82,  71,  66,   0, 
-     80, 101, 114,  76,  97, 121, 
-    101, 114,   0, 171, 154,   0, 
-      0,   0,   4,   0,   0,   0, 
-    188,   0,   0,   0, 112,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  28,   1, 
-      0,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,  44,   1,   0,   0, 
-      0,   0,   0,   0,  60,   1, 
-      0,   0,  16,   0,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,  44,   1,   0,   0, 
-      0,   0,   0,   0,  71,   1, 
-      0,   0,  32,   0,   0,   0, 
-      4,   0,   0,   0,   2,   0, 
-      0,   0,  88,   1,   0,   0, 
-      0,   0,   0,   0, 104,   1, 
-      0,   0,  48,   0,   0,   0, 
-     64,   0,   0,   0,   0,   0, 
-      0,   0, 120,   1,   0,   0, 
-      0,   0,   0,   0, 118,  84, 
-    101, 120, 116, 117, 114, 101, 
-     67, 111, 111, 114, 100, 115, 
-      0, 171,   1,   0,   3,   0, 
-      1,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    118,  76,  97, 121, 101, 114, 
-     81, 117,  97, 100,   0, 102, 
-     76,  97, 121, 101, 114,  79, 
-    112,  97,  99, 105, 116, 121, 
-      0, 171, 171, 171,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 109,  76,  97, 121, 
-    101, 114,  84, 114,  97, 110, 
-    115, 102, 111, 114, 109,   0, 
-      3,   0,   3,   0,   4,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  77, 105, 
-     99, 114, 111, 115, 111, 102, 
-    116,  32,  40,  82,  41,  32, 
-     72,  76,  83,  76,  32,  83, 
-    104,  97, 100, 101, 114,  32, 
-     67, 111, 109, 112, 105, 108, 
-    101, 114,  32,  57,  46,  50, 
-     55,  46,  57,  53,  50,  46, 
-     51,  48,  50,  50,   0, 171, 
-    171, 171,  73,  83,  71,  78, 
-     80,   0,   0,   0,   2,   0, 
-      0,   0,   8,   0,   0,   0, 
-     56,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     68,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   1,   0, 
-      0,   0,   3,   3,   0,   0, 
-     83,  86,  95,  80, 111, 115, 
-    105, 116, 105, 111, 110,   0, 
-     84,  69,  88,  67,  79,  79, 
-     82,  68,   0, 171, 171, 171, 
-     79,  83,  71,  78,  44,   0, 
-      0,   0,   1,   0,   0,   0, 
-      8,   0,   0,   0,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-     15,   0,   0,   0,  83,  86, 
-     95,  84,  97, 114, 103, 101, 
-    116,   0, 171, 171,  18,  23, 
-      0,   0,   0,   0,   0,   0, 
-     82, 101, 110, 100, 101, 114, 
-     82,  71,  66,  65,  76,  97, 
-    121, 101, 114,  80, 114, 101, 
-    109, 117, 108,   0,   4,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-    255, 255, 255, 255,  24,   7, 
-      0,   0,  68,  88,  66,  67, 
-    254, 249,  65, 252,  64,  46, 
-    192, 119,  73, 197, 161, 234, 
-     24,   1, 194, 131,   1,   0, 
-      0,   0,  24,   7,   0,   0, 
-      6,   0,   0,   0,  56,   0, 
-      0,   0, 164,   1,   0,   0, 
-    148,   3,   0,   0,  16,   4, 
-      0,   0, 140,   6,   0,   0, 
-    192,   6,   0,   0,  65, 111, 
-    110,  57, 100,   1,   0,   0, 
-    100,   1,   0,   0,   0,   2, 
-    254, 255,   0,   1,   0,   0, 
-    100,   0,   0,   0,   5,   0, 
-     36,   0,   0,   0,  96,   0, 
-      0,   0,  96,   0,   0,   0, 
-     36,   0,   1,   0,  96,   0, 
-      0,   0,   0,   0,   2,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   2,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,   6,   0,   1,   0, 
-      5,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      6,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   4,   0, 
-      7,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   2, 
-    254, 255,  31,   0,   0,   2, 
-      5,   0,   0, 128,   0,   0, 
-     15, 144,   4,   0,   0,   4, 
-      0,   0,   3, 224,   0,   0, 
-    228, 144,   1,   0, 238, 160, 
-      1,   0, 228, 160,   4,   0, 
-      0,   4,   0,   0,   1, 128, 
-      0,   0,  85, 144,   2,   0, 
-    255, 160,   2,   0,  85, 160, 
-      5,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0,   0, 128, 
-      4,   0, 228, 160,   4,   0, 
-      0,   4,   1,   0,   1, 128, 
-      0,   0,   0, 144,   2,   0, 
-    170, 160,   2,   0,   0, 160, 
-      4,   0,   0,   4,   0,   0, 
-     15, 128,   3,   0, 228, 160, 
-      1,   0,   0, 128,   0,   0, 
-    228, 128,   2,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   5,   0, 228, 160, 
-      2,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
-      6,   0, 228, 161,   5,   0, 
-      0,   3,   1,   0,  15, 128, 
-      0,   0,  85, 128,   8,   0, 
-    228, 160,   4,   0,   0,   4, 
-      1,   0,  15, 128,   7,   0, 
-    228, 160,   0,   0,   0, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   1,   0,  15, 128, 
-      9,   0, 228, 160,   0,   0, 
-    170, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   0,   0, 
-     15, 128,  10,   0, 228, 160, 
-      0,   0, 255, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      0,   0,   3, 192,   0,   0, 
-    255, 128,   0,   0, 228, 160, 
-      0,   0, 228, 128,   1,   0, 
-      0,   2,   0,   0,  12, 192, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0,  83,  72,  68,  82, 
-    232,   1,   0,   0,  64,   0, 
-      1,   0, 122,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      7,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   4,   0,   0,   0, 
-     95,   0,   0,   3,  50,  16, 
-     16,   0,   0,   0,   0,   0, 
-    103,   0,   0,   4, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0, 101,   0, 
-      0,   3,  50,  32,  16,   0, 
-      1,   0,   0,   0, 104,   0, 
-      0,   2,   2,   0,   0,   0, 
-     50,   0,   0,  11,  50,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  16,  16,   0,   0,   0, 
-      0,   0, 230, 138,  32,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  70, 128,  32,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  56,   0,   0,   8, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  86,   5,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      4,   0,   0,   0,  50,   0, 
-      0,  10, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   6,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,   0,   0,   0,   8, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      6,   0,   0,   0,   0,   0, 
-      0,   9, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32, 128,  65,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  56,   0, 
-      0,   8, 242,   0,  16,   0, 
-      1,   0,   0,   0,  86,   5, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      6,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  10, 242,   0,  16,   0, 
-      1,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      2,   0,   0,   0, 166,  10, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   3,   0, 
-      0,   0, 246,  15,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-     50,   0,   0,  11,  50,  32, 
-     16,   0,   1,   0,   0,   0, 
-     70,  16,  16,   0,   0,   0, 
-      0,   0, 230, 138,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  70, 128,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  62,   0,   0,   1, 
-     83,  84,  65,  84, 116,   0, 
-      0,   0,  11,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  82,  68, 
-     69,  70, 116,   2,   0,   0, 
-      3,   0,   0,   0, 168,   0, 
-      0,   0,   3,   0,   0,   0, 
-     28,   0,   0,   0,   0,   4, 
-    254, 255,   0,   1,   0,   0, 
-     64,   2,   0,   0, 124,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    133,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 152,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0,  80, 101, 114,  79,  99, 
-     99,  97, 115, 105, 111, 110, 
-     97, 108,  76,  97, 121, 101, 
-    114,   0,  80, 101, 114,  76, 
-     97, 121, 101, 114,  77,  97, 
-    110,  97, 103, 101, 114,   0, 
-    124,   0,   0,   0,   4,   0, 
-      0,   0, 240,   0,   0,   0, 
-    112,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    133,   0,   0,   0,   2,   0, 
-      0,   0, 188,   1,   0,   0, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    152,   0,   0,   0,   1,   0, 
-      0,   0,  28,   2,   0,   0, 
-     64,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     80,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,  96,   1, 
-      0,   0,   0,   0,   0,   0, 
-    112,   1,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,  96,   1, 
-      0,   0,   0,   0,   0,   0, 
-    123,   1,   0,   0,  32,   0, 
-      0,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0, 140,   1, 
-      0,   0,   0,   0,   0,   0, 
-    156,   1,   0,   0,  48,   0, 
-      0,   0,  64,   0,   0,   0, 
-      2,   0,   0,   0, 172,   1, 
-      0,   0,   0,   0,   0,   0, 
-    118,  84, 101, 120, 116, 117, 
-    114, 101,  67, 111, 111, 114, 
-    100, 115,   0, 171,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 118,  76,  97, 121, 
-    101, 114,  81, 117,  97, 100, 
-      0, 102,  76,  97, 121, 101, 
-    114,  79, 112,  97,  99, 105, 
-    116, 121,   0, 171, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 109,  76, 
-     97, 121, 101, 114,  84, 114, 
-     97, 110, 115, 102, 111, 114, 
-    109,   0,   3,   0,   3,   0, 
-      4,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    236,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      2,   0,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-     16,   2,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-    118,  82, 101, 110, 100, 101, 
-    114,  84,  97, 114, 103, 101, 
-    116,  79, 102, 102, 115, 101, 
-    116,   0,   1,   0,   3,   0, 
-      1,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    102,  76,  97, 121, 101, 114, 
-     67, 111, 108, 111, 114,   0, 
-     52,   2,   0,   0,   0,   0, 
-      0,   0,  64,   0,   0,   0, 
-      2,   0,   0,   0, 172,   1, 
-      0,   0,   0,   0,   0,   0, 
-    109,  80, 114, 111, 106, 101, 
-     99, 116, 105, 111, 110,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  57, 
-     46,  50,  55,  46,  57,  53, 
-     50,  46,  51,  48,  50,  50, 
-      0, 171, 171, 171,  73,  83, 
-     71,  78,  44,   0,   0,   0, 
-      1,   0,   0,   0,   8,   0, 
-      0,   0,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   3,   3, 
-      0,   0,  80,  79,  83,  73, 
-     84,  73,  79,  78,   0, 171, 
-    171, 171,  79,  83,  71,  78, 
-     80,   0,   0,   0,   2,   0, 
-      0,   0,   8,   0,   0,   0, 
-     56,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     68,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   1,   0, 
-      0,   0,   3,  12,   0,   0, 
-     83,  86,  95,  80, 111, 115, 
-    105, 116, 105, 111, 110,   0, 
-     84,  69,  88,  67,  79,  79, 
-     82,  68,   0, 171, 171, 171, 
-    184,  27,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,  48,   4,   0,   0, 
-     68,  88,  66,  67, 135,  78, 
-    217, 178,  82, 246,  12, 136, 
-     40, 218, 112,  36, 133,  68, 
-    115,  32,   1,   0,   0,   0, 
-     48,   4,   0,   0,   6,   0, 
-      0,   0,  56,   0,   0,   0, 
-    192,   0,   0,   0, 100,   1, 
-      0,   0, 224,   1,   0,   0, 
-    164,   3,   0,   0, 252,   3, 
-      0,   0,  65, 111, 110,  57, 
-    128,   0,   0,   0, 128,   0, 
-      0,   0,   0,   2, 255, 255, 
-     76,   0,   0,   0,  52,   0, 
-      0,   0,   1,   0,  40,   0, 
-      0,   0,  52,   0,   0,   0, 
-     52,   0,   1,   0,  36,   0, 
-      0,   0,  52,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   2, 255, 255, 
-     31,   0,   0,   2,   0,   0, 
-      0, 128,   0,   0,   3, 176, 
-     31,   0,   0,   2,   0,   0, 
-      0, 144,   0,   8,  15, 160, 
-     66,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 176, 
-      0,   8, 228, 160,   5,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 128,   0,   0, 
-      0, 160,   1,   0,   0,   2, 
-      0,   8,  15, 128,   0,   0, 
-    228, 128, 255, 255,   0,   0, 
-     83,  72,  68,  82, 156,   0, 
-      0,   0,  64,   0,   0,   0, 
-     39,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,  90,   0,   0,   3, 
-      0,  96,  16,   0,   0,   0, 
-      0,   0,  88,  24,   0,   4, 
-      0, 112,  16,   0,   0,   0, 
-      0,   0,  85,  85,   0,   0, 
-     98,  16,   0,   3,  50,  16, 
-     16,   0,   1,   0,   0,   0, 
-    101,   0,   0,   3, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-    104,   0,   0,   2,   1,   0, 
-      0,   0,  69,   0,   0,   9, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70,  16,  16,   0, 
-      1,   0,   0,   0,  70, 126, 
-     16,   0,   0,   0,   0,   0, 
-      0,  96,  16,   0,   0,   0, 
-      0,   0,  56,   0,   0,   8, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      0,   0,   0,   0,   6, 128, 
-     32,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,  62,   0, 
-      0,   1,  83,  84,  65,  84, 
-    116,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     82,  68,  69,  70, 188,   1, 
-      0,   0,   1,   0,   0,   0, 
-    164,   0,   0,   0,   3,   0, 
-      0,   0,  28,   0,   0,   0, 
-      0,   4, 255, 255,   0,   1, 
-      0,   0, 136,   1,   0,   0, 
-    124,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 150,   0,   0,   0, 
-      2,   0,   0,   0,   5,   0, 
-      0,   0,   4,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-     12,   0,   0,   0, 155,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     76,  97, 121, 101, 114,  84, 
-    101, 120, 116, 117, 114, 101, 
-     83,  97, 109, 112, 108, 101, 
-    114,  76, 105, 110, 101,  97, 
-    114,   0, 116,  82,  71,  66, 
-      0,  80, 101, 114,  76,  97, 
-    121, 101, 114,   0, 155,   0, 
-      0,   0,   4,   0,   0,   0, 
-    188,   0,   0,   0, 112,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  28,   1, 
-      0,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,  44,   1,   0,   0, 
-      0,   0,   0,   0,  60,   1, 
-      0,   0,  16,   0,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,  44,   1,   0,   0, 
-      0,   0,   0,   0,  71,   1, 
-      0,   0,  32,   0,   0,   0, 
-      4,   0,   0,   0,   2,   0, 
-      0,   0,  88,   1,   0,   0, 
-      0,   0,   0,   0, 104,   1, 
-      0,   0,  48,   0,   0,   0, 
-     64,   0,   0,   0,   0,   0, 
-      0,   0, 120,   1,   0,   0, 
-      0,   0,   0,   0, 118,  84, 
-    101, 120, 116, 117, 114, 101, 
-     67, 111, 111, 114, 100, 115, 
-      0, 171,   1,   0,   3,   0, 
-      1,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    118,  76,  97, 121, 101, 114, 
-     81, 117,  97, 100,   0, 102, 
-     76,  97, 121, 101, 114,  79, 
-    112,  97,  99, 105, 116, 121, 
-      0, 171, 171, 171,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 109,  76,  97, 121, 
-    101, 114,  84, 114,  97, 110, 
-    115, 102, 111, 114, 109,   0, 
-      3,   0,   3,   0,   4,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  77, 105, 
-     99, 114, 111, 115, 111, 102, 
-    116,  32,  40,  82,  41,  32, 
-     72,  76,  83,  76,  32,  83, 
-    104,  97, 100, 101, 114,  32, 
-     67, 111, 109, 112, 105, 108, 
-    101, 114,  32,  57,  46,  50, 
-     55,  46,  57,  53,  50,  46, 
-     51,  48,  50,  50,   0, 171, 
-    171, 171,  73,  83,  71,  78, 
-     80,   0,   0,   0,   2,   0, 
-      0,   0,   8,   0,   0,   0, 
-     56,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     68,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   1,   0, 
-      0,   0,   3,   3,   0,   0, 
-     83,  86,  95,  80, 111, 115, 
-    105, 116, 105, 111, 110,   0, 
-     84,  69,  88,  67,  79,  79, 
-     82,  68,   0, 171, 171, 171, 
-     79,  83,  71,  78,  44,   0, 
-      0,   0,   1,   0,   0,   0, 
-      8,   0,   0,   0,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-     15,   0,   0,   0,  83,  86, 
-     95,  84,  97, 114, 103, 101, 
-    116,   0, 171, 171, 232,  34, 
-      0,   0,   0,   0,   0,   0, 
-     82, 101, 110, 100, 101, 114, 
-     82,  71,  66,  65,  76,  97, 
-    121, 101, 114,  78, 111, 110, 
-     80, 114, 101, 109, 117, 108, 
-      0,   4,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      0,   0,   0, 255, 255, 255, 
-    255,  24,   7,   0,   0,  68, 
-     88,  66,  67, 254, 249,  65, 
-    252,  64,  46, 192, 119,  73, 
-    197, 161, 234,  24,   1, 194, 
-    131,   1,   0,   0,   0,  24, 
-      7,   0,   0,   6,   0,   0, 
-      0,  56,   0,   0,   0, 164, 
-      1,   0,   0, 148,   3,   0, 
-      0,  16,   4,   0,   0, 140, 
-      6,   0,   0, 192,   6,   0, 
-      0,  65, 111, 110,  57, 100, 
-      1,   0,   0, 100,   1,   0, 
-      0,   0,   2, 254, 255,   0, 
-      1,   0,   0, 100,   0,   0, 
-      0,   5,   0,  36,   0,   0, 
-      0,  96,   0,   0,   0,  96, 
-      0,   0,   0,  36,   0,   1, 
-      0,  96,   0,   0,   0,   0, 
-      0,   2,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   2,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,   6, 
-      0,   1,   0,   5,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   1,   0,   6,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   4,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   2, 254, 255,  31, 
-      0,   0,   2,   5,   0,   0, 
-    128,   0,   0,  15, 144,   4, 
-      0,   0,   4,   0,   0,   3, 
-    224,   0,   0, 228, 144,   1, 
-      0, 238, 160,   1,   0, 228, 
-    160,   4,   0,   0,   4,   0, 
-      0,   1, 128,   0,   0,  85, 
-    144,   2,   0, 255, 160,   2, 
-      0,  85, 160,   5,   0,   0, 
-      3,   0,   0,  15, 128,   0, 
-      0,   0, 128,   4,   0, 228, 
-    160,   4,   0,   0,   4,   1, 
-      0,   1, 128,   0,   0,   0, 
-    144,   2,   0, 170, 160,   2, 
-      0,   0, 160,   4,   0,   0, 
-      4,   0,   0,  15, 128,   3, 
-      0, 228, 160,   1,   0,   0, 
-    128,   0,   0, 228, 128,   2, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0, 228, 128,   5, 
-      0, 228, 160,   2,   0,   0, 
-      3,   0,   0,  15, 128,   0, 
-      0, 228, 128,   6,   0, 228, 
-    161,   5,   0,   0,   3,   1, 
-      0,  15, 128,   0,   0,  85, 
-    128,   8,   0, 228, 160,   4, 
-      0,   0,   4,   1,   0,  15, 
-    128,   7,   0, 228, 160,   0, 
-      0,   0, 128,   1,   0, 228, 
-    128,   4,   0,   0,   4,   1, 
-      0,  15, 128,   9,   0, 228, 
-    160,   0,   0, 170, 128,   1, 
-      0, 228, 128,   4,   0,   0, 
-      4,   0,   0,  15, 128,  10, 
-      0, 228, 160,   0,   0, 255, 
-    128,   1,   0, 228, 128,   4, 
-      0,   0,   4,   0,   0,   3, 
-    192,   0,   0, 255, 128,   0, 
-      0, 228, 160,   0,   0, 228, 
-    128,   1,   0,   0,   2,   0, 
-      0,  12, 192,   0,   0, 228, 
-    128, 255, 255,   0,   0,  83, 
-     72,  68,  82, 232,   1,   0, 
-      0,  64,   0,   1,   0, 122, 
-      0,   0,   0,  89,   0,   0, 
-      4,  70, 142,  32,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   1,   0,   0, 
-      0,   1,   0,   0,   0,  89, 
-      0,   0,   4,  70, 142,  32, 
-      0,   2,   0,   0,   0,   4, 
-      0,   0,   0,  95,   0,   0, 
-      3,  50,  16,  16,   0,   0, 
-      0,   0,   0, 103,   0,   0, 
-      4, 242,  32,  16,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 101,   0,   0,   3,  50, 
-     32,  16,   0,   1,   0,   0, 
-      0, 104,   0,   0,   2,   2, 
-      0,   0,   0,  50,   0,   0, 
-     11,  50,   0,  16,   0,   0, 
-      0,   0,   0,  70,  16,  16, 
-      0,   0,   0,   0,   0, 230, 
-    138,  32,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  70, 
-    128,  32,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  56, 
-      0,   0,   8, 242,   0,  16, 
-      0,   1,   0,   0,   0,  86, 
-      5,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   0, 
-      0,   0,   0,   4,   0,   0, 
-      0,  50,   0,   0,  10, 242, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   6,   0,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   8, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   0, 
-      0,   0,   0,   6,   0,   0, 
-      0,   0,   0,   0,   9, 242, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-    128,  65,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,  56,   0,   0,   8, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  86,   5,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   2,   0,   0,   0,   1, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,   0,  16,   0,   1, 
-      0,   0,   0,  70, 142,  32, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   6,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,  50,   0,   0,  10, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  70, 142,  32,   0,   2, 
-      0,   0,   0,   2,   0,   0, 
-      0, 166,  10,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  10, 242,  32,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   3,   0,   0,   0, 246, 
-     15,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   1, 
-      0,   0,   0,  50,   0,   0, 
-     11,  50,  32,  16,   0,   1, 
-      0,   0,   0,  70,  16,  16, 
-      0,   0,   0,   0,   0, 230, 
-    138,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  70, 
-    128,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  62, 
-      0,   0,   1,  83,  84,  65, 
-     84, 116,   0,   0,   0,  11, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  82,  68,  69,  70, 116, 
-      2,   0,   0,   3,   0,   0, 
-      0, 168,   0,   0,   0,   3, 
-      0,   0,   0,  28,   0,   0, 
-      0,   0,   4, 254, 255,   0, 
-      1,   0,   0,  64,   2,   0, 
-      0, 124,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0, 133,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 152, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,  80, 101, 114,  76,  97, 
-    121, 101, 114,   0,  80, 101, 
-    114,  79,  99,  99,  97, 115, 
-    105, 111, 110,  97, 108,  76, 
-     97, 121, 101, 114,   0,  80, 
-    101, 114,  76,  97, 121, 101, 
-    114,  77,  97, 110,  97, 103, 
-    101, 114,   0, 124,   0,   0, 
-      0,   4,   0,   0,   0, 240, 
-      0,   0,   0, 112,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 133,   0,   0, 
-      0,   2,   0,   0,   0, 188, 
-      1,   0,   0,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 152,   0,   0, 
-      0,   1,   0,   0,   0,  28, 
-      2,   0,   0,  64,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  80,   1,   0, 
-      0,   0,   0,   0,   0,  16, 
-      0,   0,   0,   2,   0,   0, 
-      0,  96,   1,   0,   0,   0, 
-      0,   0,   0, 112,   1,   0, 
-      0,  16,   0,   0,   0,  16, 
-      0,   0,   0,   2,   0,   0, 
-      0,  96,   1,   0,   0,   0, 
-      0,   0,   0, 123,   1,   0, 
-      0,  32,   0,   0,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0, 140,   1,   0,   0,   0, 
-      0,   0,   0, 156,   1,   0, 
-      0,  48,   0,   0,   0,  64, 
-      0,   0,   0,   2,   0,   0, 
-      0, 172,   1,   0,   0,   0, 
-      0,   0,   0, 118,  84, 101, 
-    120, 116, 117, 114, 101,  67, 
-    111, 111, 114, 100, 115,   0, 
-    171,   1,   0,   3,   0,   1, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 118, 
-     76,  97, 121, 101, 114,  81, 
-    117,  97, 100,   0, 102,  76, 
-     97, 121, 101, 114,  79, 112, 
-     97,  99, 105, 116, 121,   0, 
-    171, 171, 171,   0,   0,   3, 
-      0,   1,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 109,  76,  97, 121, 101, 
-    114,  84, 114,  97, 110, 115, 
-    102, 111, 114, 109,   0,   3, 
-      0,   3,   0,   4,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 236,   1,   0, 
-      0,   0,   0,   0,   0,  16, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,  16,   2,   0, 
-      0,  16,   0,   0,   0,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0, 118,  82, 101, 
-    110, 100, 101, 114,  84,  97, 
-    114, 103, 101, 116,  79, 102, 
-    102, 115, 101, 116,   0,   1, 
-      0,   3,   0,   1,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 102,  76,  97, 
-    121, 101, 114,  67, 111, 108, 
-    111, 114,   0,  52,   2,   0, 
-      0,   0,   0,   0,   0,  64, 
-      0,   0,   0,   2,   0,   0, 
-      0, 172,   1,   0,   0,   0, 
-      0,   0,   0, 109,  80, 114, 
-    111, 106, 101,  99, 116, 105, 
-    111, 110,   0,  77, 105,  99, 
-    114, 111, 115, 111, 102, 116, 
-     32,  40,  82,  41,  32,  72, 
-     76,  83,  76,  32,  83, 104, 
-     97, 100, 101, 114,  32,  67, 
-    111, 109, 112, 105, 108, 101, 
-    114,  32,  57,  46,  50,  55, 
-     46,  57,  53,  50,  46,  51, 
-     48,  50,  50,   0, 171, 171, 
-    171,  73,  83,  71,  78,  44, 
-      0,   0,   0,   1,   0,   0, 
-      0,   8,   0,   0,   0,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   3,   0,   0,  80, 
-     79,  83,  73,  84,  73,  79, 
-     78,   0, 171, 171, 171,  79, 
-     83,  71,  78,  80,   0,   0, 
-      0,   2,   0,   0,   0,   8, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,  15, 
-      0,   0,   0,  68,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-     12,   0,   0,  83,  86,  95, 
-     80, 111, 115, 105, 116, 105, 
-    111, 110,   0,  84,  69,  88, 
-     67,  79,  79,  82,  68,   0, 
-    171, 171, 171, 109,  39,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,  48, 
-      4,   0,   0,  68,  88,  66, 
-     67, 135,  78, 217, 178,  82, 
-    246,  12, 136,  40, 218, 112, 
-     36, 133,  68, 115,  32,   1, 
-      0,   0,   0,  48,   4,   0, 
-      0,   6,   0,   0,   0,  56, 
-      0,   0,   0, 192,   0,   0, 
-      0, 100,   1,   0,   0, 224, 
-      1,   0,   0, 164,   3,   0, 
-      0, 252,   3,   0,   0,  65, 
-    111, 110,  57, 128,   0,   0, 
-      0, 128,   0,   0,   0,   0, 
-      2, 255, 255,  76,   0,   0, 
-      0,  52,   0,   0,   0,   1, 
-      0,  40,   0,   0,   0,  52, 
-      0,   0,   0,  52,   0,   1, 
-      0,  36,   0,   0,   0,  52, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      2, 255, 255,  31,   0,   0, 
-      2,   0,   0,   0, 128,   0, 
-      0,   3, 176,  31,   0,   0, 
-      2,   0,   0,   0, 144,   0, 
-      8,  15, 160,  66,   0,   0, 
-      3,   0,   0,  15, 128,   0, 
-      0, 228, 176,   0,   8, 228, 
-    160,   5,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    128,   0,   0,   0, 160,   1, 
-      0,   0,   2,   0,   8,  15, 
-    128,   0,   0, 228, 128, 255, 
-    255,   0,   0,  83,  72,  68, 
-     82, 156,   0,   0,   0,  64, 
-      0,   0,   0,  39,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,  90, 
-      0,   0,   3,   0,  96,  16, 
-      0,   0,   0,   0,   0,  88, 
-     24,   0,   4,   0, 112,  16, 
-      0,   0,   0,   0,   0,  85, 
-     85,   0,   0,  98,  16,   0, 
-      3,  50,  16,  16,   0,   1, 
-      0,   0,   0, 101,   0,   0, 
-      3, 242,  32,  16,   0,   0, 
-      0,   0,   0, 104,   0,   0, 
-      2,   1,   0,   0,   0,  69, 
-      0,   0,   9, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     16,  16,   0,   1,   0,   0, 
-      0,  70, 126,  16,   0,   0, 
-      0,   0,   0,   0,  96,  16, 
-      0,   0,   0,   0,   0,  56, 
-      0,   0,   8, 242,  32,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   0,   0,   0, 
-      0,   6, 128,  32,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,   3,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70, 188,   1,   0,   0,   1, 
-      0,   0,   0, 164,   0,   0, 
-      0,   3,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 255, 
-    255,   0,   1,   0,   0, 136, 
-      1,   0,   0, 124,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 150, 
-      0,   0,   0,   2,   0,   0, 
-      0,   5,   0,   0,   0,   4, 
-      0,   0,   0, 255, 255, 255, 
-    255,   0,   0,   0,   0,   1, 
-      0,   0,   0,  12,   0,   0, 
-      0, 155,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,  76,  97, 121, 
-    101, 114,  84, 101, 120, 116, 
-    117, 114, 101,  83,  97, 109, 
-    112, 108, 101, 114,  76, 105, 
-    110, 101,  97, 114,   0, 116, 
-     82,  71,  66,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0, 155,   0,   0,   0,   4, 
-      0,   0,   0, 188,   0,   0, 
-      0, 112,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  28,   1,   0,   0,   0, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0,  44, 
-      1,   0,   0,   0,   0,   0, 
-      0,  60,   1,   0,   0,  16, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0,  44, 
-      1,   0,   0,   0,   0,   0, 
-      0,  71,   1,   0,   0,  32, 
-      0,   0,   0,   4,   0,   0, 
-      0,   2,   0,   0,   0,  88, 
-      1,   0,   0,   0,   0,   0, 
-      0, 104,   1,   0,   0,  48, 
-      0,   0,   0,  64,   0,   0, 
-      0,   0,   0,   0,   0, 120, 
-      1,   0,   0,   0,   0,   0, 
-      0, 118,  84, 101, 120, 116, 
-    117, 114, 101,  67, 111, 111, 
-    114, 100, 115,   0, 171,   1, 
-      0,   3,   0,   1,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 118,  76,  97, 
-    121, 101, 114,  81, 117,  97, 
-    100,   0, 102,  76,  97, 121, 
-    101, 114,  79, 112,  97,  99, 
-    105, 116, 121,   0, 171, 171, 
-    171,   0,   0,   3,   0,   1, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 109, 
-     76,  97, 121, 101, 114,  84, 
-    114,  97, 110, 115, 102, 111, 
-    114, 109,   0,   3,   0,   3, 
-      0,   4,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  55,  46,  57, 
-     53,  50,  46,  51,  48,  50, 
-     50,   0, 171, 171, 171,  73, 
-     83,  71,  78,  80,   0,   0, 
-      0,   2,   0,   0,   0,   8, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,  15, 
-      0,   0,   0,  68,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      3,   0,   0,  83,  86,  95, 
-     80, 111, 115, 105, 116, 105, 
-    111, 110,   0,  84,  69,  88, 
-     67,  79,  79,  82,  68,   0, 
-    171, 171, 171,  79,  83,  71, 
-     78,  44,   0,   0,   0,   1, 
-      0,   0,   0,   8,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,  15,   0,   0, 
-      0,  83,  86,  95,  84,  97, 
-    114, 103, 101, 116,   0, 171, 
-    171, 157,  46,   0,   0,   0, 
-      0,   0,   0,  82, 101, 110, 
-    100, 101, 114,  82,  71,  66, 
-     65,  76,  97, 121, 101, 114, 
-     80, 114, 101, 109, 117, 108, 
-     80, 111, 105, 110, 116,   0, 
-      4,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0, 255, 255, 255, 255, 
-     24,   7,   0,   0,  68,  88, 
-     66,  67, 254, 249,  65, 252, 
-     64,  46, 192, 119,  73, 197, 
-    161, 234,  24,   1, 194, 131, 
-      1,   0,   0,   0,  24,   7, 
-      0,   0,   6,   0,   0,   0, 
-     56,   0,   0,   0, 164,   1, 
-      0,   0, 148,   3,   0,   0, 
-     16,   4,   0,   0, 140,   6, 
-      0,   0, 192,   6,   0,   0, 
-     65, 111, 110,  57, 100,   1, 
-      0,   0, 100,   1,   0,   0, 
-      0,   2, 254, 255,   0,   1, 
-      0,   0, 100,   0,   0,   0, 
-      5,   0,  36,   0,   0,   0, 
-     96,   0,   0,   0,  96,   0, 
-      0,   0,  36,   0,   1,   0, 
-     96,   0,   0,   0,   0,   0, 
-      2,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      2,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   6,   0, 
-      1,   0,   5,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      1,   0,   6,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      4,   0,   7,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   2, 254, 255,  31,   0, 
-      0,   2,   5,   0,   0, 128, 
-      0,   0,  15, 144,   4,   0, 
-      0,   4,   0,   0,   3, 224, 
-      0,   0, 228, 144,   1,   0, 
-    238, 160,   1,   0, 228, 160, 
-      4,   0,   0,   4,   0,   0, 
-      1, 128,   0,   0,  85, 144, 
-      2,   0, 255, 160,   2,   0, 
-     85, 160,   5,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-      0, 128,   4,   0, 228, 160, 
-      4,   0,   0,   4,   1,   0, 
-      1, 128,   0,   0,   0, 144, 
-      2,   0, 170, 160,   2,   0, 
-      0, 160,   4,   0,   0,   4, 
-      0,   0,  15, 128,   3,   0, 
-    228, 160,   1,   0,   0, 128, 
-      0,   0, 228, 128,   2,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 128,   5,   0, 
-    228, 160,   2,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   6,   0, 228, 161, 
-      5,   0,   0,   3,   1,   0, 
-     15, 128,   0,   0,  85, 128, 
-      8,   0, 228, 160,   4,   0, 
-      0,   4,   1,   0,  15, 128, 
-      7,   0, 228, 160,   0,   0, 
-      0, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   1,   0, 
-     15, 128,   9,   0, 228, 160, 
-      0,   0, 170, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      0,   0,  15, 128,  10,   0, 
-    228, 160,   0,   0, 255, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   0,   0,   3, 192, 
-      0,   0, 255, 128,   0,   0, 
-    228, 160,   0,   0, 228, 128, 
-      1,   0,   0,   2,   0,   0, 
-     12, 192,   0,   0, 228, 128, 
-    255, 255,   0,   0,  83,  72, 
-     68,  82, 232,   1,   0,   0, 
-     64,   0,   1,   0, 122,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   7,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      2,   0,   0,   0,   4,   0, 
-      0,   0,  95,   0,   0,   3, 
-     50,  16,  16,   0,   0,   0, 
-      0,   0, 103,   0,   0,   4, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-    101,   0,   0,   3,  50,  32, 
-     16,   0,   1,   0,   0,   0, 
-    104,   0,   0,   2,   2,   0, 
-      0,   0,  50,   0,   0,  11, 
-     50,   0,  16,   0,   0,   0, 
-      0,   0,  70,  16,  16,   0, 
-      0,   0,   0,   0, 230, 138, 
-     32,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,  70, 128, 
-     32,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,  56,   0, 
-      0,   8, 242,   0,  16,   0, 
-      1,   0,   0,   0,  86,   5, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   4,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      6,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   8, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   6,   0,   0,   0, 
-      0,   0,   0,   9, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32, 128, 
-     65,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     56,   0,   0,   8, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     86,   5,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,   0,   6,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-     50,   0,   0,  10, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   2,   0,   0,   0, 
-    166,  10,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  10, 242,  32,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      3,   0,   0,   0, 246,  15, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,  50,   0,   0,  11, 
-     50,  32,  16,   0,   1,   0, 
-      0,   0,  70,  16,  16,   0, 
-      0,   0,   0,   0, 230, 138, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  70, 128, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  62,   0, 
-      0,   1,  83,  84,  65,  84, 
-    116,   0,   0,   0,  11,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     82,  68,  69,  70, 116,   2, 
-      0,   0,   3,   0,   0,   0, 
-    168,   0,   0,   0,   3,   0, 
-      0,   0,  28,   0,   0,   0, 
-      0,   4, 254, 255,   0,   1, 
-      0,   0,  64,   2,   0,   0, 
-    124,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 133,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 152,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-     80, 101, 114,  76,  97, 121, 
-    101, 114,   0,  80, 101, 114, 
-     79,  99,  99,  97, 115, 105, 
-    111, 110,  97, 108,  76,  97, 
-    121, 101, 114,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-     77,  97, 110,  97, 103, 101, 
-    114,   0, 124,   0,   0,   0, 
-      4,   0,   0,   0, 240,   0, 
-      0,   0, 112,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 133,   0,   0,   0, 
-      2,   0,   0,   0, 188,   1, 
-      0,   0,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 152,   0,   0,   0, 
-      1,   0,   0,   0,  28,   2, 
-      0,   0,  64,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  80,   1,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-     96,   1,   0,   0,   0,   0, 
-      0,   0, 112,   1,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-     96,   1,   0,   0,   0,   0, 
-      0,   0, 123,   1,   0,   0, 
-     32,   0,   0,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-    140,   1,   0,   0,   0,   0, 
-      0,   0, 156,   1,   0,   0, 
-     48,   0,   0,   0,  64,   0, 
-      0,   0,   2,   0,   0,   0, 
-    172,   1,   0,   0,   0,   0, 
-      0,   0, 118,  84, 101, 120, 
-    116, 117, 114, 101,  67, 111, 
-    111, 114, 100, 115,   0, 171, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 118,  76, 
-     97, 121, 101, 114,  81, 117, 
-     97, 100,   0, 102,  76,  97, 
-    121, 101, 114,  79, 112,  97, 
-     99, 105, 116, 121,   0, 171, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    109,  76,  97, 121, 101, 114, 
-     84, 114,  97, 110, 115, 102, 
-    111, 114, 109,   0,   3,   0, 
-      3,   0,   4,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 236,   1,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,  16,   2,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0, 118,  82, 101, 110, 
-    100, 101, 114,  84,  97, 114, 
-    103, 101, 116,  79, 102, 102, 
-    115, 101, 116,   0,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 102,  76,  97, 121, 
-    101, 114,  67, 111, 108, 111, 
-    114,   0,  52,   2,   0,   0, 
-      0,   0,   0,   0,  64,   0, 
-      0,   0,   2,   0,   0,   0, 
-    172,   1,   0,   0,   0,   0, 
-      0,   0, 109,  80, 114, 111, 
-    106, 101,  99, 116, 105, 111, 
-    110,   0,  77, 105,  99, 114, 
-    111, 115, 111, 102, 116,  32, 
-     40,  82,  41,  32,  72,  76, 
-     83,  76,  32,  83, 104,  97, 
-    100, 101, 114,  32,  67, 111, 
-    109, 112, 105, 108, 101, 114, 
-     32,  57,  46,  50,  55,  46, 
-     57,  53,  50,  46,  51,  48, 
-     50,  50,   0, 171, 171, 171, 
-     73,  83,  71,  78,  44,   0, 
-      0,   0,   1,   0,   0,   0, 
-      8,   0,   0,   0,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   3,   0,   0,  80,  79, 
-     83,  73,  84,  73,  79,  78, 
-      0, 171, 171, 171,  79,  83, 
-     71,  78,  80,   0,   0,   0, 
-      2,   0,   0,   0,   8,   0, 
-      0,   0,  56,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,  15,   0, 
-      0,   0,  68,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   3,  12, 
-      0,   0,  83,  86,  95,  80, 
-    111, 115, 105, 116, 105, 111, 
-    110,   0,  84,  69,  88,  67, 
-     79,  79,  82,  68,   0, 171, 
-    171, 171,  36,  51,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,  48,   4, 
-      0,   0,  68,  88,  66,  67, 
-     15,  77, 243, 211, 185,  20, 
-    200, 151,  80,  95, 178, 168, 
-    167, 229, 221,  45,   1,   0, 
-      0,   0,  48,   4,   0,   0, 
-      6,   0,   0,   0,  56,   0, 
-      0,   0, 192,   0,   0,   0, 
-    100,   1,   0,   0, 224,   1, 
-      0,   0, 164,   3,   0,   0, 
-    252,   3,   0,   0,  65, 111, 
-    110,  57, 128,   0,   0,   0, 
-    128,   0,   0,   0,   0,   2, 
-    255, 255,  76,   0,   0,   0, 
-     52,   0,   0,   0,   1,   0, 
-     40,   0,   0,   0,  52,   0, 
-      0,   0,  52,   0,   1,   0, 
-     36,   0,   0,   0,  52,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   2, 
-    255, 255,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-      5,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0,  83,  72,  68,  82, 
-    156,   0,   0,   0,  64,   0, 
-      0,   0,  39,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,  90,   0, 
-      0,   3,   0,  96,  16,   0, 
-      0,   0,   0,   0,  88,  24, 
-      0,   4,   0, 112,  16,   0, 
-      0,   0,   0,   0,  85,  85, 
-      0,   0,  98,  16,   0,   3, 
-     50,  16,  16,   0,   1,   0, 
-      0,   0, 101,   0,   0,   3, 
-    242,  32,  16,   0,   0,   0, 
-      0,   0, 104,   0,   0,   2, 
-      1,   0,   0,   0,  69,   0, 
-      0,   9, 242,   0,  16,   0, 
-      0,   0,   0,   0,  70,  16, 
-     16,   0,   1,   0,   0,   0, 
-     70, 126,  16,   0,   0,   0, 
-      0,   0,   0,  96,  16,   0, 
-      0,   0,   0,   0,  56,   0, 
-      0,   8, 242,  32,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   0,   0,   0,   0, 
-      6, 128,  32,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-     62,   0,   0,   1,  83,  84, 
-     65,  84, 116,   0,   0,   0, 
-      3,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  82,  68,  69,  70, 
-    188,   1,   0,   0,   1,   0, 
-      0,   0, 164,   0,   0,   0, 
-      3,   0,   0,   0,  28,   0, 
-      0,   0,   0,   4, 255, 255, 
-      0,   1,   0,   0, 136,   1, 
-      0,   0, 124,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 149,   0, 
-      0,   0,   2,   0,   0,   0, 
-      5,   0,   0,   0,   4,   0, 
-      0,   0, 255, 255, 255, 255, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,  12,   0,   0,   0, 
-    154,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  76,  97, 121, 101, 
-    114,  84, 101, 120, 116, 117, 
-    114, 101,  83,  97, 109, 112, 
-    108, 101, 114,  80, 111, 105, 
-    110, 116,   0, 116,  82,  71, 
-     66,   0,  80, 101, 114,  76, 
-     97, 121, 101, 114,   0, 171, 
-    154,   0,   0,   0,   4,   0, 
-      0,   0, 188,   0,   0,   0, 
-    112,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     28,   1,   0,   0,   0,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,  44,   1, 
-      0,   0,   0,   0,   0,   0, 
-     60,   1,   0,   0,  16,   0, 
-      0,   0,  16,   0,   0,   0, 
-      0,   0,   0,   0,  44,   1, 
-      0,   0,   0,   0,   0,   0, 
-     71,   1,   0,   0,  32,   0, 
-      0,   0,   4,   0,   0,   0, 
-      2,   0,   0,   0,  88,   1, 
-      0,   0,   0,   0,   0,   0, 
-    104,   1,   0,   0,  48,   0, 
-      0,   0,  64,   0,   0,   0, 
-      0,   0,   0,   0, 120,   1, 
-      0,   0,   0,   0,   0,   0, 
-    118,  84, 101, 120, 116, 117, 
-    114, 101,  67, 111, 111, 114, 
-    100, 115,   0, 171,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 118,  76,  97, 121, 
-    101, 114,  81, 117,  97, 100, 
-      0, 102,  76,  97, 121, 101, 
-    114,  79, 112,  97,  99, 105, 
-    116, 121,   0, 171, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 109,  76, 
-     97, 121, 101, 114,  84, 114, 
-     97, 110, 115, 102, 111, 114, 
-    109,   0,   3,   0,   3,   0, 
-      4,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  57, 
-     46,  50,  55,  46,  57,  53, 
-     50,  46,  51,  48,  50,  50, 
-      0, 171, 171, 171,  73,  83, 
-     71,  78,  80,   0,   0,   0, 
-      2,   0,   0,   0,   8,   0, 
-      0,   0,  56,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,  15,   0, 
-      0,   0,  68,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   3,   3, 
-      0,   0,  83,  86,  95,  80, 
-    111, 115, 105, 116, 105, 111, 
-    110,   0,  84,  69,  88,  67, 
-     79,  79,  82,  68,   0, 171, 
-    171, 171,  79,  83,  71,  78, 
-     44,   0,   0,   0,   1,   0, 
-      0,   0,   8,   0,   0,   0, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,  15,   0,   0,   0, 
-     83,  86,  95,  84,  97, 114, 
-    103, 101, 116,   0, 171, 171, 
-     84,  58,   0,   0,   0,   0, 
-      0,   0,  82, 101, 110, 100, 
-    101, 114,  82,  71,  66,  65, 
-     76,  97, 121, 101, 114,  78, 
-    111, 110,  80, 114, 101, 109, 
-    117, 108,  80, 111, 105, 110, 
-    116,   0,   4,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   0,   0,   0, 255, 255, 
-    255, 255,  24,   7,   0,   0, 
-     68,  88,  66,  67, 254, 249, 
-     65, 252,  64,  46, 192, 119, 
-     73, 197, 161, 234,  24,   1, 
-    194, 131,   1,   0,   0,   0, 
-     24,   7,   0,   0,   6,   0, 
-      0,   0,  56,   0,   0,   0, 
-    164,   1,   0,   0, 148,   3, 
-      0,   0,  16,   4,   0,   0, 
-    140,   6,   0,   0, 192,   6, 
-      0,   0,  65, 111, 110,  57, 
-    100,   1,   0,   0, 100,   1, 
-      0,   0,   0,   2, 254, 255, 
-      0,   1,   0,   0, 100,   0, 
-      0,   0,   5,   0,  36,   0, 
-      0,   0,  96,   0,   0,   0, 
-     96,   0,   0,   0,  36,   0, 
-      1,   0,  96,   0,   0,   0, 
-      0,   0,   2,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   2,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-      6,   0,   1,   0,   5,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   1,   0,   6,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   4,   0,   7,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   2, 254, 255, 
-     31,   0,   0,   2,   5,   0, 
-      0, 128,   0,   0,  15, 144, 
-      4,   0,   0,   4,   0,   0, 
-      3, 224,   0,   0, 228, 144, 
-      1,   0, 238, 160,   1,   0, 
-    228, 160,   4,   0,   0,   4, 
-      0,   0,   1, 128,   0,   0, 
-     85, 144,   2,   0, 255, 160, 
-      2,   0,  85, 160,   5,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0,   0, 128,   4,   0, 
-    228, 160,   4,   0,   0,   4, 
-      1,   0,   1, 128,   0,   0, 
-      0, 144,   2,   0, 170, 160, 
-      2,   0,   0, 160,   4,   0, 
-      0,   4,   0,   0,  15, 128, 
-      3,   0, 228, 160,   1,   0, 
-      0, 128,   0,   0, 228, 128, 
-      2,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
-      5,   0, 228, 160,   2,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 128,   6,   0, 
-    228, 161,   5,   0,   0,   3, 
-      1,   0,  15, 128,   0,   0, 
-     85, 128,   8,   0, 228, 160, 
-      4,   0,   0,   4,   1,   0, 
-     15, 128,   7,   0, 228, 160, 
-      0,   0,   0, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      1,   0,  15, 128,   9,   0, 
-    228, 160,   0,   0, 170, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   0,   0,  15, 128, 
-     10,   0, 228, 160,   0,   0, 
-    255, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   0,   0, 
-      3, 192,   0,   0, 255, 128, 
-      0,   0, 228, 160,   0,   0, 
-    228, 128,   1,   0,   0,   2, 
-      0,   0,  12, 192,   0,   0, 
-    228, 128, 255, 255,   0,   0, 
-     83,  72,  68,  82, 232,   1, 
-      0,   0,  64,   0,   1,   0, 
-    122,   0,   0,   0,  89,   0, 
-      0,   4,  70, 142,  32,   0, 
-      0,   0,   0,   0,   7,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-     89,   0,   0,   4,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      4,   0,   0,   0,  95,   0, 
-      0,   3,  50,  16,  16,   0, 
-      0,   0,   0,   0, 103,   0, 
-      0,   4, 242,  32,  16,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0, 101,   0,   0,   3, 
-     50,  32,  16,   0,   1,   0, 
-      0,   0, 104,   0,   0,   2, 
-      2,   0,   0,   0,  50,   0, 
-      0,  11,  50,   0,  16,   0, 
-      0,   0,   0,   0,  70,  16, 
-     16,   0,   0,   0,   0,   0, 
-    230, 138,  32,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-     70, 128,  32,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-     56,   0,   0,   8, 242,   0, 
-     16,   0,   1,   0,   0,   0, 
-     86,   5,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      0,   0,   0,   0,   4,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   6,   0,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-      0,   0,   0,   8, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   0,   0, 
-      0,   0,  70, 142,  32,   0, 
-      0,   0,   0,   0,   6,   0, 
-      0,   0,   0,   0,   0,   9, 
-    242,   0,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32, 128,  65,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  56,   0,   0,   8, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  86,   5,  16,   0, 
-      0,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  10, 242,   0,  16,   0, 
-      1,   0,   0,   0,  70, 142, 
-     32,   0,   2,   0,   0,   0, 
-      0,   0,   0,   0,   6,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   1,   0, 
-      0,   0,  50,   0,   0,  10, 
-    242,   0,  16,   0,   1,   0, 
-      0,   0,  70, 142,  32,   0, 
-      2,   0,   0,   0,   2,   0, 
-      0,   0, 166,  10,  16,   0, 
-      0,   0,   0,   0,  70,  14, 
-     16,   0,   1,   0,   0,   0, 
-     50,   0,   0,  10, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-     70, 142,  32,   0,   2,   0, 
-      0,   0,   3,   0,   0,   0, 
-    246,  15,  16,   0,   0,   0, 
-      0,   0,  70,  14,  16,   0, 
-      1,   0,   0,   0,  50,   0, 
-      0,  11,  50,  32,  16,   0, 
-      1,   0,   0,   0,  70,  16, 
-     16,   0,   0,   0,   0,   0, 
-    230, 138,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     70, 128,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-     62,   0,   0,   1,  83,  84, 
-     65,  84, 116,   0,   0,   0, 
-     11,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  82,  68,  69,  70, 
-    116,   2,   0,   0,   3,   0, 
-      0,   0, 168,   0,   0,   0, 
-      3,   0,   0,   0,  28,   0, 
-      0,   0,   0,   4, 254, 255, 
-      0,   1,   0,   0,  64,   2, 
-      0,   0, 124,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 133,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    152,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  80, 101, 114,  76, 
-     97, 121, 101, 114,   0,  80, 
-    101, 114,  79,  99,  99,  97, 
-    115, 105, 111, 110,  97, 108, 
-     76,  97, 121, 101, 114,   0, 
-     80, 101, 114,  76,  97, 121, 
-    101, 114,  77,  97, 110,  97, 
-    103, 101, 114,   0, 124,   0, 
-      0,   0,   4,   0,   0,   0, 
-    240,   0,   0,   0, 112,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 133,   0, 
-      0,   0,   2,   0,   0,   0, 
-    188,   1,   0,   0,  32,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 152,   0, 
-      0,   0,   1,   0,   0,   0, 
-     28,   2,   0,   0,  64,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  80,   1, 
-      0,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0,   2,   0, 
-      0,   0,  96,   1,   0,   0, 
-      0,   0,   0,   0, 112,   1, 
-      0,   0,  16,   0,   0,   0, 
-     16,   0,   0,   0,   2,   0, 
-      0,   0,  96,   1,   0,   0, 
-      0,   0,   0,   0, 123,   1, 
-      0,   0,  32,   0,   0,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0, 140,   1,   0,   0, 
-      0,   0,   0,   0, 156,   1, 
-      0,   0,  48,   0,   0,   0, 
-     64,   0,   0,   0,   2,   0, 
-      0,   0, 172,   1,   0,   0, 
-      0,   0,   0,   0, 118,  84, 
-    101, 120, 116, 117, 114, 101, 
-     67, 111, 111, 114, 100, 115, 
-      0, 171,   1,   0,   3,   0, 
-      1,   0,   4,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    118,  76,  97, 121, 101, 114, 
-     81, 117,  97, 100,   0, 102, 
-     76,  97, 121, 101, 114,  79, 
-    112,  97,  99, 105, 116, 121, 
-      0, 171, 171, 171,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0, 109,  76,  97, 121, 
-    101, 114,  84, 114,  97, 110, 
-    115, 102, 111, 114, 109,   0, 
-      3,   0,   3,   0,   4,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 236,   1, 
-      0,   0,   0,   0,   0,   0, 
-     16,   0,   0,   0,   2,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,  16,   2, 
-      0,   0,  16,   0,   0,   0, 
-     16,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0, 118,  82, 
-    101, 110, 100, 101, 114,  84, 
-     97, 114, 103, 101, 116,  79, 
-    102, 102, 115, 101, 116,   0, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 102,  76, 
-     97, 121, 101, 114,  67, 111, 
-    108, 111, 114,   0,  52,   2, 
-      0,   0,   0,   0,   0,   0, 
-     64,   0,   0,   0,   2,   0, 
-      0,   0, 172,   1,   0,   0, 
-      0,   0,   0,   0, 109,  80, 
-    114, 111, 106, 101,  99, 116, 
-    105, 111, 110,   0,  77, 105, 
-     99, 114, 111, 115, 111, 102, 
-    116,  32,  40,  82,  41,  32, 
-     72,  76,  83,  76,  32,  83, 
-    104,  97, 100, 101, 114,  32, 
-     67, 111, 109, 112, 105, 108, 
-    101, 114,  32,  57,  46,  50, 
-     55,  46,  57,  53,  50,  46, 
-     51,  48,  50,  50,   0, 171, 
-    171, 171,  73,  83,  71,  78, 
-     44,   0,   0,   0,   1,   0, 
-      0,   0,   8,   0,   0,   0, 
-     32,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,   0,   0, 
-      0,   0,   3,   3,   0,   0, 
-     80,  79,  83,  73,  84,  73, 
-     79,  78,   0, 171, 171, 171, 
-     79,  83,  71,  78,  80,   0, 
-      0,   0,   2,   0,   0,   0, 
-      8,   0,   0,   0,  56,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-     15,   0,   0,   0,  68,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,  12,   0,   0,  83,  86, 
-     95,  80, 111, 115, 105, 116, 
-    105, 111, 110,   0,  84,  69, 
-     88,  67,  79,  79,  82,  68, 
-      0, 171, 171, 171, 222,  62, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,   0, 
-     48,   4,   0,   0,  68,  88, 
-     66,  67,  15,  77, 243, 211, 
-    185,  20, 200, 151,  80,  95, 
-    178, 168, 167, 229, 221,  45, 
-      1,   0,   0,   0,  48,   4, 
-      0,   0,   6,   0,   0,   0, 
-     56,   0,   0,   0, 192,   0, 
-      0,   0, 100,   1,   0,   0, 
-    224,   1,   0,   0, 164,   3, 
-      0,   0, 252,   3,   0,   0, 
-     65, 111, 110,  57, 128,   0, 
-      0,   0, 128,   0,   0,   0, 
-      0,   2, 255, 255,  76,   0, 
-      0,   0,  52,   0,   0,   0, 
-      1,   0,  40,   0,   0,   0, 
-     52,   0,   0,   0,  52,   0, 
-      1,   0,  36,   0,   0,   0, 
-     52,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   2, 255, 255,  31,   0, 
-      0,   2,   0,   0,   0, 128, 
-      0,   0,   3, 176,  31,   0, 
-      0,   2,   0,   0,   0, 144, 
-      0,   8,  15, 160,  66,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 176,   0,   8, 
-    228, 160,   5,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   0,   0,   0, 160, 
-      1,   0,   0,   2,   0,   8, 
-     15, 128,   0,   0, 228, 128, 
-    255, 255,   0,   0,  83,  72, 
-     68,  82, 156,   0,   0,   0, 
-     64,   0,   0,   0,  39,   0, 
-      0,   0,  89,   0,   0,   4, 
-     70, 142,  32,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-     90,   0,   0,   3,   0,  96, 
-     16,   0,   0,   0,   0,   0, 
-     88,  24,   0,   4,   0, 112, 
-     16,   0,   0,   0,   0,   0, 
-     85,  85,   0,   0,  98,  16, 
-      0,   3,  50,  16,  16,   0, 
-      1,   0,   0,   0, 101,   0, 
-      0,   3, 242,  32,  16,   0, 
-      0,   0,   0,   0, 104,   0, 
-      0,   2,   1,   0,   0,   0, 
-     69,   0,   0,   9, 242,   0, 
-     16,   0,   0,   0,   0,   0, 
-     70,  16,  16,   0,   1,   0, 
-      0,   0,  70, 126,  16,   0, 
-      0,   0,   0,   0,   0,  96, 
-     16,   0,   0,   0,   0,   0, 
-     56,   0,   0,   8, 242,  32, 
-     16,   0,   0,   0,   0,   0, 
-     70,  14,  16,   0,   0,   0, 
-      0,   0,   6, 128,  32,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,  62,   0,   0,   1, 
-     83,  84,  65,  84, 116,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  82,  68, 
-     69,  70, 188,   1,   0,   0, 
-      1,   0,   0,   0, 164,   0, 
-      0,   0,   3,   0,   0,   0, 
-     28,   0,   0,   0,   0,   4, 
-    255, 255,   0,   1,   0,   0, 
-    136,   1,   0,   0, 124,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    149,   0,   0,   0,   2,   0, 
-      0,   0,   5,   0,   0,   0, 
-      4,   0,   0,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-      1,   0,   0,   0,  12,   0, 
-      0,   0, 154,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  76,  97, 
-    121, 101, 114,  84, 101, 120, 
-    116, 117, 114, 101,  83,  97, 
-    109, 112, 108, 101, 114,  80, 
-    111, 105, 110, 116,   0, 116, 
-     82,  71,  66,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0, 171, 154,   0,   0,   0, 
-      4,   0,   0,   0, 188,   0, 
-      0,   0, 112,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  28,   1,   0,   0, 
-      0,   0,   0,   0,  16,   0, 
-      0,   0,   0,   0,   0,   0, 
-     44,   1,   0,   0,   0,   0, 
-      0,   0,  60,   1,   0,   0, 
-     16,   0,   0,   0,  16,   0, 
-      0,   0,   0,   0,   0,   0, 
-     44,   1,   0,   0,   0,   0, 
-      0,   0,  71,   1,   0,   0, 
-     32,   0,   0,   0,   4,   0, 
-      0,   0,   2,   0,   0,   0, 
-     88,   1,   0,   0,   0,   0, 
-      0,   0, 104,   1,   0,   0, 
-     48,   0,   0,   0,  64,   0, 
-      0,   0,   0,   0,   0,   0, 
-    120,   1,   0,   0,   0,   0, 
-      0,   0, 118,  84, 101, 120, 
-    116, 117, 114, 101,  67, 111, 
-    111, 114, 100, 115,   0, 171, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 118,  76, 
-     97, 121, 101, 114,  81, 117, 
-     97, 100,   0, 102,  76,  97, 
-    121, 101, 114,  79, 112,  97, 
-     99, 105, 116, 121,   0, 171, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-    109,  76,  97, 121, 101, 114, 
-     84, 114,  97, 110, 115, 102, 
-    111, 114, 109,   0,   3,   0, 
-      3,   0,   4,   0,   4,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  77, 105,  99, 114, 
-    111, 115, 111, 102, 116,  32, 
-     40,  82,  41,  32,  72,  76, 
-     83,  76,  32,  83, 104,  97, 
-    100, 101, 114,  32,  67, 111, 
-    109, 112, 105, 108, 101, 114, 
-     32,  57,  46,  50,  55,  46, 
-     57,  53,  50,  46,  51,  48, 
-     50,  50,   0, 171, 171, 171, 
-     73,  83,  71,  78,  80,   0, 
-      0,   0,   2,   0,   0,   0, 
-      8,   0,   0,   0,  56,   0, 
-      0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   3,   0, 
-      0,   0,   0,   0,   0,   0, 
-     15,   0,   0,   0,  68,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-      3,   3,   0,   0,  83,  86, 
-     95,  80, 111, 115, 105, 116, 
-    105, 111, 110,   0,  84,  69, 
-     88,  67,  79,  79,  82,  68, 
-      0, 171, 171, 171,  79,  83, 
-     71,  78,  44,   0,   0,   0, 
-      1,   0,   0,   0,   8,   0, 
-      0,   0,  32,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   3,   0,   0,   0, 
-      0,   0,   0,   0,  15,   0, 
-      0,   0,  83,  86,  95,  84, 
-     97, 114, 103, 101, 116,   0, 
-    171, 171,  14,  70,   0,   0, 
-      0,   0,   0,   0,  82, 101, 
-    110, 100, 101, 114,  89,  67, 
-     98,  67, 114,  76,  97, 121, 
-    101, 114,   0,   4,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,   0,   0,   0, 255, 
-    255, 255, 255,  24,   7,   0, 
-      0,  68,  88,  66,  67, 254, 
-    249,  65, 252,  64,  46, 192, 
-    119,  73, 197, 161, 234,  24, 
-      1, 194, 131,   1,   0,   0, 
-      0,  24,   7,   0,   0,   6, 
-      0,   0,   0,  56,   0,   0, 
-      0, 164,   1,   0,   0, 148, 
-      3,   0,   0,  16,   4,   0, 
-      0, 140,   6,   0,   0, 192, 
-      6,   0,   0,  65, 111, 110, 
-     57, 100,   1,   0,   0, 100, 
-      1,   0,   0,   0,   2, 254, 
-    255,   0,   1,   0,   0, 100, 
-      0,   0,   0,   5,   0,  36, 
-      0,   0,   0,  96,   0,   0, 
-      0,  96,   0,   0,   0,  36, 
-      0,   1,   0,  96,   0,   0, 
-      0,   0,   0,   2,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   2,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,   6,   0,   1,   0,   5, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   1,   0,   6, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,   4,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   2, 254, 
-    255,  31,   0,   0,   2,   5, 
-      0,   0, 128,   0,   0,  15, 
-    144,   4,   0,   0,   4,   0, 
-      0,   3, 224,   0,   0, 228, 
-    144,   1,   0, 238, 160,   1, 
-      0, 228, 160,   4,   0,   0, 
-      4,   0,   0,   1, 128,   0, 
-      0,  85, 144,   2,   0, 255, 
-    160,   2,   0,  85, 160,   5, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0,   0, 128,   4, 
-      0, 228, 160,   4,   0,   0, 
-      4,   1,   0,   1, 128,   0, 
-      0,   0, 144,   2,   0, 170, 
-    160,   2,   0,   0, 160,   4, 
-      0,   0,   4,   0,   0,  15, 
-    128,   3,   0, 228, 160,   1, 
-      0,   0, 128,   0,   0, 228, 
-    128,   2,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    128,   5,   0, 228, 160,   2, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0, 228, 128,   6, 
-      0, 228, 161,   5,   0,   0, 
-      3,   1,   0,  15, 128,   0, 
-      0,  85, 128,   8,   0, 228, 
-    160,   4,   0,   0,   4,   1, 
-      0,  15, 128,   7,   0, 228, 
-    160,   0,   0,   0, 128,   1, 
-      0, 228, 128,   4,   0,   0, 
-      4,   1,   0,  15, 128,   9, 
-      0, 228, 160,   0,   0, 170, 
-    128,   1,   0, 228, 128,   4, 
-      0,   0,   4,   0,   0,  15, 
-    128,  10,   0, 228, 160,   0, 
-      0, 255, 128,   1,   0, 228, 
-    128,   4,   0,   0,   4,   0, 
-      0,   3, 192,   0,   0, 255, 
-    128,   0,   0, 228, 160,   0, 
-      0, 228, 128,   1,   0,   0, 
-      2,   0,   0,  12, 192,   0, 
-      0, 228, 128, 255, 255,   0, 
-      0,  83,  72,  68,  82, 232, 
-      1,   0,   0,  64,   0,   1, 
-      0, 122,   0,   0,   0,  89, 
-      0,   0,   4,  70, 142,  32, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0,  89,   0,   0, 
-      4,  70, 142,  32,   0,   1, 
-      0,   0,   0,   1,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   4,   0,   0,   0,  95, 
-      0,   0,   3,  50,  16,  16, 
-      0,   0,   0,   0,   0, 103, 
-      0,   0,   4, 242,  32,  16, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 101,   0,   0, 
-      3,  50,  32,  16,   0,   1, 
-      0,   0,   0, 104,   0,   0, 
-      2,   2,   0,   0,   0,  50, 
-      0,   0,  11,  50,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     16,  16,   0,   0,   0,   0, 
-      0, 230, 138,  32,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  70, 128,  32,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  56,   0,   0,   8, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  86,   5,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   4, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   6,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,   0,   0,   0,   8, 242, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      9, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32, 128,  65,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,  56,   0,   0, 
-      8, 242,   0,  16,   0,   1, 
-      0,   0,   0,  86,   5,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  10, 242,   0,  16, 
-      0,   1,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   6, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   1, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,   0,  16,   0,   1, 
-      0,   0,   0,  70, 142,  32, 
-      0,   2,   0,   0,   0,   2, 
-      0,   0,   0, 166,  10,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,  50,   0,   0,  10, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   2, 
-      0,   0,   0,   3,   0,   0, 
-      0, 246,  15,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  11,  50,  32,  16, 
-      0,   1,   0,   0,   0,  70, 
-     16,  16,   0,   0,   0,   0, 
-      0, 230, 138,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  70, 128,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,  11,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70, 116,   2,   0,   0,   3, 
-      0,   0,   0, 168,   0,   0, 
-      0,   3,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 254, 
-    255,   0,   1,   0,   0,  64, 
-      2,   0,   0, 124,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 133, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 152,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,  80, 101, 114, 
-     76,  97, 121, 101, 114,   0, 
-     80, 101, 114,  79,  99,  99, 
-     97, 115, 105, 111, 110,  97, 
-    108,  76,  97, 121, 101, 114, 
-      0,  80, 101, 114,  76,  97, 
-    121, 101, 114,  77,  97, 110, 
-     97, 103, 101, 114,   0, 124, 
-      0,   0,   0,   4,   0,   0, 
-      0, 240,   0,   0,   0, 112, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 133, 
-      0,   0,   0,   2,   0,   0, 
-      0, 188,   1,   0,   0,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 152, 
-      0,   0,   0,   1,   0,   0, 
-      0,  28,   2,   0,   0,  64, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  80, 
-      1,   0,   0,   0,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,  96,   1,   0, 
-      0,   0,   0,   0,   0, 112, 
-      1,   0,   0,  16,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,  96,   1,   0, 
-      0,   0,   0,   0,   0, 123, 
-      1,   0,   0,  32,   0,   0, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0, 140,   1,   0, 
-      0,   0,   0,   0,   0, 156, 
-      1,   0,   0,  48,   0,   0, 
-      0,  64,   0,   0,   0,   2, 
-      0,   0,   0, 172,   1,   0, 
-      0,   0,   0,   0,   0, 118, 
-     84, 101, 120, 116, 117, 114, 
-    101,  67, 111, 111, 114, 100, 
-    115,   0, 171,   1,   0,   3, 
-      0,   1,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 118,  76,  97, 121, 101, 
-    114,  81, 117,  97, 100,   0, 
-    102,  76,  97, 121, 101, 114, 
-     79, 112,  97,  99, 105, 116, 
-    121,   0, 171, 171, 171,   0, 
-      0,   3,   0,   1,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 109,  76,  97, 
-    121, 101, 114,  84, 114,  97, 
-    110, 115, 102, 111, 114, 109, 
-      0,   3,   0,   3,   0,   4, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 236, 
-      1,   0,   0,   0,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,  16, 
-      2,   0,   0,  16,   0,   0, 
-      0,  16,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0, 118, 
-     82, 101, 110, 100, 101, 114, 
-     84,  97, 114, 103, 101, 116, 
-     79, 102, 102, 115, 101, 116, 
-      0,   1,   0,   3,   0,   1, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 102, 
-     76,  97, 121, 101, 114,  67, 
-    111, 108, 111, 114,   0,  52, 
-      2,   0,   0,   0,   0,   0, 
-      0,  64,   0,   0,   0,   2, 
-      0,   0,   0, 172,   1,   0, 
-      0,   0,   0,   0,   0, 109, 
-     80, 114, 111, 106, 101,  99, 
-    116, 105, 111, 110,   0,  77, 
-    105,  99, 114, 111, 115, 111, 
-    102, 116,  32,  40,  82,  41, 
-     32,  72,  76,  83,  76,  32, 
-     83, 104,  97, 100, 101, 114, 
-     32,  67, 111, 109, 112, 105, 
-    108, 101, 114,  32,  57,  46, 
-     50,  55,  46,  57,  53,  50, 
-     46,  51,  48,  50,  50,   0, 
-    171, 171, 171,  73,  83,  71, 
-     78,  44,   0,   0,   0,   1, 
-      0,   0,   0,   8,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   3,   3,   0, 
-      0,  80,  79,  83,  73,  84, 
-     73,  79,  78,   0, 171, 171, 
-    171,  79,  83,  71,  78,  80, 
-      0,   0,   0,   2,   0,   0, 
-      0,   8,   0,   0,   0,  56, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,  15,   0,   0,   0,  68, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,  12,   0,   0,  83, 
-     86,  95,  80, 111, 115, 105, 
-    116, 105, 111, 110,   0,  84, 
-     69,  88,  67,  79,  79,  82, 
-     68,   0, 171, 171, 171, 139, 
-     74,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,  64,   7,   0,   0,  68, 
-     88,  66,  67, 126,  75, 135, 
-    159,  85, 129, 194,  57,   1, 
-      1,  77, 205, 160, 221, 154, 
-    168,   1,   0,   0,   0,  64, 
-      7,   0,   0,   6,   0,   0, 
-      0,  56,   0,   0,   0, 220, 
-      1,   0,   0,  44,   4,   0, 
-      0, 168,   4,   0,   0, 180, 
-      6,   0,   0,  12,   7,   0, 
-      0,  65, 111, 110,  57, 156, 
-      1,   0,   0, 156,   1,   0, 
-      0,   0,   2, 255, 255,  96, 
-      1,   0,   0,  60,   0,   0, 
-      0,   1,   0,  48,   0,   0, 
-      0,  60,   0,   0,   0,  60, 
-      0,   3,   0,  36,   0,   0, 
-      0,  60,   0,   0,   0,   0, 
-      0,   1,   0,   1,   0,   2, 
-      0,   2,   0,   0,   0,   2, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   2, 255, 
-    255,  81,   0,   0,   5,   1, 
-      0,  15, 160,   0,   0,   0, 
-    191,   0,   0, 128, 189, 186, 
-     73, 204,  63, 197,  32,  80, 
-     63,  81,   0,   0,   5,   2, 
-      0,  15, 160, 244, 253, 148, 
-     63, 233,  38,   1,  64,  39, 
-     49, 200,  62,   0,   0, 128, 
-     63,  31,   0,   0,   2,   0, 
-      0,   0, 128,   0,   0,   3, 
-    176,  31,   0,   0,   2,   0, 
-      0,   0, 144,   0,   8,  15, 
-    160,  31,   0,   0,   2,   0, 
-      0,   0, 144,   1,   8,  15, 
-    160,  31,   0,   0,   2,   0, 
-      0,   0, 144,   2,   8,  15, 
-    160,  66,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    176,   0,   8, 228, 160,  66, 
-      0,   0,   3,   1,   0,  15, 
-    128,   0,   0, 228, 176,   2, 
-      8, 228, 160,   2,   0,   0, 
-      3,   0,   0,   2, 128,   1, 
-      0,   0, 128,   1,   0,   0, 
-    160,   5,   0,   0,   3,   0, 
-      0,   6, 128,   0,   0,  85, 
-    128,   1,   0, 248, 160,   2, 
-      0,   0,   3,   0,   0,   1, 
-    128,   0,   0,   0, 128,   1, 
-      0,  85, 160,   4,   0,   0, 
-      4,   0,   0,   4, 128,   0, 
-      0,   0, 128,   2,   0,   0, 
-    160,   0,   0, 170, 129,   4, 
-      0,   0,   4,   1,   0,   1, 
-    128,   0,   0,   0, 128,   2, 
-      0,   0, 160,   0,   0,  85, 
-    128,  66,   0,   0,   3,   2, 
-      0,  15, 128,   0,   0, 228, 
-    176,   1,   8, 228, 160,   2, 
-      0,   0,   3,   0,   0,   2, 
-    128,   2,   0,   0, 128,   1, 
-      0,   0, 160,   4,   0,   0, 
-      4,   1,   0,   2, 128,   0, 
-      0,  85, 128,   2,   0, 170, 
-    161,   0,   0, 170, 128,   5, 
-      0,   0,   3,   0,   0,   2, 
-    128,   0,   0,  85, 128,   2, 
-      0,  85, 160,   4,   0,   0, 
-      4,   1,   0,   4, 128,   0, 
-      0,   0, 128,   2,   0,   0, 
-    160,   0,   0,  85, 128,   1, 
-      0,   0,   2,   1,   0,   8, 
-    128,   2,   0, 255, 160,   5, 
-      0,   0,   3,   0,   0,  15, 
-    128,   1,   0, 228, 128,   0, 
-      0,   0, 160,   1,   0,   0, 
-      2,   0,   8,  15, 128,   0, 
-      0, 228, 128, 255, 255,   0, 
-      0,  83,  72,  68,  82,  72, 
-      2,   0,   0,  64,   0,   0, 
-      0, 146,   0,   0,   0,  89, 
-      0,   0,   4,  70, 142,  32, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,  90,   0,   0, 
-      3,   0,  96,  16,   0,   0, 
-      0,   0,   0,  88,  24,   0, 
-      4,   0, 112,  16,   0,   0, 
-      0,   0,   0,  85,  85,   0, 
-      0,  88,  24,   0,   4,   0, 
-    112,  16,   0,   1,   0,   0, 
-      0,  85,  85,   0,   0,  88, 
-     24,   0,   4,   0, 112,  16, 
-      0,   2,   0,   0,   0,  85, 
-     85,   0,   0,  98,  16,   0, 
-      3,  50,  16,  16,   0,   1, 
-      0,   0,   0, 101,   0,   0, 
-      3, 242,  32,  16,   0,   0, 
-      0,   0,   0, 104,   0,   0, 
-      2,   3,   0,   0,   0,  69, 
-      0,   0,   9, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     16,  16,   0,   1,   0,   0, 
-      0,  70, 126,  16,   0,   2, 
-      0,   0,   0,   0,  96,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   7,  18,   0,  16, 
-      0,   0,   0,   0,   0,  10, 
-      0,  16,   0,   0,   0,   0, 
-      0,   1,  64,   0,   0,   0, 
-      0,   0, 191,  56,   0,   0, 
-     10,  50,   0,  16,   0,   0, 
-      0,   0,   0,   6,   0,  16, 
-      0,   0,   0,   0,   0,   2, 
-     64,   0,   0, 186,  73, 204, 
-     63, 197,  32,  80,  63,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  69,   0,   0,   9, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  70,  16,  16,   0,   1, 
-      0,   0,   0,  70, 126,  16, 
-      0,   0,   0,   0,   0,   0, 
-     96,  16,   0,   0,   0,   0, 
-      0,   0,   0,   0,   7,  66, 
-      0,  16,   0,   0,   0,   0, 
-      0,  10,   0,  16,   0,   1, 
-      0,   0,   0,   1,  64,   0, 
-      0,   0,   0, 128, 189,  50, 
-      0,   0,  10,  34,   0,  16, 
-      0,   0,   0,   0,   0,  42, 
-      0,  16,   0,   0,   0,   0, 
-      0,   1,  64,   0,   0, 244, 
-    253, 148,  63,  26,   0,  16, 
-    128,  65,   0,   0,   0,   0, 
-      0,   0,   0,  50,   0,   0, 
-      9,  18,   0,  16,   0,   1, 
-      0,   0,   0,  42,   0,  16, 
-      0,   0,   0,   0,   0,   1, 
-     64,   0,   0, 244, 253, 148, 
-     63,  10,   0,  16,   0,   0, 
-      0,   0,   0,  69,   0,   0, 
-      9, 242,   0,  16,   0,   2, 
-      0,   0,   0,  70,  16,  16, 
-      0,   1,   0,   0,   0,  70, 
-    126,  16,   0,   1,   0,   0, 
-      0,   0,  96,  16,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      7,  18,   0,  16,   0,   0, 
-      0,   0,   0,  10,   0,  16, 
-      0,   2,   0,   0,   0,   1, 
-     64,   0,   0,   0,   0,   0, 
-    191,  50,   0,   0,  10,  34, 
-      0,  16,   0,   1,   0,   0, 
-      0,  10,   0,  16, 128,  65, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,  64,   0,   0,  39, 
-     49, 200,  62,  26,   0,  16, 
-      0,   0,   0,   0,   0,  56, 
-      0,   0,   7,  18,   0,  16, 
-      0,   0,   0,   0,   0,  10, 
-      0,  16,   0,   0,   0,   0, 
-      0,   1,  64,   0,   0, 233, 
-     38,   1,  64,  50,   0,   0, 
-      9,  66,   0,  16,   0,   1, 
-      0,   0,   0,  42,   0,  16, 
-      0,   0,   0,   0,   0,   1, 
-     64,   0,   0, 244, 253, 148, 
-     63,  10,   0,  16,   0,   0, 
-      0,   0,   0,  54,   0,   0, 
-      5, 130,   0,  16,   0,   1, 
-      0,   0,   0,   1,  64,   0, 
-      0,   0,   0, 128,  63,  56, 
-      0,   0,   8, 242,  32,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,   6, 128,  32,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,  15,   0,   0,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70,   4,   2,   0,   0,   1, 
-      0,   0,   0, 236,   0,   0, 
-      0,   5,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 255, 
-    255,   0,   1,   0,   0, 208, 
-      1,   0,   0, 188,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 214, 
-      0,   0,   0,   2,   0,   0, 
-      0,   5,   0,   0,   0,   4, 
-      0,   0,   0, 255, 255, 255, 
-    255,   0,   0,   0,   0,   1, 
-      0,   0,   0,  12,   0,   0, 
-      0, 217,   0,   0,   0,   2, 
-      0,   0,   0,   5,   0,   0, 
-      0,   4,   0,   0,   0, 255, 
-    255, 255, 255,   1,   0,   0, 
-      0,   1,   0,   0,   0,  12, 
-      0,   0,   0, 221,   0,   0, 
-      0,   2,   0,   0,   0,   5, 
-      0,   0,   0,   4,   0,   0, 
-      0, 255, 255, 255, 255,   2, 
-      0,   0,   0,   1,   0,   0, 
-      0,  12,   0,   0,   0, 225, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,  76,  97, 121, 101, 114, 
-     84, 101, 120, 116, 117, 114, 
-    101,  83,  97, 109, 112, 108, 
-    101, 114,  76, 105, 110, 101, 
-     97, 114,   0, 116,  89,   0, 
-    116,  67,  98,   0, 116,  67, 
-    114,   0,  80, 101, 114,  76, 
-     97, 121, 101, 114,   0, 171, 
-    171, 225,   0,   0,   0,   4, 
-      0,   0,   0,   4,   1,   0, 
-      0, 112,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 100,   1,   0,   0,   0, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0, 116, 
-      1,   0,   0,   0,   0,   0, 
-      0, 132,   1,   0,   0,  16, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0, 116, 
-      1,   0,   0,   0,   0,   0, 
-      0, 143,   1,   0,   0,  32, 
-      0,   0,   0,   4,   0,   0, 
-      0,   2,   0,   0,   0, 160, 
-      1,   0,   0,   0,   0,   0, 
-      0, 176,   1,   0,   0,  48, 
-      0,   0,   0,  64,   0,   0, 
-      0,   0,   0,   0,   0, 192, 
-      1,   0,   0,   0,   0,   0, 
-      0, 118,  84, 101, 120, 116, 
-    117, 114, 101,  67, 111, 111, 
-    114, 100, 115,   0, 171,   1, 
-      0,   3,   0,   1,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 118,  76,  97, 
-    121, 101, 114,  81, 117,  97, 
-    100,   0, 102,  76,  97, 121, 
-    101, 114,  79, 112,  97,  99, 
-    105, 116, 121,   0, 171, 171, 
-    171,   0,   0,   3,   0,   1, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 109, 
-     76,  97, 121, 101, 114,  84, 
-    114,  97, 110, 115, 102, 111, 
-    114, 109,   0,   3,   0,   3, 
-      0,   4,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  55,  46,  57, 
-     53,  50,  46,  51,  48,  50, 
-     50,   0, 171, 171, 171,  73, 
-     83,  71,  78,  80,   0,   0, 
-      0,   2,   0,   0,   0,   8, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,  15, 
-      0,   0,   0,  68,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      3,   0,   0,  83,  86,  95, 
-     80, 111, 115, 105, 116, 105, 
-    111, 110,   0,  84,  69,  88, 
-     67,  79,  79,  82,  68,   0, 
-    171, 171, 171,  79,  83,  71, 
-     78,  44,   0,   0,   0,   1, 
-      0,   0,   0,   8,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,  15,   0,   0, 
-      0,  83,  86,  95,  84,  97, 
-    114, 103, 101, 116,   0, 171, 
-    171, 187,  81,   0,   0,   0, 
-      0,   0,   0,  82, 101, 110, 
-    100, 101, 114,  67, 111, 109, 
-    112, 111, 110, 101, 110, 116, 
-     65, 108, 112, 104,  97,  76, 
-     97, 121, 101, 114,   0,   4, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   3,   0,   0, 
-      0, 255, 255, 255, 255,  24, 
-      7,   0,   0,  68,  88,  66, 
-     67, 254, 249,  65, 252,  64, 
-     46, 192, 119,  73, 197, 161, 
-    234,  24,   1, 194, 131,   1, 
-      0,   0,   0,  24,   7,   0, 
-      0,   6,   0,   0,   0,  56, 
-      0,   0,   0, 164,   1,   0, 
-      0, 148,   3,   0,   0,  16, 
-      4,   0,   0, 140,   6,   0, 
-      0, 192,   6,   0,   0,  65, 
-    111, 110,  57, 100,   1,   0, 
-      0, 100,   1,   0,   0,   0, 
-      2, 254, 255,   0,   1,   0, 
-      0, 100,   0,   0,   0,   5, 
-      0,  36,   0,   0,   0,  96, 
-      0,   0,   0,  96,   0,   0, 
-      0,  36,   0,   1,   0,  96, 
-      0,   0,   0,   0,   0,   2, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   2, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   6,   0,   1, 
-      0,   5,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   1, 
-      0,   6,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,   4, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      2, 254, 255,  31,   0,   0, 
-      2,   5,   0,   0, 128,   0, 
-      0,  15, 144,   4,   0,   0, 
-      4,   0,   0,   3, 224,   0, 
-      0, 228, 144,   1,   0, 238, 
-    160,   1,   0, 228, 160,   4, 
-      0,   0,   4,   0,   0,   1, 
-    128,   0,   0,  85, 144,   2, 
-      0, 255, 160,   2,   0,  85, 
-    160,   5,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0,   0, 
-    128,   4,   0, 228, 160,   4, 
-      0,   0,   4,   1,   0,   1, 
-    128,   0,   0,   0, 144,   2, 
-      0, 170, 160,   2,   0,   0, 
-    160,   4,   0,   0,   4,   0, 
-      0,  15, 128,   3,   0, 228, 
-    160,   1,   0,   0, 128,   0, 
-      0, 228, 128,   2,   0,   0, 
-      3,   0,   0,  15, 128,   0, 
-      0, 228, 128,   5,   0, 228, 
-    160,   2,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    128,   6,   0, 228, 161,   5, 
-      0,   0,   3,   1,   0,  15, 
-    128,   0,   0,  85, 128,   8, 
-      0, 228, 160,   4,   0,   0, 
-      4,   1,   0,  15, 128,   7, 
-      0, 228, 160,   0,   0,   0, 
-    128,   1,   0, 228, 128,   4, 
-      0,   0,   4,   1,   0,  15, 
-    128,   9,   0, 228, 160,   0, 
-      0, 170, 128,   1,   0, 228, 
-    128,   4,   0,   0,   4,   0, 
-      0,  15, 128,  10,   0, 228, 
-    160,   0,   0, 255, 128,   1, 
-      0, 228, 128,   4,   0,   0, 
-      4,   0,   0,   3, 192,   0, 
-      0, 255, 128,   0,   0, 228, 
-    160,   0,   0, 228, 128,   1, 
-      0,   0,   2,   0,   0,  12, 
-    192,   0,   0, 228, 128, 255, 
-    255,   0,   0,  83,  72,  68, 
-     82, 232,   1,   0,   0,  64, 
-      0,   1,   0, 122,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0,  89, 
-      0,   0,   4,  70, 142,  32, 
-      0,   1,   0,   0,   0,   1, 
-      0,   0,   0,  89,   0,   0, 
-      4,  70, 142,  32,   0,   2, 
-      0,   0,   0,   4,   0,   0, 
-      0,  95,   0,   0,   3,  50, 
-     16,  16,   0,   0,   0,   0, 
-      0, 103,   0,   0,   4, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 101, 
-      0,   0,   3,  50,  32,  16, 
-      0,   1,   0,   0,   0, 104, 
-      0,   0,   2,   2,   0,   0, 
-      0,  50,   0,   0,  11,  50, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  16,  16,   0,   0, 
-      0,   0,   0, 230, 138,  32, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  70, 128,  32, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  56,   0,   0, 
-      8, 242,   0,  16,   0,   1, 
-      0,   0,   0,  86,   5,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   4,   0,   0,   0,  50, 
-      0,   0,  10, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   6, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      8, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   6,   0,   0,   0,   0, 
-      0,   0,   9, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32, 128,  65, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,  56, 
-      0,   0,   8, 242,   0,  16, 
-      0,   1,   0,   0,   0,  86, 
-      5,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   2, 
-      0,   0,   0,   1,   0,   0, 
-      0,  50,   0,   0,  10, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  70, 142,  32,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   6,   0,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  10, 242,   0,  16, 
-      0,   1,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   2,   0,   0,   0, 166, 
-     10,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   1, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,  32,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   2,   0,   0,   0,   3, 
-      0,   0,   0, 246,  15,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,  50,   0,   0,  11,  50, 
-     32,  16,   0,   1,   0,   0, 
-      0,  70,  16,  16,   0,   0, 
-      0,   0,   0, 230, 138,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  70, 128,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  62,   0,   0, 
-      1,  83,  84,  65,  84, 116, 
-      0,   0,   0,  11,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  82, 
-     68,  69,  70, 116,   2,   0, 
-      0,   3,   0,   0,   0, 168, 
-      0,   0,   0,   3,   0,   0, 
-      0,  28,   0,   0,   0,   0, 
-      4, 254, 255,   0,   1,   0, 
-      0,  64,   2,   0,   0, 124, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 133,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0, 152,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,  80, 
-    101, 114,  76,  97, 121, 101, 
-    114,   0,  80, 101, 114,  79, 
-     99,  99,  97, 115, 105, 111, 
-    110,  97, 108,  76,  97, 121, 
-    101, 114,   0,  80, 101, 114, 
-     76,  97, 121, 101, 114,  77, 
-     97, 110,  97, 103, 101, 114, 
-      0, 124,   0,   0,   0,   4, 
-      0,   0,   0, 240,   0,   0, 
-      0, 112,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 133,   0,   0,   0,   2, 
-      0,   0,   0, 188,   1,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 152,   0,   0,   0,   1, 
-      0,   0,   0,  28,   2,   0, 
-      0,  64,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  80,   1,   0,   0,   0, 
-      0,   0,   0,  16,   0,   0, 
-      0,   2,   0,   0,   0,  96, 
-      1,   0,   0,   0,   0,   0, 
-      0, 112,   1,   0,   0,  16, 
-      0,   0,   0,  16,   0,   0, 
-      0,   2,   0,   0,   0,  96, 
-      1,   0,   0,   0,   0,   0, 
-      0, 123,   1,   0,   0,  32, 
-      0,   0,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0, 140, 
-      1,   0,   0,   0,   0,   0, 
-      0, 156,   1,   0,   0,  48, 
-      0,   0,   0,  64,   0,   0, 
-      0,   2,   0,   0,   0, 172, 
-      1,   0,   0,   0,   0,   0, 
-      0, 118,  84, 101, 120, 116, 
-    117, 114, 101,  67, 111, 111, 
-    114, 100, 115,   0, 171,   1, 
-      0,   3,   0,   1,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 118,  76,  97, 
-    121, 101, 114,  81, 117,  97, 
-    100,   0, 102,  76,  97, 121, 
-    101, 114,  79, 112,  97,  99, 
-    105, 116, 121,   0, 171, 171, 
-    171,   0,   0,   3,   0,   1, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 109, 
-     76,  97, 121, 101, 114,  84, 
-    114,  97, 110, 115, 102, 111, 
-    114, 109,   0,   3,   0,   3, 
-      0,   4,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 236,   1,   0,   0,   0, 
-      0,   0,   0,  16,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0,  16,   2,   0,   0,  16, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      2,   0,   0,   0,   0,   0, 
-      0, 118,  82, 101, 110, 100, 
-    101, 114,  84,  97, 114, 103, 
-    101, 116,  79, 102, 102, 115, 
-    101, 116,   0,   1,   0,   3, 
-      0,   1,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 102,  76,  97, 121, 101, 
-    114,  67, 111, 108, 111, 114, 
-      0,  52,   2,   0,   0,   0, 
-      0,   0,   0,  64,   0,   0, 
-      0,   2,   0,   0,   0, 172, 
-      1,   0,   0,   0,   0,   0, 
-      0, 109,  80, 114, 111, 106, 
-    101,  99, 116, 105, 111, 110, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  55,  46,  57, 
-     53,  50,  46,  51,  48,  50, 
-     50,   0, 171, 171, 171,  73, 
-     83,  71,  78,  44,   0,   0, 
-      0,   1,   0,   0,   0,   8, 
-      0,   0,   0,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      3,   0,   0,  80,  79,  83, 
-     73,  84,  73,  79,  78,   0, 
-    171, 171, 171,  79,  83,  71, 
-     78,  80,   0,   0,   0,   2, 
-      0,   0,   0,   8,   0,   0, 
-      0,  56,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,  15,   0,   0, 
-      0,  68,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   1, 
-      0,   0,   0,   3,  12,   0, 
-      0,  83,  86,  95,  80, 111, 
-    115, 105, 116, 105, 111, 110, 
-      0,  84,  69,  88,  67,  79, 
-     79,  82,  68,   0, 171, 171, 
-    171,  81,  89,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0, 144,   5,   0, 
-      0,  68,  88,  66,  67, 238, 
-     19, 121, 188, 150,  99, 227, 
-    180,  83, 152, 252, 187,  65, 
-      5, 113, 253,   1,   0,   0, 
-      0, 144,   5,   0,   0,   6, 
-      0,   0,   0,  56,   0,   0, 
-      0,  52,   1,   0,   0, 128, 
-      2,   0,   0, 252,   2,   0, 
-      0, 236,   4,   0,   0,  68, 
-      5,   0,   0,  65, 111, 110, 
-     57, 244,   0,   0,   0, 244, 
-      0,   0,   0,   0,   2, 255, 
-    255, 188,   0,   0,   0,  56, 
-      0,   0,   0,   1,   0,  44, 
-      0,   0,   0,  56,   0,   0, 
-      0,  56,   0,   2,   0,  36, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   1,   0,   1, 
-      0,   0,   0,   2,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   2, 255, 255,  81, 
-      0,   0,   5,   1,   0,  15, 
-    160,   0,   0, 128,  63,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  31, 
-      0,   0,   2,   0,   0,   0, 
-    128,   0,   0,   3, 176,  31, 
-      0,   0,   2,   0,   0,   0, 
-    144,   0,   8,  15, 160,  31, 
-      0,   0,   2,   0,   0,   0, 
-    144,   1,   8,  15, 160,  66, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0, 228, 176,   1, 
-      8, 228, 160,  66,   0,   0, 
-      3,   1,   0,  15, 128,   0, 
-      0, 228, 176,   0,   8, 228, 
-    160,   5,   0,   0,   3,   2, 
-      0,  15, 128,   1,   0, 228, 
-    128,   0,   0,   0, 160,   1, 
-      0,   0,   2,   0,   8,  15, 
-    128,   2,   0, 228, 128,   2, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0, 228, 129,   1, 
-      0, 228, 128,   2,   0,   0, 
-      3,   0,   0,  15, 128,   0, 
-      0, 228, 128,   1,   0,   0, 
-    160,   5,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    128,   0,   0,   0, 160,   1, 
-      0,   0,   2,   1,   8,  15, 
-    128,   0,   0, 228, 128, 255, 
-    255,   0,   0,  83,  72,  68, 
-     82,  68,   1,   0,   0,  64, 
-      0,   0,   0,  81,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,  90, 
-      0,   0,   3,   0,  96,  16, 
-      0,   0,   0,   0,   0,  88, 
-     24,   0,   4,   0, 112,  16, 
-      0,   0,   0,   0,   0,  85, 
-     85,   0,   0,  88,  24,   0, 
-      4,   0, 112,  16,   0,   1, 
-      0,   0,   0,  85,  85,   0, 
-      0,  98,  16,   0,   3,  50, 
-     16,  16,   0,   1,   0,   0, 
-      0, 101,   0,   0,   3, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0, 101,   0,   0,   3, 242, 
-     32,  16,   0,   1,   0,   0, 
-      0, 104,   0,   0,   2,   2, 
-      0,   0,   0,  69,   0,   0, 
-      9, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70,  16,  16, 
-      0,   1,   0,   0,   0,  70, 
-    126,  16,   0,   0,   0,   0, 
-      0,   0,  96,  16,   0,   0, 
-      0,   0,   0,  56,   0,   0, 
-      8, 242,  32,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   0,   0,   0,   0,   6, 
-    128,  32,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,  69, 
-      0,   0,   9, 242,   0,  16, 
-      0,   1,   0,   0,   0,  70, 
-     16,  16,   0,   1,   0,   0, 
-      0,  70, 126,  16,   0,   1, 
-      0,   0,   0,   0,  96,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   8, 242,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16, 128,  65, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,  10, 242, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   0, 
-      0,   0,   0,   2,  64,   0, 
-      0,   0,   0, 128,  63,   0, 
-      0, 128,  63,   0,   0, 128, 
-     63,   0,   0, 128,  63,  56, 
-      0,   0,   8, 242,  32,  16, 
-      0,   1,   0,   0,   0,  70, 
-     14,  16,   0,   0,   0,   0, 
-      0,   6, 128,  32,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,   7,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70, 232,   1,   0,   0,   1, 
-      0,   0,   0, 208,   0,   0, 
-      0,   4,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 255, 
-    255,   0,   1,   0,   0, 180, 
-      1,   0,   0, 156,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 182, 
-      0,   0,   0,   2,   0,   0, 
-      0,   5,   0,   0,   0,   4, 
-      0,   0,   0, 255, 255, 255, 
-    255,   0,   0,   0,   0,   1, 
-      0,   0,   0,  12,   0,   0, 
-      0, 187,   0,   0,   0,   2, 
-      0,   0,   0,   5,   0,   0, 
-      0,   4,   0,   0,   0, 255, 
-    255, 255, 255,   1,   0,   0, 
-      0,   1,   0,   0,   0,  12, 
-      0,   0,   0, 197,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,  76, 
-     97, 121, 101, 114,  84, 101, 
-    120, 116, 117, 114, 101,  83, 
-     97, 109, 112, 108, 101, 114, 
-     76, 105, 110, 101,  97, 114, 
-      0, 116,  82,  71,  66,   0, 
-    116,  82,  71,  66,  87, 104, 
-    105, 116, 101,   0,  80, 101, 
-    114,  76,  97, 121, 101, 114, 
-      0, 171, 171, 197,   0,   0, 
-      0,   4,   0,   0,   0, 232, 
-      0,   0,   0, 112,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  72,   1,   0, 
-      0,   0,   0,   0,   0,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,  88,   1,   0,   0,   0, 
-      0,   0,   0, 104,   1,   0, 
-      0,  16,   0,   0,   0,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,  88,   1,   0,   0,   0, 
-      0,   0,   0, 115,   1,   0, 
-      0,  32,   0,   0,   0,   4, 
-      0,   0,   0,   2,   0,   0, 
-      0, 132,   1,   0,   0,   0, 
-      0,   0,   0, 148,   1,   0, 
-      0,  48,   0,   0,   0,  64, 
-      0,   0,   0,   0,   0,   0, 
-      0, 164,   1,   0,   0,   0, 
-      0,   0,   0, 118,  84, 101, 
-    120, 116, 117, 114, 101,  67, 
-    111, 111, 114, 100, 115,   0, 
-    171,   1,   0,   3,   0,   1, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 118, 
-     76,  97, 121, 101, 114,  81, 
-    117,  97, 100,   0, 102,  76, 
-     97, 121, 101, 114,  79, 112, 
-     97,  99, 105, 116, 121,   0, 
-    171, 171, 171,   0,   0,   3, 
-      0,   1,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 109,  76,  97, 121, 101, 
-    114,  84, 114,  97, 110, 115, 
-    102, 111, 114, 109,   0,   3, 
-      0,   3,   0,   4,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  77, 105,  99, 
-    114, 111, 115, 111, 102, 116, 
-     32,  40,  82,  41,  32,  72, 
-     76,  83,  76,  32,  83, 104, 
-     97, 100, 101, 114,  32,  67, 
-    111, 109, 112, 105, 108, 101, 
-    114,  32,  57,  46,  50,  55, 
-     46,  57,  53,  50,  46,  51, 
-     48,  50,  50,   0, 171, 171, 
-    171,  73,  83,  71,  78,  80, 
-      0,   0,   0,   2,   0,   0, 
-      0,   8,   0,   0,   0,  56, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,  15,   0,   0,   0,  68, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,   3,   0,   0,  83, 
-     86,  95,  80, 111, 115, 105, 
-    116, 105, 111, 110,   0,  84, 
-     69,  88,  67,  79,  79,  82, 
-     68,   0, 171, 171, 171,  79, 
-     83,  71,  78,  68,   0,   0, 
-      0,   2,   0,   0,   0,   8, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,  15, 
-      0,   0,   0,  56,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   1,   0,   0,   0,  15, 
-      0,   0,   0,  83,  86,  95, 
-     84,  97, 114, 103, 101, 116, 
-      0, 171, 171, 129,  96,   0, 
-      0,   0,   0,   0,   0,  82, 
-    101, 110, 100, 101, 114,  83, 
-    111, 108, 105, 100,  67, 111, 
-    108, 111, 114,  76,  97, 121, 
-    101, 114,   0,   4,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,   0,   0,   0, 255, 
-    255, 255, 255,  24,   7,   0, 
-      0,  68,  88,  66,  67, 254, 
-    249,  65, 252,  64,  46, 192, 
-    119,  73, 197, 161, 234,  24, 
-      1, 194, 131,   1,   0,   0, 
-      0,  24,   7,   0,   0,   6, 
-      0,   0,   0,  56,   0,   0, 
-      0, 164,   1,   0,   0, 148, 
-      3,   0,   0,  16,   4,   0, 
-      0, 140,   6,   0,   0, 192, 
-      6,   0,   0,  65, 111, 110, 
-     57, 100,   1,   0,   0, 100, 
-      1,   0,   0,   0,   2, 254, 
-    255,   0,   1,   0,   0, 100, 
-      0,   0,   0,   5,   0,  36, 
-      0,   0,   0,  96,   0,   0, 
-      0,  96,   0,   0,   0,  36, 
-      0,   1,   0,  96,   0,   0, 
-      0,   0,   0,   2,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   2,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,   6,   0,   1,   0,   5, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   1,   0,   6, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,   4,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   2, 254, 
-    255,  31,   0,   0,   2,   5, 
-      0,   0, 128,   0,   0,  15, 
-    144,   4,   0,   0,   4,   0, 
-      0,   3, 224,   0,   0, 228, 
-    144,   1,   0, 238, 160,   1, 
-      0, 228, 160,   4,   0,   0, 
-      4,   0,   0,   1, 128,   0, 
-      0,  85, 144,   2,   0, 255, 
-    160,   2,   0,  85, 160,   5, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0,   0, 128,   4, 
-      0, 228, 160,   4,   0,   0, 
-      4,   1,   0,   1, 128,   0, 
-      0,   0, 144,   2,   0, 170, 
-    160,   2,   0,   0, 160,   4, 
-      0,   0,   4,   0,   0,  15, 
-    128,   3,   0, 228, 160,   1, 
-      0,   0, 128,   0,   0, 228, 
-    128,   2,   0,   0,   3,   0, 
-      0,  15, 128,   0,   0, 228, 
-    128,   5,   0, 228, 160,   2, 
-      0,   0,   3,   0,   0,  15, 
-    128,   0,   0, 228, 128,   6, 
-      0, 228, 161,   5,   0,   0, 
-      3,   1,   0,  15, 128,   0, 
-      0,  85, 128,   8,   0, 228, 
-    160,   4,   0,   0,   4,   1, 
-      0,  15, 128,   7,   0, 228, 
-    160,   0,   0,   0, 128,   1, 
-      0, 228, 128,   4,   0,   0, 
-      4,   1,   0,  15, 128,   9, 
-      0, 228, 160,   0,   0, 170, 
-    128,   1,   0, 228, 128,   4, 
-      0,   0,   4,   0,   0,  15, 
-    128,  10,   0, 228, 160,   0, 
-      0, 255, 128,   1,   0, 228, 
-    128,   4,   0,   0,   4,   0, 
-      0,   3, 192,   0,   0, 255, 
-    128,   0,   0, 228, 160,   0, 
-      0, 228, 128,   1,   0,   0, 
-      2,   0,   0,  12, 192,   0, 
-      0, 228, 128, 255, 255,   0, 
-      0,  83,  72,  68,  82, 232, 
-      1,   0,   0,  64,   0,   1, 
-      0, 122,   0,   0,   0,  89, 
-      0,   0,   4,  70, 142,  32, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0,  89,   0,   0, 
-      4,  70, 142,  32,   0,   1, 
-      0,   0,   0,   1,   0,   0, 
-      0,  89,   0,   0,   4,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   4,   0,   0,   0,  95, 
-      0,   0,   3,  50,  16,  16, 
-      0,   0,   0,   0,   0, 103, 
-      0,   0,   4, 242,  32,  16, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 101,   0,   0, 
-      3,  50,  32,  16,   0,   1, 
-      0,   0,   0, 104,   0,   0, 
-      2,   2,   0,   0,   0,  50, 
-      0,   0,  11,  50,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     16,  16,   0,   0,   0,   0, 
-      0, 230, 138,  32,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  70, 128,  32,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  56,   0,   0,   8, 242, 
-      0,  16,   0,   1,   0,   0, 
-      0,  86,   5,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   4, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   6,   0,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,   0,   0,   0,   8, 242, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   0, 
-      0,   0,   0,  70, 142,  32, 
-      0,   0,   0,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      9, 242,   0,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32, 128,  65,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,  56,   0,   0, 
-      8, 242,   0,  16,   0,   1, 
-      0,   0,   0,  86,   5,  16, 
-      0,   0,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  10, 242,   0,  16, 
-      0,   1,   0,   0,   0,  70, 
-    142,  32,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   6, 
-      0,  16,   0,   0,   0,   0, 
-      0,  70,  14,  16,   0,   1, 
-      0,   0,   0,  50,   0,   0, 
-     10, 242,   0,  16,   0,   1, 
-      0,   0,   0,  70, 142,  32, 
-      0,   2,   0,   0,   0,   2, 
-      0,   0,   0, 166,  10,  16, 
-      0,   0,   0,   0,   0,  70, 
-     14,  16,   0,   1,   0,   0, 
-      0,  50,   0,   0,  10, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   2, 
-      0,   0,   0,   3,   0,   0, 
-      0, 246,  15,  16,   0,   0, 
-      0,   0,   0,  70,  14,  16, 
-      0,   1,   0,   0,   0,  50, 
-      0,   0,  11,  50,  32,  16, 
-      0,   1,   0,   0,   0,  70, 
-     16,  16,   0,   0,   0,   0, 
-      0, 230, 138,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  70, 128,  32,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,  11,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   4, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70, 116,   2,   0,   0,   3, 
-      0,   0,   0, 168,   0,   0, 
-      0,   3,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 254, 
-    255,   0,   1,   0,   0,  64, 
-      2,   0,   0, 124,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 133, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 152,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,  80, 101, 114, 
-     76,  97, 121, 101, 114,   0, 
-     80, 101, 114,  79,  99,  99, 
-     97, 115, 105, 111, 110,  97, 
-    108,  76,  97, 121, 101, 114, 
-      0,  80, 101, 114,  76,  97, 
-    121, 101, 114,  77,  97, 110, 
-     97, 103, 101, 114,   0, 124, 
-      0,   0,   0,   4,   0,   0, 
-      0, 240,   0,   0,   0, 112, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 133, 
-      0,   0,   0,   2,   0,   0, 
-      0, 188,   1,   0,   0,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 152, 
-      0,   0,   0,   1,   0,   0, 
-      0,  28,   2,   0,   0,  64, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,  80, 
-      1,   0,   0,   0,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,  96,   1,   0, 
-      0,   0,   0,   0,   0, 112, 
-      1,   0,   0,  16,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,  96,   1,   0, 
-      0,   0,   0,   0,   0, 123, 
-      1,   0,   0,  32,   0,   0, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0, 140,   1,   0, 
-      0,   0,   0,   0,   0, 156, 
-      1,   0,   0,  48,   0,   0, 
-      0,  64,   0,   0,   0,   2, 
-      0,   0,   0, 172,   1,   0, 
-      0,   0,   0,   0,   0, 118, 
-     84, 101, 120, 116, 117, 114, 
-    101,  67, 111, 111, 114, 100, 
-    115,   0, 171,   1,   0,   3, 
-      0,   1,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 118,  76,  97, 121, 101, 
-    114,  81, 117,  97, 100,   0, 
-    102,  76,  97, 121, 101, 114, 
-     79, 112,  97,  99, 105, 116, 
-    121,   0, 171, 171, 171,   0, 
-      0,   3,   0,   1,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 109,  76,  97, 
-    121, 101, 114,  84, 114,  97, 
-    110, 115, 102, 111, 114, 109, 
-      0,   3,   0,   3,   0,   4, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 236, 
-      1,   0,   0,   0,   0,   0, 
-      0,  16,   0,   0,   0,   2, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0,  16, 
-      2,   0,   0,  16,   0,   0, 
-      0,  16,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      0,   0,   0,   0,   0, 118, 
-     82, 101, 110, 100, 101, 114, 
-     84,  97, 114, 103, 101, 116, 
-     79, 102, 102, 115, 101, 116, 
-      0,   1,   0,   3,   0,   1, 
-      0,   4,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 102, 
-     76,  97, 121, 101, 114,  67, 
-    111, 108, 111, 114,   0,  52, 
-      2,   0,   0,   0,   0,   0, 
-      0,  64,   0,   0,   0,   2, 
-      0,   0,   0, 172,   1,   0, 
-      0,   0,   0,   0,   0, 109, 
-     80, 114, 111, 106, 101,  99, 
-    116, 105, 111, 110,   0,  77, 
-    105,  99, 114, 111, 115, 111, 
-    102, 116,  32,  40,  82,  41, 
-     32,  72,  76,  83,  76,  32, 
-     83, 104,  97, 100, 101, 114, 
-     32,  67, 111, 109, 112, 105, 
-    108, 101, 114,  32,  57,  46, 
-     50,  55,  46,  57,  53,  50, 
-     46,  51,  48,  50,  50,   0, 
-    171, 171, 171,  73,  83,  71, 
-     78,  44,   0,   0,   0,   1, 
-      0,   0,   0,   8,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,   3,   3,   0, 
-      0,  80,  79,  83,  73,  84, 
-     73,  79,  78,   0, 171, 171, 
-    171,  79,  83,  71,  78,  80, 
-      0,   0,   0,   2,   0,   0, 
-      0,   8,   0,   0,   0,  56, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      0,   0,   0,   0,   0,   0, 
-      0,  15,   0,   0,   0,  68, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   3, 
-      0,   0,   0,   1,   0,   0, 
-      0,   3,  12,   0,   0,  83, 
-     86,  95,  80, 111, 115, 105, 
-    116, 105, 111, 110,   0,  84, 
-     69,  88,  67,  79,  79,  82, 
-     68,   0, 171, 171, 171,  99, 
-    102,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0, 216,   2,   0,   0,  68, 
-     88,  66,  67, 247, 128, 122, 
-    171, 183, 156, 243,  15,  69, 
-     10, 154, 190,  66, 220,  37, 
-     74,   1,   0,   0,   0, 216, 
-      2,   0,   0,   6,   0,   0, 
-      0,  56,   0,   0,   0, 132, 
-      0,   0,   0, 204,   0,   0, 
-      0,  72,   1,   0,   0,  76, 
-      2,   0,   0, 164,   2,   0, 
-      0,  65, 111, 110,  57,  68, 
-      0,   0,   0,  68,   0,   0, 
-      0,   0,   2, 255, 255,  20, 
-      0,   0,   0,  48,   0,   0, 
-      0,   1,   0,  36,   0,   0, 
-      0,  48,   0,   0,   0,  48, 
-      0,   0,   0,  36,   0,   0, 
-      0,  48,   0,   0,   0,   1, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   1,   2, 255, 
-    255,   1,   0,   0,   2,   0, 
-      8,  15, 128,   0,   0, 228, 
-    160, 255, 255,   0,   0,  83, 
-     72,  68,  82,  64,   0,   0, 
-      0,  64,   0,   0,   0,  16, 
-      0,   0,   0,  89,   0,   0, 
-      4,  70, 142,  32,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0, 101,   0,   0,   3, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0,  54,   0,   0,   6, 242, 
-     32,  16,   0,   0,   0,   0, 
-      0,  70, 142,  32,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  62,   0,   0,   1,  83, 
-     84,  65,  84, 116,   0,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,  82,  68,  69, 
-     70, 252,   0,   0,   0,   1, 
-      0,   0,   0,  80,   0,   0, 
-      0,   1,   0,   0,   0,  28, 
-      0,   0,   0,   0,   4, 255, 
-    255,   0,   1,   0,   0, 200, 
-      0,   0,   0,  60,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0,  80, 
-    101, 114,  79,  99,  99,  97, 
-    115, 105, 111, 110,  97, 108, 
-     76,  97, 121, 101, 114,   0, 
-    171,  60,   0,   0,   0,   2, 
-      0,   0,   0, 104,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 152,   0,   0,   0,   0, 
-      0,   0,   0,  16,   0,   0, 
-      0,   0,   0,   0,   0, 172, 
-      0,   0,   0,   0,   0,   0, 
-      0, 188,   0,   0,   0,  16, 
-      0,   0,   0,  16,   0,   0, 
-      0,   2,   0,   0,   0, 172, 
-      0,   0,   0,   0,   0,   0, 
-      0, 118,  82, 101, 110, 100, 
-    101, 114,  84,  97, 114, 103, 
-    101, 116,  79, 102, 102, 115, 
-    101, 116,   0,   1,   0,   3, 
-      0,   1,   0,   4,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 102,  76,  97, 121, 101, 
-    114,  67, 111, 108, 111, 114, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  55,  46,  57, 
-     53,  50,  46,  51,  48,  50, 
-     50,   0, 171, 171, 171,  73, 
-     83,  71,  78,  80,   0,   0, 
-      0,   2,   0,   0,   0,   8, 
-      0,   0,   0,  56,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,   3,   0,   0, 
-      0,   0,   0,   0,   0,  15, 
-      0,   0,   0,  68,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   3,   0,   0, 
-      0,   1,   0,   0,   0,   3, 
-      0,   0,   0,  83,  86,  95, 
-     80, 111, 115, 105, 116, 105, 
-    111, 110,   0,  84,  69,  88, 
-     67,  79,  79,  82,  68,   0, 
-    171, 171, 171,  79,  83,  71, 
-     78,  44,   0,   0,   0,   1, 
-      0,   0,   0,   8,   0,   0, 
-      0,  32,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   3,   0,   0,   0,   0, 
-      0,   0,   0,  15,   0,   0, 
-      0,  83,  86,  95,  84,  97, 
-    114, 103, 101, 116,   0, 171, 
-    171, 147, 109,   0,   0,   0, 
-      0,   0,   0,   4,   0,   0, 
-      0, 112,   0,   0,   0,   0, 
-      0,   0,   0,   4,   0,   0, 
-      0, 255, 255, 255, 255,   0, 
-      0,   0,   0,  48,   0,   0, 
-      0,  20,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  63,   0,   0,   0,  20, 
-      0,   0,   0,   0,   0,   0, 
-      0,  16,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 108, 
-      0,   0,   0,  80,   0,   0, 
-      0,   0,   0,   0,   0,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 159,   0,   0, 
-      0, 131,   0,   0,   0,   0, 
-      0,   0,   0,  48,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0, 175,   0,   0,   0,  32, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0, 255, 
-    255, 255, 255,   0,   0,   0, 
-      0, 194,   0,   0,   0,  20, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0, 214, 
-      0,   0,   0,  20,   0,   0, 
-      0,   0,   0,   0,   0,  16, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0, 226,   0,   0, 
-      0,  64,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 255, 255, 255, 255,   0, 
-      0,   0,   0, 242,   0,   0, 
-      0, 131,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,  37,   1,   0,   0,   9, 
-      1,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   9, 
-      0,   0,   0,  36,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  44,   1,   0, 
-      0,  37,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  56,   1,   0,   0,  38, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  68, 
-      1,   0,   0,  39,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  80,   1,   0, 
-      0,  40,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  92,   1,   0,   0,  41, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 104, 
-      1,   0,   0,  42,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 116,   1,   0, 
-      0,  43,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 128,   1,   0,   0,  44, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 140, 
-      1,   0,   0,   0,   0,   0, 
-      0, 152,   1,   0,   0,   9, 
-      1,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   9, 
-      0,   0,   0,  36,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 162,   1,   0, 
-      0,  37,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 174,   1,   0,   0,  38, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 186, 
-      1,   0,   0,  39,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 198,   1,   0, 
-      0,  40,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 210,   1,   0,   0,  41, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 222, 
-      1,   0,   0,  42,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 234,   1,   0, 
-      0,  43,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 246,   1,   0,   0,  44, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   2, 
-      2,   0,   0,   0,   0,   0, 
-      0,  14,   2,   0,   0,   9, 
-      1,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   9, 
-      0,   0,   0,  36,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  34,   2,   0, 
-      0,  37,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  46,   2,   0,   0,  38, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  58, 
-      2,   0,   0,  39,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  70,   2,   0, 
-      0,  40,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  82,   2,   0,   0,  41, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  94, 
-      2,   0,   0,  42,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 106,   2,   0, 
-      0,  43,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 118,   2,   0,   0,  44, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 130, 
-      2,   0,   0,   0,   0,   0, 
-      0, 186,   2,   0,   0, 158, 
-      2,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   2, 
-      0,   0,   0,  19,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 196,   2,   0, 
-      0,  13,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 208,   2,   0,   0,   0, 
-      0,   0,   0,   2,   3,   0, 
-      0, 230,   2,   0,   0,   0, 
-      0,   0,   0, 255, 255, 255, 
-    255,   0,   0,   0,   0,   7, 
-      3,   0,   0, 230,   2,   0, 
-      0,   0,   0,   0,   0, 255, 
-    255, 255, 255,   0,   0,   0, 
-      0,  10,   3,   0,   0, 230, 
-      2,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   0, 
-      0,   0,   0,  14,   3,   0, 
-      0, 230,   2,   0,   0,   0, 
-      0,   0,   0, 255, 255, 255, 
-    255,   0,   0,   0,   0,  18, 
-      3,   0,   0, 230,   2,   0, 
-      0,   0,   0,   0,   0, 255, 
-    255, 255, 255,   0,   0,   0, 
-      0,  69,   3,   0,   0,  41, 
-      3,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   3, 
-      0,   0,   0,  45,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  95,   3,   0, 
-      0,  46,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 107,   3,   0,   0,  47, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 119, 
-      3,   0,   0,   0,   0,   0, 
-      0, 131,   3,   0,   0,  41, 
-      3,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255,   3, 
-      0,   0,   0,  45,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 156,   3,   0, 
-      0,  46,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 168,   3,   0,   0,  47, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 180, 
-      3,   0,   0,   0,   0,   0, 
-      0, 192,   3,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 213,   3,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0, 186,   2,   0,   0,  10, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 216, 
-      3,   0,   0,  11,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 252,   3,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,  37,   1,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0,  36, 
-     11,   0,   0,   8,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  44,  11,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 144,  15,   0,   0, 152, 
-     15,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 213, 
-      3,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0, 186, 
-      2,   0,   0,  10,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 178,  15,   0, 
-      0,  11,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 214,  15,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,  37, 
-      1,   0,   0,   6,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0, 254,  22,   0, 
-      0,   8,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,   6,  23,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0, 106, 
-     27,   0,   0, 114,  27,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0, 213,   3,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0, 186,   2,   0, 
-      0,  10,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 136,  27,   0,   0,  11, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 172, 
-     27,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,  37,   1,   0, 
-      0,   6,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 212,  34,   0,   0,   8, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 220, 
-     34,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0,  28,  39,   0, 
-      0,  36,  39,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 213,   3,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0, 186,   2,   0,   0,  10, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  61, 
-     39,   0,   0,  11,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  97,  39,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0, 152,   1,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0, 137, 
-     46,   0,   0,   8,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 145,  46,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 209,  50,   0,   0, 217, 
-     50,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 213, 
-      3,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0, 186, 
-      2,   0,   0,  10,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 244,  50,   0, 
-      0,  11,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  24,  51,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,  37, 
-      1,   0,   0,   6,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0,  64,  58,   0, 
-      0,   8,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  72,  58,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0, 136, 
-     62,   0,   0, 144,  62,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0, 213,   3,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0, 186,   2,   0, 
-      0,  10,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 174,  62,   0,   0,  11, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 210, 
-     62,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0, 152,   1,   0, 
-      0,   6,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 250,  69,   0,   0,   8, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,   2, 
-     70,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0,  66,  74,   0, 
-      0,  74,  74,   0,   0,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0, 213,   3,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0, 186,   2,   0,   0,  10, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  91, 
-     74,   0,   0,  11,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 127,  74,   0, 
-      0,   2,   0,   0,   0,   0, 
-      0,   0,   0,   2,   0,   0, 
-      0,  37,   1,   0,   0,   6, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0, 167, 
-     81,   0,   0,   8,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0, 175,  81,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 255,  88,   0,   0,   7, 
-     89,   0,   0,   1,   0,   0, 
-      0,   0,   0,   0,   0, 213, 
-      3,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0, 186, 
-      2,   0,   0,  10,   0,   0, 
-      0,   0,   0,   0,   0,   1, 
-      0,   0,   0,  33,  89,   0, 
-      0,  11,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  69,  89,   0,   0,   2, 
-      0,   0,   0,   0,   0,   0, 
-      0,   2,   0,   0,   0,  14, 
-      2,   0,   0,   6,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0, 109,  96,   0, 
-      0,   8,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0, 117,  96,   0,   0,   7, 
-      0,   0,   0,   0,   0,   0, 
-      0,   7,   0,   0,   0,  21, 
-    102,   0,   0,  29, 102,   0, 
-      0,   1,   0,   0,   0,   0, 
-      0,   0,   0, 213,   3,   0, 
-      0,   7,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0, 186,   2,   0, 
-      0,  10,   0,   0,   0,   0, 
-      0,   0,   0,   1,   0,   0, 
-      0,  51, 102,   0,   0,  11, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0,  87, 
-    102,   0,   0,   2,   0,   0, 
-      0,   0,   0,   0,   0,   2, 
-      0,   0,   0,  37,   1,   0, 
-      0,   6,   0,   0,   0,   0, 
-      0,   0,   0,   7,   0,   0, 
-      0, 127, 109,   0,   0,   8, 
-      0,   0,   0,   0,   0,   0, 
-      0,   1,   0,   0,   0, 135, 
-    109,   0,   0,   7,   0,   0, 
-      0,   0,   0,   0,   0,   7, 
-      0,   0,   0, 111, 112,   0, 
-      0
-};
+#if 0
+//
+// FX Version: fx_4_0
+// Child effect (requires effect pool): false
+//
+// 3 local buffer(s)
+//
+cbuffer PerLayer
+{
+    float4  vTextureCoords;             // Offset:    0, size:   16
+    float4  vLayerQuad;                 // Offset:   16, size:   16
+    float   fLayerOpacity;              // Offset:   32, size:    4
+    float4x4 mLayerTransform;           // Offset:   48, size:   64
+}
+
+cbuffer PerOccasionalLayer
+{
+    float4  vRenderTargetOffset;        // Offset:    0, size:   16
+    float4  fLayerColor;                // Offset:   16, size:   16
+}
+
+cbuffer PerLayerManager
+{
+    float4x4 mProjection;               // Offset:    0, size:   64
+}
+
+//
+// 11 local object(s)
+//
+BlendState Premul
+{
+    AlphaToCoverageEnable = bool(FALSE /* 0 */);
+    BlendEnable[0] = bool(TRUE /* 1 */);
+    SrcBlend[0] = uint(ONE /* 2 */);
+    DestBlend[0] = uint(INV_SRC_ALPHA /* 6 */);
+    BlendOp[0] = uint(ADD /* 1 */);
+    SrcBlendAlpha[0] = uint(ONE /* 2 */);
+    DestBlendAlpha[0] = uint(INV_SRC_ALPHA /* 6 */);
+    BlendOpAlpha[0] = uint(ADD /* 1 */);
+    RenderTargetWriteMask[0] = byte(0x0f);
+};
+BlendState NonPremul
+{
+    AlphaToCoverageEnable = bool(FALSE /* 0 */);
+    BlendEnable[0] = bool(TRUE /* 1 */);
+    SrcBlend[0] = uint(SRC_ALPHA /* 5 */);
+    DestBlend[0] = uint(INV_SRC_ALPHA /* 6 */);
+    BlendOp[0] = uint(ADD /* 1 */);
+    SrcBlendAlpha[0] = uint(ONE /* 2 */);
+    DestBlendAlpha[0] = uint(INV_SRC_ALPHA /* 6 */);
+    BlendOpAlpha[0] = uint(ADD /* 1 */);
+    RenderTargetWriteMask[0] = byte(0x0f);
+};
+BlendState ComponentAlphaBlend
+{
+    AlphaToCoverageEnable = bool(FALSE /* 0 */);
+    BlendEnable[0] = bool(TRUE /* 1 */);
+    SrcBlend[0] = uint(ONE /* 2 */);
+    DestBlend[0] = uint(INV_SRC1_COLOR /* 17 */);
+    BlendOp[0] = uint(ADD /* 1 */);
+    SrcBlendAlpha[0] = uint(ZERO /* 1 */);
+    DestBlendAlpha[0] = uint(ONE /* 2 */);
+    BlendOpAlpha[0] = uint(ADD /* 1 */);
+    RenderTargetWriteMask[0] = byte(0x0f);
+};
+RasterizerState LayerRast
+{
+    ScissorEnable = bool(TRUE /* 1 */);
+    CullMode = uint(NONE /* 1 */);
+};
+Texture2D tRGB;
+Texture2D tY;
+Texture2D tCb;
+Texture2D tCr;
+Texture2D tRGBWhite;
+SamplerState LayerTextureSamplerLinear
+{
+    Filter   = uint(MIN_MAG_MIP_LINEAR /* 21 */);
+    AddressU = uint(CLAMP /* 3 */);
+    AddressV = uint(CLAMP /* 3 */);
+};
+SamplerState LayerTextureSamplerPoint
+{
+    Filter   = uint(MIN_MAG_MIP_POINT /* 0 */);
+    AddressU = uint(CLAMP /* 3 */);
+    AddressV = uint(CLAMP /* 3 */);
+};
+
+//
+// 9 technique(s)
+//
+technique10 RenderRGBLayerPremul
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0.xyz, r0, c0.x
+                mov r0.w, c0.x
+                mov oC0, r0
+            
+            // approximately 4 instruction slots used (1 texture, 3 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyz, r0.xyzx, cb0[2].xxxx
+            mov o0.w, cb0[2].x
+            ret 
+            // Approximately 4 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderRGBLayerPremulPoint
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0.xyz, r0, c0.x
+                mov r0.w, c0.x
+                mov oC0, r0
+            
+            // approximately 4 instruction slots used (1 texture, 3 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyz, r0.xyzx, cb0[2].xxxx
+            mov o0.w, cb0[2].x
+            ret 
+            // Approximately 4 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderRGBALayerPremul
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0, r0, c0.x
+                mov oC0, r0
+            
+            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 3 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderRGBALayerNonPremul
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = NonPremul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0, r0, c0.x
+                mov oC0, r0
+            
+            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 3 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderRGBALayerPremulPoint
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0, r0, c0.x
+                mov oC0, r0
+            
+            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 3 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderRGBALayerNonPremulPoint
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = NonPremul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerPoint          sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                dcl t0.xy
+                dcl_2d s0
+                texld r0, t0, s0
+                mul r0, r0, c0.x
+                mov oC0, r0
+            
+            // approximately 3 instruction slots used (1 texture, 2 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 1
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 3 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderYCbCrLayer
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
+            // tY                                texture  float4          2d    0        1
+            // tCb                               texture  float4          2d    1        1
+            // tCr                               texture  float4          2d    2        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            // s1             s0              t1               
+            // s2             s0              t2               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                def c1, -0.5, -0.0625, 1.59599996, 0.813000023
+                def c2, 1.16400003, 2.01799989, 0.391000003, 1
+                dcl t0.xy
+                dcl_2d s0
+                dcl_2d s1
+                dcl_2d s2
+                texld r0, t0, s0
+                texld r1, t0, s2
+                add r0.y, r1.x, c1.x
+                mul r0.yz, r0.y, c1.xzww
+                add r0.x, r0.x, c1.y
+                mad r0.z, r0.x, c2.x, -r0.z
+                mad r1.x, r0.x, c2.x, r0.y
+                texld r2, t0, s1
+                add r0.y, r2.x, c1.x
+                mad r1.y, r0.y, -c2.z, r0.z
+                mul r0.y, r0.y, c2.y
+                mad r1.z, r0.x, c2.x, r0.y
+                mov r1.w, c2.w
+                mul r0, r1, c0.x
+                mov oC0, r0
+            
+            // approximately 15 instruction slots used (3 texture, 12 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_resource_texture2d (float,float,float,float) t1
+            dcl_resource_texture2d (float,float,float,float) t2
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_temps 3
+            sample r0.xyzw, v1.xyxx, t2.xyzw, s0
+            add r0.x, r0.x, l(-0.500000)
+            mul r0.xy, r0.xxxx, l(1.596000, 0.813000, 0.000000, 0.000000)
+            sample r1.xyzw, v1.xyxx, t0.xyzw, s0
+            add r0.z, r1.x, l(-0.062500)
+            mad r0.y, r0.z, l(1.164000), -r0.y
+            mad r1.x, r0.z, l(1.164000), r0.x
+            sample r2.xyzw, v1.xyxx, t1.xyzw, s0
+            add r0.x, r2.x, l(-0.500000)
+            mad r1.y, -r0.x, l(0.391000), r0.y
+            mul r0.x, r0.x, l(2.018000)
+            mad r1.z, r0.z, l(1.164000), r0.x
+            mov r1.w, l(1.000000)
+            mul o0.xyzw, r1.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 15 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderComponentAlphaLayer
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = ComponentAlphaBlend;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16 [unused]
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16 [unused]
+            //   float fLayerOpacity;               // Offset:   32 Size:     4
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64 [unused]
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // LayerTextureSamplerLinear         sampler      NA          NA    0        1
+            // tRGB                              texture  float4          2d    0        1
+            // tRGBWhite                         texture  float4          2d    1        1
+            // PerLayer                          cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            // SV_Target                1   xyzw        1   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             2         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Sampler/Resource to DX9 shader sampler mappings:
+            //
+            // Target Sampler Source Sampler  Source Resource
+            // -------------- --------------- ----------------
+            // s0             s0              t0               
+            // s1             s0              t1               
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                def c1, 1, 0, 0, 0
+                dcl t0.xy
+                dcl_2d s0
+                dcl_2d s1
+                texld r0, t0, s1
+                texld r1, t0, s0
+                mul r2, r1, c0.x
+                mov oC0, r2
+                add r0, -r0, r1
+                add r0, r0, c1.x
+                mul r0, r0, c0.x
+                mov oC1, r0
+            
+            // approximately 8 instruction slots used (2 texture, 6 arithmetic)
+            ps_4_0
+            dcl_constantbuffer cb0[3], immediateIndexed
+            dcl_sampler s0, mode_default
+            dcl_resource_texture2d (float,float,float,float) t0
+            dcl_resource_texture2d (float,float,float,float) t1
+            dcl_input_ps linear v1.xy
+            dcl_output o0.xyzw
+            dcl_output o1.xyzw
+            dcl_temps 2
+            sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+            mul o0.xyzw, r0.xyzw, cb0[2].xxxx
+            sample r1.xyzw, v1.xyxx, t1.xyzw, s0
+            add r0.xyzw, r0.xyzw, -r1.xyzw
+            add r0.xyzw, r0.xyzw, l(1.000000, 1.000000, 1.000000, 1.000000)
+            mul o1.xyzw, r0.xyzw, cb0[2].xxxx
+            ret 
+            // Approximately 7 instruction slots used
+                    
+        };
+    }
+
+}
+
+technique10 RenderSolidColorLayer
+{
+    pass P0
+    {
+        RasterizerState = LayerRast;
+        AB_BlendFactor = float4(0, 0, 0, 0);
+        AB_SampleMask = uint(0xffffffff);
+        BlendState = Premul;
+        VertexShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerLayer
+            // {
+            //
+            //   float4 vTextureCoords;             // Offset:    0 Size:    16
+            //   float4 vLayerQuad;                 // Offset:   16 Size:    16
+            //   float fLayerOpacity;               // Offset:   32 Size:     4 [unused]
+            //   float4x4 mLayerTransform;          // Offset:   48 Size:    64
+            //
+            // }
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16
+            //   float4 fLayerColor;                // Offset:   16 Size:    16 [unused]
+            //
+            // }
+            //
+            // cbuffer PerLayerManager
+            // {
+            //
+            //   float4x4 mProjection;              // Offset:    0 Size:    64
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerLayer                          cbuffer      NA          NA    0        1
+            // PerOccasionalLayer                cbuffer      NA          NA    1        1
+            // PerLayerManager                   cbuffer      NA          NA    2        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // POSITION                 0   xy          0     NONE  float   xy  
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float   xyzw
+            // TEXCOORD                 0   xy          1     NONE  float   xy  
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+            // c3         cb0             3         2  ( FLT, FLT, FLT, FLT)
+            // c5         cb0             6         1  ( FLT, FLT, FLT, FLT)
+            // c6         cb1             0         1  ( FLT, FLT, FLT, FLT)
+            // c7         cb2             0         4  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Runtime generated constant mappings:
+            //
+            // Target Reg                               Constant Description
+            // ---------- --------------------------------------------------
+            // c0                              Vertex Shader position offset
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                vs_2_x
+                dcl_texcoord v0
+                mad oT0.xy, v0, c1.zwzw, c1
+                mad r0.x, v0.y, c2.w, c2.y
+                mul r0, r0.x, c4
+                mad r1.x, v0.x, c2.z, c2.x
+                mad r0, c3, r1.x, r0
+                add r0, r0, c5
+                add r0, r0, -c6
+                mul r1, r0.y, c8
+                mad r1, c7, r0.x, r1
+                mad r1, c9, r0.z, r1
+                mad r0, c10, r0.w, r1
+                mad oPos.xy, r0.w, c0, r0
+                mov oPos.zw, r0
+            
+            // approximately 13 instruction slots used
+            vs_4_0
+            dcl_constantbuffer cb0[7], immediateIndexed
+            dcl_constantbuffer cb1[1], immediateIndexed
+            dcl_constantbuffer cb2[4], immediateIndexed
+            dcl_input v0.xy
+            dcl_output_siv o0.xyzw, position
+            dcl_output o1.xy
+            dcl_temps 2
+            mad r0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+            mul r1.xyzw, r0.yyyy, cb0[4].xyzw
+            mad r0.xyzw, cb0[3].xyzw, r0.xxxx, r1.xyzw
+            add r0.xyzw, r0.xyzw, cb0[6].xyzw
+            add r0.xyzw, r0.xyzw, -cb1[0].xyzw
+            mul r1.xyzw, r0.yyyy, cb2[1].xyzw
+            mad r1.xyzw, cb2[0].xyzw, r0.xxxx, r1.xyzw
+            mad r1.xyzw, cb2[2].xyzw, r0.zzzz, r1.xyzw
+            mad o0.xyzw, cb2[3].xyzw, r0.wwww, r1.xyzw
+            mad o1.xy, v0.xyxx, cb0[0].zwzz, cb0[0].xyxx
+            ret 
+            // Approximately 11 instruction slots used
+                    
+        };
+        GeometryShader = NULL;
+        PixelShader = asm {
+            //
+            // Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+            //
+            //
+            // Buffer Definitions: 
+            //
+            // cbuffer PerOccasionalLayer
+            // {
+            //
+            //   float4 vRenderTargetOffset;        // Offset:    0 Size:    16 [unused]
+            //   float4 fLayerColor;                // Offset:   16 Size:    16
+            //
+            // }
+            //
+            //
+            // Resource Bindings:
+            //
+            // Name                                 Type  Format         Dim Slot Elements
+            // ------------------------------ ---------- ------- ----------- ---- --------
+            // PerOccasionalLayer                cbuffer      NA          NA    0        1
+            //
+            //
+            //
+            // Input signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Position              0   xyzw        0      POS  float       
+            // TEXCOORD                 0   xy          1     NONE  float       
+            //
+            //
+            // Output signature:
+            //
+            // Name                 Index   Mask Register SysValue Format   Used
+            // -------------------- ----- ------ -------- -------- ------ ------
+            // SV_Target                0   xyzw        0   TARGET  float   xyzw
+            //
+            //
+            // Constant buffer to DX9 shader constant mappings:
+            //
+            // Target Reg Buffer  Start Reg # of Regs        Data Conversion
+            // ---------- ------- --------- --------- ----------------------
+            // c0         cb0             1         1  ( FLT, FLT, FLT, FLT)
+            //
+            //
+            // Level9 shader bytecode:
+            //
+                ps_2_x
+                mov oC0, c0
+            
+            // approximately 1 instruction slot used
+            ps_4_0
+            dcl_constantbuffer cb0[2], immediateIndexed
+            dcl_output o0.xyzw
+            mov o0.xyzw, cb0[1].xyzw
+            ret 
+            // Approximately 2 instruction slots used
+                    
+        };
+    }
+
+}
+
+#endif
+
+const BYTE g_main[] =
+{
+     68,  88,  66,  67, 105, 120, 
+    157,  39, 125,  94,  29,  78, 
+     15, 169,  65, 191,  70, 115, 
+    164,  88,   1,   0,   0,   0, 
+    231, 121,   0,   0,   1,   0, 
+      0,   0,  36,   0,   0,   0, 
+     70,  88,  49,  48, 187, 121, 
+      0,   0,   1,  16, 255, 254, 
+      3,   0,   0,   0,   7,   0, 
+      0,   0,  11,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      9,   0,   0,   0, 119, 112, 
+      0,   0,   0,   0,   0,   0, 
+      5,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  18,   0, 
+      0,   0,  18,   0,   0,   0, 
+      0,   0,   0,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0, 102, 108, 111,  97, 116, 
+     52,   0,  13,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,  10,  33,   0,   0, 
+    118,  84, 101, 120, 116, 117, 
+    114, 101,  67, 111, 111, 114, 
+    100, 115,   0, 118,  76,  97, 
+    121, 101, 114,  81, 117,  97, 
+    100,   0, 102, 108, 111,  97, 
+    116,   0,  74,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   4,   0,   0,   0, 
+     16,   0,   0,   0,   4,   0, 
+      0,   0,   9,   9,   0,   0, 
+    102,  76,  97, 121, 101, 114, 
+     79, 112,  97,  99, 105, 116, 
+    121,   0, 102, 108, 111,  97, 
+    116,  52, 120,  52,   0, 122, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,  64, 
+      0,   0,   0,  64,   0,   0, 
+      0,  64,   0,   0,   0,  11, 
+    100,   0,   0, 109,  76,  97, 
+    121, 101, 114,  84, 114,  97, 
+    110, 115, 102, 111, 114, 109, 
+      0,  80, 101, 114,  79,  99, 
+     99,  97, 115, 105, 111, 110, 
+     97, 108,  76,  97, 121, 101, 
+    114,   0, 118,  82, 101, 110, 
+    100, 101, 114,  84,  97, 114, 
+    103, 101, 116,  79, 102, 102, 
+    115, 101, 116,   0, 102,  76, 
+     97, 121, 101, 114,  67, 111, 
+    108, 111, 114,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+     77,  97, 110,  97, 103, 101, 
+    114,   0, 109,  80, 114, 111, 
+    106, 101,  99, 116, 105, 111, 
+    110,   0,  66, 108, 101, 110, 
+    100,  83, 116,  97, 116, 101, 
+      0, 254,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,  80, 
+    114, 101, 109, 117, 108,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   6,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   6,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0,  15,   0,   0,   0, 
+     78, 111, 110,  80, 114, 101, 
+    109, 117, 108,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      5,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      6,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      6,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+     15,   0,   0,   0,  67, 111, 
+    109, 112, 111, 110, 101, 110, 
+    116,  65, 108, 112, 104,  97, 
+     66, 108, 101, 110, 100,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,  17,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0,  15,   0,   0,   0, 
+     82,  97, 115, 116, 101, 114, 
+    105, 122, 101, 114,  83, 116, 
+     97, 116, 101,   0, 142,   2, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   4,   0, 
+      0,   0,  76,  97, 121, 101, 
+    114,  82,  97, 115, 116,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+     84, 101, 120, 116, 117, 114, 
+    101,  50,  68,   0, 220,   2, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  12,   0, 
+      0,   0, 116,  82,  71,  66, 
+      0, 116,  89,   0, 116,  67, 
+     98,   0, 116,  67, 114,   0, 
+    116,  82,  71,  66,  87, 104, 
+    105, 116, 101,   0,  83,  97, 
+    109, 112, 108, 101, 114,  83, 
+    116,  97, 116, 101,   0,  28, 
+      3,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  21, 
+      0,   0,   0,  76,  97, 121, 
+    101, 114,  84, 101, 120, 116, 
+    117, 114, 101,  83,  97, 109, 
+    112, 108, 101, 114,  76, 105, 
+    110, 101,  97, 114,   0,   1, 
+      0,   0,   0,   2,   0,   0, 
+      0,  21,   0,   0,   0,   1, 
+      0,   0,   0,   2,   0,   0, 
+      0,   3,   0,   0,   0,   1, 
+      0,   0,   0,   2,   0,   0, 
+      0,   3,   0,   0,   0,  76, 
+     97, 121, 101, 114,  84, 101, 
+    120, 116, 117, 114, 101,  83, 
+     97, 109, 112, 108, 101, 114, 
+     80, 111, 105, 110, 116,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   3,   0,   0,   0, 
+     82, 101, 110, 100, 101, 114, 
+     82,  71,  66,  76,  97, 121, 
+    101, 114,  80, 114, 101, 109, 
+    117, 108,   0,  80,  48,   0, 
+      4,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0, 255, 255, 255, 255, 
+     24,   7,   0,   0,  68,  88, 
+     66,  67, 254, 249,  65, 252, 
+     64,  46, 192, 119,  73, 197, 
+    161, 234,  24,   1, 194, 131, 
+      1,   0,   0,   0,  24,   7, 
+      0,   0,   6,   0,   0,   0, 
+     56,   0,   0,   0, 164,   1, 
+      0,   0, 148,   3,   0,   0, 
+     16,   4,   0,   0, 140,   6, 
+      0,   0, 192,   6,   0,   0, 
+     65, 111, 110,  57, 100,   1, 
+      0,   0, 100,   1,   0,   0, 
+      0,   2, 254, 255,   0,   1, 
+      0,   0, 100,   0,   0,   0, 
+      5,   0,  36,   0,   0,   0, 
+     96,   0,   0,   0,  96,   0, 
+      0,   0,  36,   0,   1,   0, 
+     96,   0,   0,   0,   0,   0, 
+      2,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      2,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   6,   0, 
+      1,   0,   5,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   6,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      4,   0,   7,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   2, 254, 255,  31,   0, 
+      0,   2,   5,   0,   0, 128, 
+      0,   0,  15, 144,   4,   0, 
+      0,   4,   0,   0,   3, 224, 
+      0,   0, 228, 144,   1,   0, 
+    238, 160,   1,   0, 228, 160, 
+      4,   0,   0,   4,   0,   0, 
+      1, 128,   0,   0,  85, 144, 
+      2,   0, 255, 160,   2,   0, 
+     85, 160,   5,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+      0, 128,   4,   0, 228, 160, 
+      4,   0,   0,   4,   1,   0, 
+      1, 128,   0,   0,   0, 144, 
+      2,   0, 170, 160,   2,   0, 
+      0, 160,   4,   0,   0,   4, 
+      0,   0,  15, 128,   3,   0, 
+    228, 160,   1,   0,   0, 128, 
+      0,   0, 228, 128,   2,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 128,   5,   0, 
+    228, 160,   2,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   6,   0, 228, 161, 
+      5,   0,   0,   3,   1,   0, 
+     15, 128,   0,   0,  85, 128, 
+      8,   0, 228, 160,   4,   0, 
+      0,   4,   1,   0,  15, 128, 
+      7,   0, 228, 160,   0,   0, 
+      0, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   1,   0, 
+     15, 128,   9,   0, 228, 160, 
+      0,   0, 170, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      0,   0,  15, 128,  10,   0, 
+    228, 160,   0,   0, 255, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   0,   0,   3, 192, 
+      0,   0, 255, 128,   0,   0, 
+    228, 160,   0,   0, 228, 128, 
+      1,   0,   0,   2,   0,   0, 
+     12, 192,   0,   0, 228, 128, 
+    255, 255,   0,   0,  83,  72, 
+     68,  82, 232,   1,   0,   0, 
+     64,   0,   1,   0, 122,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   7,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      2,   0,   0,   0,   4,   0, 
+      0,   0,  95,   0,   0,   3, 
+     50,  16,  16,   0,   0,   0, 
+      0,   0, 103,   0,   0,   4, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+    101,   0,   0,   3,  50,  32, 
+     16,   0,   1,   0,   0,   0, 
+    104,   0,   0,   2,   2,   0, 
+      0,   0,  50,   0,   0,  11, 
+     50,   0,  16,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      0,   0,   0,   0, 230, 138, 
+     32,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,  70, 128, 
+     32,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,  56,   0, 
+      0,   8, 242,   0,  16,   0, 
+      1,   0,   0,   0,  86,   5, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   4,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      6,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   8, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   6,   0,   0,   0, 
+      0,   0,   0,   9, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32, 128, 
+     65,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     56,   0,   0,   8, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     86,   5,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,   6,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+    166,  10,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  10, 242,  32,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      3,   0,   0,   0, 246,  15, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,  50,   0,   0,  11, 
+     50,  32,  16,   0,   1,   0, 
+      0,   0,  70,  16,  16,   0, 
+      0,   0,   0,   0, 230, 138, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  70, 128, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,  11,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70, 116,   2, 
+      0,   0,   3,   0,   0,   0, 
+    168,   0,   0,   0,   3,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 254, 255,   0,   1, 
+      0,   0,  64,   2,   0,   0, 
+    124,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 133,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 152,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     80, 101, 114,  76,  97, 121, 
+    101, 114,   0,  80, 101, 114, 
+     79,  99,  99,  97, 115, 105, 
+    111, 110,  97, 108,  76,  97, 
+    121, 101, 114,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+     77,  97, 110,  97, 103, 101, 
+    114,   0, 124,   0,   0,   0, 
+      4,   0,   0,   0, 240,   0, 
+      0,   0, 112,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 133,   0,   0,   0, 
+      2,   0,   0,   0, 188,   1, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 152,   0,   0,   0, 
+      1,   0,   0,   0,  28,   2, 
+      0,   0,  64,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  80,   1,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+     96,   1,   0,   0,   0,   0, 
+      0,   0, 112,   1,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+     96,   1,   0,   0,   0,   0, 
+      0,   0, 123,   1,   0,   0, 
+     32,   0,   0,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+    140,   1,   0,   0,   0,   0, 
+      0,   0, 156,   1,   0,   0, 
+     48,   0,   0,   0,  64,   0, 
+      0,   0,   2,   0,   0,   0, 
+    172,   1,   0,   0,   0,   0, 
+      0,   0, 118,  84, 101, 120, 
+    116, 117, 114, 101,  67, 111, 
+    111, 114, 100, 115,   0, 171, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 118,  76, 
+     97, 121, 101, 114,  81, 117, 
+     97, 100,   0, 102,  76,  97, 
+    121, 101, 114,  79, 112,  97, 
+     99, 105, 116, 121,   0, 171, 
+    171, 171,   0,   0,   3,   0, 
+      1,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    109,  76,  97, 121, 101, 114, 
+     84, 114,  97, 110, 115, 102, 
+    111, 114, 109,   0,   3,   0, 
+      3,   0,   4,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 236,   1,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,  16,   2,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0, 118,  82, 101, 110, 
+    100, 101, 114,  84,  97, 114, 
+    103, 101, 116,  79, 102, 102, 
+    115, 101, 116,   0,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 102,  76,  97, 121, 
+    101, 114,  67, 111, 108, 111, 
+    114,   0,  52,   2,   0,   0, 
+      0,   0,   0,   0,  64,   0, 
+      0,   0,   2,   0,   0,   0, 
+    172,   1,   0,   0,   0,   0, 
+      0,   0, 109,  80, 114, 111, 
+    106, 101,  99, 116, 105, 111, 
+    110,   0,  77, 105,  99, 114, 
+    111, 115, 111, 102, 116,  32, 
+     40,  82,  41,  32,  72,  76, 
+     83,  76,  32,  83, 104,  97, 
+    100, 101, 114,  32,  67, 111, 
+    109, 112, 105, 108, 101, 114, 
+     32,  57,  46,  50,  55,  46, 
+     57,  53,  50,  46,  51,  48, 
+     50,  50,   0, 171, 171, 171, 
+     73,  83,  71,  78,  44,   0, 
+      0,   0,   1,   0,   0,   0, 
+      8,   0,   0,   0,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   3,   0,   0,  80,  79, 
+     83,  73,  84,  73,  79,  78, 
+      0, 171, 171, 171,  79,  83, 
+     71,  78,  80,   0,   0,   0, 
+      2,   0,   0,   0,   8,   0, 
+      0,   0,  56,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0,  68,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   3,  12, 
+      0,   0,  83,  86,  95,  80, 
+    111, 115, 105, 116, 105, 111, 
+    110,   0,  84,  69,  88,  67, 
+     79,  79,  82,  68,   0, 171, 
+    171, 171,   8,   4,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,  84,   4, 
+      0,   0,  68,  88,  66,  67, 
+    170, 213,  87, 132, 192, 216, 
+     64,  34, 189,  70,  85, 214, 
+    198,   9, 122, 139,   1,   0, 
+      0,   0,  84,   4,   0,   0, 
+      6,   0,   0,   0,  56,   0, 
+      0,   0, 204,   0,   0,   0, 
+    136,   1,   0,   0,   4,   2, 
+      0,   0, 200,   3,   0,   0, 
+     32,   4,   0,   0,  65, 111, 
+    110,  57, 140,   0,   0,   0, 
+    140,   0,   0,   0,   0,   2, 
+    255, 255,  88,   0,   0,   0, 
+     52,   0,   0,   0,   1,   0, 
+     40,   0,   0,   0,  52,   0, 
+      0,   0,  52,   0,   1,   0, 
+     36,   0,   0,   0,  52,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   2, 
+    255, 255,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+      5,   0,   0,   3,   0,   0, 
+      7, 128,   0,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   0,   8, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0,  83,  72,  68,  82, 
+    180,   0,   0,   0,  64,   0, 
+      0,   0,  45,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,  90,   0, 
+      0,   3,   0,  96,  16,   0, 
+      0,   0,   0,   0,  88,  24, 
+      0,   4,   0, 112,  16,   0, 
+      0,   0,   0,   0,  85,  85, 
+      0,   0,  98,  16,   0,   3, 
+     50,  16,  16,   0,   1,   0, 
+      0,   0, 101,   0,   0,   3, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0, 104,   0,   0,   2, 
+      1,   0,   0,   0,  69,   0, 
+      0,   9, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   1,   0,   0,   0, 
+     70, 126,  16,   0,   0,   0, 
+      0,   0,   0,  96,  16,   0, 
+      0,   0,   0,   0,  56,   0, 
+      0,   8, 114,  32,  16,   0, 
+      0,   0,   0,   0,  70,   2, 
+     16,   0,   0,   0,   0,   0, 
+      6, 128,  32,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+     54,   0,   0,   6, 130,  32, 
+     16,   0,   0,   0,   0,   0, 
+     10, 128,  32,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+     62,   0,   0,   1,  83,  84, 
+     65,  84, 116,   0,   0,   0, 
+      4,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  82,  68,  69,  70, 
+    188,   1,   0,   0,   1,   0, 
+      0,   0, 164,   0,   0,   0, 
+      3,   0,   0,   0,  28,   0, 
+      0,   0,   0,   4, 255, 255, 
+      0,   1,   0,   0, 136,   1, 
+      0,   0, 124,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 150,   0, 
+      0,   0,   2,   0,   0,   0, 
+      5,   0,   0,   0,   4,   0, 
+      0,   0, 255, 255, 255, 255, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  12,   0,   0,   0, 
+    155,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  76,  97, 121, 101, 
+    114,  84, 101, 120, 116, 117, 
+    114, 101,  83,  97, 109, 112, 
+    108, 101, 114,  76, 105, 110, 
+    101,  97, 114,   0, 116,  82, 
+     71,  66,   0,  80, 101, 114, 
+     76,  97, 121, 101, 114,   0, 
+    155,   0,   0,   0,   4,   0, 
+      0,   0, 188,   0,   0,   0, 
+    112,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     28,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,  44,   1, 
+      0,   0,   0,   0,   0,   0, 
+     60,   1,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,  44,   1, 
+      0,   0,   0,   0,   0,   0, 
+     71,   1,   0,   0,  32,   0, 
+      0,   0,   4,   0,   0,   0, 
+      2,   0,   0,   0,  88,   1, 
+      0,   0,   0,   0,   0,   0, 
+    104,   1,   0,   0,  48,   0, 
+      0,   0,  64,   0,   0,   0, 
+      0,   0,   0,   0, 120,   1, 
+      0,   0,   0,   0,   0,   0, 
+    118,  84, 101, 120, 116, 117, 
+    114, 101,  67, 111, 111, 114, 
+    100, 115,   0, 171,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 118,  76,  97, 121, 
+    101, 114,  81, 117,  97, 100, 
+      0, 102,  76,  97, 121, 101, 
+    114,  79, 112,  97,  99, 105, 
+    116, 121,   0, 171, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 109,  76, 
+     97, 121, 101, 114,  84, 114, 
+     97, 110, 115, 102, 111, 114, 
+    109,   0,   3,   0,   3,   0, 
+      4,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     77, 105,  99, 114, 111, 115, 
+    111, 102, 116,  32,  40,  82, 
+     41,  32,  72,  76,  83,  76, 
+     32,  83, 104,  97, 100, 101, 
+    114,  32,  67, 111, 109, 112, 
+    105, 108, 101, 114,  32,  57, 
+     46,  50,  55,  46,  57,  53, 
+     50,  46,  51,  48,  50,  50, 
+      0, 171, 171, 171,  73,  83, 
+     71,  78,  80,   0,   0,   0, 
+      2,   0,   0,   0,   8,   0, 
+      0,   0,  56,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0,  68,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   3,   3, 
+      0,   0,  83,  86,  95,  80, 
+    111, 115, 105, 116, 105, 111, 
+    110,   0,  84,  69,  88,  67, 
+     79,  79,  82,  68,   0, 171, 
+    171, 171,  79,  83,  71,  78, 
+     44,   0,   0,   0,   1,   0, 
+      0,   0,   8,   0,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     83,  86,  95,  84,  97, 114, 
+    103, 101, 116,   0, 171, 171, 
+     56,  11,   0,   0,   0,   0, 
+      0,   0,  82, 101, 110, 100, 
+    101, 114,  82,  71,  66,  76, 
+     97, 121, 101, 114,  80, 114, 
+    101, 109, 117, 108,  80, 111, 
+    105, 110, 116,   0,   4,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+    255, 255, 255, 255,  24,   7, 
+      0,   0,  68,  88,  66,  67, 
+    254, 249,  65, 252,  64,  46, 
+    192, 119,  73, 197, 161, 234, 
+     24,   1, 194, 131,   1,   0, 
+      0,   0,  24,   7,   0,   0, 
+      6,   0,   0,   0,  56,   0, 
+      0,   0, 164,   1,   0,   0, 
+    148,   3,   0,   0,  16,   4, 
+      0,   0, 140,   6,   0,   0, 
+    192,   6,   0,   0,  65, 111, 
+    110,  57, 100,   1,   0,   0, 
+    100,   1,   0,   0,   0,   2, 
+    254, 255,   0,   1,   0,   0, 
+    100,   0,   0,   0,   5,   0, 
+     36,   0,   0,   0,  96,   0, 
+      0,   0,  96,   0,   0,   0, 
+     36,   0,   1,   0,  96,   0, 
+      0,   0,   0,   0,   2,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   2,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   6,   0,   1,   0, 
+      5,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      6,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   4,   0, 
+      7,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   2, 
+    254, 255,  31,   0,   0,   2, 
+      5,   0,   0, 128,   0,   0, 
+     15, 144,   4,   0,   0,   4, 
+      0,   0,   3, 224,   0,   0, 
+    228, 144,   1,   0, 238, 160, 
+      1,   0, 228, 160,   4,   0, 
+      0,   4,   0,   0,   1, 128, 
+      0,   0,  85, 144,   2,   0, 
+    255, 160,   2,   0,  85, 160, 
+      5,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0,   0, 128, 
+      4,   0, 228, 160,   4,   0, 
+      0,   4,   1,   0,   1, 128, 
+      0,   0,   0, 144,   2,   0, 
+    170, 160,   2,   0,   0, 160, 
+      4,   0,   0,   4,   0,   0, 
+     15, 128,   3,   0, 228, 160, 
+      1,   0,   0, 128,   0,   0, 
+    228, 128,   2,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   5,   0, 228, 160, 
+      2,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 128, 
+      6,   0, 228, 161,   5,   0, 
+      0,   3,   1,   0,  15, 128, 
+      0,   0,  85, 128,   8,   0, 
+    228, 160,   4,   0,   0,   4, 
+      1,   0,  15, 128,   7,   0, 
+    228, 160,   0,   0,   0, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   1,   0,  15, 128, 
+      9,   0, 228, 160,   0,   0, 
+    170, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   0,   0, 
+     15, 128,  10,   0, 228, 160, 
+      0,   0, 255, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      0,   0,   3, 192,   0,   0, 
+    255, 128,   0,   0, 228, 160, 
+      0,   0, 228, 128,   1,   0, 
+      0,   2,   0,   0,  12, 192, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0,  83,  72,  68,  82, 
+    232,   1,   0,   0,  64,   0, 
+      1,   0, 122,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      7,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   4,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   0,   0,   0,   0, 
+    103,   0,   0,   4, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0, 101,   0, 
+      0,   3,  50,  32,  16,   0, 
+      1,   0,   0,   0, 104,   0, 
+      0,   2,   2,   0,   0,   0, 
+     50,   0,   0,  11,  50,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  16,  16,   0,   0,   0, 
+      0,   0, 230, 138,  32,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  70, 128,  32,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  56,   0,   0,   8, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  86,   5,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      4,   0,   0,   0,  50,   0, 
+      0,  10, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   6,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,   0,   0,   0,   8, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      6,   0,   0,   0,   0,   0, 
+      0,   9, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32, 128,  65,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  56,   0, 
+      0,   8, 242,   0,  16,   0, 
+      1,   0,   0,   0,  86,   5, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      6,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  10, 242,   0,  16,   0, 
+      1,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      2,   0,   0,   0, 166,  10, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   3,   0, 
+      0,   0, 246,  15,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+     50,   0,   0,  11,  50,  32, 
+     16,   0,   1,   0,   0,   0, 
+     70,  16,  16,   0,   0,   0, 
+      0,   0, 230, 138,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  70, 128,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  62,   0,   0,   1, 
+     83,  84,  65,  84, 116,   0, 
+      0,   0,  11,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  82,  68, 
+     69,  70, 116,   2,   0,   0, 
+      3,   0,   0,   0, 168,   0, 
+      0,   0,   3,   0,   0,   0, 
+     28,   0,   0,   0,   0,   4, 
+    254, 255,   0,   1,   0,   0, 
+     64,   2,   0,   0, 124,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    133,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 152,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0,  80, 101, 114,  79,  99, 
+     99,  97, 115, 105, 111, 110, 
+     97, 108,  76,  97, 121, 101, 
+    114,   0,  80, 101, 114,  76, 
+     97, 121, 101, 114,  77,  97, 
+    110,  97, 103, 101, 114,   0, 
+    124,   0,   0,   0,   4,   0, 
+      0,   0, 240,   0,   0,   0, 
+    112,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    133,   0,   0,   0,   2,   0, 
+      0,   0, 188,   1,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    152,   0,   0,   0,   1,   0, 
+      0,   0,  28,   2,   0,   0, 
+     64,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     80,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,  96,   1, 
+      0,   0,   0,   0,   0,   0, 
+    112,   1,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,  96,   1, 
+      0,   0,   0,   0,   0,   0, 
+    123,   1,   0,   0,  32,   0, 
+      0,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0, 140,   1, 
+      0,   0,   0,   0,   0,   0, 
+    156,   1,   0,   0,  48,   0, 
+      0,   0,  64,   0,   0,   0, 
+      2,   0,   0,   0, 172,   1, 
+      0,   0,   0,   0,   0,   0, 
+    118,  84, 101, 120, 116, 117, 
+    114, 101,  67, 111, 111, 114, 
+    100, 115,   0, 171,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 118,  76,  97, 121, 
+    101, 114,  81, 117,  97, 100, 
+      0, 102,  76,  97, 121, 101, 
+    114,  79, 112,  97,  99, 105, 
+    116, 121,   0, 171, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 109,  76, 
+     97, 121, 101, 114,  84, 114, 
+     97, 110, 115, 102, 111, 114, 
+    109,   0,   3,   0,   3,   0, 
+      4,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    236,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+     16,   2,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+    118,  82, 101, 110, 100, 101, 
+    114,  84,  97, 114, 103, 101, 
+    116,  79, 102, 102, 115, 101, 
+    116,   0,   1,   0,   3,   0, 
+      1,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    102,  76,  97, 121, 101, 114, 
+     67, 111, 108, 111, 114,   0, 
+     52,   2,   0,   0,   0,   0, 
+      0,   0,  64,   0,   0,   0, 
+      2,   0,   0,   0, 172,   1, 
+      0,   0,   0,   0,   0,   0, 
+    109,  80, 114, 111, 106, 101, 
+     99, 116, 105, 111, 110,   0, 
+     77, 105,  99, 114, 111, 115, 
+    111, 102, 116,  32,  40,  82, 
+     41,  32,  72,  76,  83,  76, 
+     32,  83, 104,  97, 100, 101, 
+    114,  32,  67, 111, 109, 112, 
+    105, 108, 101, 114,  32,  57, 
+     46,  50,  55,  46,  57,  53, 
+     50,  46,  51,  48,  50,  50, 
+      0, 171, 171, 171,  73,  83, 
+     71,  78,  44,   0,   0,   0, 
+      1,   0,   0,   0,   8,   0, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   3,   3, 
+      0,   0,  80,  79,  83,  73, 
+     84,  73,  79,  78,   0, 171, 
+    171, 171,  79,  83,  71,  78, 
+     80,   0,   0,   0,   2,   0, 
+      0,   0,   8,   0,   0,   0, 
+     56,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     68,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   1,   0, 
+      0,   0,   3,  12,   0,   0, 
+     83,  86,  95,  80, 111, 115, 
+    105, 116, 105, 111, 110,   0, 
+     84,  69,  88,  67,  79,  79, 
+     82,  68,   0, 171, 171, 171, 
+    226,  15,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,  84,   4,   0,   0, 
+     68,  88,  66,  67, 146,   3, 
+    215,  66, 245, 177,   6,  57, 
+     16,  82, 147, 232,  61, 101, 
+    156, 116,   1,   0,   0,   0, 
+     84,   4,   0,   0,   6,   0, 
+      0,   0,  56,   0,   0,   0, 
+    204,   0,   0,   0, 136,   1, 
+      0,   0,   4,   2,   0,   0, 
+    200,   3,   0,   0,  32,   4, 
+      0,   0,  65, 111, 110,  57, 
+    140,   0,   0,   0, 140,   0, 
+      0,   0,   0,   2, 255, 255, 
+     88,   0,   0,   0,  52,   0, 
+      0,   0,   1,   0,  40,   0, 
+      0,   0,  52,   0,   0,   0, 
+     52,   0,   1,   0,  36,   0, 
+      0,   0,  52,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   2, 255, 255, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   0,   0,   3, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 144,   0,   8,  15, 160, 
+     66,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 176, 
+      0,   8, 228, 160,   5,   0, 
+      0,   3,   0,   0,   7, 128, 
+      0,   0, 228, 128,   0,   0, 
+      0, 160,   1,   0,   0,   2, 
+      0,   0,   8, 128,   0,   0, 
+      0, 160,   1,   0,   0,   2, 
+      0,   8,  15, 128,   0,   0, 
+    228, 128, 255, 255,   0,   0, 
+     83,  72,  68,  82, 180,   0, 
+      0,   0,  64,   0,   0,   0, 
+     45,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,  90,   0,   0,   3, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  88,  24,   0,   4, 
+      0, 112,  16,   0,   0,   0, 
+      0,   0,  85,  85,   0,   0, 
+     98,  16,   0,   3,  50,  16, 
+     16,   0,   1,   0,   0,   0, 
+    101,   0,   0,   3, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+    104,   0,   0,   2,   1,   0, 
+      0,   0,  69,   0,   0,   9, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      1,   0,   0,   0,  70, 126, 
+     16,   0,   0,   0,   0,   0, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  56,   0,   0,   8, 
+    114,  32,  16,   0,   0,   0, 
+      0,   0,  70,   2,  16,   0, 
+      0,   0,   0,   0,   6, 128, 
+     32,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,  54,   0, 
+      0,   6, 130,  32,  16,   0, 
+      0,   0,   0,   0,  10, 128, 
+     32,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,   4,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70, 188,   1, 
+      0,   0,   1,   0,   0,   0, 
+    164,   0,   0,   0,   3,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 255, 255,   0,   1, 
+      0,   0, 136,   1,   0,   0, 
+    124,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 149,   0,   0,   0, 
+      2,   0,   0,   0,   5,   0, 
+      0,   0,   4,   0,   0,   0, 
+    255, 255, 255, 255,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     12,   0,   0,   0, 154,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     76,  97, 121, 101, 114,  84, 
+    101, 120, 116, 117, 114, 101, 
+     83,  97, 109, 112, 108, 101, 
+    114,  80, 111, 105, 110, 116, 
+      0, 116,  82,  71,  66,   0, 
+     80, 101, 114,  76,  97, 121, 
+    101, 114,   0, 171, 154,   0, 
+      0,   0,   4,   0,   0,   0, 
+    188,   0,   0,   0, 112,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  28,   1, 
+      0,   0,   0,   0,   0,   0, 
+     16,   0,   0,   0,   0,   0, 
+      0,   0,  44,   1,   0,   0, 
+      0,   0,   0,   0,  60,   1, 
+      0,   0,  16,   0,   0,   0, 
+     16,   0,   0,   0,   0,   0, 
+      0,   0,  44,   1,   0,   0, 
+      0,   0,   0,   0,  71,   1, 
+      0,   0,  32,   0,   0,   0, 
+      4,   0,   0,   0,   2,   0, 
+      0,   0,  88,   1,   0,   0, 
+      0,   0,   0,   0, 104,   1, 
+      0,   0,  48,   0,   0,   0, 
+     64,   0,   0,   0,   0,   0, 
+      0,   0, 120,   1,   0,   0, 
+      0,   0,   0,   0, 118,  84, 
+    101, 120, 116, 117, 114, 101, 
+     67, 111, 111, 114, 100, 115, 
+      0, 171,   1,   0,   3,   0, 
+      1,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    118,  76,  97, 121, 101, 114, 
+     81, 117,  97, 100,   0, 102, 
+     76,  97, 121, 101, 114,  79, 
+    112,  97,  99, 105, 116, 121, 
+      0, 171, 171, 171,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 109,  76,  97, 121, 
+    101, 114,  84, 114,  97, 110, 
+    115, 102, 111, 114, 109,   0, 
+      3,   0,   3,   0,   4,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  77, 105, 
+     99, 114, 111, 115, 111, 102, 
+    116,  32,  40,  82,  41,  32, 
+     72,  76,  83,  76,  32,  83, 
+    104,  97, 100, 101, 114,  32, 
+     67, 111, 109, 112, 105, 108, 
+    101, 114,  32,  57,  46,  50, 
+     55,  46,  57,  53,  50,  46, 
+     51,  48,  50,  50,   0, 171, 
+    171, 171,  73,  83,  71,  78, 
+     80,   0,   0,   0,   2,   0, 
+      0,   0,   8,   0,   0,   0, 
+     56,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     68,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   1,   0, 
+      0,   0,   3,   3,   0,   0, 
+     83,  86,  95,  80, 111, 115, 
+    105, 116, 105, 111, 110,   0, 
+     84,  69,  88,  67,  79,  79, 
+     82,  68,   0, 171, 171, 171, 
+     79,  83,  71,  78,  44,   0, 
+      0,   0,   1,   0,   0,   0, 
+      8,   0,   0,   0,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+     15,   0,   0,   0,  83,  86, 
+     95,  84,  97, 114, 103, 101, 
+    116,   0, 171, 171,  18,  23, 
+      0,   0,   0,   0,   0,   0, 
+     82, 101, 110, 100, 101, 114, 
+     82,  71,  66,  65,  76,  97, 
+    121, 101, 114,  80, 114, 101, 
+    109, 117, 108,   0,   4,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+    255, 255, 255, 255,  24,   7, 
+      0,   0,  68,  88,  66,  67, 
+    254, 249,  65, 252,  64,  46, 
+    192, 119,  73, 197, 161, 234, 
+     24,   1, 194, 131,   1,   0, 
+      0,   0,  24,   7,   0,   0, 
+      6,   0,   0,   0,  56,   0, 
+      0,   0, 164,   1,   0,   0, 
+    148,   3,   0,   0,  16,   4, 
+      0,   0, 140,   6,   0,   0, 
+    192,   6,   0,   0,  65, 111, 
+    110,  57, 100,   1,   0,   0, 
+    100,   1,   0,   0,   0,   2, 
+    254, 255,   0,   1,   0,   0, 
+    100,   0,   0,   0,   5,   0, 
+     36,   0,   0,   0,  96,   0, 
+      0,   0,  96,   0,   0,   0, 
+     36,   0,   1,   0,  96,   0, 
+      0,   0,   0,   0,   2,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   2,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   6,   0,   1,   0, 
+      5,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      6,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   4,   0, 
+      7,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   2, 
+    254, 255,  31,   0,   0,   2, 
+      5,   0,   0, 128,   0,   0, 
+     15, 144,   4,   0,   0,   4, 
+      0,   0,   3, 224,   0,   0, 
+    228, 144,   1,   0, 238, 160, 
+      1,   0, 228, 160,   4,   0, 
+      0,   4,   0,   0,   1, 128, 
+      0,   0,  85, 144,   2,   0, 
+    255, 160,   2,   0,  85, 160, 
+      5,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0,   0, 128, 
+      4,   0, 228, 160,   4,   0, 
+      0,   4,   1,   0,   1, 128, 
+      0,   0,   0, 144,   2,   0, 
+    170, 160,   2,   0,   0, 160, 
+      4,   0,   0,   4,   0,   0, 
+     15, 128,   3,   0, 228, 160, 
+      1,   0,   0, 128,   0,   0, 
+    228, 128,   2,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   5,   0, 228, 160, 
+      2,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 128, 
+      6,   0, 228, 161,   5,   0, 
+      0,   3,   1,   0,  15, 128, 
+      0,   0,  85, 128,   8,   0, 
+    228, 160,   4,   0,   0,   4, 
+      1,   0,  15, 128,   7,   0, 
+    228, 160,   0,   0,   0, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   1,   0,  15, 128, 
+      9,   0, 228, 160,   0,   0, 
+    170, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   0,   0, 
+     15, 128,  10,   0, 228, 160, 
+      0,   0, 255, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      0,   0,   3, 192,   0,   0, 
+    255, 128,   0,   0, 228, 160, 
+      0,   0, 228, 128,   1,   0, 
+      0,   2,   0,   0,  12, 192, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0,  83,  72,  68,  82, 
+    232,   1,   0,   0,  64,   0, 
+      1,   0, 122,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      7,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   4,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   0,   0,   0,   0, 
+    103,   0,   0,   4, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0, 101,   0, 
+      0,   3,  50,  32,  16,   0, 
+      1,   0,   0,   0, 104,   0, 
+      0,   2,   2,   0,   0,   0, 
+     50,   0,   0,  11,  50,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  16,  16,   0,   0,   0, 
+      0,   0, 230, 138,  32,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  70, 128,  32,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  56,   0,   0,   8, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  86,   5,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      4,   0,   0,   0,  50,   0, 
+      0,  10, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   6,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,   0,   0,   0,   8, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      6,   0,   0,   0,   0,   0, 
+      0,   9, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32, 128,  65,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  56,   0, 
+      0,   8, 242,   0,  16,   0, 
+      1,   0,   0,   0,  86,   5, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      6,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  10, 242,   0,  16,   0, 
+      1,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      2,   0,   0,   0, 166,  10, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   3,   0, 
+      0,   0, 246,  15,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+     50,   0,   0,  11,  50,  32, 
+     16,   0,   1,   0,   0,   0, 
+     70,  16,  16,   0,   0,   0, 
+      0,   0, 230, 138,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  70, 128,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  62,   0,   0,   1, 
+     83,  84,  65,  84, 116,   0, 
+      0,   0,  11,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  82,  68, 
+     69,  70, 116,   2,   0,   0, 
+      3,   0,   0,   0, 168,   0, 
+      0,   0,   3,   0,   0,   0, 
+     28,   0,   0,   0,   0,   4, 
+    254, 255,   0,   1,   0,   0, 
+     64,   2,   0,   0, 124,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    133,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 152,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0,  80, 101, 114,  79,  99, 
+     99,  97, 115, 105, 111, 110, 
+     97, 108,  76,  97, 121, 101, 
+    114,   0,  80, 101, 114,  76, 
+     97, 121, 101, 114,  77,  97, 
+    110,  97, 103, 101, 114,   0, 
+    124,   0,   0,   0,   4,   0, 
+      0,   0, 240,   0,   0,   0, 
+    112,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    133,   0,   0,   0,   2,   0, 
+      0,   0, 188,   1,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    152,   0,   0,   0,   1,   0, 
+      0,   0,  28,   2,   0,   0, 
+     64,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     80,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,  96,   1, 
+      0,   0,   0,   0,   0,   0, 
+    112,   1,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,  96,   1, 
+      0,   0,   0,   0,   0,   0, 
+    123,   1,   0,   0,  32,   0, 
+      0,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0, 140,   1, 
+      0,   0,   0,   0,   0,   0, 
+    156,   1,   0,   0,  48,   0, 
+      0,   0,  64,   0,   0,   0, 
+      2,   0,   0,   0, 172,   1, 
+      0,   0,   0,   0,   0,   0, 
+    118,  84, 101, 120, 116, 117, 
+    114, 101,  67, 111, 111, 114, 
+    100, 115,   0, 171,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 118,  76,  97, 121, 
+    101, 114,  81, 117,  97, 100, 
+      0, 102,  76,  97, 121, 101, 
+    114,  79, 112,  97,  99, 105, 
+    116, 121,   0, 171, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 109,  76, 
+     97, 121, 101, 114,  84, 114, 
+     97, 110, 115, 102, 111, 114, 
+    109,   0,   3,   0,   3,   0, 
+      4,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    236,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      2,   0,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+     16,   2,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+    118,  82, 101, 110, 100, 101, 
+    114,  84,  97, 114, 103, 101, 
+    116,  79, 102, 102, 115, 101, 
+    116,   0,   1,   0,   3,   0, 
+      1,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    102,  76,  97, 121, 101, 114, 
+     67, 111, 108, 111, 114,   0, 
+     52,   2,   0,   0,   0,   0, 
+      0,   0,  64,   0,   0,   0, 
+      2,   0,   0,   0, 172,   1, 
+      0,   0,   0,   0,   0,   0, 
+    109,  80, 114, 111, 106, 101, 
+     99, 116, 105, 111, 110,   0, 
+     77, 105,  99, 114, 111, 115, 
+    111, 102, 116,  32,  40,  82, 
+     41,  32,  72,  76,  83,  76, 
+     32,  83, 104,  97, 100, 101, 
+    114,  32,  67, 111, 109, 112, 
+    105, 108, 101, 114,  32,  57, 
+     46,  50,  55,  46,  57,  53, 
+     50,  46,  51,  48,  50,  50, 
+      0, 171, 171, 171,  73,  83, 
+     71,  78,  44,   0,   0,   0, 
+      1,   0,   0,   0,   8,   0, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   3,   3, 
+      0,   0,  80,  79,  83,  73, 
+     84,  73,  79,  78,   0, 171, 
+    171, 171,  79,  83,  71,  78, 
+     80,   0,   0,   0,   2,   0, 
+      0,   0,   8,   0,   0,   0, 
+     56,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     68,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   1,   0, 
+      0,   0,   3,  12,   0,   0, 
+     83,  86,  95,  80, 111, 115, 
+    105, 116, 105, 111, 110,   0, 
+     84,  69,  88,  67,  79,  79, 
+     82,  68,   0, 171, 171, 171, 
+    184,  27,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,  48,   4,   0,   0, 
+     68,  88,  66,  67, 135,  78, 
+    217, 178,  82, 246,  12, 136, 
+     40, 218, 112,  36, 133,  68, 
+    115,  32,   1,   0,   0,   0, 
+     48,   4,   0,   0,   6,   0, 
+      0,   0,  56,   0,   0,   0, 
+    192,   0,   0,   0, 100,   1, 
+      0,   0, 224,   1,   0,   0, 
+    164,   3,   0,   0, 252,   3, 
+      0,   0,  65, 111, 110,  57, 
+    128,   0,   0,   0, 128,   0, 
+      0,   0,   0,   2, 255, 255, 
+     76,   0,   0,   0,  52,   0, 
+      0,   0,   1,   0,  40,   0, 
+      0,   0,  52,   0,   0,   0, 
+     52,   0,   1,   0,  36,   0, 
+      0,   0,  52,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   2, 255, 255, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   0,   0,   3, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 144,   0,   8,  15, 160, 
+     66,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 176, 
+      0,   8, 228, 160,   5,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 128,   0,   0, 
+      0, 160,   1,   0,   0,   2, 
+      0,   8,  15, 128,   0,   0, 
+    228, 128, 255, 255,   0,   0, 
+     83,  72,  68,  82, 156,   0, 
+      0,   0,  64,   0,   0,   0, 
+     39,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,  90,   0,   0,   3, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  88,  24,   0,   4, 
+      0, 112,  16,   0,   0,   0, 
+      0,   0,  85,  85,   0,   0, 
+     98,  16,   0,   3,  50,  16, 
+     16,   0,   1,   0,   0,   0, 
+    101,   0,   0,   3, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+    104,   0,   0,   2,   1,   0, 
+      0,   0,  69,   0,   0,   9, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      1,   0,   0,   0,  70, 126, 
+     16,   0,   0,   0,   0,   0, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  56,   0,   0,   8, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      0,   0,   0,   0,   6, 128, 
+     32,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70, 188,   1, 
+      0,   0,   1,   0,   0,   0, 
+    164,   0,   0,   0,   3,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 255, 255,   0,   1, 
+      0,   0, 136,   1,   0,   0, 
+    124,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 150,   0,   0,   0, 
+      2,   0,   0,   0,   5,   0, 
+      0,   0,   4,   0,   0,   0, 
+    255, 255, 255, 255,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     12,   0,   0,   0, 155,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     76,  97, 121, 101, 114,  84, 
+    101, 120, 116, 117, 114, 101, 
+     83,  97, 109, 112, 108, 101, 
+    114,  76, 105, 110, 101,  97, 
+    114,   0, 116,  82,  71,  66, 
+      0,  80, 101, 114,  76,  97, 
+    121, 101, 114,   0, 155,   0, 
+      0,   0,   4,   0,   0,   0, 
+    188,   0,   0,   0, 112,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  28,   1, 
+      0,   0,   0,   0,   0,   0, 
+     16,   0,   0,   0,   0,   0, 
+      0,   0,  44,   1,   0,   0, 
+      0,   0,   0,   0,  60,   1, 
+      0,   0,  16,   0,   0,   0, 
+     16,   0,   0,   0,   0,   0, 
+      0,   0,  44,   1,   0,   0, 
+      0,   0,   0,   0,  71,   1, 
+      0,   0,  32,   0,   0,   0, 
+      4,   0,   0,   0,   2,   0, 
+      0,   0,  88,   1,   0,   0, 
+      0,   0,   0,   0, 104,   1, 
+      0,   0,  48,   0,   0,   0, 
+     64,   0,   0,   0,   0,   0, 
+      0,   0, 120,   1,   0,   0, 
+      0,   0,   0,   0, 118,  84, 
+    101, 120, 116, 117, 114, 101, 
+     67, 111, 111, 114, 100, 115, 
+      0, 171,   1,   0,   3,   0, 
+      1,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    118,  76,  97, 121, 101, 114, 
+     81, 117,  97, 100,   0, 102, 
+     76,  97, 121, 101, 114,  79, 
+    112,  97,  99, 105, 116, 121, 
+      0, 171, 171, 171,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 109,  76,  97, 121, 
+    101, 114,  84, 114,  97, 110, 
+    115, 102, 111, 114, 109,   0, 
+      3,   0,   3,   0,   4,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  77, 105, 
+     99, 114, 111, 115, 111, 102, 
+    116,  32,  40,  82,  41,  32, 
+     72,  76,  83,  76,  32,  83, 
+    104,  97, 100, 101, 114,  32, 
+     67, 111, 109, 112, 105, 108, 
+    101, 114,  32,  57,  46,  50, 
+     55,  46,  57,  53,  50,  46, 
+     51,  48,  50,  50,   0, 171, 
+    171, 171,  73,  83,  71,  78, 
+     80,   0,   0,   0,   2,   0, 
+      0,   0,   8,   0,   0,   0, 
+     56,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     68,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   1,   0, 
+      0,   0,   3,   3,   0,   0, 
+     83,  86,  95,  80, 111, 115, 
+    105, 116, 105, 111, 110,   0, 
+     84,  69,  88,  67,  79,  79, 
+     82,  68,   0, 171, 171, 171, 
+     79,  83,  71,  78,  44,   0, 
+      0,   0,   1,   0,   0,   0, 
+      8,   0,   0,   0,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+     15,   0,   0,   0,  83,  86, 
+     95,  84,  97, 114, 103, 101, 
+    116,   0, 171, 171, 232,  34, 
+      0,   0,   0,   0,   0,   0, 
+     82, 101, 110, 100, 101, 114, 
+     82,  71,  66,  65,  76,  97, 
+    121, 101, 114,  78, 111, 110, 
+     80, 114, 101, 109, 117, 108, 
+      0,   4,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      0,   0,   0, 255, 255, 255, 
+    255,  24,   7,   0,   0,  68, 
+     88,  66,  67, 254, 249,  65, 
+    252,  64,  46, 192, 119,  73, 
+    197, 161, 234,  24,   1, 194, 
+    131,   1,   0,   0,   0,  24, 
+      7,   0,   0,   6,   0,   0, 
+      0,  56,   0,   0,   0, 164, 
+      1,   0,   0, 148,   3,   0, 
+      0,  16,   4,   0,   0, 140, 
+      6,   0,   0, 192,   6,   0, 
+      0,  65, 111, 110,  57, 100, 
+      1,   0,   0, 100,   1,   0, 
+      0,   0,   2, 254, 255,   0, 
+      1,   0,   0, 100,   0,   0, 
+      0,   5,   0,  36,   0,   0, 
+      0,  96,   0,   0,   0,  96, 
+      0,   0,   0,  36,   0,   1, 
+      0,  96,   0,   0,   0,   0, 
+      0,   2,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   2,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,   6, 
+      0,   1,   0,   5,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   1,   0,   6,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   4,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   2, 254, 255,  31, 
+      0,   0,   2,   5,   0,   0, 
+    128,   0,   0,  15, 144,   4, 
+      0,   0,   4,   0,   0,   3, 
+    224,   0,   0, 228, 144,   1, 
+      0, 238, 160,   1,   0, 228, 
+    160,   4,   0,   0,   4,   0, 
+      0,   1, 128,   0,   0,  85, 
+    144,   2,   0, 255, 160,   2, 
+      0,  85, 160,   5,   0,   0, 
+      3,   0,   0,  15, 128,   0, 
+      0,   0, 128,   4,   0, 228, 
+    160,   4,   0,   0,   4,   1, 
+      0,   1, 128,   0,   0,   0, 
+    144,   2,   0, 170, 160,   2, 
+      0,   0, 160,   4,   0,   0, 
+      4,   0,   0,  15, 128,   3, 
+      0, 228, 160,   1,   0,   0, 
+    128,   0,   0, 228, 128,   2, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0, 228, 128,   5, 
+      0, 228, 160,   2,   0,   0, 
+      3,   0,   0,  15, 128,   0, 
+      0, 228, 128,   6,   0, 228, 
+    161,   5,   0,   0,   3,   1, 
+      0,  15, 128,   0,   0,  85, 
+    128,   8,   0, 228, 160,   4, 
+      0,   0,   4,   1,   0,  15, 
+    128,   7,   0, 228, 160,   0, 
+      0,   0, 128,   1,   0, 228, 
+    128,   4,   0,   0,   4,   1, 
+      0,  15, 128,   9,   0, 228, 
+    160,   0,   0, 170, 128,   1, 
+      0, 228, 128,   4,   0,   0, 
+      4,   0,   0,  15, 128,  10, 
+      0, 228, 160,   0,   0, 255, 
+    128,   1,   0, 228, 128,   4, 
+      0,   0,   4,   0,   0,   3, 
+    192,   0,   0, 255, 128,   0, 
+      0, 228, 160,   0,   0, 228, 
+    128,   1,   0,   0,   2,   0, 
+      0,  12, 192,   0,   0, 228, 
+    128, 255, 255,   0,   0,  83, 
+     72,  68,  82, 232,   1,   0, 
+      0,  64,   0,   1,   0, 122, 
+      0,   0,   0,  89,   0,   0, 
+      4,  70, 142,  32,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   1,   0,   0, 
+      0,   1,   0,   0,   0,  89, 
+      0,   0,   4,  70, 142,  32, 
+      0,   2,   0,   0,   0,   4, 
+      0,   0,   0,  95,   0,   0, 
+      3,  50,  16,  16,   0,   0, 
+      0,   0,   0, 103,   0,   0, 
+      4, 242,  32,  16,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 101,   0,   0,   3,  50, 
+     32,  16,   0,   1,   0,   0, 
+      0, 104,   0,   0,   2,   2, 
+      0,   0,   0,  50,   0,   0, 
+     11,  50,   0,  16,   0,   0, 
+      0,   0,   0,  70,  16,  16, 
+      0,   0,   0,   0,   0, 230, 
+    138,  32,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  70, 
+    128,  32,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  56, 
+      0,   0,   8, 242,   0,  16, 
+      0,   1,   0,   0,   0,  86, 
+      5,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   0, 
+      0,   0,   0,   4,   0,   0, 
+      0,  50,   0,   0,  10, 242, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   6,   0,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   8, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   0, 
+      0,   0,   0,   6,   0,   0, 
+      0,   0,   0,   0,   9, 242, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+    128,  65,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,  56,   0,   0,   8, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  86,   5,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   2,   0,   0,   0,   1, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,   0,  16,   0,   1, 
+      0,   0,   0,  70, 142,  32, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   6,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,  50,   0,   0,  10, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  70, 142,  32,   0,   2, 
+      0,   0,   0,   2,   0,   0, 
+      0, 166,  10,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  10, 242,  32,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   3,   0,   0,   0, 246, 
+     15,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   1, 
+      0,   0,   0,  50,   0,   0, 
+     11,  50,  32,  16,   0,   1, 
+      0,   0,   0,  70,  16,  16, 
+      0,   0,   0,   0,   0, 230, 
+    138,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  70, 
+    128,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  62, 
+      0,   0,   1,  83,  84,  65, 
+     84, 116,   0,   0,   0,  11, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  82,  68,  69,  70, 116, 
+      2,   0,   0,   3,   0,   0, 
+      0, 168,   0,   0,   0,   3, 
+      0,   0,   0,  28,   0,   0, 
+      0,   0,   4, 254, 255,   0, 
+      1,   0,   0,  64,   2,   0, 
+      0, 124,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0, 133,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 152, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,  80, 101, 114,  76,  97, 
+    121, 101, 114,   0,  80, 101, 
+    114,  79,  99,  99,  97, 115, 
+    105, 111, 110,  97, 108,  76, 
+     97, 121, 101, 114,   0,  80, 
+    101, 114,  76,  97, 121, 101, 
+    114,  77,  97, 110,  97, 103, 
+    101, 114,   0, 124,   0,   0, 
+      0,   4,   0,   0,   0, 240, 
+      0,   0,   0, 112,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 133,   0,   0, 
+      0,   2,   0,   0,   0, 188, 
+      1,   0,   0,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 152,   0,   0, 
+      0,   1,   0,   0,   0,  28, 
+      2,   0,   0,  64,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  80,   1,   0, 
+      0,   0,   0,   0,   0,  16, 
+      0,   0,   0,   2,   0,   0, 
+      0,  96,   1,   0,   0,   0, 
+      0,   0,   0, 112,   1,   0, 
+      0,  16,   0,   0,   0,  16, 
+      0,   0,   0,   2,   0,   0, 
+      0,  96,   1,   0,   0,   0, 
+      0,   0,   0, 123,   1,   0, 
+      0,  32,   0,   0,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0, 140,   1,   0,   0,   0, 
+      0,   0,   0, 156,   1,   0, 
+      0,  48,   0,   0,   0,  64, 
+      0,   0,   0,   2,   0,   0, 
+      0, 172,   1,   0,   0,   0, 
+      0,   0,   0, 118,  84, 101, 
+    120, 116, 117, 114, 101,  67, 
+    111, 111, 114, 100, 115,   0, 
+    171,   1,   0,   3,   0,   1, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 118, 
+     76,  97, 121, 101, 114,  81, 
+    117,  97, 100,   0, 102,  76, 
+     97, 121, 101, 114,  79, 112, 
+     97,  99, 105, 116, 121,   0, 
+    171, 171, 171,   0,   0,   3, 
+      0,   1,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 109,  76,  97, 121, 101, 
+    114,  84, 114,  97, 110, 115, 
+    102, 111, 114, 109,   0,   3, 
+      0,   3,   0,   4,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 236,   1,   0, 
+      0,   0,   0,   0,   0,  16, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,  16,   2,   0, 
+      0,  16,   0,   0,   0,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0, 118,  82, 101, 
+    110, 100, 101, 114,  84,  97, 
+    114, 103, 101, 116,  79, 102, 
+    102, 115, 101, 116,   0,   1, 
+      0,   3,   0,   1,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 102,  76,  97, 
+    121, 101, 114,  67, 111, 108, 
+    111, 114,   0,  52,   2,   0, 
+      0,   0,   0,   0,   0,  64, 
+      0,   0,   0,   2,   0,   0, 
+      0, 172,   1,   0,   0,   0, 
+      0,   0,   0, 109,  80, 114, 
+    111, 106, 101,  99, 116, 105, 
+    111, 110,   0,  77, 105,  99, 
+    114, 111, 115, 111, 102, 116, 
+     32,  40,  82,  41,  32,  72, 
+     76,  83,  76,  32,  83, 104, 
+     97, 100, 101, 114,  32,  67, 
+    111, 109, 112, 105, 108, 101, 
+    114,  32,  57,  46,  50,  55, 
+     46,  57,  53,  50,  46,  51, 
+     48,  50,  50,   0, 171, 171, 
+    171,  73,  83,  71,  78,  44, 
+      0,   0,   0,   1,   0,   0, 
+      0,   8,   0,   0,   0,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   3,   0,   0,  80, 
+     79,  83,  73,  84,  73,  79, 
+     78,   0, 171, 171, 171,  79, 
+     83,  71,  78,  80,   0,   0, 
+      0,   2,   0,   0,   0,   8, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,  15, 
+      0,   0,   0,  68,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+     12,   0,   0,  83,  86,  95, 
+     80, 111, 115, 105, 116, 105, 
+    111, 110,   0,  84,  69,  88, 
+     67,  79,  79,  82,  68,   0, 
+    171, 171, 171, 109,  39,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,  48, 
+      4,   0,   0,  68,  88,  66, 
+     67, 135,  78, 217, 178,  82, 
+    246,  12, 136,  40, 218, 112, 
+     36, 133,  68, 115,  32,   1, 
+      0,   0,   0,  48,   4,   0, 
+      0,   6,   0,   0,   0,  56, 
+      0,   0,   0, 192,   0,   0, 
+      0, 100,   1,   0,   0, 224, 
+      1,   0,   0, 164,   3,   0, 
+      0, 252,   3,   0,   0,  65, 
+    111, 110,  57, 128,   0,   0, 
+      0, 128,   0,   0,   0,   0, 
+      2, 255, 255,  76,   0,   0, 
+      0,  52,   0,   0,   0,   1, 
+      0,  40,   0,   0,   0,  52, 
+      0,   0,   0,  52,   0,   1, 
+      0,  36,   0,   0,   0,  52, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      2, 255, 255,  31,   0,   0, 
+      2,   0,   0,   0, 128,   0, 
+      0,   3, 176,  31,   0,   0, 
+      2,   0,   0,   0, 144,   0, 
+      8,  15, 160,  66,   0,   0, 
+      3,   0,   0,  15, 128,   0, 
+      0, 228, 176,   0,   8, 228, 
+    160,   5,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    128,   0,   0,   0, 160,   1, 
+      0,   0,   2,   0,   8,  15, 
+    128,   0,   0, 228, 128, 255, 
+    255,   0,   0,  83,  72,  68, 
+     82, 156,   0,   0,   0,  64, 
+      0,   0,   0,  39,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,  90, 
+      0,   0,   3,   0,  96,  16, 
+      0,   0,   0,   0,   0,  88, 
+     24,   0,   4,   0, 112,  16, 
+      0,   0,   0,   0,   0,  85, 
+     85,   0,   0,  98,  16,   0, 
+      3,  50,  16,  16,   0,   1, 
+      0,   0,   0, 101,   0,   0, 
+      3, 242,  32,  16,   0,   0, 
+      0,   0,   0, 104,   0,   0, 
+      2,   1,   0,   0,   0,  69, 
+      0,   0,   9, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     16,  16,   0,   1,   0,   0, 
+      0,  70, 126,  16,   0,   0, 
+      0,   0,   0,   0,  96,  16, 
+      0,   0,   0,   0,   0,  56, 
+      0,   0,   8, 242,  32,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   0,   0,   0, 
+      0,   6, 128,  32,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,   3,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70, 188,   1,   0,   0,   1, 
+      0,   0,   0, 164,   0,   0, 
+      0,   3,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 255, 
+    255,   0,   1,   0,   0, 136, 
+      1,   0,   0, 124,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 150, 
+      0,   0,   0,   2,   0,   0, 
+      0,   5,   0,   0,   0,   4, 
+      0,   0,   0, 255, 255, 255, 
+    255,   0,   0,   0,   0,   1, 
+      0,   0,   0,  12,   0,   0, 
+      0, 155,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,  76,  97, 121, 
+    101, 114,  84, 101, 120, 116, 
+    117, 114, 101,  83,  97, 109, 
+    112, 108, 101, 114,  76, 105, 
+    110, 101,  97, 114,   0, 116, 
+     82,  71,  66,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0, 155,   0,   0,   0,   4, 
+      0,   0,   0, 188,   0,   0, 
+      0, 112,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  28,   1,   0,   0,   0, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0,  44, 
+      1,   0,   0,   0,   0,   0, 
+      0,  60,   1,   0,   0,  16, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0,  44, 
+      1,   0,   0,   0,   0,   0, 
+      0,  71,   1,   0,   0,  32, 
+      0,   0,   0,   4,   0,   0, 
+      0,   2,   0,   0,   0,  88, 
+      1,   0,   0,   0,   0,   0, 
+      0, 104,   1,   0,   0,  48, 
+      0,   0,   0,  64,   0,   0, 
+      0,   0,   0,   0,   0, 120, 
+      1,   0,   0,   0,   0,   0, 
+      0, 118,  84, 101, 120, 116, 
+    117, 114, 101,  67, 111, 111, 
+    114, 100, 115,   0, 171,   1, 
+      0,   3,   0,   1,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 118,  76,  97, 
+    121, 101, 114,  81, 117,  97, 
+    100,   0, 102,  76,  97, 121, 
+    101, 114,  79, 112,  97,  99, 
+    105, 116, 121,   0, 171, 171, 
+    171,   0,   0,   3,   0,   1, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 109, 
+     76,  97, 121, 101, 114,  84, 
+    114,  97, 110, 115, 102, 111, 
+    114, 109,   0,   3,   0,   3, 
+      0,   4,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  55,  46,  57, 
+     53,  50,  46,  51,  48,  50, 
+     50,   0, 171, 171, 171,  73, 
+     83,  71,  78,  80,   0,   0, 
+      0,   2,   0,   0,   0,   8, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,  15, 
+      0,   0,   0,  68,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      3,   0,   0,  83,  86,  95, 
+     80, 111, 115, 105, 116, 105, 
+    111, 110,   0,  84,  69,  88, 
+     67,  79,  79,  82,  68,   0, 
+    171, 171, 171,  79,  83,  71, 
+     78,  44,   0,   0,   0,   1, 
+      0,   0,   0,   8,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,  15,   0,   0, 
+      0,  83,  86,  95,  84,  97, 
+    114, 103, 101, 116,   0, 171, 
+    171, 157,  46,   0,   0,   0, 
+      0,   0,   0,  82, 101, 110, 
+    100, 101, 114,  82,  71,  66, 
+     65,  76,  97, 121, 101, 114, 
+     80, 114, 101, 109, 117, 108, 
+     80, 111, 105, 110, 116,   0, 
+      4,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0, 255, 255, 255, 255, 
+     24,   7,   0,   0,  68,  88, 
+     66,  67, 254, 249,  65, 252, 
+     64,  46, 192, 119,  73, 197, 
+    161, 234,  24,   1, 194, 131, 
+      1,   0,   0,   0,  24,   7, 
+      0,   0,   6,   0,   0,   0, 
+     56,   0,   0,   0, 164,   1, 
+      0,   0, 148,   3,   0,   0, 
+     16,   4,   0,   0, 140,   6, 
+      0,   0, 192,   6,   0,   0, 
+     65, 111, 110,  57, 100,   1, 
+      0,   0, 100,   1,   0,   0, 
+      0,   2, 254, 255,   0,   1, 
+      0,   0, 100,   0,   0,   0, 
+      5,   0,  36,   0,   0,   0, 
+     96,   0,   0,   0,  96,   0, 
+      0,   0,  36,   0,   1,   0, 
+     96,   0,   0,   0,   0,   0, 
+      2,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      2,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   6,   0, 
+      1,   0,   5,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      1,   0,   6,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      4,   0,   7,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   2, 254, 255,  31,   0, 
+      0,   2,   5,   0,   0, 128, 
+      0,   0,  15, 144,   4,   0, 
+      0,   4,   0,   0,   3, 224, 
+      0,   0, 228, 144,   1,   0, 
+    238, 160,   1,   0, 228, 160, 
+      4,   0,   0,   4,   0,   0, 
+      1, 128,   0,   0,  85, 144, 
+      2,   0, 255, 160,   2,   0, 
+     85, 160,   5,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+      0, 128,   4,   0, 228, 160, 
+      4,   0,   0,   4,   1,   0, 
+      1, 128,   0,   0,   0, 144, 
+      2,   0, 170, 160,   2,   0, 
+      0, 160,   4,   0,   0,   4, 
+      0,   0,  15, 128,   3,   0, 
+    228, 160,   1,   0,   0, 128, 
+      0,   0, 228, 128,   2,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 128,   5,   0, 
+    228, 160,   2,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   6,   0, 228, 161, 
+      5,   0,   0,   3,   1,   0, 
+     15, 128,   0,   0,  85, 128, 
+      8,   0, 228, 160,   4,   0, 
+      0,   4,   1,   0,  15, 128, 
+      7,   0, 228, 160,   0,   0, 
+      0, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   1,   0, 
+     15, 128,   9,   0, 228, 160, 
+      0,   0, 170, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      0,   0,  15, 128,  10,   0, 
+    228, 160,   0,   0, 255, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   0,   0,   3, 192, 
+      0,   0, 255, 128,   0,   0, 
+    228, 160,   0,   0, 228, 128, 
+      1,   0,   0,   2,   0,   0, 
+     12, 192,   0,   0, 228, 128, 
+    255, 255,   0,   0,  83,  72, 
+     68,  82, 232,   1,   0,   0, 
+     64,   0,   1,   0, 122,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   7,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   1,   0,   0,   0, 
+      1,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      2,   0,   0,   0,   4,   0, 
+      0,   0,  95,   0,   0,   3, 
+     50,  16,  16,   0,   0,   0, 
+      0,   0, 103,   0,   0,   4, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+    101,   0,   0,   3,  50,  32, 
+     16,   0,   1,   0,   0,   0, 
+    104,   0,   0,   2,   2,   0, 
+      0,   0,  50,   0,   0,  11, 
+     50,   0,  16,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      0,   0,   0,   0, 230, 138, 
+     32,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,  70, 128, 
+     32,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,  56,   0, 
+      0,   8, 242,   0,  16,   0, 
+      1,   0,   0,   0,  86,   5, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   4,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      6,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   8, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   6,   0,   0,   0, 
+      0,   0,   0,   9, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32, 128, 
+     65,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     56,   0,   0,   8, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     86,   5,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,   6,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+     50,   0,   0,  10, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   2,   0,   0,   0, 
+    166,  10,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  10, 242,  32,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      3,   0,   0,   0, 246,  15, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,  50,   0,   0,  11, 
+     50,  32,  16,   0,   1,   0, 
+      0,   0,  70,  16,  16,   0, 
+      0,   0,   0,   0, 230, 138, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  70, 128, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,  11,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70, 116,   2, 
+      0,   0,   3,   0,   0,   0, 
+    168,   0,   0,   0,   3,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 254, 255,   0,   1, 
+      0,   0,  64,   2,   0,   0, 
+    124,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 133,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 152,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+     80, 101, 114,  76,  97, 121, 
+    101, 114,   0,  80, 101, 114, 
+     79,  99,  99,  97, 115, 105, 
+    111, 110,  97, 108,  76,  97, 
+    121, 101, 114,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+     77,  97, 110,  97, 103, 101, 
+    114,   0, 124,   0,   0,   0, 
+      4,   0,   0,   0, 240,   0, 
+      0,   0, 112,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 133,   0,   0,   0, 
+      2,   0,   0,   0, 188,   1, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 152,   0,   0,   0, 
+      1,   0,   0,   0,  28,   2, 
+      0,   0,  64,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  80,   1,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+     96,   1,   0,   0,   0,   0, 
+      0,   0, 112,   1,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+     96,   1,   0,   0,   0,   0, 
+      0,   0, 123,   1,   0,   0, 
+     32,   0,   0,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+    140,   1,   0,   0,   0,   0, 
+      0,   0, 156,   1,   0,   0, 
+     48,   0,   0,   0,  64,   0, 
+      0,   0,   2,   0,   0,   0, 
+    172,   1,   0,   0,   0,   0, 
+      0,   0, 118,  84, 101, 120, 
+    116, 117, 114, 101,  67, 111, 
+    111, 114, 100, 115,   0, 171, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 118,  76, 
+     97, 121, 101, 114,  81, 117, 
+     97, 100,   0, 102,  76,  97, 
+    121, 101, 114,  79, 112,  97, 
+     99, 105, 116, 121,   0, 171, 
+    171, 171,   0,   0,   3,   0, 
+      1,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    109,  76,  97, 121, 101, 114, 
+     84, 114,  97, 110, 115, 102, 
+    111, 114, 109,   0,   3,   0, 
+      3,   0,   4,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 236,   1,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,  16,   2,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0, 118,  82, 101, 110, 
+    100, 101, 114,  84,  97, 114, 
+    103, 101, 116,  79, 102, 102, 
+    115, 101, 116,   0,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 102,  76,  97, 121, 
+    101, 114,  67, 111, 108, 111, 
+    114,   0,  52,   2,   0,   0, 
+      0,   0,   0,   0,  64,   0, 
+      0,   0,   2,   0,   0,   0, 
+    172,   1,   0,   0,   0,   0, 
+      0,   0, 109,  80, 114, 111, 
+    106, 101,  99, 116, 105, 111, 
+    110,   0,  77, 105,  99, 114, 
+    111, 115, 111, 102, 116,  32, 
+     40,  82,  41,  32,  72,  76, 
+     83,  76,  32,  83, 104,  97, 
+    100, 101, 114,  32,  67, 111, 
+    109, 112, 105, 108, 101, 114, 
+     32,  57,  46,  50,  55,  46, 
+     57,  53,  50,  46,  51,  48, 
+     50,  50,   0, 171, 171, 171, 
+     73,  83,  71,  78,  44,   0, 
+      0,   0,   1,   0,   0,   0, 
+      8,   0,   0,   0,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   3,   0,   0,  80,  79, 
+     83,  73,  84,  73,  79,  78, 
+      0, 171, 171, 171,  79,  83, 
+     71,  78,  80,   0,   0,   0, 
+      2,   0,   0,   0,   8,   0, 
+      0,   0,  56,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0,  68,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   3,  12, 
+      0,   0,  83,  86,  95,  80, 
+    111, 115, 105, 116, 105, 111, 
+    110,   0,  84,  69,  88,  67, 
+     79,  79,  82,  68,   0, 171, 
+    171, 171,  36,  51,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,  48,   4, 
+      0,   0,  68,  88,  66,  67, 
+     15,  77, 243, 211, 185,  20, 
+    200, 151,  80,  95, 178, 168, 
+    167, 229, 221,  45,   1,   0, 
+      0,   0,  48,   4,   0,   0, 
+      6,   0,   0,   0,  56,   0, 
+      0,   0, 192,   0,   0,   0, 
+    100,   1,   0,   0, 224,   1, 
+      0,   0, 164,   3,   0,   0, 
+    252,   3,   0,   0,  65, 111, 
+    110,  57, 128,   0,   0,   0, 
+    128,   0,   0,   0,   0,   2, 
+    255, 255,  76,   0,   0,   0, 
+     52,   0,   0,   0,   1,   0, 
+     40,   0,   0,   0,  52,   0, 
+      0,   0,  52,   0,   1,   0, 
+     36,   0,   0,   0,  52,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   2, 
+    255, 255,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+      5,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0,  83,  72,  68,  82, 
+    156,   0,   0,   0,  64,   0, 
+      0,   0,  39,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,  90,   0, 
+      0,   3,   0,  96,  16,   0, 
+      0,   0,   0,   0,  88,  24, 
+      0,   4,   0, 112,  16,   0, 
+      0,   0,   0,   0,  85,  85, 
+      0,   0,  98,  16,   0,   3, 
+     50,  16,  16,   0,   1,   0, 
+      0,   0, 101,   0,   0,   3, 
+    242,  32,  16,   0,   0,   0, 
+      0,   0, 104,   0,   0,   2, 
+      1,   0,   0,   0,  69,   0, 
+      0,   9, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   1,   0,   0,   0, 
+     70, 126,  16,   0,   0,   0, 
+      0,   0,   0,  96,  16,   0, 
+      0,   0,   0,   0,  56,   0, 
+      0,   8, 242,  32,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   0,   0,   0,   0, 
+      6, 128,  32,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+     62,   0,   0,   1,  83,  84, 
+     65,  84, 116,   0,   0,   0, 
+      3,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  82,  68,  69,  70, 
+    188,   1,   0,   0,   1,   0, 
+      0,   0, 164,   0,   0,   0, 
+      3,   0,   0,   0,  28,   0, 
+      0,   0,   0,   4, 255, 255, 
+      0,   1,   0,   0, 136,   1, 
+      0,   0, 124,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 149,   0, 
+      0,   0,   2,   0,   0,   0, 
+      5,   0,   0,   0,   4,   0, 
+      0,   0, 255, 255, 255, 255, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,  12,   0,   0,   0, 
+    154,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  76,  97, 121, 101, 
+    114,  84, 101, 120, 116, 117, 
+    114, 101,  83,  97, 109, 112, 
+    108, 101, 114,  80, 111, 105, 
+    110, 116,   0, 116,  82,  71, 
+     66,   0,  80, 101, 114,  76, 
+     97, 121, 101, 114,   0, 171, 
+    154,   0,   0,   0,   4,   0, 
+      0,   0, 188,   0,   0,   0, 
+    112,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     28,   1,   0,   0,   0,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,  44,   1, 
+      0,   0,   0,   0,   0,   0, 
+     60,   1,   0,   0,  16,   0, 
+      0,   0,  16,   0,   0,   0, 
+      0,   0,   0,   0,  44,   1, 
+      0,   0,   0,   0,   0,   0, 
+     71,   1,   0,   0,  32,   0, 
+      0,   0,   4,   0,   0,   0, 
+      2,   0,   0,   0,  88,   1, 
+      0,   0,   0,   0,   0,   0, 
+    104,   1,   0,   0,  48,   0, 
+      0,   0,  64,   0,   0,   0, 
+      0,   0,   0,   0, 120,   1, 
+      0,   0,   0,   0,   0,   0, 
+    118,  84, 101, 120, 116, 117, 
+    114, 101,  67, 111, 111, 114, 
+    100, 115,   0, 171,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 118,  76,  97, 121, 
+    101, 114,  81, 117,  97, 100, 
+      0, 102,  76,  97, 121, 101, 
+    114,  79, 112,  97,  99, 105, 
+    116, 121,   0, 171, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 109,  76, 
+     97, 121, 101, 114,  84, 114, 
+     97, 110, 115, 102, 111, 114, 
+    109,   0,   3,   0,   3,   0, 
+      4,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     77, 105,  99, 114, 111, 115, 
+    111, 102, 116,  32,  40,  82, 
+     41,  32,  72,  76,  83,  76, 
+     32,  83, 104,  97, 100, 101, 
+    114,  32,  67, 111, 109, 112, 
+    105, 108, 101, 114,  32,  57, 
+     46,  50,  55,  46,  57,  53, 
+     50,  46,  51,  48,  50,  50, 
+      0, 171, 171, 171,  73,  83, 
+     71,  78,  80,   0,   0,   0, 
+      2,   0,   0,   0,   8,   0, 
+      0,   0,  56,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0,  68,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   3,   3, 
+      0,   0,  83,  86,  95,  80, 
+    111, 115, 105, 116, 105, 111, 
+    110,   0,  84,  69,  88,  67, 
+     79,  79,  82,  68,   0, 171, 
+    171, 171,  79,  83,  71,  78, 
+     44,   0,   0,   0,   1,   0, 
+      0,   0,   8,   0,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     83,  86,  95,  84,  97, 114, 
+    103, 101, 116,   0, 171, 171, 
+     84,  58,   0,   0,   0,   0, 
+      0,   0,  82, 101, 110, 100, 
+    101, 114,  82,  71,  66,  65, 
+     76,  97, 121, 101, 114,  78, 
+    111, 110,  80, 114, 101, 109, 
+    117, 108,  80, 111, 105, 110, 
+    116,   0,   4,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   0,   0,   0, 255, 255, 
+    255, 255,  24,   7,   0,   0, 
+     68,  88,  66,  67, 254, 249, 
+     65, 252,  64,  46, 192, 119, 
+     73, 197, 161, 234,  24,   1, 
+    194, 131,   1,   0,   0,   0, 
+     24,   7,   0,   0,   6,   0, 
+      0,   0,  56,   0,   0,   0, 
+    164,   1,   0,   0, 148,   3, 
+      0,   0,  16,   4,   0,   0, 
+    140,   6,   0,   0, 192,   6, 
+      0,   0,  65, 111, 110,  57, 
+    100,   1,   0,   0, 100,   1, 
+      0,   0,   0,   2, 254, 255, 
+      0,   1,   0,   0, 100,   0, 
+      0,   0,   5,   0,  36,   0, 
+      0,   0,  96,   0,   0,   0, 
+     96,   0,   0,   0,  36,   0, 
+      1,   0,  96,   0,   0,   0, 
+      0,   0,   2,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   2,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      6,   0,   1,   0,   5,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   1,   0,   6,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   4,   0,   7,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   2, 254, 255, 
+     31,   0,   0,   2,   5,   0, 
+      0, 128,   0,   0,  15, 144, 
+      4,   0,   0,   4,   0,   0, 
+      3, 224,   0,   0, 228, 144, 
+      1,   0, 238, 160,   1,   0, 
+    228, 160,   4,   0,   0,   4, 
+      0,   0,   1, 128,   0,   0, 
+     85, 144,   2,   0, 255, 160, 
+      2,   0,  85, 160,   5,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0,   0, 128,   4,   0, 
+    228, 160,   4,   0,   0,   4, 
+      1,   0,   1, 128,   0,   0, 
+      0, 144,   2,   0, 170, 160, 
+      2,   0,   0, 160,   4,   0, 
+      0,   4,   0,   0,  15, 128, 
+      3,   0, 228, 160,   1,   0, 
+      0, 128,   0,   0, 228, 128, 
+      2,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 128, 
+      5,   0, 228, 160,   2,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 128,   6,   0, 
+    228, 161,   5,   0,   0,   3, 
+      1,   0,  15, 128,   0,   0, 
+     85, 128,   8,   0, 228, 160, 
+      4,   0,   0,   4,   1,   0, 
+     15, 128,   7,   0, 228, 160, 
+      0,   0,   0, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      1,   0,  15, 128,   9,   0, 
+    228, 160,   0,   0, 170, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   0,   0,  15, 128, 
+     10,   0, 228, 160,   0,   0, 
+    255, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   0,   0, 
+      3, 192,   0,   0, 255, 128, 
+      0,   0, 228, 160,   0,   0, 
+    228, 128,   1,   0,   0,   2, 
+      0,   0,  12, 192,   0,   0, 
+    228, 128, 255, 255,   0,   0, 
+     83,  72,  68,  82, 232,   1, 
+      0,   0,  64,   0,   1,   0, 
+    122,   0,   0,   0,  89,   0, 
+      0,   4,  70, 142,  32,   0, 
+      0,   0,   0,   0,   7,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   1,   0, 
+      0,   0,   1,   0,   0,   0, 
+     89,   0,   0,   4,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      4,   0,   0,   0,  95,   0, 
+      0,   3,  50,  16,  16,   0, 
+      0,   0,   0,   0, 103,   0, 
+      0,   4, 242,  32,  16,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0, 101,   0,   0,   3, 
+     50,  32,  16,   0,   1,   0, 
+      0,   0, 104,   0,   0,   2, 
+      2,   0,   0,   0,  50,   0, 
+      0,  11,  50,   0,  16,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   0,   0,   0,   0, 
+    230, 138,  32,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     70, 128,  32,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     56,   0,   0,   8, 242,   0, 
+     16,   0,   1,   0,   0,   0, 
+     86,   5,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      0,   0,   0,   0,   4,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   6,   0,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+      0,   0,   0,   8, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   0,   0, 
+      0,   0,  70, 142,  32,   0, 
+      0,   0,   0,   0,   6,   0, 
+      0,   0,   0,   0,   0,   9, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32, 128,  65,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  56,   0,   0,   8, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  86,   5,  16,   0, 
+      0,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  10, 242,   0,  16,   0, 
+      1,   0,   0,   0,  70, 142, 
+     32,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   6,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   1,   0, 
+      0,   0,  50,   0,   0,  10, 
+    242,   0,  16,   0,   1,   0, 
+      0,   0,  70, 142,  32,   0, 
+      2,   0,   0,   0,   2,   0, 
+      0,   0, 166,  10,  16,   0, 
+      0,   0,   0,   0,  70,  14, 
+     16,   0,   1,   0,   0,   0, 
+     50,   0,   0,  10, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+     70, 142,  32,   0,   2,   0, 
+      0,   0,   3,   0,   0,   0, 
+    246,  15,  16,   0,   0,   0, 
+      0,   0,  70,  14,  16,   0, 
+      1,   0,   0,   0,  50,   0, 
+      0,  11,  50,  32,  16,   0, 
+      1,   0,   0,   0,  70,  16, 
+     16,   0,   0,   0,   0,   0, 
+    230, 138,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     70, 128,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     62,   0,   0,   1,  83,  84, 
+     65,  84, 116,   0,   0,   0, 
+     11,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  82,  68,  69,  70, 
+    116,   2,   0,   0,   3,   0, 
+      0,   0, 168,   0,   0,   0, 
+      3,   0,   0,   0,  28,   0, 
+      0,   0,   0,   4, 254, 255, 
+      0,   1,   0,   0,  64,   2, 
+      0,   0, 124,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 133,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    152,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  80, 101, 114,  76, 
+     97, 121, 101, 114,   0,  80, 
+    101, 114,  79,  99,  99,  97, 
+    115, 105, 111, 110,  97, 108, 
+     76,  97, 121, 101, 114,   0, 
+     80, 101, 114,  76,  97, 121, 
+    101, 114,  77,  97, 110,  97, 
+    103, 101, 114,   0, 124,   0, 
+      0,   0,   4,   0,   0,   0, 
+    240,   0,   0,   0, 112,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 133,   0, 
+      0,   0,   2,   0,   0,   0, 
+    188,   1,   0,   0,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 152,   0, 
+      0,   0,   1,   0,   0,   0, 
+     28,   2,   0,   0,  64,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  80,   1, 
+      0,   0,   0,   0,   0,   0, 
+     16,   0,   0,   0,   2,   0, 
+      0,   0,  96,   1,   0,   0, 
+      0,   0,   0,   0, 112,   1, 
+      0,   0,  16,   0,   0,   0, 
+     16,   0,   0,   0,   2,   0, 
+      0,   0,  96,   1,   0,   0, 
+      0,   0,   0,   0, 123,   1, 
+      0,   0,  32,   0,   0,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0, 140,   1,   0,   0, 
+      0,   0,   0,   0, 156,   1, 
+      0,   0,  48,   0,   0,   0, 
+     64,   0,   0,   0,   2,   0, 
+      0,   0, 172,   1,   0,   0, 
+      0,   0,   0,   0, 118,  84, 
+    101, 120, 116, 117, 114, 101, 
+     67, 111, 111, 114, 100, 115, 
+      0, 171,   1,   0,   3,   0, 
+      1,   0,   4,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    118,  76,  97, 121, 101, 114, 
+     81, 117,  97, 100,   0, 102, 
+     76,  97, 121, 101, 114,  79, 
+    112,  97,  99, 105, 116, 121, 
+      0, 171, 171, 171,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 109,  76,  97, 121, 
+    101, 114,  84, 114,  97, 110, 
+    115, 102, 111, 114, 109,   0, 
+      3,   0,   3,   0,   4,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 236,   1, 
+      0,   0,   0,   0,   0,   0, 
+     16,   0,   0,   0,   2,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,  16,   2, 
+      0,   0,  16,   0,   0,   0, 
+     16,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0, 118,  82, 
+    101, 110, 100, 101, 114,  84, 
+     97, 114, 103, 101, 116,  79, 
+    102, 102, 115, 101, 116,   0, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 102,  76, 
+     97, 121, 101, 114,  67, 111, 
+    108, 111, 114,   0,  52,   2, 
+      0,   0,   0,   0,   0,   0, 
+     64,   0,   0,   0,   2,   0, 
+      0,   0, 172,   1,   0,   0, 
+      0,   0,   0,   0, 109,  80, 
+    114, 111, 106, 101,  99, 116, 
+    105, 111, 110,   0,  77, 105, 
+     99, 114, 111, 115, 111, 102, 
+    116,  32,  40,  82,  41,  32, 
+     72,  76,  83,  76,  32,  83, 
+    104,  97, 100, 101, 114,  32, 
+     67, 111, 109, 112, 105, 108, 
+    101, 114,  32,  57,  46,  50, 
+     55,  46,  57,  53,  50,  46, 
+     51,  48,  50,  50,   0, 171, 
+    171, 171,  73,  83,  71,  78, 
+     44,   0,   0,   0,   1,   0, 
+      0,   0,   8,   0,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   3,   3,   0,   0, 
+     80,  79,  83,  73,  84,  73, 
+     79,  78,   0, 171, 171, 171, 
+     79,  83,  71,  78,  80,   0, 
+      0,   0,   2,   0,   0,   0, 
+      8,   0,   0,   0,  56,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+     15,   0,   0,   0,  68,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,  12,   0,   0,  83,  86, 
+     95,  80, 111, 115, 105, 116, 
+    105, 111, 110,   0,  84,  69, 
+     88,  67,  79,  79,  82,  68, 
+      0, 171, 171, 171, 222,  62, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,   0, 
+     48,   4,   0,   0,  68,  88, 
+     66,  67,  15,  77, 243, 211, 
+    185,  20, 200, 151,  80,  95, 
+    178, 168, 167, 229, 221,  45, 
+      1,   0,   0,   0,  48,   4, 
+      0,   0,   6,   0,   0,   0, 
+     56,   0,   0,   0, 192,   0, 
+      0,   0, 100,   1,   0,   0, 
+    224,   1,   0,   0, 164,   3, 
+      0,   0, 252,   3,   0,   0, 
+     65, 111, 110,  57, 128,   0, 
+      0,   0, 128,   0,   0,   0, 
+      0,   2, 255, 255,  76,   0, 
+      0,   0,  52,   0,   0,   0, 
+      1,   0,  40,   0,   0,   0, 
+     52,   0,   0,   0,  52,   0, 
+      1,   0,  36,   0,   0,   0, 
+     52,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   2, 255, 255,  31,   0, 
+      0,   2,   0,   0,   0, 128, 
+      0,   0,   3, 176,  31,   0, 
+      0,   2,   0,   0,   0, 144, 
+      0,   8,  15, 160,  66,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 176,   0,   8, 
+    228, 160,   5,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   0,   0,   0, 160, 
+      1,   0,   0,   2,   0,   8, 
+     15, 128,   0,   0, 228, 128, 
+    255, 255,   0,   0,  83,  72, 
+     68,  82, 156,   0,   0,   0, 
+     64,   0,   0,   0,  39,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+     90,   0,   0,   3,   0,  96, 
+     16,   0,   0,   0,   0,   0, 
+     88,  24,   0,   4,   0, 112, 
+     16,   0,   0,   0,   0,   0, 
+     85,  85,   0,   0,  98,  16, 
+      0,   3,  50,  16,  16,   0, 
+      1,   0,   0,   0, 101,   0, 
+      0,   3, 242,  32,  16,   0, 
+      0,   0,   0,   0, 104,   0, 
+      0,   2,   1,   0,   0,   0, 
+     69,   0,   0,   9, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  16,  16,   0,   1,   0, 
+      0,   0,  70, 126,  16,   0, 
+      0,   0,   0,   0,   0,  96, 
+     16,   0,   0,   0,   0,   0, 
+     56,   0,   0,   8, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+     70,  14,  16,   0,   0,   0, 
+      0,   0,   6, 128,  32,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,  62,   0,   0,   1, 
+     83,  84,  65,  84, 116,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  82,  68, 
+     69,  70, 188,   1,   0,   0, 
+      1,   0,   0,   0, 164,   0, 
+      0,   0,   3,   0,   0,   0, 
+     28,   0,   0,   0,   0,   4, 
+    255, 255,   0,   1,   0,   0, 
+    136,   1,   0,   0, 124,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    149,   0,   0,   0,   2,   0, 
+      0,   0,   5,   0,   0,   0, 
+      4,   0,   0,   0, 255, 255, 
+    255, 255,   0,   0,   0,   0, 
+      1,   0,   0,   0,  12,   0, 
+      0,   0, 154,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  76,  97, 
+    121, 101, 114,  84, 101, 120, 
+    116, 117, 114, 101,  83,  97, 
+    109, 112, 108, 101, 114,  80, 
+    111, 105, 110, 116,   0, 116, 
+     82,  71,  66,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0, 171, 154,   0,   0,   0, 
+      4,   0,   0,   0, 188,   0, 
+      0,   0, 112,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  28,   1,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   0,   0,   0,   0, 
+     44,   1,   0,   0,   0,   0, 
+      0,   0,  60,   1,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   0,   0,   0,   0, 
+     44,   1,   0,   0,   0,   0, 
+      0,   0,  71,   1,   0,   0, 
+     32,   0,   0,   0,   4,   0, 
+      0,   0,   2,   0,   0,   0, 
+     88,   1,   0,   0,   0,   0, 
+      0,   0, 104,   1,   0,   0, 
+     48,   0,   0,   0,  64,   0, 
+      0,   0,   0,   0,   0,   0, 
+    120,   1,   0,   0,   0,   0, 
+      0,   0, 118,  84, 101, 120, 
+    116, 117, 114, 101,  67, 111, 
+    111, 114, 100, 115,   0, 171, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 118,  76, 
+     97, 121, 101, 114,  81, 117, 
+     97, 100,   0, 102,  76,  97, 
+    121, 101, 114,  79, 112,  97, 
+     99, 105, 116, 121,   0, 171, 
+    171, 171,   0,   0,   3,   0, 
+      1,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+    109,  76,  97, 121, 101, 114, 
+     84, 114,  97, 110, 115, 102, 
+    111, 114, 109,   0,   3,   0, 
+      3,   0,   4,   0,   4,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  77, 105,  99, 114, 
+    111, 115, 111, 102, 116,  32, 
+     40,  82,  41,  32,  72,  76, 
+     83,  76,  32,  83, 104,  97, 
+    100, 101, 114,  32,  67, 111, 
+    109, 112, 105, 108, 101, 114, 
+     32,  57,  46,  50,  55,  46, 
+     57,  53,  50,  46,  51,  48, 
+     50,  50,   0, 171, 171, 171, 
+     73,  83,  71,  78,  80,   0, 
+      0,   0,   2,   0,   0,   0, 
+      8,   0,   0,   0,  56,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+     15,   0,   0,   0,  68,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   3,   0,   0,  83,  86, 
+     95,  80, 111, 115, 105, 116, 
+    105, 111, 110,   0,  84,  69, 
+     88,  67,  79,  79,  82,  68, 
+      0, 171, 171, 171,  79,  83, 
+     71,  78,  44,   0,   0,   0, 
+      1,   0,   0,   0,   8,   0, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0,  83,  86,  95,  84, 
+     97, 114, 103, 101, 116,   0, 
+    171, 171,  14,  70,   0,   0, 
+      0,   0,   0,   0,  82, 101, 
+    110, 100, 101, 114,  89,  67, 
+     98,  67, 114,  76,  97, 121, 
+    101, 114,   0,   4,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,   0,   0,   0, 255, 
+    255, 255, 255,  24,   7,   0, 
+      0,  68,  88,  66,  67, 254, 
+    249,  65, 252,  64,  46, 192, 
+    119,  73, 197, 161, 234,  24, 
+      1, 194, 131,   1,   0,   0, 
+      0,  24,   7,   0,   0,   6, 
+      0,   0,   0,  56,   0,   0, 
+      0, 164,   1,   0,   0, 148, 
+      3,   0,   0,  16,   4,   0, 
+      0, 140,   6,   0,   0, 192, 
+      6,   0,   0,  65, 111, 110, 
+     57, 100,   1,   0,   0, 100, 
+      1,   0,   0,   0,   2, 254, 
+    255,   0,   1,   0,   0, 100, 
+      0,   0,   0,   5,   0,  36, 
+      0,   0,   0,  96,   0,   0, 
+      0,  96,   0,   0,   0,  36, 
+      0,   1,   0,  96,   0,   0, 
+      0,   0,   0,   2,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   2,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,   6,   0,   1,   0,   5, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   1,   0,   6, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,   4,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   2, 254, 
+    255,  31,   0,   0,   2,   5, 
+      0,   0, 128,   0,   0,  15, 
+    144,   4,   0,   0,   4,   0, 
+      0,   3, 224,   0,   0, 228, 
+    144,   1,   0, 238, 160,   1, 
+      0, 228, 160,   4,   0,   0, 
+      4,   0,   0,   1, 128,   0, 
+      0,  85, 144,   2,   0, 255, 
+    160,   2,   0,  85, 160,   5, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0,   0, 128,   4, 
+      0, 228, 160,   4,   0,   0, 
+      4,   1,   0,   1, 128,   0, 
+      0,   0, 144,   2,   0, 170, 
+    160,   2,   0,   0, 160,   4, 
+      0,   0,   4,   0,   0,  15, 
+    128,   3,   0, 228, 160,   1, 
+      0,   0, 128,   0,   0, 228, 
+    128,   2,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    128,   5,   0, 228, 160,   2, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0, 228, 128,   6, 
+      0, 228, 161,   5,   0,   0, 
+      3,   1,   0,  15, 128,   0, 
+      0,  85, 128,   8,   0, 228, 
+    160,   4,   0,   0,   4,   1, 
+      0,  15, 128,   7,   0, 228, 
+    160,   0,   0,   0, 128,   1, 
+      0, 228, 128,   4,   0,   0, 
+      4,   1,   0,  15, 128,   9, 
+      0, 228, 160,   0,   0, 170, 
+    128,   1,   0, 228, 128,   4, 
+      0,   0,   4,   0,   0,  15, 
+    128,  10,   0, 228, 160,   0, 
+      0, 255, 128,   1,   0, 228, 
+    128,   4,   0,   0,   4,   0, 
+      0,   3, 192,   0,   0, 255, 
+    128,   0,   0, 228, 160,   0, 
+      0, 228, 128,   1,   0,   0, 
+      2,   0,   0,  12, 192,   0, 
+      0, 228, 128, 255, 255,   0, 
+      0,  83,  72,  68,  82, 232, 
+      1,   0,   0,  64,   0,   1, 
+      0, 122,   0,   0,   0,  89, 
+      0,   0,   4,  70, 142,  32, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0,  89,   0,   0, 
+      4,  70, 142,  32,   0,   1, 
+      0,   0,   0,   1,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   4,   0,   0,   0,  95, 
+      0,   0,   3,  50,  16,  16, 
+      0,   0,   0,   0,   0, 103, 
+      0,   0,   4, 242,  32,  16, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 101,   0,   0, 
+      3,  50,  32,  16,   0,   1, 
+      0,   0,   0, 104,   0,   0, 
+      2,   2,   0,   0,   0,  50, 
+      0,   0,  11,  50,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     16,  16,   0,   0,   0,   0, 
+      0, 230, 138,  32,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  70, 128,  32,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  56,   0,   0,   8, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  86,   5,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   4, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   6,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,   0,   0,   0,   8, 242, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      9, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32, 128,  65,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,  56,   0,   0, 
+      8, 242,   0,  16,   0,   1, 
+      0,   0,   0,  86,   5,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  10, 242,   0,  16, 
+      0,   1,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   6, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   1, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,   0,  16,   0,   1, 
+      0,   0,   0,  70, 142,  32, 
+      0,   2,   0,   0,   0,   2, 
+      0,   0,   0, 166,  10,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,  50,   0,   0,  10, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   2, 
+      0,   0,   0,   3,   0,   0, 
+      0, 246,  15,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  11,  50,  32,  16, 
+      0,   1,   0,   0,   0,  70, 
+     16,  16,   0,   0,   0,   0, 
+      0, 230, 138,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  70, 128,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,  11,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70, 116,   2,   0,   0,   3, 
+      0,   0,   0, 168,   0,   0, 
+      0,   3,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 254, 
+    255,   0,   1,   0,   0,  64, 
+      2,   0,   0, 124,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 133, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 152,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,  80, 101, 114, 
+     76,  97, 121, 101, 114,   0, 
+     80, 101, 114,  79,  99,  99, 
+     97, 115, 105, 111, 110,  97, 
+    108,  76,  97, 121, 101, 114, 
+      0,  80, 101, 114,  76,  97, 
+    121, 101, 114,  77,  97, 110, 
+     97, 103, 101, 114,   0, 124, 
+      0,   0,   0,   4,   0,   0, 
+      0, 240,   0,   0,   0, 112, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 133, 
+      0,   0,   0,   2,   0,   0, 
+      0, 188,   1,   0,   0,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 152, 
+      0,   0,   0,   1,   0,   0, 
+      0,  28,   2,   0,   0,  64, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  80, 
+      1,   0,   0,   0,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,  96,   1,   0, 
+      0,   0,   0,   0,   0, 112, 
+      1,   0,   0,  16,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,  96,   1,   0, 
+      0,   0,   0,   0,   0, 123, 
+      1,   0,   0,  32,   0,   0, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0, 140,   1,   0, 
+      0,   0,   0,   0,   0, 156, 
+      1,   0,   0,  48,   0,   0, 
+      0,  64,   0,   0,   0,   2, 
+      0,   0,   0, 172,   1,   0, 
+      0,   0,   0,   0,   0, 118, 
+     84, 101, 120, 116, 117, 114, 
+    101,  67, 111, 111, 114, 100, 
+    115,   0, 171,   1,   0,   3, 
+      0,   1,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 118,  76,  97, 121, 101, 
+    114,  81, 117,  97, 100,   0, 
+    102,  76,  97, 121, 101, 114, 
+     79, 112,  97,  99, 105, 116, 
+    121,   0, 171, 171, 171,   0, 
+      0,   3,   0,   1,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 109,  76,  97, 
+    121, 101, 114,  84, 114,  97, 
+    110, 115, 102, 111, 114, 109, 
+      0,   3,   0,   3,   0,   4, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 236, 
+      1,   0,   0,   0,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,  16, 
+      2,   0,   0,  16,   0,   0, 
+      0,  16,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0, 118, 
+     82, 101, 110, 100, 101, 114, 
+     84,  97, 114, 103, 101, 116, 
+     79, 102, 102, 115, 101, 116, 
+      0,   1,   0,   3,   0,   1, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 102, 
+     76,  97, 121, 101, 114,  67, 
+    111, 108, 111, 114,   0,  52, 
+      2,   0,   0,   0,   0,   0, 
+      0,  64,   0,   0,   0,   2, 
+      0,   0,   0, 172,   1,   0, 
+      0,   0,   0,   0,   0, 109, 
+     80, 114, 111, 106, 101,  99, 
+    116, 105, 111, 110,   0,  77, 
+    105,  99, 114, 111, 115, 111, 
+    102, 116,  32,  40,  82,  41, 
+     32,  72,  76,  83,  76,  32, 
+     83, 104,  97, 100, 101, 114, 
+     32,  67, 111, 109, 112, 105, 
+    108, 101, 114,  32,  57,  46, 
+     50,  55,  46,  57,  53,  50, 
+     46,  51,  48,  50,  50,   0, 
+    171, 171, 171,  73,  83,  71, 
+     78,  44,   0,   0,   0,   1, 
+      0,   0,   0,   8,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   3,   3,   0, 
+      0,  80,  79,  83,  73,  84, 
+     73,  79,  78,   0, 171, 171, 
+    171,  79,  83,  71,  78,  80, 
+      0,   0,   0,   2,   0,   0, 
+      0,   8,   0,   0,   0,  56, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,  15,   0,   0,   0,  68, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,  12,   0,   0,  83, 
+     86,  95,  80, 111, 115, 105, 
+    116, 105, 111, 110,   0,  84, 
+     69,  88,  67,  79,  79,  82, 
+     68,   0, 171, 171, 171, 139, 
+     74,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,  64,   7,   0,   0,  68, 
+     88,  66,  67, 126,  75, 135, 
+    159,  85, 129, 194,  57,   1, 
+      1,  77, 205, 160, 221, 154, 
+    168,   1,   0,   0,   0,  64, 
+      7,   0,   0,   6,   0,   0, 
+      0,  56,   0,   0,   0, 220, 
+      1,   0,   0,  44,   4,   0, 
+      0, 168,   4,   0,   0, 180, 
+      6,   0,   0,  12,   7,   0, 
+      0,  65, 111, 110,  57, 156, 
+      1,   0,   0, 156,   1,   0, 
+      0,   0,   2, 255, 255,  96, 
+      1,   0,   0,  60,   0,   0, 
+      0,   1,   0,  48,   0,   0, 
+      0,  60,   0,   0,   0,  60, 
+      0,   3,   0,  36,   0,   0, 
+      0,  60,   0,   0,   0,   0, 
+      0,   1,   0,   1,   0,   2, 
+      0,   2,   0,   0,   0,   2, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   2, 255, 
+    255,  81,   0,   0,   5,   1, 
+      0,  15, 160,   0,   0,   0, 
+    191,   0,   0, 128, 189, 186, 
+     73, 204,  63, 197,  32,  80, 
+     63,  81,   0,   0,   5,   2, 
+      0,  15, 160, 244, 253, 148, 
+     63, 233,  38,   1,  64,  39, 
+     49, 200,  62,   0,   0, 128, 
+     63,  31,   0,   0,   2,   0, 
+      0,   0, 128,   0,   0,   3, 
+    176,  31,   0,   0,   2,   0, 
+      0,   0, 144,   0,   8,  15, 
+    160,  31,   0,   0,   2,   0, 
+      0,   0, 144,   1,   8,  15, 
+    160,  31,   0,   0,   2,   0, 
+      0,   0, 144,   2,   8,  15, 
+    160,  66,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    176,   0,   8, 228, 160,  66, 
+      0,   0,   3,   1,   0,  15, 
+    128,   0,   0, 228, 176,   2, 
+      8, 228, 160,   2,   0,   0, 
+      3,   0,   0,   2, 128,   1, 
+      0,   0, 128,   1,   0,   0, 
+    160,   5,   0,   0,   3,   0, 
+      0,   6, 128,   0,   0,  85, 
+    128,   1,   0, 248, 160,   2, 
+      0,   0,   3,   0,   0,   1, 
+    128,   0,   0,   0, 128,   1, 
+      0,  85, 160,   4,   0,   0, 
+      4,   0,   0,   4, 128,   0, 
+      0,   0, 128,   2,   0,   0, 
+    160,   0,   0, 170, 129,   4, 
+      0,   0,   4,   1,   0,   1, 
+    128,   0,   0,   0, 128,   2, 
+      0,   0, 160,   0,   0,  85, 
+    128,  66,   0,   0,   3,   2, 
+      0,  15, 128,   0,   0, 228, 
+    176,   1,   8, 228, 160,   2, 
+      0,   0,   3,   0,   0,   2, 
+    128,   2,   0,   0, 128,   1, 
+      0,   0, 160,   4,   0,   0, 
+      4,   1,   0,   2, 128,   0, 
+      0,  85, 128,   2,   0, 170, 
+    161,   0,   0, 170, 128,   5, 
+      0,   0,   3,   0,   0,   2, 
+    128,   0,   0,  85, 128,   2, 
+      0,  85, 160,   4,   0,   0, 
+      4,   1,   0,   4, 128,   0, 
+      0,   0, 128,   2,   0,   0, 
+    160,   0,   0,  85, 128,   1, 
+      0,   0,   2,   1,   0,   8, 
+    128,   2,   0, 255, 160,   5, 
+      0,   0,   3,   0,   0,  15, 
+    128,   1,   0, 228, 128,   0, 
+      0,   0, 160,   1,   0,   0, 
+      2,   0,   8,  15, 128,   0, 
+      0, 228, 128, 255, 255,   0, 
+      0,  83,  72,  68,  82,  72, 
+      2,   0,   0,  64,   0,   0, 
+      0, 146,   0,   0,   0,  89, 
+      0,   0,   4,  70, 142,  32, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,  90,   0,   0, 
+      3,   0,  96,  16,   0,   0, 
+      0,   0,   0,  88,  24,   0, 
+      4,   0, 112,  16,   0,   0, 
+      0,   0,   0,  85,  85,   0, 
+      0,  88,  24,   0,   4,   0, 
+    112,  16,   0,   1,   0,   0, 
+      0,  85,  85,   0,   0,  88, 
+     24,   0,   4,   0, 112,  16, 
+      0,   2,   0,   0,   0,  85, 
+     85,   0,   0,  98,  16,   0, 
+      3,  50,  16,  16,   0,   1, 
+      0,   0,   0, 101,   0,   0, 
+      3, 242,  32,  16,   0,   0, 
+      0,   0,   0, 104,   0,   0, 
+      2,   3,   0,   0,   0,  69, 
+      0,   0,   9, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     16,  16,   0,   1,   0,   0, 
+      0,  70, 126,  16,   0,   2, 
+      0,   0,   0,   0,  96,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   7,  18,   0,  16, 
+      0,   0,   0,   0,   0,  10, 
+      0,  16,   0,   0,   0,   0, 
+      0,   1,  64,   0,   0,   0, 
+      0,   0, 191,  56,   0,   0, 
+     10,  50,   0,  16,   0,   0, 
+      0,   0,   0,   6,   0,  16, 
+      0,   0,   0,   0,   0,   2, 
+     64,   0,   0, 186,  73, 204, 
+     63, 197,  32,  80,  63,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  69,   0,   0,   9, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  70,  16,  16,   0,   1, 
+      0,   0,   0,  70, 126,  16, 
+      0,   0,   0,   0,   0,   0, 
+     96,  16,   0,   0,   0,   0, 
+      0,   0,   0,   0,   7,  66, 
+      0,  16,   0,   0,   0,   0, 
+      0,  10,   0,  16,   0,   1, 
+      0,   0,   0,   1,  64,   0, 
+      0,   0,   0, 128, 189,  50, 
+      0,   0,  10,  34,   0,  16, 
+      0,   0,   0,   0,   0,  42, 
+      0,  16,   0,   0,   0,   0, 
+      0,   1,  64,   0,   0, 244, 
+    253, 148,  63,  26,   0,  16, 
+    128,  65,   0,   0,   0,   0, 
+      0,   0,   0,  50,   0,   0, 
+      9,  18,   0,  16,   0,   1, 
+      0,   0,   0,  42,   0,  16, 
+      0,   0,   0,   0,   0,   1, 
+     64,   0,   0, 244, 253, 148, 
+     63,  10,   0,  16,   0,   0, 
+      0,   0,   0,  69,   0,   0, 
+      9, 242,   0,  16,   0,   2, 
+      0,   0,   0,  70,  16,  16, 
+      0,   1,   0,   0,   0,  70, 
+    126,  16,   0,   1,   0,   0, 
+      0,   0,  96,  16,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      7,  18,   0,  16,   0,   0, 
+      0,   0,   0,  10,   0,  16, 
+      0,   2,   0,   0,   0,   1, 
+     64,   0,   0,   0,   0,   0, 
+    191,  50,   0,   0,  10,  34, 
+      0,  16,   0,   1,   0,   0, 
+      0,  10,   0,  16, 128,  65, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,  64,   0,   0,  39, 
+     49, 200,  62,  26,   0,  16, 
+      0,   0,   0,   0,   0,  56, 
+      0,   0,   7,  18,   0,  16, 
+      0,   0,   0,   0,   0,  10, 
+      0,  16,   0,   0,   0,   0, 
+      0,   1,  64,   0,   0, 233, 
+     38,   1,  64,  50,   0,   0, 
+      9,  66,   0,  16,   0,   1, 
+      0,   0,   0,  42,   0,  16, 
+      0,   0,   0,   0,   0,   1, 
+     64,   0,   0, 244, 253, 148, 
+     63,  10,   0,  16,   0,   0, 
+      0,   0,   0,  54,   0,   0, 
+      5, 130,   0,  16,   0,   1, 
+      0,   0,   0,   1,  64,   0, 
+      0,   0,   0, 128,  63,  56, 
+      0,   0,   8, 242,  32,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,   6, 128,  32,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,  15,   0,   0,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70,   4,   2,   0,   0,   1, 
+      0,   0,   0, 236,   0,   0, 
+      0,   5,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 255, 
+    255,   0,   1,   0,   0, 208, 
+      1,   0,   0, 188,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 214, 
+      0,   0,   0,   2,   0,   0, 
+      0,   5,   0,   0,   0,   4, 
+      0,   0,   0, 255, 255, 255, 
+    255,   0,   0,   0,   0,   1, 
+      0,   0,   0,  12,   0,   0, 
+      0, 217,   0,   0,   0,   2, 
+      0,   0,   0,   5,   0,   0, 
+      0,   4,   0,   0,   0, 255, 
+    255, 255, 255,   1,   0,   0, 
+      0,   1,   0,   0,   0,  12, 
+      0,   0,   0, 221,   0,   0, 
+      0,   2,   0,   0,   0,   5, 
+      0,   0,   0,   4,   0,   0, 
+      0, 255, 255, 255, 255,   2, 
+      0,   0,   0,   1,   0,   0, 
+      0,  12,   0,   0,   0, 225, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,  76,  97, 121, 101, 114, 
+     84, 101, 120, 116, 117, 114, 
+    101,  83,  97, 109, 112, 108, 
+    101, 114,  76, 105, 110, 101, 
+     97, 114,   0, 116,  89,   0, 
+    116,  67,  98,   0, 116,  67, 
+    114,   0,  80, 101, 114,  76, 
+     97, 121, 101, 114,   0, 171, 
+    171, 225,   0,   0,   0,   4, 
+      0,   0,   0,   4,   1,   0, 
+      0, 112,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 100,   1,   0,   0,   0, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0, 116, 
+      1,   0,   0,   0,   0,   0, 
+      0, 132,   1,   0,   0,  16, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0, 116, 
+      1,   0,   0,   0,   0,   0, 
+      0, 143,   1,   0,   0,  32, 
+      0,   0,   0,   4,   0,   0, 
+      0,   2,   0,   0,   0, 160, 
+      1,   0,   0,   0,   0,   0, 
+      0, 176,   1,   0,   0,  48, 
+      0,   0,   0,  64,   0,   0, 
+      0,   0,   0,   0,   0, 192, 
+      1,   0,   0,   0,   0,   0, 
+      0, 118,  84, 101, 120, 116, 
+    117, 114, 101,  67, 111, 111, 
+    114, 100, 115,   0, 171,   1, 
+      0,   3,   0,   1,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 118,  76,  97, 
+    121, 101, 114,  81, 117,  97, 
+    100,   0, 102,  76,  97, 121, 
+    101, 114,  79, 112,  97,  99, 
+    105, 116, 121,   0, 171, 171, 
+    171,   0,   0,   3,   0,   1, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 109, 
+     76,  97, 121, 101, 114,  84, 
+    114,  97, 110, 115, 102, 111, 
+    114, 109,   0,   3,   0,   3, 
+      0,   4,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  55,  46,  57, 
+     53,  50,  46,  51,  48,  50, 
+     50,   0, 171, 171, 171,  73, 
+     83,  71,  78,  80,   0,   0, 
+      0,   2,   0,   0,   0,   8, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,  15, 
+      0,   0,   0,  68,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      3,   0,   0,  83,  86,  95, 
+     80, 111, 115, 105, 116, 105, 
+    111, 110,   0,  84,  69,  88, 
+     67,  79,  79,  82,  68,   0, 
+    171, 171, 171,  79,  83,  71, 
+     78,  44,   0,   0,   0,   1, 
+      0,   0,   0,   8,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,  15,   0,   0, 
+      0,  83,  86,  95,  84,  97, 
+    114, 103, 101, 116,   0, 171, 
+    171, 187,  81,   0,   0,   0, 
+      0,   0,   0,  82, 101, 110, 
+    100, 101, 114,  67, 111, 109, 
+    112, 111, 110, 101, 110, 116, 
+     65, 108, 112, 104,  97,  76, 
+     97, 121, 101, 114,   0,   4, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   3,   0,   0, 
+      0, 255, 255, 255, 255,  24, 
+      7,   0,   0,  68,  88,  66, 
+     67, 254, 249,  65, 252,  64, 
+     46, 192, 119,  73, 197, 161, 
+    234,  24,   1, 194, 131,   1, 
+      0,   0,   0,  24,   7,   0, 
+      0,   6,   0,   0,   0,  56, 
+      0,   0,   0, 164,   1,   0, 
+      0, 148,   3,   0,   0,  16, 
+      4,   0,   0, 140,   6,   0, 
+      0, 192,   6,   0,   0,  65, 
+    111, 110,  57, 100,   1,   0, 
+      0, 100,   1,   0,   0,   0, 
+      2, 254, 255,   0,   1,   0, 
+      0, 100,   0,   0,   0,   5, 
+      0,  36,   0,   0,   0,  96, 
+      0,   0,   0,  96,   0,   0, 
+      0,  36,   0,   1,   0,  96, 
+      0,   0,   0,   0,   0,   2, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   2, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   6,   0,   1, 
+      0,   5,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   1, 
+      0,   6,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,   4, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      2, 254, 255,  31,   0,   0, 
+      2,   5,   0,   0, 128,   0, 
+      0,  15, 144,   4,   0,   0, 
+      4,   0,   0,   3, 224,   0, 
+      0, 228, 144,   1,   0, 238, 
+    160,   1,   0, 228, 160,   4, 
+      0,   0,   4,   0,   0,   1, 
+    128,   0,   0,  85, 144,   2, 
+      0, 255, 160,   2,   0,  85, 
+    160,   5,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0,   0, 
+    128,   4,   0, 228, 160,   4, 
+      0,   0,   4,   1,   0,   1, 
+    128,   0,   0,   0, 144,   2, 
+      0, 170, 160,   2,   0,   0, 
+    160,   4,   0,   0,   4,   0, 
+      0,  15, 128,   3,   0, 228, 
+    160,   1,   0,   0, 128,   0, 
+      0, 228, 128,   2,   0,   0, 
+      3,   0,   0,  15, 128,   0, 
+      0, 228, 128,   5,   0, 228, 
+    160,   2,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    128,   6,   0, 228, 161,   5, 
+      0,   0,   3,   1,   0,  15, 
+    128,   0,   0,  85, 128,   8, 
+      0, 228, 160,   4,   0,   0, 
+      4,   1,   0,  15, 128,   7, 
+      0, 228, 160,   0,   0,   0, 
+    128,   1,   0, 228, 128,   4, 
+      0,   0,   4,   1,   0,  15, 
+    128,   9,   0, 228, 160,   0, 
+      0, 170, 128,   1,   0, 228, 
+    128,   4,   0,   0,   4,   0, 
+      0,  15, 128,  10,   0, 228, 
+    160,   0,   0, 255, 128,   1, 
+      0, 228, 128,   4,   0,   0, 
+      4,   0,   0,   3, 192,   0, 
+      0, 255, 128,   0,   0, 228, 
+    160,   0,   0, 228, 128,   1, 
+      0,   0,   2,   0,   0,  12, 
+    192,   0,   0, 228, 128, 255, 
+    255,   0,   0,  83,  72,  68, 
+     82, 232,   1,   0,   0,  64, 
+      0,   1,   0, 122,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0,  89, 
+      0,   0,   4,  70, 142,  32, 
+      0,   1,   0,   0,   0,   1, 
+      0,   0,   0,  89,   0,   0, 
+      4,  70, 142,  32,   0,   2, 
+      0,   0,   0,   4,   0,   0, 
+      0,  95,   0,   0,   3,  50, 
+     16,  16,   0,   0,   0,   0, 
+      0, 103,   0,   0,   4, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 101, 
+      0,   0,   3,  50,  32,  16, 
+      0,   1,   0,   0,   0, 104, 
+      0,   0,   2,   2,   0,   0, 
+      0,  50,   0,   0,  11,  50, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  16,  16,   0,   0, 
+      0,   0,   0, 230, 138,  32, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  70, 128,  32, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  56,   0,   0, 
+      8, 242,   0,  16,   0,   1, 
+      0,   0,   0,  86,   5,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   4,   0,   0,   0,  50, 
+      0,   0,  10, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   6, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      8, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   6,   0,   0,   0,   0, 
+      0,   0,   9, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32, 128,  65, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,  56, 
+      0,   0,   8, 242,   0,  16, 
+      0,   1,   0,   0,   0,  86, 
+      5,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   2, 
+      0,   0,   0,   1,   0,   0, 
+      0,  50,   0,   0,  10, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  70, 142,  32,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   6,   0,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  10, 242,   0,  16, 
+      0,   1,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   2,   0,   0,   0, 166, 
+     10,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   1, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,  32,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   2,   0,   0,   0,   3, 
+      0,   0,   0, 246,  15,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,  50,   0,   0,  11,  50, 
+     32,  16,   0,   1,   0,   0, 
+      0,  70,  16,  16,   0,   0, 
+      0,   0,   0, 230, 138,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  70, 128,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  62,   0,   0, 
+      1,  83,  84,  65,  84, 116, 
+      0,   0,   0,  11,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  82, 
+     68,  69,  70, 116,   2,   0, 
+      0,   3,   0,   0,   0, 168, 
+      0,   0,   0,   3,   0,   0, 
+      0,  28,   0,   0,   0,   0, 
+      4, 254, 255,   0,   1,   0, 
+      0,  64,   2,   0,   0, 124, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 133,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0, 152,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,  80, 
+    101, 114,  76,  97, 121, 101, 
+    114,   0,  80, 101, 114,  79, 
+     99,  99,  97, 115, 105, 111, 
+    110,  97, 108,  76,  97, 121, 
+    101, 114,   0,  80, 101, 114, 
+     76,  97, 121, 101, 114,  77, 
+     97, 110,  97, 103, 101, 114, 
+      0, 124,   0,   0,   0,   4, 
+      0,   0,   0, 240,   0,   0, 
+      0, 112,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 133,   0,   0,   0,   2, 
+      0,   0,   0, 188,   1,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 152,   0,   0,   0,   1, 
+      0,   0,   0,  28,   2,   0, 
+      0,  64,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  80,   1,   0,   0,   0, 
+      0,   0,   0,  16,   0,   0, 
+      0,   2,   0,   0,   0,  96, 
+      1,   0,   0,   0,   0,   0, 
+      0, 112,   1,   0,   0,  16, 
+      0,   0,   0,  16,   0,   0, 
+      0,   2,   0,   0,   0,  96, 
+      1,   0,   0,   0,   0,   0, 
+      0, 123,   1,   0,   0,  32, 
+      0,   0,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0, 140, 
+      1,   0,   0,   0,   0,   0, 
+      0, 156,   1,   0,   0,  48, 
+      0,   0,   0,  64,   0,   0, 
+      0,   2,   0,   0,   0, 172, 
+      1,   0,   0,   0,   0,   0, 
+      0, 118,  84, 101, 120, 116, 
+    117, 114, 101,  67, 111, 111, 
+    114, 100, 115,   0, 171,   1, 
+      0,   3,   0,   1,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 118,  76,  97, 
+    121, 101, 114,  81, 117,  97, 
+    100,   0, 102,  76,  97, 121, 
+    101, 114,  79, 112,  97,  99, 
+    105, 116, 121,   0, 171, 171, 
+    171,   0,   0,   3,   0,   1, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 109, 
+     76,  97, 121, 101, 114,  84, 
+    114,  97, 110, 115, 102, 111, 
+    114, 109,   0,   3,   0,   3, 
+      0,   4,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 236,   1,   0,   0,   0, 
+      0,   0,   0,  16,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,  16,   2,   0,   0,  16, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0, 118,  82, 101, 110, 100, 
+    101, 114,  84,  97, 114, 103, 
+    101, 116,  79, 102, 102, 115, 
+    101, 116,   0,   1,   0,   3, 
+      0,   1,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 102,  76,  97, 121, 101, 
+    114,  67, 111, 108, 111, 114, 
+      0,  52,   2,   0,   0,   0, 
+      0,   0,   0,  64,   0,   0, 
+      0,   2,   0,   0,   0, 172, 
+      1,   0,   0,   0,   0,   0, 
+      0, 109,  80, 114, 111, 106, 
+    101,  99, 116, 105, 111, 110, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  55,  46,  57, 
+     53,  50,  46,  51,  48,  50, 
+     50,   0, 171, 171, 171,  73, 
+     83,  71,  78,  44,   0,   0, 
+      0,   1,   0,   0,   0,   8, 
+      0,   0,   0,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      3,   0,   0,  80,  79,  83, 
+     73,  84,  73,  79,  78,   0, 
+    171, 171, 171,  79,  83,  71, 
+     78,  80,   0,   0,   0,   2, 
+      0,   0,   0,   8,   0,   0, 
+      0,  56,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,  15,   0,   0, 
+      0,  68,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   1, 
+      0,   0,   0,   3,  12,   0, 
+      0,  83,  86,  95,  80, 111, 
+    115, 105, 116, 105, 111, 110, 
+      0,  84,  69,  88,  67,  79, 
+     79,  82,  68,   0, 171, 171, 
+    171,  81,  89,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0, 144,   5,   0, 
+      0,  68,  88,  66,  67, 238, 
+     19, 121, 188, 150,  99, 227, 
+    180,  83, 152, 252, 187,  65, 
+      5, 113, 253,   1,   0,   0, 
+      0, 144,   5,   0,   0,   6, 
+      0,   0,   0,  56,   0,   0, 
+      0,  52,   1,   0,   0, 128, 
+      2,   0,   0, 252,   2,   0, 
+      0, 236,   4,   0,   0,  68, 
+      5,   0,   0,  65, 111, 110, 
+     57, 244,   0,   0,   0, 244, 
+      0,   0,   0,   0,   2, 255, 
+    255, 188,   0,   0,   0,  56, 
+      0,   0,   0,   1,   0,  44, 
+      0,   0,   0,  56,   0,   0, 
+      0,  56,   0,   2,   0,  36, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   1,   0,   1, 
+      0,   0,   0,   2,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   2, 255, 255,  81, 
+      0,   0,   5,   1,   0,  15, 
+    160,   0,   0, 128,  63,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  31, 
+      0,   0,   2,   0,   0,   0, 
+    128,   0,   0,   3, 176,  31, 
+      0,   0,   2,   0,   0,   0, 
+    144,   0,   8,  15, 160,  31, 
+      0,   0,   2,   0,   0,   0, 
+    144,   1,   8,  15, 160,  66, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0, 228, 176,   1, 
+      8, 228, 160,  66,   0,   0, 
+      3,   1,   0,  15, 128,   0, 
+      0, 228, 176,   0,   8, 228, 
+    160,   5,   0,   0,   3,   2, 
+      0,  15, 128,   1,   0, 228, 
+    128,   0,   0,   0, 160,   1, 
+      0,   0,   2,   0,   8,  15, 
+    128,   2,   0, 228, 128,   2, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0, 228, 129,   1, 
+      0, 228, 128,   2,   0,   0, 
+      3,   0,   0,  15, 128,   0, 
+      0, 228, 128,   1,   0,   0, 
+    160,   5,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    128,   0,   0,   0, 160,   1, 
+      0,   0,   2,   1,   8,  15, 
+    128,   0,   0, 228, 128, 255, 
+    255,   0,   0,  83,  72,  68, 
+     82,  68,   1,   0,   0,  64, 
+      0,   0,   0,  81,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,  90, 
+      0,   0,   3,   0,  96,  16, 
+      0,   0,   0,   0,   0,  88, 
+     24,   0,   4,   0, 112,  16, 
+      0,   0,   0,   0,   0,  85, 
+     85,   0,   0,  88,  24,   0, 
+      4,   0, 112,  16,   0,   1, 
+      0,   0,   0,  85,  85,   0, 
+      0,  98,  16,   0,   3,  50, 
+     16,  16,   0,   1,   0,   0, 
+      0, 101,   0,   0,   3, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0, 101,   0,   0,   3, 242, 
+     32,  16,   0,   1,   0,   0, 
+      0, 104,   0,   0,   2,   2, 
+      0,   0,   0,  69,   0,   0, 
+      9, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70,  16,  16, 
+      0,   1,   0,   0,   0,  70, 
+    126,  16,   0,   0,   0,   0, 
+      0,   0,  96,  16,   0,   0, 
+      0,   0,   0,  56,   0,   0, 
+      8, 242,  32,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   0,   0,   0,   0,   6, 
+    128,  32,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,  69, 
+      0,   0,   9, 242,   0,  16, 
+      0,   1,   0,   0,   0,  70, 
+     16,  16,   0,   1,   0,   0, 
+      0,  70, 126,  16,   0,   1, 
+      0,   0,   0,   0,  96,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   8, 242,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16, 128,  65, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,  10, 242, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   0, 
+      0,   0,   0,   2,  64,   0, 
+      0,   0,   0, 128,  63,   0, 
+      0, 128,  63,   0,   0, 128, 
+     63,   0,   0, 128,  63,  56, 
+      0,   0,   8, 242,  32,  16, 
+      0,   1,   0,   0,   0,  70, 
+     14,  16,   0,   0,   0,   0, 
+      0,   6, 128,  32,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,   7,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70, 232,   1,   0,   0,   1, 
+      0,   0,   0, 208,   0,   0, 
+      0,   4,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 255, 
+    255,   0,   1,   0,   0, 180, 
+      1,   0,   0, 156,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 182, 
+      0,   0,   0,   2,   0,   0, 
+      0,   5,   0,   0,   0,   4, 
+      0,   0,   0, 255, 255, 255, 
+    255,   0,   0,   0,   0,   1, 
+      0,   0,   0,  12,   0,   0, 
+      0, 187,   0,   0,   0,   2, 
+      0,   0,   0,   5,   0,   0, 
+      0,   4,   0,   0,   0, 255, 
+    255, 255, 255,   1,   0,   0, 
+      0,   1,   0,   0,   0,  12, 
+      0,   0,   0, 197,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,  76, 
+     97, 121, 101, 114,  84, 101, 
+    120, 116, 117, 114, 101,  83, 
+     97, 109, 112, 108, 101, 114, 
+     76, 105, 110, 101,  97, 114, 
+      0, 116,  82,  71,  66,   0, 
+    116,  82,  71,  66,  87, 104, 
+    105, 116, 101,   0,  80, 101, 
+    114,  76,  97, 121, 101, 114, 
+      0, 171, 171, 197,   0,   0, 
+      0,   4,   0,   0,   0, 232, 
+      0,   0,   0, 112,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  72,   1,   0, 
+      0,   0,   0,   0,   0,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,  88,   1,   0,   0,   0, 
+      0,   0,   0, 104,   1,   0, 
+      0,  16,   0,   0,   0,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,  88,   1,   0,   0,   0, 
+      0,   0,   0, 115,   1,   0, 
+      0,  32,   0,   0,   0,   4, 
+      0,   0,   0,   2,   0,   0, 
+      0, 132,   1,   0,   0,   0, 
+      0,   0,   0, 148,   1,   0, 
+      0,  48,   0,   0,   0,  64, 
+      0,   0,   0,   0,   0,   0, 
+      0, 164,   1,   0,   0,   0, 
+      0,   0,   0, 118,  84, 101, 
+    120, 116, 117, 114, 101,  67, 
+    111, 111, 114, 100, 115,   0, 
+    171,   1,   0,   3,   0,   1, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 118, 
+     76,  97, 121, 101, 114,  81, 
+    117,  97, 100,   0, 102,  76, 
+     97, 121, 101, 114,  79, 112, 
+     97,  99, 105, 116, 121,   0, 
+    171, 171, 171,   0,   0,   3, 
+      0,   1,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 109,  76,  97, 121, 101, 
+    114,  84, 114,  97, 110, 115, 
+    102, 111, 114, 109,   0,   3, 
+      0,   3,   0,   4,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  77, 105,  99, 
+    114, 111, 115, 111, 102, 116, 
+     32,  40,  82,  41,  32,  72, 
+     76,  83,  76,  32,  83, 104, 
+     97, 100, 101, 114,  32,  67, 
+    111, 109, 112, 105, 108, 101, 
+    114,  32,  57,  46,  50,  55, 
+     46,  57,  53,  50,  46,  51, 
+     48,  50,  50,   0, 171, 171, 
+    171,  73,  83,  71,  78,  80, 
+      0,   0,   0,   2,   0,   0, 
+      0,   8,   0,   0,   0,  56, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,  15,   0,   0,   0,  68, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,   3,   0,   0,  83, 
+     86,  95,  80, 111, 115, 105, 
+    116, 105, 111, 110,   0,  84, 
+     69,  88,  67,  79,  79,  82, 
+     68,   0, 171, 171, 171,  79, 
+     83,  71,  78,  68,   0,   0, 
+      0,   2,   0,   0,   0,   8, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,  15, 
+      0,   0,   0,  56,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   1,   0,   0,   0,  15, 
+      0,   0,   0,  83,  86,  95, 
+     84,  97, 114, 103, 101, 116, 
+      0, 171, 171, 129,  96,   0, 
+      0,   0,   0,   0,   0,  82, 
+    101, 110, 100, 101, 114,  83, 
+    111, 108, 105, 100,  67, 111, 
+    108, 111, 114,  76,  97, 121, 
+    101, 114,   0,   4,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,   0,   0,   0, 255, 
+    255, 255, 255,  24,   7,   0, 
+      0,  68,  88,  66,  67, 254, 
+    249,  65, 252,  64,  46, 192, 
+    119,  73, 197, 161, 234,  24, 
+      1, 194, 131,   1,   0,   0, 
+      0,  24,   7,   0,   0,   6, 
+      0,   0,   0,  56,   0,   0, 
+      0, 164,   1,   0,   0, 148, 
+      3,   0,   0,  16,   4,   0, 
+      0, 140,   6,   0,   0, 192, 
+      6,   0,   0,  65, 111, 110, 
+     57, 100,   1,   0,   0, 100, 
+      1,   0,   0,   0,   2, 254, 
+    255,   0,   1,   0,   0, 100, 
+      0,   0,   0,   5,   0,  36, 
+      0,   0,   0,  96,   0,   0, 
+      0,  96,   0,   0,   0,  36, 
+      0,   1,   0,  96,   0,   0, 
+      0,   0,   0,   2,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   2,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,   6,   0,   1,   0,   5, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   1,   0,   6, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,   4,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   2, 254, 
+    255,  31,   0,   0,   2,   5, 
+      0,   0, 128,   0,   0,  15, 
+    144,   4,   0,   0,   4,   0, 
+      0,   3, 224,   0,   0, 228, 
+    144,   1,   0, 238, 160,   1, 
+      0, 228, 160,   4,   0,   0, 
+      4,   0,   0,   1, 128,   0, 
+      0,  85, 144,   2,   0, 255, 
+    160,   2,   0,  85, 160,   5, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0,   0, 128,   4, 
+      0, 228, 160,   4,   0,   0, 
+      4,   1,   0,   1, 128,   0, 
+      0,   0, 144,   2,   0, 170, 
+    160,   2,   0,   0, 160,   4, 
+      0,   0,   4,   0,   0,  15, 
+    128,   3,   0, 228, 160,   1, 
+      0,   0, 128,   0,   0, 228, 
+    128,   2,   0,   0,   3,   0, 
+      0,  15, 128,   0,   0, 228, 
+    128,   5,   0, 228, 160,   2, 
+      0,   0,   3,   0,   0,  15, 
+    128,   0,   0, 228, 128,   6, 
+      0, 228, 161,   5,   0,   0, 
+      3,   1,   0,  15, 128,   0, 
+      0,  85, 128,   8,   0, 228, 
+    160,   4,   0,   0,   4,   1, 
+      0,  15, 128,   7,   0, 228, 
+    160,   0,   0,   0, 128,   1, 
+      0, 228, 128,   4,   0,   0, 
+      4,   1,   0,  15, 128,   9, 
+      0, 228, 160,   0,   0, 170, 
+    128,   1,   0, 228, 128,   4, 
+      0,   0,   4,   0,   0,  15, 
+    128,  10,   0, 228, 160,   0, 
+      0, 255, 128,   1,   0, 228, 
+    128,   4,   0,   0,   4,   0, 
+      0,   3, 192,   0,   0, 255, 
+    128,   0,   0, 228, 160,   0, 
+      0, 228, 128,   1,   0,   0, 
+      2,   0,   0,  12, 192,   0, 
+      0, 228, 128, 255, 255,   0, 
+      0,  83,  72,  68,  82, 232, 
+      1,   0,   0,  64,   0,   1, 
+      0, 122,   0,   0,   0,  89, 
+      0,   0,   4,  70, 142,  32, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0,  89,   0,   0, 
+      4,  70, 142,  32,   0,   1, 
+      0,   0,   0,   1,   0,   0, 
+      0,  89,   0,   0,   4,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   4,   0,   0,   0,  95, 
+      0,   0,   3,  50,  16,  16, 
+      0,   0,   0,   0,   0, 103, 
+      0,   0,   4, 242,  32,  16, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 101,   0,   0, 
+      3,  50,  32,  16,   0,   1, 
+      0,   0,   0, 104,   0,   0, 
+      2,   2,   0,   0,   0,  50, 
+      0,   0,  11,  50,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     16,  16,   0,   0,   0,   0, 
+      0, 230, 138,  32,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  70, 128,  32,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  56,   0,   0,   8, 242, 
+      0,  16,   0,   1,   0,   0, 
+      0,  86,   5,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   4, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   6,   0,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,   0,   0,   0,   8, 242, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   0, 
+      0,   0,   0,  70, 142,  32, 
+      0,   0,   0,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      9, 242,   0,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32, 128,  65,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,  56,   0,   0, 
+      8, 242,   0,  16,   0,   1, 
+      0,   0,   0,  86,   5,  16, 
+      0,   0,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  10, 242,   0,  16, 
+      0,   1,   0,   0,   0,  70, 
+    142,  32,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   6, 
+      0,  16,   0,   0,   0,   0, 
+      0,  70,  14,  16,   0,   1, 
+      0,   0,   0,  50,   0,   0, 
+     10, 242,   0,  16,   0,   1, 
+      0,   0,   0,  70, 142,  32, 
+      0,   2,   0,   0,   0,   2, 
+      0,   0,   0, 166,  10,  16, 
+      0,   0,   0,   0,   0,  70, 
+     14,  16,   0,   1,   0,   0, 
+      0,  50,   0,   0,  10, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   2, 
+      0,   0,   0,   3,   0,   0, 
+      0, 246,  15,  16,   0,   0, 
+      0,   0,   0,  70,  14,  16, 
+      0,   1,   0,   0,   0,  50, 
+      0,   0,  11,  50,  32,  16, 
+      0,   1,   0,   0,   0,  70, 
+     16,  16,   0,   0,   0,   0, 
+      0, 230, 138,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  70, 128,  32,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,  11,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   4, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70, 116,   2,   0,   0,   3, 
+      0,   0,   0, 168,   0,   0, 
+      0,   3,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 254, 
+    255,   0,   1,   0,   0,  64, 
+      2,   0,   0, 124,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 133, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 152,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,  80, 101, 114, 
+     76,  97, 121, 101, 114,   0, 
+     80, 101, 114,  79,  99,  99, 
+     97, 115, 105, 111, 110,  97, 
+    108,  76,  97, 121, 101, 114, 
+      0,  80, 101, 114,  76,  97, 
+    121, 101, 114,  77,  97, 110, 
+     97, 103, 101, 114,   0, 124, 
+      0,   0,   0,   4,   0,   0, 
+      0, 240,   0,   0,   0, 112, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 133, 
+      0,   0,   0,   2,   0,   0, 
+      0, 188,   1,   0,   0,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 152, 
+      0,   0,   0,   1,   0,   0, 
+      0,  28,   2,   0,   0,  64, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,  80, 
+      1,   0,   0,   0,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,  96,   1,   0, 
+      0,   0,   0,   0,   0, 112, 
+      1,   0,   0,  16,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,  96,   1,   0, 
+      0,   0,   0,   0,   0, 123, 
+      1,   0,   0,  32,   0,   0, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0, 140,   1,   0, 
+      0,   0,   0,   0,   0, 156, 
+      1,   0,   0,  48,   0,   0, 
+      0,  64,   0,   0,   0,   2, 
+      0,   0,   0, 172,   1,   0, 
+      0,   0,   0,   0,   0, 118, 
+     84, 101, 120, 116, 117, 114, 
+    101,  67, 111, 111, 114, 100, 
+    115,   0, 171,   1,   0,   3, 
+      0,   1,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 118,  76,  97, 121, 101, 
+    114,  81, 117,  97, 100,   0, 
+    102,  76,  97, 121, 101, 114, 
+     79, 112,  97,  99, 105, 116, 
+    121,   0, 171, 171, 171,   0, 
+      0,   3,   0,   1,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 109,  76,  97, 
+    121, 101, 114,  84, 114,  97, 
+    110, 115, 102, 111, 114, 109, 
+      0,   3,   0,   3,   0,   4, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 236, 
+      1,   0,   0,   0,   0,   0, 
+      0,  16,   0,   0,   0,   2, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0,  16, 
+      2,   0,   0,  16,   0,   0, 
+      0,  16,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,   0,   0,   0, 118, 
+     82, 101, 110, 100, 101, 114, 
+     84,  97, 114, 103, 101, 116, 
+     79, 102, 102, 115, 101, 116, 
+      0,   1,   0,   3,   0,   1, 
+      0,   4,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 102, 
+     76,  97, 121, 101, 114,  67, 
+    111, 108, 111, 114,   0,  52, 
+      2,   0,   0,   0,   0,   0, 
+      0,  64,   0,   0,   0,   2, 
+      0,   0,   0, 172,   1,   0, 
+      0,   0,   0,   0,   0, 109, 
+     80, 114, 111, 106, 101,  99, 
+    116, 105, 111, 110,   0,  77, 
+    105,  99, 114, 111, 115, 111, 
+    102, 116,  32,  40,  82,  41, 
+     32,  72,  76,  83,  76,  32, 
+     83, 104,  97, 100, 101, 114, 
+     32,  67, 111, 109, 112, 105, 
+    108, 101, 114,  32,  57,  46, 
+     50,  55,  46,  57,  53,  50, 
+     46,  51,  48,  50,  50,   0, 
+    171, 171, 171,  73,  83,  71, 
+     78,  44,   0,   0,   0,   1, 
+      0,   0,   0,   8,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,   3,   3,   0, 
+      0,  80,  79,  83,  73,  84, 
+     73,  79,  78,   0, 171, 171, 
+    171,  79,  83,  71,  78,  80, 
+      0,   0,   0,   2,   0,   0, 
+      0,   8,   0,   0,   0,  56, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      0,   0,   0,   0,   0,   0, 
+      0,  15,   0,   0,   0,  68, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   3, 
+      0,   0,   0,   1,   0,   0, 
+      0,   3,  12,   0,   0,  83, 
+     86,  95,  80, 111, 115, 105, 
+    116, 105, 111, 110,   0,  84, 
+     69,  88,  67,  79,  79,  82, 
+     68,   0, 171, 171, 171,  99, 
+    102,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0, 216,   2,   0,   0,  68, 
+     88,  66,  67, 247, 128, 122, 
+    171, 183, 156, 243,  15,  69, 
+     10, 154, 190,  66, 220,  37, 
+     74,   1,   0,   0,   0, 216, 
+      2,   0,   0,   6,   0,   0, 
+      0,  56,   0,   0,   0, 132, 
+      0,   0,   0, 204,   0,   0, 
+      0,  72,   1,   0,   0,  76, 
+      2,   0,   0, 164,   2,   0, 
+      0,  65, 111, 110,  57,  68, 
+      0,   0,   0,  68,   0,   0, 
+      0,   0,   2, 255, 255,  20, 
+      0,   0,   0,  48,   0,   0, 
+      0,   1,   0,  36,   0,   0, 
+      0,  48,   0,   0,   0,  48, 
+      0,   0,   0,  36,   0,   0, 
+      0,  48,   0,   0,   0,   1, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   1,   2, 255, 
+    255,   1,   0,   0,   2,   0, 
+      8,  15, 128,   0,   0, 228, 
+    160, 255, 255,   0,   0,  83, 
+     72,  68,  82,  64,   0,   0, 
+      0,  64,   0,   0,   0,  16, 
+      0,   0,   0,  89,   0,   0, 
+      4,  70, 142,  32,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0, 101,   0,   0,   3, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0,  54,   0,   0,   6, 242, 
+     32,  16,   0,   0,   0,   0, 
+      0,  70, 142,  32,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  62,   0,   0,   1,  83, 
+     84,  65,  84, 116,   0,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  82,  68,  69, 
+     70, 252,   0,   0,   0,   1, 
+      0,   0,   0,  80,   0,   0, 
+      0,   1,   0,   0,   0,  28, 
+      0,   0,   0,   0,   4, 255, 
+    255,   0,   1,   0,   0, 200, 
+      0,   0,   0,  60,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0,  80, 
+    101, 114,  79,  99,  99,  97, 
+    115, 105, 111, 110,  97, 108, 
+     76,  97, 121, 101, 114,   0, 
+    171,  60,   0,   0,   0,   2, 
+      0,   0,   0, 104,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 152,   0,   0,   0,   0, 
+      0,   0,   0,  16,   0,   0, 
+      0,   0,   0,   0,   0, 172, 
+      0,   0,   0,   0,   0,   0, 
+      0, 188,   0,   0,   0,  16, 
+      0,   0,   0,  16,   0,   0, 
+      0,   2,   0,   0,   0, 172, 
+      0,   0,   0,   0,   0,   0, 
+      0, 118,  82, 101, 110, 100, 
+    101, 114,  84,  97, 114, 103, 
+    101, 116,  79, 102, 102, 115, 
+    101, 116,   0,   1,   0,   3, 
+      0,   1,   0,   4,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 102,  76,  97, 121, 101, 
+    114,  67, 111, 108, 111, 114, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  55,  46,  57, 
+     53,  50,  46,  51,  48,  50, 
+     50,   0, 171, 171, 171,  73, 
+     83,  71,  78,  80,   0,   0, 
+      0,   2,   0,   0,   0,   8, 
+      0,   0,   0,  56,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,   3,   0,   0, 
+      0,   0,   0,   0,   0,  15, 
+      0,   0,   0,  68,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   3,   0,   0, 
+      0,   1,   0,   0,   0,   3, 
+      0,   0,   0,  83,  86,  95, 
+     80, 111, 115, 105, 116, 105, 
+    111, 110,   0,  84,  69,  88, 
+     67,  79,  79,  82,  68,   0, 
+    171, 171, 171,  79,  83,  71, 
+     78,  44,   0,   0,   0,   1, 
+      0,   0,   0,   8,   0,   0, 
+      0,  32,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   3,   0,   0,   0,   0, 
+      0,   0,   0,  15,   0,   0, 
+      0,  83,  86,  95,  84,  97, 
+    114, 103, 101, 116,   0, 171, 
+    171, 147, 109,   0,   0,   0, 
+      0,   0,   0,   4,   0,   0, 
+      0, 112,   0,   0,   0,   0, 
+      0,   0,   0,   4,   0,   0, 
+      0, 255, 255, 255, 255,   0, 
+      0,   0,   0,  48,   0,   0, 
+      0,  20,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  63,   0,   0,   0,  20, 
+      0,   0,   0,   0,   0,   0, 
+      0,  16,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 108, 
+      0,   0,   0,  80,   0,   0, 
+      0,   0,   0,   0,   0,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 159,   0,   0, 
+      0, 131,   0,   0,   0,   0, 
+      0,   0,   0,  48,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0, 175,   0,   0,   0,  32, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0, 255, 
+    255, 255, 255,   0,   0,   0, 
+      0, 194,   0,   0,   0,  20, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 214, 
+      0,   0,   0,  20,   0,   0, 
+      0,   0,   0,   0,   0,  16, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0, 226,   0,   0, 
+      0,  64,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 255, 255, 255, 255,   0, 
+      0,   0,   0, 242,   0,   0, 
+      0, 131,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,  37,   1,   0,   0,   9, 
+      1,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   9, 
+      0,   0,   0,  36,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  44,   1,   0, 
+      0,  37,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  56,   1,   0,   0,  38, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  68, 
+      1,   0,   0,  39,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  80,   1,   0, 
+      0,  40,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  92,   1,   0,   0,  41, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 104, 
+      1,   0,   0,  42,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 116,   1,   0, 
+      0,  43,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 128,   1,   0,   0,  44, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 140, 
+      1,   0,   0,   0,   0,   0, 
+      0, 152,   1,   0,   0,   9, 
+      1,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   9, 
+      0,   0,   0,  36,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 162,   1,   0, 
+      0,  37,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 174,   1,   0,   0,  38, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 186, 
+      1,   0,   0,  39,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 198,   1,   0, 
+      0,  40,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 210,   1,   0,   0,  41, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 222, 
+      1,   0,   0,  42,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 234,   1,   0, 
+      0,  43,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 246,   1,   0,   0,  44, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   2, 
+      2,   0,   0,   0,   0,   0, 
+      0,  14,   2,   0,   0,   9, 
+      1,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   9, 
+      0,   0,   0,  36,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  34,   2,   0, 
+      0,  37,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  46,   2,   0,   0,  38, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  58, 
+      2,   0,   0,  39,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  70,   2,   0, 
+      0,  40,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  82,   2,   0,   0,  41, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  94, 
+      2,   0,   0,  42,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 106,   2,   0, 
+      0,  43,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 118,   2,   0,   0,  44, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 130, 
+      2,   0,   0,   0,   0,   0, 
+      0, 186,   2,   0,   0, 158, 
+      2,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   2, 
+      0,   0,   0,  19,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 196,   2,   0, 
+      0,  13,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 208,   2,   0,   0,   0, 
+      0,   0,   0,   2,   3,   0, 
+      0, 230,   2,   0,   0,   0, 
+      0,   0,   0, 255, 255, 255, 
+    255,   0,   0,   0,   0,   7, 
+      3,   0,   0, 230,   2,   0, 
+      0,   0,   0,   0,   0, 255, 
+    255, 255, 255,   0,   0,   0, 
+      0,  10,   3,   0,   0, 230, 
+      2,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   0, 
+      0,   0,   0,  14,   3,   0, 
+      0, 230,   2,   0,   0,   0, 
+      0,   0,   0, 255, 255, 255, 
+    255,   0,   0,   0,   0,  18, 
+      3,   0,   0, 230,   2,   0, 
+      0,   0,   0,   0,   0, 255, 
+    255, 255, 255,   0,   0,   0, 
+      0,  69,   3,   0,   0,  41, 
+      3,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   3, 
+      0,   0,   0,  45,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  95,   3,   0, 
+      0,  46,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 107,   3,   0,   0,  47, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 119, 
+      3,   0,   0,   0,   0,   0, 
+      0, 131,   3,   0,   0,  41, 
+      3,   0,   0,   0,   0,   0, 
+      0, 255, 255, 255, 255,   3, 
+      0,   0,   0,  45,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 156,   3,   0, 
+      0,  46,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 168,   3,   0,   0,  47, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 180, 
+      3,   0,   0,   0,   0,   0, 
+      0, 192,   3,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 213,   3,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0, 186,   2,   0,   0,  10, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 216, 
+      3,   0,   0,  11,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 252,   3,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,  37,   1,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0,  36, 
+     11,   0,   0,   8,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  44,  11,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 144,  15,   0,   0, 152, 
+     15,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 213, 
+      3,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0, 186, 
+      2,   0,   0,  10,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 178,  15,   0, 
+      0,  11,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 214,  15,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,  37, 
+      1,   0,   0,   6,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0, 254,  22,   0, 
+      0,   8,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,   6,  23,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0, 106, 
+     27,   0,   0, 114,  27,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0, 213,   3,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0, 186,   2,   0, 
+      0,  10,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 136,  27,   0,   0,  11, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 172, 
+     27,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,  37,   1,   0, 
+      0,   6,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 212,  34,   0,   0,   8, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 220, 
+     34,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0,  28,  39,   0, 
+      0,  36,  39,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 213,   3,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0, 186,   2,   0,   0,  10, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  61, 
+     39,   0,   0,  11,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  97,  39,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0, 152,   1,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0, 137, 
+     46,   0,   0,   8,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 145,  46,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 209,  50,   0,   0, 217, 
+     50,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 213, 
+      3,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0, 186, 
+      2,   0,   0,  10,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 244,  50,   0, 
+      0,  11,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  24,  51,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,  37, 
+      1,   0,   0,   6,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0,  64,  58,   0, 
+      0,   8,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  72,  58,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0, 136, 
+     62,   0,   0, 144,  62,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0, 213,   3,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0, 186,   2,   0, 
+      0,  10,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 174,  62,   0,   0,  11, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 210, 
+     62,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0, 152,   1,   0, 
+      0,   6,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 250,  69,   0,   0,   8, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,   2, 
+     70,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0,  66,  74,   0, 
+      0,  74,  74,   0,   0,   1, 
+      0,   0,   0,   0,   0,   0, 
+      0, 213,   3,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0, 186,   2,   0,   0,  10, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  91, 
+     74,   0,   0,  11,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 127,  74,   0, 
+      0,   2,   0,   0,   0,   0, 
+      0,   0,   0,   2,   0,   0, 
+      0,  37,   1,   0,   0,   6, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0, 167, 
+     81,   0,   0,   8,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0, 175,  81,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 255,  88,   0,   0,   7, 
+     89,   0,   0,   1,   0,   0, 
+      0,   0,   0,   0,   0, 213, 
+      3,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0, 186, 
+      2,   0,   0,  10,   0,   0, 
+      0,   0,   0,   0,   0,   1, 
+      0,   0,   0,  33,  89,   0, 
+      0,  11,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  69,  89,   0,   0,   2, 
+      0,   0,   0,   0,   0,   0, 
+      0,   2,   0,   0,   0,  14, 
+      2,   0,   0,   6,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0, 109,  96,   0, 
+      0,   8,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0, 117,  96,   0,   0,   7, 
+      0,   0,   0,   0,   0,   0, 
+      0,   7,   0,   0,   0,  21, 
+    102,   0,   0,  29, 102,   0, 
+      0,   1,   0,   0,   0,   0, 
+      0,   0,   0, 213,   3,   0, 
+      0,   7,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0, 186,   2,   0, 
+      0,  10,   0,   0,   0,   0, 
+      0,   0,   0,   1,   0,   0, 
+      0,  51, 102,   0,   0,  11, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0,  87, 
+    102,   0,   0,   2,   0,   0, 
+      0,   0,   0,   0,   0,   2, 
+      0,   0,   0,  37,   1,   0, 
+      0,   6,   0,   0,   0,   0, 
+      0,   0,   0,   7,   0,   0, 
+      0, 127, 109,   0,   0,   8, 
+      0,   0,   0,   0,   0,   0, 
+      0,   1,   0,   0,   0, 135, 
+    109,   0,   0,   7,   0,   0, 
+      0,   0,   0,   0,   0,   7, 
+      0,   0,   0, 111, 112,   0, 
+      0
+};
diff --git a/gfx/layers/d3d9/LayerManagerD3D9.cpp b/gfx/layers/d3d9/LayerManagerD3D9.cpp
index 80aa7c12367..40883636173 100644
--- a/gfx/layers/d3d9/LayerManagerD3D9.cpp
+++ b/gfx/layers/d3d9/LayerManagerD3D9.cpp
@@ -80,7 +80,7 @@ LayerManagerD3D9::Initialize()
   /* XXX: this preference and blacklist code should move out of the layer manager */
   PRBool forceAccelerate = PR_FALSE;
   if (prefs) {
-    // we should use AddBoolPrefVarCache
+    // we should use Preferences::AddBoolVarCache
     prefs->GetBoolPref("layers.acceleration.force-enabled",
                        &forceAccelerate);
   }
diff --git a/gfx/layers/d3d9/LayerManagerD3D9Shaders.h b/gfx/layers/d3d9/LayerManagerD3D9Shaders.h
index fe3525410eb..faf845a833f 100644
--- a/gfx/layers/d3d9/LayerManagerD3D9Shaders.h
+++ b/gfx/layers/d3d9/LayerManagerD3D9Shaders.h
@@ -1,748 +1,748 @@
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -ELayerQuadVS -nologo -FhtmpShaderHeader
-//    -VnLayerQuadVS
-//
-//
-// Parameters:
-//
-//   float4x4 mLayerTransform;
-//   float4x4 mProjection;
-//   float4 vLayerQuad;
-//   float4 vRenderTargetOffset;
-//   float4 vTextureCoords;
-//
-//
-// Registers:
-//
-//   Name                Reg   Size
-//   ------------------- ----- ----
-//   mLayerTransform     c0       4
-//   mProjection         c4       4
-//   vRenderTargetOffset c8       1
-//   vTextureCoords      c9       1
-//   vLayerQuad          c10      1
-//
-
-    vs_2_0
-    def c11, -0.5, 0, 0, 0
-    dcl_position v0
-    mad r0.xy, v0, c10.zwzw, c10
-    mul r1, r0.y, c1
-    mad r0, c0, r0.x, r1
-    mad r0, c2, v0.z, r0
-    mad r0, c3, v0.w, r0
-    add r0, r0, -c8
-    add r0.xy, r0, c11.x
-    mul r1, r0.y, c5
-    mad r1, c4, r0.x, r1
-    mad r1, c6, r0.z, r1
-    mad oPos, c7, r0.w, r1
-    mad oT0.xy, v0, c9.zwzw, c9
-
-// approximately 12 instruction slots used
-#endif
-
-const BYTE LayerQuadVS[] =
-{
-      0,   2, 254, 255, 254, 255, 
-     78,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0,   2,   1, 
-      0,   0,   0,   2, 254, 255, 
-      5,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    251,   0,   0,   0, 128,   0, 
-      0,   0,   2,   0,   0,   0, 
-      4,   0,   0,   0, 144,   0, 
-      0,   0,   0,   0,   0,   0, 
-    160,   0,   0,   0,   2,   0, 
-      4,   0,   4,   0,   0,   0, 
-    144,   0,   0,   0,   0,   0, 
-      0,   0, 172,   0,   0,   0, 
-      2,   0,  10,   0,   1,   0, 
-      0,   0, 184,   0,   0,   0, 
-      0,   0,   0,   0, 200,   0, 
-      0,   0,   2,   0,   8,   0, 
-      1,   0,   0,   0, 220,   0, 
-      0,   0,   0,   0,   0,   0, 
-    236,   0,   0,   0,   2,   0, 
-      9,   0,   1,   0,   0,   0, 
-    184,   0,   0,   0,   0,   0, 
-      0,   0, 109,  76,  97, 121, 
-    101, 114,  84, 114,  97, 110, 
-    115, 102, 111, 114, 109,   0, 
-      3,   0,   3,   0,   4,   0, 
-      4,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 109,  80, 
-    114, 111, 106, 101,  99, 116, 
-    105, 111, 110,   0, 118,  76, 
-     97, 121, 101, 114,  81, 117, 
-     97, 100,   0, 171,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 118,  82, 101, 110, 
-    100, 101, 114,  84,  97, 114, 
-    103, 101, 116,  79, 102, 102, 
-    115, 101, 116,   0,   1,   0, 
-      3,   0,   1,   0,   4,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 118,  84, 101, 120, 
-    116, 117, 114, 101,  67, 111, 
-    111, 114, 100, 115,   0, 118, 
-    115,  95,  50,  95,  48,   0, 
-     77, 105,  99, 114, 111, 115, 
-    111, 102, 116,  32,  40,  82, 
-     41,  32,  72,  76,  83,  76, 
-     32,  83, 104,  97, 100, 101, 
-    114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  57, 
-     46,  50,  57,  46,  57,  53, 
-     50,  46,  51,  49,  49,  49, 
-      0, 171,  81,   0,   0,   5, 
-     11,   0,  15, 160,   0,   0, 
-      0, 191,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-     15, 144,   4,   0,   0,   4, 
-      0,   0,   3, 128,   0,   0, 
-    228, 144,  10,   0, 238, 160, 
-     10,   0, 228, 160,   5,   0, 
-      0,   3,   1,   0,  15, 128, 
-      0,   0,  85, 128,   1,   0, 
-    228, 160,   4,   0,   0,   4, 
-      0,   0,  15, 128,   0,   0, 
-    228, 160,   0,   0,   0, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   0,   0,  15, 128, 
-      2,   0, 228, 160,   0,   0, 
-    170, 144,   0,   0, 228, 128, 
-      4,   0,   0,   4,   0,   0, 
-     15, 128,   3,   0, 228, 160, 
-      0,   0, 255, 144,   0,   0, 
-    228, 128,   2,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 128,   8,   0, 228, 161, 
-      2,   0,   0,   3,   0,   0, 
-      3, 128,   0,   0, 228, 128, 
-     11,   0,   0, 160,   5,   0, 
-      0,   3,   1,   0,  15, 128, 
-      0,   0,  85, 128,   5,   0, 
-    228, 160,   4,   0,   0,   4, 
-      1,   0,  15, 128,   4,   0, 
-    228, 160,   0,   0,   0, 128, 
-      1,   0, 228, 128,   4,   0, 
-      0,   4,   1,   0,  15, 128, 
-      6,   0, 228, 160,   0,   0, 
-    170, 128,   1,   0, 228, 128, 
-      4,   0,   0,   4,   0,   0, 
-     15, 192,   7,   0, 228, 160, 
-      0,   0, 255, 128,   1,   0, 
-    228, 128,   4,   0,   0,   4, 
-      0,   0,   3, 224,   0,   0, 
-    228, 144,   9,   0, 238, 160, 
-      9,   0, 228, 160, 255, 255, 
-      0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -ERGBAShader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnRGBAShaderPS
-//
-//
-// Parameters:
-//
-//   float fLayerOpacity;
-//   sampler2D s2D;
-//
-//
-// Registers:
-//
-//   Name          Reg   Size
-//   ------------- ----- ----
-//   fLayerOpacity c0       1
-//   s2D           s0       1
-//
-
-    ps_2_0
-    dcl t0.xy
-    dcl_2d s0
-    texld r0, t0, s0
-    mul r0, r0, c0.x
-    mov oC0, r0
-
-// approximately 3 instruction slots used (1 texture, 2 arithmetic)
-#endif
-
-const BYTE RGBAShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     45,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0, 127,   0, 
-      0,   0,   0,   2, 255, 255, 
-      2,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    120,   0,   0,   0,  68,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,  84,   0, 
-      0,   0,   0,   0,   0,   0, 
-    100,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-    104,   0,   0,   0,   0,   0, 
-      0,   0, 102,  76,  97, 121, 
-    101, 114,  79, 112,  97,  99, 
-    105, 116, 121,   0, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 115,  50, 
-     68,   0,   4,   0,  12,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    112, 115,  95,  50,  95,  48, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  57,  46,  57, 
-     53,  50,  46,  51,  49,  49, 
-     49,   0,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-      5,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -EComponentPass1Shader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnComponentPass1ShaderPS
-//
-//
-// Parameters:
-//
-//   float fLayerOpacity;
-//   sampler2D s2D;
-//   sampler2D s2DWhite;
-//
-//
-// Registers:
-//
-//   Name          Reg   Size
-//   ------------- ----- ----
-//   fLayerOpacity c0       1
-//   s2D           s0       1
-//   s2DWhite      s1       1
-//
-
-    ps_2_0
-    def c1, 1, 0, 0, 0
-    dcl t0.xy
-    dcl_2d s0
-    dcl_2d s1
-    texld r0, t0, s0
-    texld r1, t0, s1
-    add r0.xyz, r0, -r1
-    add r0.xyz, r0, c1.x
-    mul r0.xyz, r0, c0.x
-    mov r1.xyz, r0
-    mov r1.w, r0.y
-    mov oC0, r1
-
-// approximately 8 instruction slots used (2 texture, 6 arithmetic)
-#endif
-
-const BYTE ComponentPass1ShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     57,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0, 175,   0, 
-      0,   0,   0,   2, 255, 255, 
-      3,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    168,   0,   0,   0,  88,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0, 104,   0, 
-      0,   0,   0,   0,   0,   0, 
-    120,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-    124,   0,   0,   0,   0,   0, 
-      0,   0, 140,   0,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      0,   0, 152,   0,   0,   0, 
-      0,   0,   0,   0, 102,  76, 
-     97, 121, 101, 114,  79, 112, 
-     97,  99, 105, 116, 121,   0, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    115,  50,  68,   0,   4,   0, 
-     12,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 115,  50,  68,  87, 
-    104, 105, 116, 101,   0, 171, 
-    171, 171,   4,   0,  12,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    112, 115,  95,  50,  95,  48, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  57,  46,  57, 
-     53,  50,  46,  51,  49,  49, 
-     49,   0,  81,   0,   0,   5, 
-      1,   0,  15, 160,   0,   0, 
-    128,  63,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  31,   0,   0,   2, 
-      0,   0,   0, 144,   1,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-     66,   0,   0,   3,   1,   0, 
-     15, 128,   0,   0, 228, 176, 
-      1,   8, 228, 160,   2,   0, 
-      0,   3,   0,   0,   7, 128, 
-      0,   0, 228, 128,   1,   0, 
-    228, 129,   2,   0,   0,   3, 
-      0,   0,   7, 128,   0,   0, 
-    228, 128,   1,   0,   0, 160, 
-      5,   0,   0,   3,   0,   0, 
-      7, 128,   0,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   1,   0,   7, 128, 
-      0,   0, 228, 128,   1,   0, 
-      0,   2,   1,   0,   8, 128, 
-      0,   0,  85, 128,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      1,   0, 228, 128, 255, 255, 
-      0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -EComponentPass2Shader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnComponentPass2ShaderPS
-//
-//
-// Parameters:
-//
-//   float fLayerOpacity;
-//   sampler2D s2D;
-//   sampler2D s2DWhite;
-//
-//
-// Registers:
-//
-//   Name          Reg   Size
-//   ------------- ----- ----
-//   fLayerOpacity c0       1
-//   s2D           s0       1
-//   s2DWhite      s1       1
-//
-
-    ps_2_0
-    def c1, 1, 0, 0, 0
-    dcl t0.xy
-    dcl_2d s0
-    dcl_2d s1
-    texld r0, t0, s1
-    texld r1, t0, s0
-    add r0.x, -r0.y, r1.y
-    add r1.w, r0.x, c1.x
-    mul r0, r1, c0.x
-    mov oC0, r0
-
-// approximately 6 instruction slots used (2 texture, 4 arithmetic)
-#endif
-
-const BYTE ComponentPass2ShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     57,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0, 175,   0, 
-      0,   0,   0,   2, 255, 255, 
-      3,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    168,   0,   0,   0,  88,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0, 104,   0, 
-      0,   0,   0,   0,   0,   0, 
-    120,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-    124,   0,   0,   0,   0,   0, 
-      0,   0, 140,   0,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      0,   0, 152,   0,   0,   0, 
-      0,   0,   0,   0, 102,  76, 
-     97, 121, 101, 114,  79, 112, 
-     97,  99, 105, 116, 121,   0, 
-    171, 171,   0,   0,   3,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    115,  50,  68,   0,   4,   0, 
-     12,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 115,  50,  68,  87, 
-    104, 105, 116, 101,   0, 171, 
-    171, 171,   4,   0,  12,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    112, 115,  95,  50,  95,  48, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  57,  46,  57, 
-     53,  50,  46,  51,  49,  49, 
-     49,   0,  81,   0,   0,   5, 
-      1,   0,  15, 160,   0,   0, 
-    128,  63,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  31,   0,   0,   2, 
-      0,   0,   0, 144,   1,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   1,   8, 228, 160, 
-     66,   0,   0,   3,   1,   0, 
-     15, 128,   0,   0, 228, 176, 
-      0,   8, 228, 160,   2,   0, 
-      0,   3,   0,   0,   1, 128, 
-      0,   0,  85, 129,   1,   0, 
-     85, 128,   2,   0,   0,   3, 
-      1,   0,   8, 128,   0,   0, 
-      0, 128,   1,   0,   0, 160, 
-      5,   0,   0,   3,   0,   0, 
-     15, 128,   1,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -ERGBShader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnRGBShaderPS
-//
-//
-// Parameters:
-//
-//   float fLayerOpacity;
-//   sampler2D s2D;
-//
-//
-// Registers:
-//
-//   Name          Reg   Size
-//   ------------- ----- ----
-//   fLayerOpacity c0       1
-//   s2D           s0       1
-//
-
-    ps_2_0
-    def c1, 1, 0, 0, 0
-    dcl t0.xy
-    dcl_2d s0
-    texld r0, t0, s0
-    mul r0.xyz, r0, c0.x
-    mov r0.w, c1.x
-    mov oC0, r0
-
-// approximately 4 instruction slots used (1 texture, 3 arithmetic)
-#endif
-
-const BYTE RGBShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     45,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0, 127,   0, 
-      0,   0,   0,   2, 255, 255, 
-      2,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    120,   0,   0,   0,  68,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,  84,   0, 
-      0,   0,   0,   0,   0,   0, 
-    100,   0,   0,   0,   3,   0, 
-      0,   0,   1,   0,   0,   0, 
-    104,   0,   0,   0,   0,   0, 
-      0,   0, 102,  76,  97, 121, 
-    101, 114,  79, 112,  97,  99, 
-    105, 116, 121,   0, 171, 171, 
-      0,   0,   3,   0,   1,   0, 
-      1,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 115,  50, 
-     68,   0,   4,   0,  12,   0, 
-      1,   0,   1,   0,   1,   0, 
-      0,   0,   0,   0,   0,   0, 
-    112, 115,  95,  50,  95,  48, 
-      0,  77, 105,  99, 114, 111, 
-    115, 111, 102, 116,  32,  40, 
-     82,  41,  32,  72,  76,  83, 
-     76,  32,  83, 104,  97, 100, 
-    101, 114,  32,  67, 111, 109, 
-    112, 105, 108, 101, 114,  32, 
-     57,  46,  50,  57,  46,  57, 
-     53,  50,  46,  51,  49,  49, 
-     49,   0,  81,   0,   0,   5, 
-      1,   0,  15, 160,   0,   0, 
-    128,  63,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,  31,   0,   0,   2, 
-      0,   0,   0, 128,   0,   0, 
-      3, 176,  31,   0,   0,   2, 
-      0,   0,   0, 144,   0,   8, 
-     15, 160,  66,   0,   0,   3, 
-      0,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-      5,   0,   0,   3,   0,   0, 
-      7, 128,   0,   0, 228, 128, 
-      0,   0,   0, 160,   1,   0, 
-      0,   2,   0,   0,   8, 128, 
-      1,   0,   0, 160,   1,   0, 
-      0,   2,   0,   8,  15, 128, 
-      0,   0, 228, 128, 255, 255, 
-      0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -EYCbCrShader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnYCbCrShaderPS
-//
-//
-// Parameters:
-//
-//   float fLayerOpacity;
-//   sampler2D s2DCb;
-//   sampler2D s2DCr;
-//   sampler2D s2DY;
-//
-//
-// Registers:
-//
-//   Name          Reg   Size
-//   ------------- ----- ----
-//   fLayerOpacity c0       1
-//   s2DY          s0       1
-//   s2DCb         s1       1
-//   s2DCr         s2       1
-//
-
-    ps_2_0
-    def c1, -0.5, -0.0625, 1.16400003, 1.59599996
-    def c2, 0.813000023, 0.391000003, 2.01799989, 1
-    dcl t0.xy
-    dcl_2d s0
-    dcl_2d s1
-    dcl_2d s2
-    texld r0, t0, s2
-    texld r1, t0, s0
-    texld r2, t0, s1
-    add r0.x, r0.x, c1.x
-    add r0.y, r1.x, c1.y
-    mul r0.y, r0.y, c1.z
-    mad r0.z, r0.x, -c2.x, r0.y
-    mad r1.x, r0.x, c1.w, r0.y
-    add r0.x, r2.x, c1.x
-    mad r1.y, r0.x, -c2.y, r0.z
-    mad r1.z, r0.x, c2.z, r0.y
-    mov r1.w, c2.w
-    mul r0, r1, c0.x
-    mov oC0, r0
-
-// approximately 14 instruction slots used (3 texture, 11 arithmetic)
-#endif
-
-const BYTE YCbCrShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     68,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0, 219,   0, 
-      0,   0,   0,   2, 255, 255, 
-      4,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-    212,   0,   0,   0, 108,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0, 124,   0, 
-      0,   0,   0,   0,   0,   0, 
-    140,   0,   0,   0,   3,   0, 
-      1,   0,   1,   0,   0,   0, 
-    148,   0,   0,   0,   0,   0, 
-      0,   0, 164,   0,   0,   0, 
-      3,   0,   2,   0,   1,   0, 
-      0,   0, 172,   0,   0,   0, 
-      0,   0,   0,   0, 188,   0, 
-      0,   0,   3,   0,   0,   0, 
-      1,   0,   0,   0, 196,   0, 
-      0,   0,   0,   0,   0,   0, 
-    102,  76,  97, 121, 101, 114, 
-     79, 112,  97,  99, 105, 116, 
-    121,   0, 171, 171,   0,   0, 
-      3,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 115,  50,  68,  67, 
-     98,   0, 171, 171,   4,   0, 
-     12,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 115,  50,  68,  67, 
-    114,   0, 171, 171,   4,   0, 
-     12,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 115,  50,  68,  89, 
-      0, 171, 171, 171,   4,   0, 
-     12,   0,   1,   0,   1,   0, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0, 112, 115,  95,  50, 
-     95,  48,   0,  77, 105,  99, 
-    114, 111, 115, 111, 102, 116, 
-     32,  40,  82,  41,  32,  72, 
-     76,  83,  76,  32,  83, 104, 
-     97, 100, 101, 114,  32,  67, 
-    111, 109, 112, 105, 108, 101, 
-    114,  32,  57,  46,  50,  57, 
-     46,  57,  53,  50,  46,  51, 
-     49,  49,  49,   0,  81,   0, 
-      0,   5,   1,   0,  15, 160, 
-      0,   0,   0, 191,   0,   0, 
-    128, 189, 244, 253, 148,  63, 
-    186,  73, 204,  63,  81,   0, 
-      0,   5,   2,   0,  15, 160, 
-    197,  32,  80,  63,  39,  49, 
-    200,  62, 233,  38,   1,  64, 
-      0,   0, 128,  63,  31,   0, 
-      0,   2,   0,   0,   0, 128, 
-      0,   0,   3, 176,  31,   0, 
-      0,   2,   0,   0,   0, 144, 
-      0,   8,  15, 160,  31,   0, 
-      0,   2,   0,   0,   0, 144, 
-      1,   8,  15, 160,  31,   0, 
-      0,   2,   0,   0,   0, 144, 
-      2,   8,  15, 160,  66,   0, 
-      0,   3,   0,   0,  15, 128, 
-      0,   0, 228, 176,   2,   8, 
-    228, 160,  66,   0,   0,   3, 
-      1,   0,  15, 128,   0,   0, 
-    228, 176,   0,   8, 228, 160, 
-     66,   0,   0,   3,   2,   0, 
-     15, 128,   0,   0, 228, 176, 
-      1,   8, 228, 160,   2,   0, 
-      0,   3,   0,   0,   1, 128, 
-      0,   0,   0, 128,   1,   0, 
-      0, 160,   2,   0,   0,   3, 
-      0,   0,   2, 128,   1,   0, 
-      0, 128,   1,   0,  85, 160, 
-      5,   0,   0,   3,   0,   0, 
-      2, 128,   0,   0,  85, 128, 
-      1,   0, 170, 160,   4,   0, 
-      0,   4,   0,   0,   4, 128, 
-      0,   0,   0, 128,   2,   0, 
-      0, 161,   0,   0,  85, 128, 
-      4,   0,   0,   4,   1,   0, 
-      1, 128,   0,   0,   0, 128, 
-      1,   0, 255, 160,   0,   0, 
-     85, 128,   2,   0,   0,   3, 
-      0,   0,   1, 128,   2,   0, 
-      0, 128,   1,   0,   0, 160, 
-      4,   0,   0,   4,   1,   0, 
-      2, 128,   0,   0,   0, 128, 
-      2,   0,  85, 161,   0,   0, 
-    170, 128,   4,   0,   0,   4, 
-      1,   0,   4, 128,   0,   0, 
-      0, 128,   2,   0, 170, 160, 
-      0,   0,  85, 128,   1,   0, 
-      0,   2,   1,   0,   8, 128, 
-      2,   0, 255, 160,   5,   0, 
-      0,   3,   0,   0,  15, 128, 
-      1,   0, 228, 128,   0,   0, 
-      0, 160,   1,   0,   0,   2, 
-      0,   8,  15, 128,   0,   0, 
-    228, 128, 255, 255,   0,   0
-};
-#if 0
-//
-// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
-//
-//   fxc LayerManagerD3D9Shaders.hlsl -ESolidColorShader -nologo -Tps_2_0
-//    -FhtmpShaderHeader -VnSolidColorShaderPS
-//
-//
-// Parameters:
-//
-//   float4 fLayerColor;
-//
-//
-// Registers:
-//
-//   Name         Reg   Size
-//   ------------ ----- ----
-//   fLayerColor  c0       1
-//
-
-    ps_2_0
-    mov oC0, c0
-
-// approximately 1 instruction slot used
-#endif
-
-const BYTE SolidColorShaderPS[] =
-{
-      0,   2, 255, 255, 254, 255, 
-     34,   0,  67,  84,  65,  66, 
-     28,   0,   0,   0,  83,   0, 
-      0,   0,   0,   2, 255, 255, 
-      1,   0,   0,   0,  28,   0, 
-      0,   0,   0,   1,   0,   0, 
-     76,   0,   0,   0,  48,   0, 
-      0,   0,   2,   0,   0,   0, 
-      1,   0,   0,   0,  60,   0, 
-      0,   0,   0,   0,   0,   0, 
-    102,  76,  97, 121, 101, 114, 
-     67, 111, 108, 111, 114,   0, 
-      1,   0,   3,   0,   1,   0, 
-      4,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0, 112, 115, 
-     95,  50,  95,  48,   0,  77, 
-    105,  99, 114, 111, 115, 111, 
-    102, 116,  32,  40,  82,  41, 
-     32,  72,  76,  83,  76,  32, 
-     83, 104,  97, 100, 101, 114, 
-     32,  67, 111, 109, 112, 105, 
-    108, 101, 114,  32,  57,  46, 
-     50,  57,  46,  57,  53,  50, 
-     46,  51,  49,  49,  49,   0, 
-      1,   0,   0,   2,   0,   8, 
-     15, 128,   0,   0, 228, 160, 
-    255, 255,   0,   0
-};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -ELayerQuadVS -nologo -FhtmpShaderHeader
+//    -VnLayerQuadVS
+//
+//
+// Parameters:
+//
+//   float4x4 mLayerTransform;
+//   float4x4 mProjection;
+//   float4 vLayerQuad;
+//   float4 vRenderTargetOffset;
+//   float4 vTextureCoords;
+//
+//
+// Registers:
+//
+//   Name                Reg   Size
+//   ------------------- ----- ----
+//   mLayerTransform     c0       4
+//   mProjection         c4       4
+//   vRenderTargetOffset c8       1
+//   vTextureCoords      c9       1
+//   vLayerQuad          c10      1
+//
+
+    vs_2_0
+    def c11, -0.5, 0, 0, 0
+    dcl_position v0
+    mad r0.xy, v0, c10.zwzw, c10
+    mul r1, r0.y, c1
+    mad r0, c0, r0.x, r1
+    mad r0, c2, v0.z, r0
+    mad r0, c3, v0.w, r0
+    add r0, r0, -c8
+    add r0.xy, r0, c11.x
+    mul r1, r0.y, c5
+    mad r1, c4, r0.x, r1
+    mad r1, c6, r0.z, r1
+    mad oPos, c7, r0.w, r1
+    mad oT0.xy, v0, c9.zwzw, c9
+
+// approximately 12 instruction slots used
+#endif
+
+const BYTE LayerQuadVS[] =
+{
+      0,   2, 254, 255, 254, 255, 
+     78,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0,   2,   1, 
+      0,   0,   0,   2, 254, 255, 
+      5,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    251,   0,   0,   0, 128,   0, 
+      0,   0,   2,   0,   0,   0, 
+      4,   0,   0,   0, 144,   0, 
+      0,   0,   0,   0,   0,   0, 
+    160,   0,   0,   0,   2,   0, 
+      4,   0,   4,   0,   0,   0, 
+    144,   0,   0,   0,   0,   0, 
+      0,   0, 172,   0,   0,   0, 
+      2,   0,  10,   0,   1,   0, 
+      0,   0, 184,   0,   0,   0, 
+      0,   0,   0,   0, 200,   0, 
+      0,   0,   2,   0,   8,   0, 
+      1,   0,   0,   0, 220,   0, 
+      0,   0,   0,   0,   0,   0, 
+    236,   0,   0,   0,   2,   0, 
+      9,   0,   1,   0,   0,   0, 
+    184,   0,   0,   0,   0,   0, 
+      0,   0, 109,  76,  97, 121, 
+    101, 114,  84, 114,  97, 110, 
+    115, 102, 111, 114, 109,   0, 
+      3,   0,   3,   0,   4,   0, 
+      4,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 109,  80, 
+    114, 111, 106, 101,  99, 116, 
+    105, 111, 110,   0, 118,  76, 
+     97, 121, 101, 114,  81, 117, 
+     97, 100,   0, 171,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 118,  82, 101, 110, 
+    100, 101, 114,  84,  97, 114, 
+    103, 101, 116,  79, 102, 102, 
+    115, 101, 116,   0,   1,   0, 
+      3,   0,   1,   0,   4,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 118,  84, 101, 120, 
+    116, 117, 114, 101,  67, 111, 
+    111, 114, 100, 115,   0, 118, 
+    115,  95,  50,  95,  48,   0, 
+     77, 105,  99, 114, 111, 115, 
+    111, 102, 116,  32,  40,  82, 
+     41,  32,  72,  76,  83,  76, 
+     32,  83, 104,  97, 100, 101, 
+    114,  32,  67, 111, 109, 112, 
+    105, 108, 101, 114,  32,  57, 
+     46,  50,  57,  46,  57,  53, 
+     50,  46,  51,  49,  49,  49, 
+      0, 171,  81,   0,   0,   5, 
+     11,   0,  15, 160,   0,   0, 
+      0, 191,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+     15, 144,   4,   0,   0,   4, 
+      0,   0,   3, 128,   0,   0, 
+    228, 144,  10,   0, 238, 160, 
+     10,   0, 228, 160,   5,   0, 
+      0,   3,   1,   0,  15, 128, 
+      0,   0,  85, 128,   1,   0, 
+    228, 160,   4,   0,   0,   4, 
+      0,   0,  15, 128,   0,   0, 
+    228, 160,   0,   0,   0, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   0,   0,  15, 128, 
+      2,   0, 228, 160,   0,   0, 
+    170, 144,   0,   0, 228, 128, 
+      4,   0,   0,   4,   0,   0, 
+     15, 128,   3,   0, 228, 160, 
+      0,   0, 255, 144,   0,   0, 
+    228, 128,   2,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 128,   8,   0, 228, 161, 
+      2,   0,   0,   3,   0,   0, 
+      3, 128,   0,   0, 228, 128, 
+     11,   0,   0, 160,   5,   0, 
+      0,   3,   1,   0,  15, 128, 
+      0,   0,  85, 128,   5,   0, 
+    228, 160,   4,   0,   0,   4, 
+      1,   0,  15, 128,   4,   0, 
+    228, 160,   0,   0,   0, 128, 
+      1,   0, 228, 128,   4,   0, 
+      0,   4,   1,   0,  15, 128, 
+      6,   0, 228, 160,   0,   0, 
+    170, 128,   1,   0, 228, 128, 
+      4,   0,   0,   4,   0,   0, 
+     15, 192,   7,   0, 228, 160, 
+      0,   0, 255, 128,   1,   0, 
+    228, 128,   4,   0,   0,   4, 
+      0,   0,   3, 224,   0,   0, 
+    228, 144,   9,   0, 238, 160, 
+      9,   0, 228, 160, 255, 255, 
+      0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -ERGBAShader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnRGBAShaderPS
+//
+//
+// Parameters:
+//
+//   float fLayerOpacity;
+//   sampler2D s2D;
+//
+//
+// Registers:
+//
+//   Name          Reg   Size
+//   ------------- ----- ----
+//   fLayerOpacity c0       1
+//   s2D           s0       1
+//
+
+    ps_2_0
+    dcl t0.xy
+    dcl_2d s0
+    texld r0, t0, s0
+    mul r0, r0, c0.x
+    mov oC0, r0
+
+// approximately 3 instruction slots used (1 texture, 2 arithmetic)
+#endif
+
+const BYTE RGBAShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     45,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0, 127,   0, 
+      0,   0,   0,   2, 255, 255, 
+      2,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    120,   0,   0,   0,  68,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,  84,   0, 
+      0,   0,   0,   0,   0,   0, 
+    100,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+    104,   0,   0,   0,   0,   0, 
+      0,   0, 102,  76,  97, 121, 
+    101, 114,  79, 112,  97,  99, 
+    105, 116, 121,   0, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 115,  50, 
+     68,   0,   4,   0,  12,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    112, 115,  95,  50,  95,  48, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  57,  46,  57, 
+     53,  50,  46,  51,  49,  49, 
+     49,   0,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+      5,   0,   0,   3,   0,   0, 
+     15, 128,   0,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -EComponentPass1Shader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnComponentPass1ShaderPS
+//
+//
+// Parameters:
+//
+//   float fLayerOpacity;
+//   sampler2D s2D;
+//   sampler2D s2DWhite;
+//
+//
+// Registers:
+//
+//   Name          Reg   Size
+//   ------------- ----- ----
+//   fLayerOpacity c0       1
+//   s2D           s0       1
+//   s2DWhite      s1       1
+//
+
+    ps_2_0
+    def c1, 1, 0, 0, 0
+    dcl t0.xy
+    dcl_2d s0
+    dcl_2d s1
+    texld r0, t0, s0
+    texld r1, t0, s1
+    add r0.xyz, r0, -r1
+    add r0.xyz, r0, c1.x
+    mul r0.xyz, r0, c0.x
+    mov r1.xyz, r0
+    mov r1.w, r0.y
+    mov oC0, r1
+
+// approximately 8 instruction slots used (2 texture, 6 arithmetic)
+#endif
+
+const BYTE ComponentPass1ShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     57,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0, 175,   0, 
+      0,   0,   0,   2, 255, 255, 
+      3,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    168,   0,   0,   0,  88,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0, 104,   0, 
+      0,   0,   0,   0,   0,   0, 
+    120,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+    124,   0,   0,   0,   0,   0, 
+      0,   0, 140,   0,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      0,   0, 152,   0,   0,   0, 
+      0,   0,   0,   0, 102,  76, 
+     97, 121, 101, 114,  79, 112, 
+     97,  99, 105, 116, 121,   0, 
+    171, 171,   0,   0,   3,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    115,  50,  68,   0,   4,   0, 
+     12,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 115,  50,  68,  87, 
+    104, 105, 116, 101,   0, 171, 
+    171, 171,   4,   0,  12,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    112, 115,  95,  50,  95,  48, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  57,  46,  57, 
+     53,  50,  46,  51,  49,  49, 
+     49,   0,  81,   0,   0,   5, 
+      1,   0,  15, 160,   0,   0, 
+    128,  63,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  31,   0,   0,   2, 
+      0,   0,   0, 144,   1,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+     66,   0,   0,   3,   1,   0, 
+     15, 128,   0,   0, 228, 176, 
+      1,   8, 228, 160,   2,   0, 
+      0,   3,   0,   0,   7, 128, 
+      0,   0, 228, 128,   1,   0, 
+    228, 129,   2,   0,   0,   3, 
+      0,   0,   7, 128,   0,   0, 
+    228, 128,   1,   0,   0, 160, 
+      5,   0,   0,   3,   0,   0, 
+      7, 128,   0,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   1,   0,   7, 128, 
+      0,   0, 228, 128,   1,   0, 
+      0,   2,   1,   0,   8, 128, 
+      0,   0,  85, 128,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      1,   0, 228, 128, 255, 255, 
+      0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -EComponentPass2Shader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnComponentPass2ShaderPS
+//
+//
+// Parameters:
+//
+//   float fLayerOpacity;
+//   sampler2D s2D;
+//   sampler2D s2DWhite;
+//
+//
+// Registers:
+//
+//   Name          Reg   Size
+//   ------------- ----- ----
+//   fLayerOpacity c0       1
+//   s2D           s0       1
+//   s2DWhite      s1       1
+//
+
+    ps_2_0
+    def c1, 1, 0, 0, 0
+    dcl t0.xy
+    dcl_2d s0
+    dcl_2d s1
+    texld r0, t0, s1
+    texld r1, t0, s0
+    add r0.x, -r0.y, r1.y
+    add r1.w, r0.x, c1.x
+    mul r0, r1, c0.x
+    mov oC0, r0
+
+// approximately 6 instruction slots used (2 texture, 4 arithmetic)
+#endif
+
+const BYTE ComponentPass2ShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     57,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0, 175,   0, 
+      0,   0,   0,   2, 255, 255, 
+      3,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    168,   0,   0,   0,  88,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0, 104,   0, 
+      0,   0,   0,   0,   0,   0, 
+    120,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+    124,   0,   0,   0,   0,   0, 
+      0,   0, 140,   0,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      0,   0, 152,   0,   0,   0, 
+      0,   0,   0,   0, 102,  76, 
+     97, 121, 101, 114,  79, 112, 
+     97,  99, 105, 116, 121,   0, 
+    171, 171,   0,   0,   3,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    115,  50,  68,   0,   4,   0, 
+     12,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 115,  50,  68,  87, 
+    104, 105, 116, 101,   0, 171, 
+    171, 171,   4,   0,  12,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    112, 115,  95,  50,  95,  48, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  57,  46,  57, 
+     53,  50,  46,  51,  49,  49, 
+     49,   0,  81,   0,   0,   5, 
+      1,   0,  15, 160,   0,   0, 
+    128,  63,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  31,   0,   0,   2, 
+      0,   0,   0, 144,   1,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   1,   8, 228, 160, 
+     66,   0,   0,   3,   1,   0, 
+     15, 128,   0,   0, 228, 176, 
+      0,   8, 228, 160,   2,   0, 
+      0,   3,   0,   0,   1, 128, 
+      0,   0,  85, 129,   1,   0, 
+     85, 128,   2,   0,   0,   3, 
+      1,   0,   8, 128,   0,   0, 
+      0, 128,   1,   0,   0, 160, 
+      5,   0,   0,   3,   0,   0, 
+     15, 128,   1,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -ERGBShader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnRGBShaderPS
+//
+//
+// Parameters:
+//
+//   float fLayerOpacity;
+//   sampler2D s2D;
+//
+//
+// Registers:
+//
+//   Name          Reg   Size
+//   ------------- ----- ----
+//   fLayerOpacity c0       1
+//   s2D           s0       1
+//
+
+    ps_2_0
+    def c1, 1, 0, 0, 0
+    dcl t0.xy
+    dcl_2d s0
+    texld r0, t0, s0
+    mul r0.xyz, r0, c0.x
+    mov r0.w, c1.x
+    mov oC0, r0
+
+// approximately 4 instruction slots used (1 texture, 3 arithmetic)
+#endif
+
+const BYTE RGBShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     45,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0, 127,   0, 
+      0,   0,   0,   2, 255, 255, 
+      2,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    120,   0,   0,   0,  68,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,  84,   0, 
+      0,   0,   0,   0,   0,   0, 
+    100,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+    104,   0,   0,   0,   0,   0, 
+      0,   0, 102,  76,  97, 121, 
+    101, 114,  79, 112,  97,  99, 
+    105, 116, 121,   0, 171, 171, 
+      0,   0,   3,   0,   1,   0, 
+      1,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 115,  50, 
+     68,   0,   4,   0,  12,   0, 
+      1,   0,   1,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+    112, 115,  95,  50,  95,  48, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  50,  57,  46,  57, 
+     53,  50,  46,  51,  49,  49, 
+     49,   0,  81,   0,   0,   5, 
+      1,   0,  15, 160,   0,   0, 
+    128,  63,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  31,   0,   0,   2, 
+      0,   0,   0, 128,   0,   0, 
+      3, 176,  31,   0,   0,   2, 
+      0,   0,   0, 144,   0,   8, 
+     15, 160,  66,   0,   0,   3, 
+      0,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+      5,   0,   0,   3,   0,   0, 
+      7, 128,   0,   0, 228, 128, 
+      0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   0,   8, 128, 
+      1,   0,   0, 160,   1,   0, 
+      0,   2,   0,   8,  15, 128, 
+      0,   0, 228, 128, 255, 255, 
+      0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -EYCbCrShader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnYCbCrShaderPS
+//
+//
+// Parameters:
+//
+//   float fLayerOpacity;
+//   sampler2D s2DCb;
+//   sampler2D s2DCr;
+//   sampler2D s2DY;
+//
+//
+// Registers:
+//
+//   Name          Reg   Size
+//   ------------- ----- ----
+//   fLayerOpacity c0       1
+//   s2DY          s0       1
+//   s2DCb         s1       1
+//   s2DCr         s2       1
+//
+
+    ps_2_0
+    def c1, -0.5, -0.0625, 1.16400003, 1.59599996
+    def c2, 0.813000023, 0.391000003, 2.01799989, 1
+    dcl t0.xy
+    dcl_2d s0
+    dcl_2d s1
+    dcl_2d s2
+    texld r0, t0, s2
+    texld r1, t0, s0
+    texld r2, t0, s1
+    add r0.x, r0.x, c1.x
+    add r0.y, r1.x, c1.y
+    mul r0.y, r0.y, c1.z
+    mad r0.z, r0.x, -c2.x, r0.y
+    mad r1.x, r0.x, c1.w, r0.y
+    add r0.x, r2.x, c1.x
+    mad r1.y, r0.x, -c2.y, r0.z
+    mad r1.z, r0.x, c2.z, r0.y
+    mov r1.w, c2.w
+    mul r0, r1, c0.x
+    mov oC0, r0
+
+// approximately 14 instruction slots used (3 texture, 11 arithmetic)
+#endif
+
+const BYTE YCbCrShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     68,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0, 219,   0, 
+      0,   0,   0,   2, 255, 255, 
+      4,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+    212,   0,   0,   0, 108,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0, 124,   0, 
+      0,   0,   0,   0,   0,   0, 
+    140,   0,   0,   0,   3,   0, 
+      1,   0,   1,   0,   0,   0, 
+    148,   0,   0,   0,   0,   0, 
+      0,   0, 164,   0,   0,   0, 
+      3,   0,   2,   0,   1,   0, 
+      0,   0, 172,   0,   0,   0, 
+      0,   0,   0,   0, 188,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0, 196,   0, 
+      0,   0,   0,   0,   0,   0, 
+    102,  76,  97, 121, 101, 114, 
+     79, 112,  97,  99, 105, 116, 
+    121,   0, 171, 171,   0,   0, 
+      3,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 115,  50,  68,  67, 
+     98,   0, 171, 171,   4,   0, 
+     12,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 115,  50,  68,  67, 
+    114,   0, 171, 171,   4,   0, 
+     12,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 115,  50,  68,  89, 
+      0, 171, 171, 171,   4,   0, 
+     12,   0,   1,   0,   1,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0, 112, 115,  95,  50, 
+     95,  48,   0,  77, 105,  99, 
+    114, 111, 115, 111, 102, 116, 
+     32,  40,  82,  41,  32,  72, 
+     76,  83,  76,  32,  83, 104, 
+     97, 100, 101, 114,  32,  67, 
+    111, 109, 112, 105, 108, 101, 
+    114,  32,  57,  46,  50,  57, 
+     46,  57,  53,  50,  46,  51, 
+     49,  49,  49,   0,  81,   0, 
+      0,   5,   1,   0,  15, 160, 
+      0,   0,   0, 191,   0,   0, 
+    128, 189, 244, 253, 148,  63, 
+    186,  73, 204,  63,  81,   0, 
+      0,   5,   2,   0,  15, 160, 
+    197,  32,  80,  63,  39,  49, 
+    200,  62, 233,  38,   1,  64, 
+      0,   0, 128,  63,  31,   0, 
+      0,   2,   0,   0,   0, 128, 
+      0,   0,   3, 176,  31,   0, 
+      0,   2,   0,   0,   0, 144, 
+      0,   8,  15, 160,  31,   0, 
+      0,   2,   0,   0,   0, 144, 
+      1,   8,  15, 160,  31,   0, 
+      0,   2,   0,   0,   0, 144, 
+      2,   8,  15, 160,  66,   0, 
+      0,   3,   0,   0,  15, 128, 
+      0,   0, 228, 176,   2,   8, 
+    228, 160,  66,   0,   0,   3, 
+      1,   0,  15, 128,   0,   0, 
+    228, 176,   0,   8, 228, 160, 
+     66,   0,   0,   3,   2,   0, 
+     15, 128,   0,   0, 228, 176, 
+      1,   8, 228, 160,   2,   0, 
+      0,   3,   0,   0,   1, 128, 
+      0,   0,   0, 128,   1,   0, 
+      0, 160,   2,   0,   0,   3, 
+      0,   0,   2, 128,   1,   0, 
+      0, 128,   1,   0,  85, 160, 
+      5,   0,   0,   3,   0,   0, 
+      2, 128,   0,   0,  85, 128, 
+      1,   0, 170, 160,   4,   0, 
+      0,   4,   0,   0,   4, 128, 
+      0,   0,   0, 128,   2,   0, 
+      0, 161,   0,   0,  85, 128, 
+      4,   0,   0,   4,   1,   0, 
+      1, 128,   0,   0,   0, 128, 
+      1,   0, 255, 160,   0,   0, 
+     85, 128,   2,   0,   0,   3, 
+      0,   0,   1, 128,   2,   0, 
+      0, 128,   1,   0,   0, 160, 
+      4,   0,   0,   4,   1,   0, 
+      2, 128,   0,   0,   0, 128, 
+      2,   0,  85, 161,   0,   0, 
+    170, 128,   4,   0,   0,   4, 
+      1,   0,   4, 128,   0,   0, 
+      0, 128,   2,   0, 170, 160, 
+      0,   0,  85, 128,   1,   0, 
+      0,   2,   1,   0,   8, 128, 
+      2,   0, 255, 160,   5,   0, 
+      0,   3,   0,   0,  15, 128, 
+      1,   0, 228, 128,   0,   0, 
+      0, 160,   1,   0,   0,   2, 
+      0,   8,  15, 128,   0,   0, 
+    228, 128, 255, 255,   0,   0
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
+//
+//   fxc LayerManagerD3D9Shaders.hlsl -ESolidColorShader -nologo -Tps_2_0
+//    -FhtmpShaderHeader -VnSolidColorShaderPS
+//
+//
+// Parameters:
+//
+//   float4 fLayerColor;
+//
+//
+// Registers:
+//
+//   Name         Reg   Size
+//   ------------ ----- ----
+//   fLayerColor  c0       1
+//
+
+    ps_2_0
+    mov oC0, c0
+
+// approximately 1 instruction slot used
+#endif
+
+const BYTE SolidColorShaderPS[] =
+{
+      0,   2, 255, 255, 254, 255, 
+     34,   0,  67,  84,  65,  66, 
+     28,   0,   0,   0,  83,   0, 
+      0,   0,   0,   2, 255, 255, 
+      1,   0,   0,   0,  28,   0, 
+      0,   0,   0,   1,   0,   0, 
+     76,   0,   0,   0,  48,   0, 
+      0,   0,   2,   0,   0,   0, 
+      1,   0,   0,   0,  60,   0, 
+      0,   0,   0,   0,   0,   0, 
+    102,  76,  97, 121, 101, 114, 
+     67, 111, 108, 111, 114,   0, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0, 112, 115, 
+     95,  50,  95,  48,   0,  77, 
+    105,  99, 114, 111, 115, 111, 
+    102, 116,  32,  40,  82,  41, 
+     32,  72,  76,  83,  76,  32, 
+     83, 104,  97, 100, 101, 114, 
+     32,  67, 111, 109, 112, 105, 
+    108, 101, 114,  32,  57,  46, 
+     50,  57,  46,  57,  53,  50, 
+     46,  51,  49,  49,  49,   0, 
+      1,   0,   0,   2,   0,   8, 
+     15, 128,   0,   0, 228, 160, 
+    255, 255,   0,   0
+};
diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
index f9ac89b0a92..38eb05f3362 100644
--- a/gfx/layers/ipc/ShadowLayersParent.cpp
+++ b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -434,11 +434,11 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
       ShadowImageLayer* image =
         static_cast<ShadowImageLayer*>(shadow->AsLayer());
 
-      SurfaceDescriptor newFront = op.newFrontBuffer();
+      SharedImage newFront = op.newFrontBuffer();
       SharedImage newBack;
       image->Swap(op.newFrontBuffer(), &newBack);
-      if (newFront == newBack.get_SurfaceDescriptor()) {
-        newFront = SurfaceDescriptor();
+      if (newFront == newBack) {
+        newFront = SharedImage();
       }
 
       replyv.push_back(OpImageSwap(shadow, NULL,
diff --git a/gfx/src/BaseMargin.h b/gfx/src/BaseMargin.h
index a38c3b36caf..a25089473e0 100644
--- a/gfx/src/BaseMargin.h
+++ b/gfx/src/BaseMargin.h
@@ -1,109 +1,109 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert O'Callahan <robert@ocallahan.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZILLA_BASEMARGIN_H_
-#define MOZILLA_BASEMARGIN_H_
-
-#include "gfxCore.h"
-
-namespace mozilla {
-
-/**
- * Do not use this class directly. Subclass it, pass that subclass as the
- * Sub parameter, and only use that subclass.
- */
-template <class T, class Sub>
-struct BaseMargin {
-  typedef mozilla::css::Side SideT;
-
-  // Do not change the layout of these members; the Side() methods below
-  // depend on this order.
-  T top, right, bottom, left;
-
-  // Constructors
-  BaseMargin() : top(0), right(0), bottom(0), left(0) {}
-  BaseMargin(T aLeft, T aTop, T aRight, T aBottom) :
-      top(aTop), right(aRight), bottom(aBottom), left(aLeft) {}
-
-  void SizeTo(T aLeft, T aTop, T aRight, T aBottom)
-  {
-    left = aLeft; top = aTop; right = aRight; bottom = aBottom;
-  }
-
-  T LeftRight() const { return left + right; }
-  T TopBottom() const { return top + bottom; }
-
-  T& Side(SideT aSide) {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    // This is ugly!
-    return *(&top + aSide);
-  }
-  T Side(SideT aSide) const {
-    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
-    // This is ugly!
-    return *(&top + aSide);
-  }
-
-  // Overloaded operators. Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-  bool operator==(const Sub& aMargin) const {
-    return left == aMargin.left && top == aMargin.top &&
-           right == aMargin.right && bottom == aMargin.bottom;
-  }
-  bool operator!=(const Sub& aMargin) const {
-    return !(*this == aMargin);
-  }
-  Sub operator+(const Sub& aMargin) const {
-    return Sub(left + aMargin.left, top + aMargin.top,
-             right + aMargin.right, bottom + aMargin.bottom);
-  }
-  Sub operator-(const Sub& aMargin) const {
-    return Sub(left - aMargin.left, top - aMargin.top,
-             right - aMargin.right, bottom - aMargin.bottom);
-  }
-  Sub& operator+=(const Sub& aMargin) {
-    left += aMargin.left;
-    top += aMargin.top;
-    right += aMargin.right;
-    bottom += aMargin.bottom;
-    return *static_cast<Sub*>(this);
-  }
-};
-
-}
-
-#endif /* MOZILLA_BASEMARGIN_H_ */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASEMARGIN_H_
+#define MOZILLA_BASEMARGIN_H_
+
+#include "gfxCore.h"
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass.
+ */
+template <class T, class Sub>
+struct BaseMargin {
+  typedef mozilla::css::Side SideT;
+
+  // Do not change the layout of these members; the Side() methods below
+  // depend on this order.
+  T top, right, bottom, left;
+
+  // Constructors
+  BaseMargin() : top(0), right(0), bottom(0), left(0) {}
+  BaseMargin(T aLeft, T aTop, T aRight, T aBottom) :
+      top(aTop), right(aRight), bottom(aBottom), left(aLeft) {}
+
+  void SizeTo(T aLeft, T aTop, T aRight, T aBottom)
+  {
+    left = aLeft; top = aTop; right = aRight; bottom = aBottom;
+  }
+
+  T LeftRight() const { return left + right; }
+  T TopBottom() const { return top + bottom; }
+
+  T& Side(SideT aSide) {
+    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    // This is ugly!
+    return *(&top + aSide);
+  }
+  T Side(SideT aSide) const {
+    NS_PRECONDITION(aSide <= NS_SIDE_LEFT, "Out of range side");
+    // This is ugly!
+    return *(&top + aSide);
+  }
+
+  // Overloaded operators. Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+  bool operator==(const Sub& aMargin) const {
+    return left == aMargin.left && top == aMargin.top &&
+           right == aMargin.right && bottom == aMargin.bottom;
+  }
+  bool operator!=(const Sub& aMargin) const {
+    return !(*this == aMargin);
+  }
+  Sub operator+(const Sub& aMargin) const {
+    return Sub(left + aMargin.left, top + aMargin.top,
+             right + aMargin.right, bottom + aMargin.bottom);
+  }
+  Sub operator-(const Sub& aMargin) const {
+    return Sub(left - aMargin.left, top - aMargin.top,
+             right - aMargin.right, bottom - aMargin.bottom);
+  }
+  Sub& operator+=(const Sub& aMargin) {
+    left += aMargin.left;
+    top += aMargin.top;
+    right += aMargin.right;
+    bottom += aMargin.bottom;
+    return *static_cast<Sub*>(this);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASEMARGIN_H_ */
diff --git a/gfx/src/BasePoint.h b/gfx/src/BasePoint.h
index 568caf80ab6..21cb0b64251 100644
--- a/gfx/src/BasePoint.h
+++ b/gfx/src/BasePoint.h
@@ -1,100 +1,100 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert O'Callahan <robert@ocallahan.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZILLA_BASEPOINT_H_
-#define MOZILLA_BASEPOINT_H_
-
-namespace mozilla {
-
-/**
- * Do not use this class directly. Subclass it, pass that subclass as the
- * Sub parameter, and only use that subclass. This allows methods to safely
- * cast 'this' to 'Sub*'.
- */
-template <class T, class Sub>
-struct BasePoint {
-  T x, y;
-
-  // Constructors
-  BasePoint() : x(0), y(0) {}
-  BasePoint(T aX, T aY) : x(aX), y(aY) {}
-
-  void MoveTo(T aX, T aY) { x = aX; y = aY; }
-  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
-
-  // Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-
-  bool operator==(const Sub& aPoint) const {
-    return x == aPoint.x && y == aPoint.y;
-  }
-  bool operator!=(const Sub& aPoint) const {
-    return x != aPoint.x || y != aPoint.y;
-  }
-
-  Sub operator+(const Sub& aPoint) const {
-    return Sub(x + aPoint.x, y + aPoint.y);
-  }
-  Sub operator-(const Sub& aPoint) const {
-    return Sub(x - aPoint.x, y - aPoint.y);
-  }
-  Sub& operator+=(const Sub& aPoint) {
-    x += aPoint.x;
-    y += aPoint.y;
-    return *static_cast<Sub*>(this);
-  }
-  Sub& operator-=(const Sub& aPoint) {
-    x -= aPoint.x;
-    y -= aPoint.y;
-    return *static_cast<Sub*>(this);
-  }
-
-  Sub operator*(T aScale) const {
-    return Sub(x * aScale, y * aScale);
-  }
-  Sub operator/(T aScale) const {
-    return Sub(x / aScale, y / aScale);
-  }
-
-  Sub operator-() const {
-    return Sub(-x, -y);
-  }
-};
-
-}
-
-#endif /* MOZILLA_BASEPOINT_H_ */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASEPOINT_H_
+#define MOZILLA_BASEPOINT_H_
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass. This allows methods to safely
+ * cast 'this' to 'Sub*'.
+ */
+template <class T, class Sub>
+struct BasePoint {
+  T x, y;
+
+  // Constructors
+  BasePoint() : x(0), y(0) {}
+  BasePoint(T aX, T aY) : x(aX), y(aY) {}
+
+  void MoveTo(T aX, T aY) { x = aX; y = aY; }
+  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
+
+  // Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+
+  bool operator==(const Sub& aPoint) const {
+    return x == aPoint.x && y == aPoint.y;
+  }
+  bool operator!=(const Sub& aPoint) const {
+    return x != aPoint.x || y != aPoint.y;
+  }
+
+  Sub operator+(const Sub& aPoint) const {
+    return Sub(x + aPoint.x, y + aPoint.y);
+  }
+  Sub operator-(const Sub& aPoint) const {
+    return Sub(x - aPoint.x, y - aPoint.y);
+  }
+  Sub& operator+=(const Sub& aPoint) {
+    x += aPoint.x;
+    y += aPoint.y;
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Sub& aPoint) {
+    x -= aPoint.x;
+    y -= aPoint.y;
+    return *static_cast<Sub*>(this);
+  }
+
+  Sub operator*(T aScale) const {
+    return Sub(x * aScale, y * aScale);
+  }
+  Sub operator/(T aScale) const {
+    return Sub(x / aScale, y / aScale);
+  }
+
+  Sub operator-() const {
+    return Sub(-x, -y);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASEPOINT_H_ */
diff --git a/gfx/src/BaseRect.h b/gfx/src/BaseRect.h
index 09f9cdc9b4c..49b84f697b7 100644
--- a/gfx/src/BaseRect.h
+++ b/gfx/src/BaseRect.h
@@ -1,318 +1,318 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert O'Callahan <robert@ocallahan.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZILLA_BASERECT_H_
-#define MOZILLA_BASERECT_H_
-
-#include "nsAlgorithm.h"
-
-namespace mozilla {
-
-/**
- * Rectangles have two interpretations: a set of (zero-size) points,
- * and a rectangular area of the plane. Most rectangle operations behave
- * the same no matter what interpretation is being used, but some operations
- * differ:
- * -- Equality tests behave differently. When a rectangle represents an area,
- * all zero-width and zero-height rectangles are equal to each other since they
- * represent the empty area. But when a rectangle represents a set of
- * mathematical points, zero-width and zero-height rectangles can be unequal.
- * -- The union operation can behave differently. When rectangles represent
- * areas, taking the union of a zero-width or zero-height rectangle with
- * another rectangle can just ignore the empty rectangle. But when rectangles
- * represent sets of mathematical points, we may need to extend the latter
- * rectangle to include the points of a zero-width or zero-height rectangle.
- *
- * To ensure that these interpretations are explicitly disambiguated, we
- * deny access to the == and != operators and require use of IsEqualEdges and
- * IsEqualInterior instead. Similarly we provide separate Union and UnionEdges
- * methods.
- *
- * Do not use this class directly. Subclass it, pass that subclass as the
- * Sub parameter, and only use that subclass.
- */
-template <class T, class Sub, class Point, class SizeT, class Margin>
-struct BaseRect {
-  T x, y, width, height;
-
-  // Constructors
-  BaseRect() : x(0), y(0), width(0), height(0) {}
-  BaseRect(const Point& aOrigin, const SizeT &aSize) :
-      x(aOrigin.x), y(aOrigin.y), width(aSize.width), height(aSize.height)
-  {
-  }
-  BaseRect(T aX, T aY, T aWidth, T aHeight) :
-      x(aX), y(aY), width(aWidth), height(aHeight)
-  {
-  }
-
-  // Emptiness. An empty rect is one that has no area, i.e. its height or width
-  // is <= 0
-  bool IsEmpty() const { return height <= 0 || width <= 0; }
-  void SetEmpty() { width = height = 0; }
-
-  // Returns true if this rectangle contains the interior of aRect. Always
-  // returns true if aRect is empty, and always returns false is aRect is
-  // nonempty but this rect is empty.
-  bool Contains(const Sub& aRect) const
-  {
-    return aRect.IsEmpty() ||
-           (x <= aRect.x && aRect.XMost() <= XMost() &&
-            y <= aRect.y && aRect.YMost() <= YMost());
-  }
-  // Returns true if this rectangle contains the rectangle (aX,aY,1,1).
-  bool Contains(T aX, T aY) const
-  {
-    return x <= aX && aX + 1 <= XMost() &&
-           y <= aY && aY + 1 <= YMost();
-  }
-  // Returns true if this rectangle contains the rectangle (aPoint.x,aPoint.y,1,1).
-  bool Contains(const Point& aPoint) const { return Contains(aPoint.x, aPoint.y); }
-
-  // Intersection. Returns TRUE if the receiver's area has non-empty
-  // intersection with aRect's area, and FALSE otherwise.
-  // Always returns false if aRect is empty or 'this' is empty.
-  bool Intersects(const Sub& aRect) const
-  {
-    return x < aRect.XMost() && aRect.x < XMost() &&
-           y < aRect.YMost() && aRect.y < YMost();
-  }
-  // Returns the rectangle containing the intersection of the points
-  // (including edges) of *this and aRect. If there are no points in that
-  // intersection, returns an empty rectangle with x/y set to the max of the x/y
-  // of *this and aRect.
-  Sub Intersect(const Sub& aRect) const
-  {
-    Sub result;
-    result.x = NS_MAX(x, aRect.x);
-    result.y = NS_MAX(y, aRect.y);
-    result.width = NS_MIN(XMost(), aRect.XMost()) - result.x;
-    result.height = NS_MIN(YMost(), aRect.YMost()) - result.y;
-    if (result.width < 0 || result.height < 0) {
-      result.SizeTo(0, 0);
-    }
-    return result;
-  }
-  // Sets *this to be the rectangle containing the intersection of the points
-  // (including edges) of *this and aRect. If there are no points in that
-  // intersection, sets *this to be an empty rectangle with x/y set to the max
-  // of the x/y of *this and aRect.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  bool IntersectRect(const Sub& aRect1, const Sub& aRect2)
-  {
-    *static_cast<Sub*>(this) = aRect1.Intersect(aRect2);
-    return !IsEmpty();
-  }
-
-  // Returns the smallest rectangle that contains both the area of both
-  // this and aRect2.
-  // Thus, empty input rectangles are ignored.
-  // If both rectangles are empty, returns this.
-  Sub Union(const Sub& aRect) const
-  {
-    if (IsEmpty()) {
-      return aRect;
-    } else if (aRect.IsEmpty()) {
-      return *static_cast<const Sub*>(this);
-    } else {
-      return UnionEdges(aRect);
-    }
-  }
-  // Returns the smallest rectangle that contains both the points (including
-  // edges) of both aRect1 and aRect2.
-  // Thus, empty input rectangles are allowed to affect the result.
-  Sub UnionEdges(const Sub& aRect) const
-  {
-    Sub result;
-    result.x = NS_MIN(x, aRect.x);
-    result.y = NS_MIN(y, aRect.y);
-    result.width = NS_MAX(XMost(), aRect.XMost()) - result.x;
-    result.height = NS_MAX(YMost(), aRect.YMost()) - result.y;
-    return result;
-  }
-  // Computes the smallest rectangle that contains both the area of both
-  // aRect1 and aRect2, and fills 'this' with the result.
-  // Thus, empty input rectangles are ignored.
-  // If both rectangles are empty, sets 'this' to aRect2.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  void UnionRect(const Sub& aRect1, const Sub& aRect2)
-  {
-    *static_cast<Sub*>(this) = aRect1.Union(aRect2);
-  }
-
-  // Computes the smallest rectangle that contains both the points (including
-  // edges) of both aRect1 and aRect2.
-  // Thus, empty input rectangles are allowed to affect the result.
-  //
-  // 'this' can be the same object as either aRect1 or aRect2
-  void UnionRectEdges(const Sub& aRect1, const Sub& aRect2)
-  {
-    *static_cast<Sub*>(this) = aRect1.UnionEdges(aRect2);
-  }
-
-  void SetRect(T aX, T aY, T aWidth, T aHeight)
-  {
-    x = aX; y = aY; width = aWidth; height = aHeight;
-  }
-  void SetRect(const Point& aPt, const SizeT& aSize)
-  {
-    SetRect(aPt.x, aPt.y, aSize.width, aSize.height);
-  }
-  void MoveTo(T aX, T aY) { x = aX; y = aY; }
-  void MoveTo(const Point& aPoint) { x = aPoint.x; y = aPoint.y; }
-  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
-  void MoveBy(const Point& aPoint) { x += aPoint.x; y += aPoint.y; }
-  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
-  void SizeTo(const SizeT& aSize) { width = aSize.width; height = aSize.height; }
-
-  void Inflate(T aD) { Inflate(aD, aD); }
-  void Inflate(T aDx, T aDy)
-  {
-    x -= aDx;
-    y -= aDy;
-    width += 2 * aDx;
-    height += 2 * aDy;
-  }
-  void Inflate(const Margin& aMargin)
-  {
-    x -= aMargin.left;
-    y -= aMargin.top;
-    width += aMargin.LeftRight();
-    height += aMargin.TopBottom();
-  }
-  void Inflate(const SizeT& aSize) { Inflate(aSize.width, aSize.height); }
-
-  void Deflate(T aD) { Deflate(aD, aD); }
-  void Deflate(T aDx, T aDy)
-  {
-    x += aDx;
-    y += aDy;
-    width = NS_MAX(T(0), width - 2 * aDx);
-    height = NS_MAX(T(0), height - 2 * aDy);
-  }
-  void Deflate(const Margin& aMargin)
-  {
-    x += aMargin.left;
-    y += aMargin.top;
-    width = NS_MAX(T(0), width - aMargin.LeftRight());
-    height = NS_MAX(T(0), height - aMargin.TopBottom());
-  }
-  void Deflate(const SizeT& aSize) { Deflate(aSize.width, aSize.height); }
-
-  // Return true if the rectangles contain the same set of points, including
-  // points on the edges.
-  // Use when we care about the exact x/y/width/height values being
-  // equal (i.e. we care about differences in empty rectangles).
-  bool IsEqualEdges(const Sub& aRect) const
-  {
-    return x == aRect.x && y == aRect.y &&
-           width == aRect.width && height == aRect.height;
-  }
-  // Return true if the rectangles contain the same area of the plane.
-  // Use when we do not care about differences in empty rectangles.
-  bool IsEqualInterior(const Sub& aRect) const
-  {
-    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
-  }
-
-  Sub operator+(const Point& aPoint) const
-  {
-    return Sub(x + aPoint.x, y + aPoint.y, width, height);
-  }
-  Sub operator-(const Point& aPoint) const
-  {
-    return Sub(x - aPoint.x, y - aPoint.y, width, height);
-  }
-  Sub& operator+=(const Point& aPoint)
-  {
-    MoveBy(aPoint);
-    return *static_cast<Sub*>(this);
-  }
-  Sub& operator-=(const Point& aPoint)
-  {
-    MoveBy(-aPoint);
-    return *static_cast<Sub*>(this);
-  }
-
-  // Find difference as a Margin
-  Margin operator-(const Sub& aRect) const
-  {
-    return Margin(aRect.x - x, aRect.y - y,
-                  XMost() - aRect.XMost(), YMost() - aRect.YMost());
-  }
-
-  // Helpers for accessing the vertices
-  Point TopLeft() const { return Point(x, y); }
-  Point TopRight() const { return Point(XMost(), y); }
-  Point BottomLeft() const { return Point(x, YMost()); }
-  Point BottomRight() const { return Point(XMost(), YMost()); }
-  Point Center() const { return Point(x, y) + Point(width, height)/2; }
-  SizeT Size() const { return SizeT(width, height); }
-
-  // Helper methods for computing the extents
-  T X() const { return x; }
-  T Y() const { return y; }
-  T Width() const { return width; }
-  T Height() const { return height; }
-  T XMost() const { return x + width; }
-  T YMost() const { return y + height; }
-
-  // Scale 'this' by aScale, converting coordinates to integers so that the result is
-  // the smallest integer-coordinate rectangle containing the unrounded result.
-  void ScaleRoundOut(double aScale) { ScaleRoundOut(aScale, aScale); }
-  void ScaleRoundOut(double aXScale, double aYScale)
-  {
-    T right = static_cast<T>(NS_ceil(double(XMost()) * aXScale));
-    T bottom = static_cast<T>(NS_ceil(double(YMost()) * aYScale));
-    x = static_cast<T>(NS_floor(double(x) * aXScale));
-    y = static_cast<T>(NS_floor(double(y) * aYScale));
-    width = right - x;
-    height = bottom - y;
-  }
-
-private:
-  // Do not use the default operator== or operator!= !
-  // Use IsEqualEdges or IsEqualInterior explicitly.
-  bool operator==(const Sub& aRect) const { return false; }
-  bool operator!=(const Sub& aRect) const { return false; }
-};
-
-}
-
-#endif /* MOZILLA_BASERECT_H_ */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASERECT_H_
+#define MOZILLA_BASERECT_H_
+
+#include "nsAlgorithm.h"
+
+namespace mozilla {
+
+/**
+ * Rectangles have two interpretations: a set of (zero-size) points,
+ * and a rectangular area of the plane. Most rectangle operations behave
+ * the same no matter what interpretation is being used, but some operations
+ * differ:
+ * -- Equality tests behave differently. When a rectangle represents an area,
+ * all zero-width and zero-height rectangles are equal to each other since they
+ * represent the empty area. But when a rectangle represents a set of
+ * mathematical points, zero-width and zero-height rectangles can be unequal.
+ * -- The union operation can behave differently. When rectangles represent
+ * areas, taking the union of a zero-width or zero-height rectangle with
+ * another rectangle can just ignore the empty rectangle. But when rectangles
+ * represent sets of mathematical points, we may need to extend the latter
+ * rectangle to include the points of a zero-width or zero-height rectangle.
+ *
+ * To ensure that these interpretations are explicitly disambiguated, we
+ * deny access to the == and != operators and require use of IsEqualEdges and
+ * IsEqualInterior instead. Similarly we provide separate Union and UnionEdges
+ * methods.
+ *
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass.
+ */
+template <class T, class Sub, class Point, class SizeT, class Margin>
+struct BaseRect {
+  T x, y, width, height;
+
+  // Constructors
+  BaseRect() : x(0), y(0), width(0), height(0) {}
+  BaseRect(const Point& aOrigin, const SizeT &aSize) :
+      x(aOrigin.x), y(aOrigin.y), width(aSize.width), height(aSize.height)
+  {
+  }
+  BaseRect(T aX, T aY, T aWidth, T aHeight) :
+      x(aX), y(aY), width(aWidth), height(aHeight)
+  {
+  }
+
+  // Emptiness. An empty rect is one that has no area, i.e. its height or width
+  // is <= 0
+  bool IsEmpty() const { return height <= 0 || width <= 0; }
+  void SetEmpty() { width = height = 0; }
+
+  // Returns true if this rectangle contains the interior of aRect. Always
+  // returns true if aRect is empty, and always returns false is aRect is
+  // nonempty but this rect is empty.
+  bool Contains(const Sub& aRect) const
+  {
+    return aRect.IsEmpty() ||
+           (x <= aRect.x && aRect.XMost() <= XMost() &&
+            y <= aRect.y && aRect.YMost() <= YMost());
+  }
+  // Returns true if this rectangle contains the rectangle (aX,aY,1,1).
+  bool Contains(T aX, T aY) const
+  {
+    return x <= aX && aX + 1 <= XMost() &&
+           y <= aY && aY + 1 <= YMost();
+  }
+  // Returns true if this rectangle contains the rectangle (aPoint.x,aPoint.y,1,1).
+  bool Contains(const Point& aPoint) const { return Contains(aPoint.x, aPoint.y); }
+
+  // Intersection. Returns TRUE if the receiver's area has non-empty
+  // intersection with aRect's area, and FALSE otherwise.
+  // Always returns false if aRect is empty or 'this' is empty.
+  bool Intersects(const Sub& aRect) const
+  {
+    return x < aRect.XMost() && aRect.x < XMost() &&
+           y < aRect.YMost() && aRect.y < YMost();
+  }
+  // Returns the rectangle containing the intersection of the points
+  // (including edges) of *this and aRect. If there are no points in that
+  // intersection, returns an empty rectangle with x/y set to the max of the x/y
+  // of *this and aRect.
+  Sub Intersect(const Sub& aRect) const
+  {
+    Sub result;
+    result.x = NS_MAX(x, aRect.x);
+    result.y = NS_MAX(y, aRect.y);
+    result.width = NS_MIN(XMost(), aRect.XMost()) - result.x;
+    result.height = NS_MIN(YMost(), aRect.YMost()) - result.y;
+    if (result.width < 0 || result.height < 0) {
+      result.SizeTo(0, 0);
+    }
+    return result;
+  }
+  // Sets *this to be the rectangle containing the intersection of the points
+  // (including edges) of *this and aRect. If there are no points in that
+  // intersection, sets *this to be an empty rectangle with x/y set to the max
+  // of the x/y of *this and aRect.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  bool IntersectRect(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.Intersect(aRect2);
+    return !IsEmpty();
+  }
+
+  // Returns the smallest rectangle that contains both the area of both
+  // this and aRect2.
+  // Thus, empty input rectangles are ignored.
+  // If both rectangles are empty, returns this.
+  Sub Union(const Sub& aRect) const
+  {
+    if (IsEmpty()) {
+      return aRect;
+    } else if (aRect.IsEmpty()) {
+      return *static_cast<const Sub*>(this);
+    } else {
+      return UnionEdges(aRect);
+    }
+  }
+  // Returns the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
+  Sub UnionEdges(const Sub& aRect) const
+  {
+    Sub result;
+    result.x = NS_MIN(x, aRect.x);
+    result.y = NS_MIN(y, aRect.y);
+    result.width = NS_MAX(XMost(), aRect.XMost()) - result.x;
+    result.height = NS_MAX(YMost(), aRect.YMost()) - result.y;
+    return result;
+  }
+  // Computes the smallest rectangle that contains both the area of both
+  // aRect1 and aRect2, and fills 'this' with the result.
+  // Thus, empty input rectangles are ignored.
+  // If both rectangles are empty, sets 'this' to aRect2.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  void UnionRect(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.Union(aRect2);
+  }
+
+  // Computes the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
+  //
+  // 'this' can be the same object as either aRect1 or aRect2
+  void UnionRectEdges(const Sub& aRect1, const Sub& aRect2)
+  {
+    *static_cast<Sub*>(this) = aRect1.UnionEdges(aRect2);
+  }
+
+  void SetRect(T aX, T aY, T aWidth, T aHeight)
+  {
+    x = aX; y = aY; width = aWidth; height = aHeight;
+  }
+  void SetRect(const Point& aPt, const SizeT& aSize)
+  {
+    SetRect(aPt.x, aPt.y, aSize.width, aSize.height);
+  }
+  void MoveTo(T aX, T aY) { x = aX; y = aY; }
+  void MoveTo(const Point& aPoint) { x = aPoint.x; y = aPoint.y; }
+  void MoveBy(T aDx, T aDy) { x += aDx; y += aDy; }
+  void MoveBy(const Point& aPoint) { x += aPoint.x; y += aPoint.y; }
+  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
+  void SizeTo(const SizeT& aSize) { width = aSize.width; height = aSize.height; }
+
+  void Inflate(T aD) { Inflate(aD, aD); }
+  void Inflate(T aDx, T aDy)
+  {
+    x -= aDx;
+    y -= aDy;
+    width += 2 * aDx;
+    height += 2 * aDy;
+  }
+  void Inflate(const Margin& aMargin)
+  {
+    x -= aMargin.left;
+    y -= aMargin.top;
+    width += aMargin.LeftRight();
+    height += aMargin.TopBottom();
+  }
+  void Inflate(const SizeT& aSize) { Inflate(aSize.width, aSize.height); }
+
+  void Deflate(T aD) { Deflate(aD, aD); }
+  void Deflate(T aDx, T aDy)
+  {
+    x += aDx;
+    y += aDy;
+    width = NS_MAX(T(0), width - 2 * aDx);
+    height = NS_MAX(T(0), height - 2 * aDy);
+  }
+  void Deflate(const Margin& aMargin)
+  {
+    x += aMargin.left;
+    y += aMargin.top;
+    width = NS_MAX(T(0), width - aMargin.LeftRight());
+    height = NS_MAX(T(0), height - aMargin.TopBottom());
+  }
+  void Deflate(const SizeT& aSize) { Deflate(aSize.width, aSize.height); }
+
+  // Return true if the rectangles contain the same set of points, including
+  // points on the edges.
+  // Use when we care about the exact x/y/width/height values being
+  // equal (i.e. we care about differences in empty rectangles).
+  bool IsEqualEdges(const Sub& aRect) const
+  {
+    return x == aRect.x && y == aRect.y &&
+           width == aRect.width && height == aRect.height;
+  }
+  // Return true if the rectangles contain the same area of the plane.
+  // Use when we do not care about differences in empty rectangles.
+  bool IsEqualInterior(const Sub& aRect) const
+  {
+    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
+  }
+
+  Sub operator+(const Point& aPoint) const
+  {
+    return Sub(x + aPoint.x, y + aPoint.y, width, height);
+  }
+  Sub operator-(const Point& aPoint) const
+  {
+    return Sub(x - aPoint.x, y - aPoint.y, width, height);
+  }
+  Sub& operator+=(const Point& aPoint)
+  {
+    MoveBy(aPoint);
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Point& aPoint)
+  {
+    MoveBy(-aPoint);
+    return *static_cast<Sub*>(this);
+  }
+
+  // Find difference as a Margin
+  Margin operator-(const Sub& aRect) const
+  {
+    return Margin(aRect.x - x, aRect.y - y,
+                  XMost() - aRect.XMost(), YMost() - aRect.YMost());
+  }
+
+  // Helpers for accessing the vertices
+  Point TopLeft() const { return Point(x, y); }
+  Point TopRight() const { return Point(XMost(), y); }
+  Point BottomLeft() const { return Point(x, YMost()); }
+  Point BottomRight() const { return Point(XMost(), YMost()); }
+  Point Center() const { return Point(x, y) + Point(width, height)/2; }
+  SizeT Size() const { return SizeT(width, height); }
+
+  // Helper methods for computing the extents
+  T X() const { return x; }
+  T Y() const { return y; }
+  T Width() const { return width; }
+  T Height() const { return height; }
+  T XMost() const { return x + width; }
+  T YMost() const { return y + height; }
+
+  // Scale 'this' by aScale, converting coordinates to integers so that the result is
+  // the smallest integer-coordinate rectangle containing the unrounded result.
+  void ScaleRoundOut(double aScale) { ScaleRoundOut(aScale, aScale); }
+  void ScaleRoundOut(double aXScale, double aYScale)
+  {
+    T right = static_cast<T>(NS_ceil(double(XMost()) * aXScale));
+    T bottom = static_cast<T>(NS_ceil(double(YMost()) * aYScale));
+    x = static_cast<T>(NS_floor(double(x) * aXScale));
+    y = static_cast<T>(NS_floor(double(y) * aYScale));
+    width = right - x;
+    height = bottom - y;
+  }
+
+private:
+  // Do not use the default operator== or operator!= !
+  // Use IsEqualEdges or IsEqualInterior explicitly.
+  bool operator==(const Sub& aRect) const { return false; }
+  bool operator!=(const Sub& aRect) const { return false; }
+};
+
+}
+
+#endif /* MOZILLA_BASERECT_H_ */
diff --git a/gfx/src/BaseSize.h b/gfx/src/BaseSize.h
index 5cb3ba58de5..f995b337261 100644
--- a/gfx/src/BaseSize.h
+++ b/gfx/src/BaseSize.h
@@ -1,101 +1,101 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Corporation code.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert O'Callahan <robert@ocallahan.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MOZILLA_BASESIZE_H_
-#define MOZILLA_BASESIZE_H_
-
-namespace mozilla {
-
-/**
- * Do not use this class directly. Subclass it, pass that subclass as the
- * Sub parameter, and only use that subclass. This allows methods to safely
- * cast 'this' to 'Sub*'.
- */
-template <class T, class Sub>
-struct BaseSize {
-  T width, height;
-
-  // Constructors
-  BaseSize() : width(0), height(0) {}
-  BaseSize(T aWidth, T aHeight) : width(aWidth), height(aHeight) {}
-
-  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
-
-  // Note that '=' isn't defined so we'll get the
-  // compiler generated default assignment operator
-
-  bool operator==(const Sub& aSize) const {
-    return width == aSize.width && height == aSize.height;
-  }
-  bool operator!=(const Sub& aSize) const {
-    return width != aSize.width || height != aSize.height;
-  }
-  bool operator<=(const Sub& aSize) const {
-    return width <= aSize.width && height <= aSize.height;
-  }
-  bool operator<(const Sub& aSize) const {
-    return *this <= aSize && *this != aSize;
-  }
-
-  Sub operator+(const Sub& aSize) const {
-    return Sub(width + aSize.width, height + aSize.height);
-  }
-  Sub operator-(const Sub& aSize) const {
-    return Sub(width - aSize.width, height - aSize.height);
-  }
-  Sub& operator+=(const Sub& aSize) {
-    width += aSize.width;
-    height += aSize.height;
-    return *static_cast<Sub*>(this);
-  }
-  Sub& operator-=(const Sub& aSize) {
-    width -= aSize.width;
-    height -= aSize.height;
-    return *static_cast<Sub*>(this);
-  }
-
-  Sub operator*(T aScale) const {
-    return Sub(width * aScale, height * aScale);
-  }
-  Sub operator/(T aScale) const {
-    return Sub(width / aScale, height / aScale);
-  }
-};
-
-}
-
-#endif /* MOZILLA_BASESIZE_H_ */
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Corporation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert O'Callahan <robert@ocallahan.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MOZILLA_BASESIZE_H_
+#define MOZILLA_BASESIZE_H_
+
+namespace mozilla {
+
+/**
+ * Do not use this class directly. Subclass it, pass that subclass as the
+ * Sub parameter, and only use that subclass. This allows methods to safely
+ * cast 'this' to 'Sub*'.
+ */
+template <class T, class Sub>
+struct BaseSize {
+  T width, height;
+
+  // Constructors
+  BaseSize() : width(0), height(0) {}
+  BaseSize(T aWidth, T aHeight) : width(aWidth), height(aHeight) {}
+
+  void SizeTo(T aWidth, T aHeight) { width = aWidth; height = aHeight; }
+
+  // Note that '=' isn't defined so we'll get the
+  // compiler generated default assignment operator
+
+  bool operator==(const Sub& aSize) const {
+    return width == aSize.width && height == aSize.height;
+  }
+  bool operator!=(const Sub& aSize) const {
+    return width != aSize.width || height != aSize.height;
+  }
+  bool operator<=(const Sub& aSize) const {
+    return width <= aSize.width && height <= aSize.height;
+  }
+  bool operator<(const Sub& aSize) const {
+    return *this <= aSize && *this != aSize;
+  }
+
+  Sub operator+(const Sub& aSize) const {
+    return Sub(width + aSize.width, height + aSize.height);
+  }
+  Sub operator-(const Sub& aSize) const {
+    return Sub(width - aSize.width, height - aSize.height);
+  }
+  Sub& operator+=(const Sub& aSize) {
+    width += aSize.width;
+    height += aSize.height;
+    return *static_cast<Sub*>(this);
+  }
+  Sub& operator-=(const Sub& aSize) {
+    width -= aSize.width;
+    height -= aSize.height;
+    return *static_cast<Sub*>(this);
+  }
+
+  Sub operator*(T aScale) const {
+    return Sub(width * aScale, height * aScale);
+  }
+  Sub operator/(T aScale) const {
+    return Sub(width / aScale, height / aScale);
+  }
+};
+
+}
+
+#endif /* MOZILLA_BASESIZE_H_ */
diff --git a/gfx/src/nsITheme.h b/gfx/src/nsITheme.h
index 4dbf319bd4c..a6f5816976f 100644
--- a/gfx/src/nsITheme.h
+++ b/gfx/src/nsITheme.h
@@ -59,9 +59,9 @@ class nsIAtom;
 class nsIWidget;
 
 // IID for the nsITheme interface
-// {887e8902-db6b-41b4-8481-a80f49c5a93a}
+// {b0f3efe9-0bd4-4f6b-8daa-0ec7f6006822}
  #define NS_ITHEME_IID     \
-{ 0x23db7c13, 0x873d, 0x4fb5, { 0xaf, 0x29, 0xc1, 0xe9, 0xed, 0x91, 0x23, 0xf9 } }
+{ 0xb0f3efe9, 0x0bd4, 0x4f6b, { 0x8d, 0xaa, 0x0e, 0xc7, 0xf6, 0x00, 0x68, 0x22 } }
 // {D930E29B-6909-44e5-AB4B-AF10D6923705}
 #define NS_THEMERENDERER_CID \
 { 0xd930e29b, 0x6909, 0x44e5, { 0xab, 0x4b, 0xaf, 0x10, 0xd6, 0x92, 0x37, 0x5 } }
@@ -101,13 +101,6 @@ public:
                                   const nsRect& aRect,
                                   const nsRect& aDirtyRect) = 0;
 
-  /**
-   * XXX Unused. This is only here because the interface is frozen for 2.0.
-   */
-  virtual void RegisterWidgetGeometry(nsIWidget* aWindow,
-                                      PRUint8 aWidgetType,
-                                      const nsIntRect& aRect) {}
-
   /**
    * Get the computed CSS border for the widget, in pixels.
    */
diff --git a/gfx/src/nsRect.h b/gfx/src/nsRect.h
index c5557633123..c736d3acf87 100644
--- a/gfx/src/nsRect.h
+++ b/gfx/src/nsRect.h
@@ -118,7 +118,7 @@ struct NS_GFX nsIntRect :
   }
 
   inline nsRect ToAppUnits(nscoord aAppUnitsPerPixel) const;
-
+
   // Returns a special nsIntRect that's used in some places to signify
   // "all available space".
   static const nsIntRect& GetMaxSizedIntRect() { return kMaxSizedIntRect; }
diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index b77425c9d98..858010d0a6c 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -1308,22 +1308,22 @@ nsRegion& nsRegion::ExtendForScaling (float aXMult, float aYMult)
   *this = region;
   return *this;
 }
-
-nsRegion& nsRegion::ScaleRoundOut (float aXScale, float aYScale)
-{
-  nsRegion region;
-  nsRegionRectIterator iter(*this);
-  for (;;) {
-    const nsRect* r = iter.Next();
-    if (!r)
-      break;
-    nsRect rect = *r;
-    rect.ScaleRoundOut(aXScale, aYScale);
-    region.Or(region, rect);
-  }
-  *this = region;
-  return *this;
-}
+
+nsRegion& nsRegion::ScaleRoundOut (float aXScale, float aYScale)
+{
+  nsRegion region;
+  nsRegionRectIterator iter(*this);
+  for (;;) {
+    const nsRect* r = iter.Next();
+    if (!r)
+      break;
+    nsRect rect = *r;
+    rect.ScaleRoundOut(aXScale, aYScale);
+    region.Or(region, rect);
+  }
+  *this = region;
+  return *this;
+}
 
 nsRegion nsRegion::ConvertAppUnitsRoundOut (PRInt32 aFromAPP, PRInt32 aToAPP) const
 {
diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h
index 4cab3f50da0..abdce9d8b49 100644
--- a/gfx/src/nsRegion.h
+++ b/gfx/src/nsRegion.h
@@ -441,12 +441,12 @@ public:
   {
     return FromRect (mImpl.GetLargestRectangle( ToRect(aContainingRect) ));
   }
-
-  nsIntRegion& ScaleRoundOut (float aXScale, float aYScale)
-  {
-    mImpl.ScaleRoundOut(aXScale, aYScale);
-    return *this;
-  }
+
+  nsIntRegion& ScaleRoundOut (float aXScale, float aYScale)
+  {
+    mImpl.ScaleRoundOut(aXScale, aYScale);
+    return *this;
+  }
 
   nsIntRegion& ExtendForScaling (float aXMult, float aYMult)
   {
diff --git a/gfx/thebes/GLContext.cpp b/gfx/thebes/GLContext.cpp
index fbc2ba00d76..5dd535c5e76 100644
--- a/gfx/thebes/GLContext.cpp
+++ b/gfx/thebes/GLContext.cpp
@@ -933,23 +933,83 @@ GLContext::DeleteOffscreenFBO()
 void
 GLContext::ClearSafely()
 {
-    GLfloat clearColor[4];
-    GLfloat clearDepth;
-    GLint clearStencil;
+    // bug 659349 --- we must be very careful here: clearing a GL framebuffer is nontrivial, relies on a lot of state,
+    // and in the case of the backbuffer of a WebGL context, state is exposed to scripts.
+    //
+    // The code here is taken from WebGLContext::ForceClearFramebufferWithDefaultValues, but I didn't find a good way of
+    // sharing code with it. WebGL's code is somewhat performance-critical as it is typically called on every frame, so
+    // WebGL keeps track of GL state to avoid having to query it everytime, and also tries to only do work for actually
+    // present buffers (e.g. stencil buffer). Doing that here seems like premature optimization,
+    // as ClearSafely() is called only when e.g. a canvas is resized, not on every animation frame.
 
-    fGetFloatv(LOCAL_GL_COLOR_CLEAR_VALUE, clearColor);
-    fGetFloatv(LOCAL_GL_DEPTH_CLEAR_VALUE, &clearDepth);
-    fGetIntegerv(LOCAL_GL_STENCIL_CLEAR_VALUE, &clearStencil);
+    realGLboolean scissorTestEnabled;
+    realGLboolean ditherEnabled;
+    realGLboolean colorWriteMask[4];
+    realGLboolean depthWriteMask;
+    GLint stencilWriteMaskFront, stencilWriteMaskBack;
+    GLfloat colorClearValue[4];
+    GLfloat depthClearValue;
+    GLint stencilClearValue;
 
-    fClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-    fClearStencil(0);
+    // save current GL state
+    fGetBooleanv(LOCAL_GL_SCISSOR_TEST, &scissorTestEnabled);
+    fGetBooleanv(LOCAL_GL_DITHER, &ditherEnabled);
+    fGetBooleanv(LOCAL_GL_COLOR_WRITEMASK, colorWriteMask);
+    fGetBooleanv(LOCAL_GL_DEPTH_WRITEMASK, &depthWriteMask);
+    fGetIntegerv(LOCAL_GL_STENCIL_WRITEMASK, &stencilWriteMaskFront);
+    fGetIntegerv(LOCAL_GL_STENCIL_BACK_WRITEMASK, &stencilWriteMaskBack);
+    fGetFloatv(LOCAL_GL_COLOR_CLEAR_VALUE, colorClearValue);
+    fGetFloatv(LOCAL_GL_DEPTH_CLEAR_VALUE, &depthClearValue);
+    fGetIntegerv(LOCAL_GL_STENCIL_CLEAR_VALUE, &stencilClearValue);
+
+    // prepare GL state for clearing
+    fDisable(LOCAL_GL_SCISSOR_TEST);
+    fDisable(LOCAL_GL_DITHER);
+    PushViewportRect(nsIntRect(0, 0, mOffscreenSize.width, mOffscreenSize.height));
+
+    fColorMask(1, 1, 1, 1);
+    fClearColor(0.f, 0.f, 0.f, 0.f);
+
+    fDepthMask(1);
     fClearDepth(1.0f);
 
-    fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT | LOCAL_GL_STENCIL_BUFFER_BIT);
+    fStencilMask(0xffffffff);
+    fClearStencil(0);
+
+    // do clear
+    fClear(LOCAL_GL_COLOR_BUFFER_BIT |
+           LOCAL_GL_DEPTH_BUFFER_BIT |
+           LOCAL_GL_STENCIL_BUFFER_BIT);
+
+    // restore GL state after clearing
+    fColorMask(colorWriteMask[0],
+               colorWriteMask[1],
+               colorWriteMask[2],
+               colorWriteMask[3]);
+    fClearColor(colorClearValue[0],
+                colorClearValue[1],
+                colorClearValue[2],
+                colorClearValue[3]);
+
+    fDepthMask(depthWriteMask);
+    fClearDepth(depthClearValue);
+
+    fStencilMaskSeparate(LOCAL_GL_FRONT, stencilWriteMaskFront);
+    fStencilMaskSeparate(LOCAL_GL_BACK, stencilWriteMaskBack);
+    fClearStencil(stencilClearValue);
+
+    PopViewportRect();
+
+    if (ditherEnabled)
+        fEnable(LOCAL_GL_DITHER);
+    else
+        fDisable(LOCAL_GL_DITHER);
+
+    if (scissorTestEnabled)
+        fEnable(LOCAL_GL_SCISSOR_TEST);
+    else
+        fDisable(LOCAL_GL_SCISSOR_TEST);
 
-    fClearColor(clearColor[0], clearColor[1], clearColor[2], clearColor[3]);
-    fClearStencil(clearStencil);
-    fClearDepth(clearDepth);
 }
 
 void
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index 2f3d5bbfce1..64fe7d4428e 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -566,6 +566,7 @@ static const char *sSurfaceNamesForSurfaceType[] = {
     "explicit/gfx/surface/tee",
     "explicit/gfx/surface/xml",
     "explicit/gfx/surface/skia",
+    "explicit/gfx/surface/subsurface",
     "explicit/gfx/surface/d2d"
 };
 
diff --git a/gfx/thebes/gfxASurface.h b/gfx/thebes/gfxASurface.h
index e79a0e36538..960d54ff0af 100644
--- a/gfx/thebes/gfxASurface.h
+++ b/gfx/thebes/gfxASurface.h
@@ -98,6 +98,7 @@ public:
         SurfaceTypeTee,
         SurfaceTypeXML,
         SurfaceTypeSkia,
+        SurfaceTypeSubsurface,
         SurfaceTypeD2D,
         SurfaceTypeMax
     } gfxSurfaceType;
diff --git a/gfx/thebes/gfxCachedTempSurface.cpp b/gfx/thebes/gfxCachedTempSurface.cpp
index a165175e478..b480174315a 100644
--- a/gfx/thebes/gfxCachedTempSurface.cpp
+++ b/gfx/thebes/gfxCachedTempSurface.cpp
@@ -98,12 +98,12 @@ gfxCachedTempSurface::~gfxCachedTempSurface()
 
 already_AddRefed<gfxContext>
 gfxCachedTempSurface::Get(gfxASurface::gfxContentType aContentType,
-                          const gfxIntSize& aSize,
+                          const gfxRect& aRect,
                           gfxASurface* aSimilarTo)
 {
   if (mSurface) {
     /* Verify the current buffer is valid for this purpose */
-    if (mSize.width < aSize.width || mSize.height < aSize.height
+    if (mSize.width < aRect.width || mSize.height < aRect.height
         || mSurface->GetContentType() != aContentType) {
       mSurface = nsnull;
     } else {
@@ -114,8 +114,8 @@ gfxCachedTempSurface::Get(gfxASurface::gfxContentType aContentType,
 
   PRBool cleared = PR_FALSE;
   if (!mSurface) {
-    mSize = aSize;
-    mSurface = aSimilarTo->CreateSimilarSurface(aContentType, aSize);
+    mSize = gfxIntSize(PRInt32(NS_ceil(aRect.width)), PRInt32(NS_ceil(aRect.height)));
+    mSurface = aSimilarTo->CreateSimilarSurface(aContentType, mSize);
     if (!mSurface)
       return nsnull;
 
@@ -124,9 +124,10 @@ gfxCachedTempSurface::Get(gfxASurface::gfxContentType aContentType,
     mType = aSimilarTo->GetType();
 #endif
   }
+  mSurface->SetDeviceOffset(-aRect.TopLeft());
 
   nsRefPtr<gfxContext> ctx = new gfxContext(mSurface);
-  ctx->Rectangle(gfxRect(0, 0, aSize.width, aSize.height));
+  ctx->Rectangle(aRect);
   ctx->Clip();
   if (!cleared && aContentType != gfxASurface::CONTENT_COLOR) {
     ctx->SetOperator(gfxContext::OPERATOR_CLEAR);
diff --git a/gfx/thebes/gfxCachedTempSurface.h b/gfx/thebes/gfxCachedTempSurface.h
index b3dbce37f39..3904cbe32ff 100644
--- a/gfx/thebes/gfxCachedTempSurface.h
+++ b/gfx/thebes/gfxCachedTempSurface.h
@@ -71,13 +71,15 @@ public:
    * different format.
    */
   already_AddRefed<gfxContext> Get(gfxASurface::gfxContentType aContentType,
-                                   const gfxIntSize& aSize,
+                                   const gfxRect& aRect,
                                    gfxASurface* aSimilarTo);
 
   void Expire() { mSurface = nsnull; }
   nsExpirationState* GetExpirationState() { return &mExpirationState; }
   ~gfxCachedTempSurface();
 
+  PRBool IsSurface(gfxASurface* aSurface) { return mSurface == aSurface; }
+
 private:
   nsRefPtr<gfxASurface> mSurface;
   gfxIntSize mSize;
diff --git a/gfx/thebes/gfxDrawable.cpp b/gfx/thebes/gfxDrawable.cpp
index c9d8ca3269a..b19691de5fe 100644
--- a/gfx/thebes/gfxDrawable.cpp
+++ b/gfx/thebes/gfxDrawable.cpp
@@ -38,6 +38,7 @@
 #include "gfxASurface.h"
 #include "gfxContext.h"
 #include "gfxPlatform.h"
+#include "mozilla/arm.h"
 #ifdef MOZ_X11
 #include "cairo.h"
 #include "gfxXlibSurface.h"
@@ -128,12 +129,6 @@ PreparePatternForUntiledDrawing(gfxPattern* aPattern,
             break;
         }
 
-        case gfxASurface::SurfaceTypeQuartz:
-        case gfxASurface::SurfaceTypeQuartzImage:
-            // Don't set EXTEND_PAD, Mac seems to be OK. Really?
-            aPattern->SetFilter(aDefaultFilter);
-            break;
-
         default:
             // turn on EXTEND_PAD.
             // This is what we really want for all surface types, if the
@@ -173,7 +168,9 @@ gfxSurfaceDrawable::Draw(gfxContext* aContext,
                                         surfaceType, currentTarget, filter);
     }
 #ifdef MOZ_GFX_OPTIMIZE_MOBILE
-    pattern->SetFilter(gfxPattern::FILTER_FAST); 
+    if (!mozilla::supports_neon()) {
+        pattern->SetFilter(gfxPattern::FILTER_FAST);
+    }
 #endif
     pattern->SetMatrix(gfxMatrix(aTransform).Multiply(mTransform));
     aContext->NewPath();
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 2abbfcd9eb9..f375c799949 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -4194,7 +4194,7 @@ gfxTextRun::CopyGlyphDataFrom(gfxTextRun *aSource, PRUint32 aStart,
         // different fonts to a base character and a following diacritic.
         // Example on OSX 10.5/10.6 with default fonts installed:
         //     data:text/html,<p style="font-family:helvetica, arial, sans-serif;">
-        //                    &#x043E;&#x0486;&#x20;&#x043E;&#x0486;
+        //                    &%23x043E;&%23x0486;&%23x20;&%23x043E;&%23x0486;
         // This means the rendering of the cluster will probably not be very good,
         // but it's the best we can do for now if the specified font only covered the
         // initial base character and not its applied marks.
diff --git a/gfx/thebes/gfxQPainterSurface.cpp b/gfx/thebes/gfxQPainterSurface.cpp
index de12c1ef865..b95e42d9f78 100644
--- a/gfx/thebes/gfxQPainterSurface.cpp
+++ b/gfx/thebes/gfxQPainterSurface.cpp
@@ -37,12 +37,10 @@
 
 #include <assert.h>
 
-#include "gfxQPainterSurface.h"
-
+#include "cairo-features.h"
 #ifdef CAIRO_HAS_QT_SURFACE
-#include "gfxImageSurface.h"
-
 #include "cairo-qt.h"
+#include "gfxQPainterSurface.h"
 
 gfxQPainterSurface::gfxQPainterSurface(QPainter *painter)
 {
diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp
index 2da74766561..01ef71ce82c 100644
--- a/gfx/thebes/gfxTeeSurface.cpp
+++ b/gfx/thebes/gfxTeeSurface.cpp
@@ -37,14 +37,7 @@
 
 #include "gfxTeeSurface.h"
 
-/* Once cairo in tree is update ensure we remove the ifdef
-    and just include cairo-tee.h
-*/
-#ifdef MOZ_TREE_CAIRO
-#include "cairo.h"
-#else
 #include "cairo-tee.h"
-#endif
 
 gfxTeeSurface::gfxTeeSurface(cairo_surface_t *csurf)
 {
diff --git a/intl/locale/src/charsetalias.properties b/intl/locale/src/charsetalias.properties
index d8ab684bc85..83182209849 100644
--- a/intl/locale/src/charsetalias.properties
+++ b/intl/locale/src/charsetalias.properties
@@ -314,7 +314,7 @@ zh_tw-big5=Big5
 #
 # Aliases for EUC-KR
 #
-csueckr=EUC-KR
+cseuckr=EUC-KR
 # The following are really not aliases EUC-KR, add them only for MS FrontPage
 #ks_c_5601-1987=EUC-KR
 iso-ir-149=EUC-KR
diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in
index 251c0656694..0ae4ea303d9 100644
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -54,7 +54,11 @@ CPPSRCS		= \
 		nsPosixLocale.cpp \
 		$(NULL)
 
+ifeq (android,$(MOZ_WIDGET_TOOLKIT))
+CPPSRCS		+= nsAndroidCharset.cpp
+else
 CPPSRCS		+= nsUNIXCharset.cpp
+endif
 
 ifdef ENABLE_TESTS
 DIRS		+= tests
diff --git a/content/html/content/src/nsImageMapUtils.h b/intl/locale/src/unix/nsAndroidCharset.cpp
similarity index 61%
rename from content/html/content/src/nsImageMapUtils.h
rename to intl/locale/src/unix/nsAndroidCharset.cpp
index 34bf534b913..ff90ae7ffd2 100644
--- a/content/html/content/src/nsImageMapUtils.h
+++ b/intl/locale/src/unix/nsAndroidCharset.cpp
@@ -14,9 +14,8 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * The Initial Developer of the Original Code is The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
@@ -35,34 +34,53 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/**
- * Utilities to help manage image maps. These are needed in more than one
- * library.
- */
+#include "nsIPlatformCharset.h"
+#include "nsPlatformCharset.h"
 
-#ifndef nsImageMapUtils_h___
-#define nsImageMapUtils_h___
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset)
 
-class nsIDocument;
-class nsIDOMHTMLMapElement;
-#include "nsAString.h"
+nsPlatformCharset::nsPlatformCharset()
+{
+}
 
-class nsImageMapUtils {
-  // This class is not to be constructed, use the static member functions only
-  nsImageMapUtils();
-  ~nsImageMapUtils();
+nsPlatformCharset::~nsPlatformCharset()
+{
+}
 
-public:
+NS_IMETHODIMP 
+nsPlatformCharset::Init()
+{
+  return NS_OK;
+}
 
-  /**
-   * FindImageMap tries to find a map element from a document.
-   *
-   * @param aDocument [in]  The document to be searched.
-   * @param aUsemap   [in]  The value of the usemap attribute.
-   * @return          The first found (if any) map element, addrefed.
-   */
-  static already_AddRefed<nsIDOMHTMLMapElement>
-         FindImageMap(nsIDocument *aDocument, const nsAString &aUsemap);
-};
+NS_IMETHODIMP 
+nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
+{
+  oResult.AssignLiteral("UTF-8");
+  return NS_OK;
+}
 
-#endif
+NS_IMETHODIMP 
+nsPlatformCharset::GetDefaultCharsetForLocale(const nsAString& localeName, nsACString &oResult)
+{
+  oResult.AssignLiteral("UTF-8");
+  return NS_OK;
+}
+
+nsresult
+nsPlatformCharset::ConvertLocaleToCharsetUsingDeprecatedConfig(nsAString& locale, nsACString& oResult)
+{
+  return NS_OK;
+}
+
+nsresult
+nsPlatformCharset::InitGetCharset(nsACString &oString)
+{
+  return NS_OK;
+}
+
+nsresult
+nsPlatformCharset::VerifyCharset(nsCString &aCharset)
+{
+  return NS_OK;
+}
diff --git a/intl/uconv/idl/nsICharsetConverterManager.idl b/intl/uconv/idl/nsICharsetConverterManager.idl
index ade2e42fbf3..044b4f49209 100644
--- a/intl/uconv/idl/nsICharsetConverterManager.idl
+++ b/intl/uconv/idl/nsICharsetConverterManager.idl
@@ -66,7 +66,7 @@ interface nsIUTF8StringEnumerator;
  * @created         21/Feb/2000
  * @author  Catalin Rotaru [CATA]
  */
-[scriptable, uuid(6aba73aa-be22-46a9-bf81-c117557f65b5)]
+[scriptable, uuid(bf733b00-198f-4553-a061-637a21793330)]
 interface nsICharsetConverterManager : nsISupports
 {
     /**
@@ -76,17 +76,17 @@ interface nsICharsetConverterManager : nsISupports
      *  will return NS_ERROR_UCONV_NOCONV if the requested charsets is
      *  vulnerable to XSS attacks and should not be used with untrusted input
      */
-    nsIUnicodeDecoder getUnicodeDecoder(in string charset);
-    nsIUnicodeDecoder getUnicodeDecoderRaw(in string charset);
-    nsIUnicodeDecoder getUnicodeDecoderInternal(in string charset);
-    nsIUnicodeDecoder getUnicodeDecoderRawInternal(in string charset);
+    [noscript] nsIUnicodeDecoder getUnicodeDecoder(in string charset);
+    [noscript] nsIUnicodeDecoder getUnicodeDecoderRaw(in string charset);
+    [noscript] nsIUnicodeDecoder getUnicodeDecoderInternal(in string charset);
+    [noscript] nsIUnicodeDecoder getUnicodeDecoderRawInternal(in string charset);
 
     /**
      * Get the Unicode encoder for the given charset.
      * The "Raw" version skips charset alias resolution
      */
-    nsIUnicodeEncoder getUnicodeEncoder(in string charset);
-    nsIUnicodeEncoder getUnicodeEncoderRaw(in string charset);
+    [noscript] nsIUnicodeEncoder getUnicodeEncoder(in string charset);
+    [noscript] nsIUnicodeEncoder getUnicodeEncoderRaw(in string charset);
 
     /**
      * A shortcut to calling nsICharsetAlias to do alias resolution
diff --git a/intl/uconv/util/uscan.c b/intl/uconv/util/uscan.c
index 381c2ae6d2c..1701f05782c 100644
--- a/intl/uconv/util/uscan.c
+++ b/intl/uconv/util/uscan.c
@@ -373,14 +373,14 @@ PRIVATE PRBool uCheckAndScanAlways2ByteGR128(
 {
   /*
    * The first byte should be in  [0xa1,0xfe] 
-   * and the second byte can take any value with MSB = 1.
+   * and the second byte in [0x41,0xfe]
    * Used by CP949 -> Unicode converter.
    * Only 2nd byte range needs to be checked because 
-   * 1st byte is checked before calling this in nsUnicodeDecoerHelper.cpp 
+   * 1st byte is checked before calling this in nsUnicodeDecoderHelper.cpp 
    */
   if(inbuflen < 2)    /* will lead to NS_OK_UDEC_MOREINPUT */
     return PR_FALSE;
-  else if (!(in[1] & 0x80))     /* 2nd byte range check */
+  else if (in[1] < 0x41)     /* 2nd byte range check */
   {
     *inscanlen = 2; 
     *out = 0xFF;  /* for 2-byte table, uMap() is guaranteed to fail for 0xFF. */
diff --git a/ipc/chromium/src/base/file_path.h b/ipc/chromium/src/base/file_path.h
index 99cbc9d2d43..73aa6830f8c 100644
--- a/ipc/chromium/src/base/file_path.h
+++ b/ipc/chromium/src/base/file_path.h
@@ -247,7 +247,7 @@ class FilePath {
 #endif  // OS_WIN
 
 // Implement hash function so that we can use FilePaths in hashsets and maps.
-#if defined(COMPILER_GCC)
+#if defined(COMPILER_GCC) && !defined(ANDROID)
 namespace __gnu_cxx {
 
 template<>
diff --git a/ipc/chromium/src/base/hash_tables.h b/ipc/chromium/src/base/hash_tables.h
index c2dcde590fc..cd2fd4ecb1f 100644
--- a/ipc/chromium/src/base/hash_tables.h
+++ b/ipc/chromium/src/base/hash_tables.h
@@ -19,12 +19,17 @@
 
 #include "base/string16.h"
 
-#if defined(COMPILER_MSVC)
+#if defined(COMPILER_MSVC) || (defined(ANDROID) && defined(_STLP_STD_NAME))
 #include <hash_map>
 #include <hash_set>
 namespace base {
+#ifdef ANDROID
+using _STLP_STD_NAME::hash_map;
+using _STLP_STD_NAME::hash_set;
+#else
 using stdext::hash_map;
 using stdext::hash_set;
+#endif
 }
 #elif defined(COMPILER_GCC)
 // This is a hack to disable the gcc 4.4 warning about hash_map and hash_set
diff --git a/ipc/chromium/src/base/observer_list.h b/ipc/chromium/src/base/observer_list.h
index f67df14ea58..217f88bfc9d 100644
--- a/ipc/chromium/src/base/observer_list.h
+++ b/ipc/chromium/src/base/observer_list.h
@@ -12,6 +12,10 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 
+#if defined(ANDROID) && defined(_STLP_STD_NAME)
+using _STLP_STD_NAME::find;
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // OVERVIEW:
diff --git a/ipc/chromium/src/base/string_util.cc b/ipc/chromium/src/base/string_util.cc
index 1566ed651e3..51609e2935f 100644
--- a/ipc/chromium/src/base/string_util.cc
+++ b/ipc/chromium/src/base/string_util.cc
@@ -734,6 +734,8 @@ bool LowerCaseEqualsASCII(std::wstring::const_iterator a_begin,
                           const char* b) {
   return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
+
+#ifndef ANDROID
 bool LowerCaseEqualsASCII(const char* a_begin,
                           const char* a_end,
                           const char* b) {
@@ -744,7 +746,7 @@ bool LowerCaseEqualsASCII(const wchar_t* a_begin,
                           const char* b) {
   return DoLowerCaseEqualsASCII(a_begin, a_end, b);
 }
-
+#endif
 bool StartsWithASCII(const std::string& str,
                      const std::string& search,
                      bool case_sensitive) {
diff --git a/ipc/chromium/src/base/third_party/nspr/prtime.cc b/ipc/chromium/src/base/third_party/nspr/prtime.cc
index a44f0ebd04e..cd4545e456b 100644
--- a/ipc/chromium/src/base/third_party/nspr/prtime.cc
+++ b/ipc/chromium/src/base/third_party/nspr/prtime.cc
@@ -73,6 +73,9 @@
 #endif
 #include <errno.h>  /* for EINVAL */
 #include <time.h>
+#ifdef ANDROID
+#include <ctype.h>  /* for isalpha() */
+#endif
 
 namespace nspr {
 
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 8023b1750b0..efecd106a15 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -107,6 +107,9 @@ MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+NO_PROFILE_GUIDED_OPTIMIZE = 1
+endif
 
 # JavaScript must be built shared, even for static builds, as it is used by
 # other modules which are always built shared. Failure to do so results in
diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
index 68713cd4c81..81b2a27edec 100644
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -329,7 +329,7 @@
 /* PLATFORM(LINUX) */
 /* Operating system level dependencies for Linux-like systems that */
 /* should be used regardless of operating environment */
-#ifdef __linux__
+#if defined(__linux__) && !defined(ANDROID)
 #define WTF_PLATFORM_LINUX 1
 #endif
 
diff --git a/js/src/build/autoconf/config.sub b/js/src/build/autoconf/config.sub
index 72438295912..3fad4d74824 100755
--- a/js/src/build/autoconf/config.sub
+++ b/js/src/build/autoconf/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-04'
+timestamp='2011-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1432,6 +1432,9 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -android*)
+	        os=android
+                ;;
 	-none)
 		;;
 	*)
@@ -1686,6 +1689,9 @@ case $basic_machine in
 			-vos*)
 				vendor=stratus
 				;;
+			*-android*|*-linuxandroid*)
+				vendor=linux-
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt
index 87783c6532f..81a286596b1 100644
--- a/js/src/config/milestone.txt
+++ b/js/src/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-6.0a1
+7.0a1
diff --git a/js/src/configure.in b/js/src/configure.in
index 4f99e2e623f..7fcc643fe4a 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -255,7 +255,25 @@ MOZ_ARG_WITH_STRING(android-sdk,
                           location where the Android SDK can be found (base directory, e.g. .../android/platforms/android-6)],
     android_sdk=$withval)
 
-if test "$target" = "arm-android-eabi" ; then
+MOZ_ARG_WITH_STRING(android-platform,
+[  --with-android-platform=DIR
+                           location of platform dir, default NDK/build/platforms/android-5/arch-arm],
+    android_platform=$withval)
+
+case "$target" in
+arm-linux*-android*|*-linuxandroid*)
+    android_tool_prefix="arm-linux-androideabi"
+    ;;
+arm-android-eabi)
+    android_tool_prefix="arm-eabi"
+    ;;
+*)
+    android_tool_prefix="$target_os"
+    ;;
+esac
+
+case "$target" in
+*-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
         AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.])
     fi
@@ -278,24 +296,30 @@ if test "$target" = "arm-android-eabi" ; then
     fi
 
     dnl set up compilers
-    AS="$android_toolchain"/bin/arm-eabi-as
-    CC="$android_toolchain"/bin/arm-eabi-gcc
-    CXX="$android_toolchain"/bin/arm-eabi-g++
-    CPP="$android_toolchain"/bin/arm-eabi-cpp
-    LD="$android_toolchain"/bin/arm-eabi-ld
-    AR="$android_toolchain"/bin/arm-eabi-ar
-    RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
-    STRIP="$android_toolchain"/bin/arm-eabi-strip
+    AS="$android_toolchain"/bin/"$android_tool_prefix"-as
+    CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc
+    CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++
+    CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp
+    LD="$android_toolchain"/bin/"$android_tool_prefix"-ld
+    AR="$android_toolchain"/bin/"$android_tool_prefix"-ar
+    RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib
+    STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip
 
-    CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
+    if test -e "$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/libstlport_static.a" ; then
+       STLPORT_CPPFLAGS="-I$android_ndk/sources/cxx-stl/stlport/stlport"
+       STLPORT_LDFLAGS="-L$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a/  -lstlport_static"
+    fi
+
+    CPPFLAGS="-I$android_platform/usr/include $STLPORT_CPPFLAGS $CPPFLAGS"
     CFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CFLAGS"
     CXXFLAGS="-mandroid -I$android_platform/usr/include -fno-short-enums -fno-exceptions $CXXFLAGS"
+    LIBS="$LIBS $STLPORT_LDFLAGS"
 
     dnl Add -llog by default, since we use it all over the place.
     dnl Add --allow-shlib-undefined, because libGLESv2 links to an
     dnl undefined symbol (present on the hardware, just not in the
     dnl NDK.)
-    LDFLAGS="-mandroid -L$android_platform/usr/lib -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
+    LDFLAGS="-mandroid -L$android_platform/usr/lib -L$android_ndk/sources/cxx-stl/stlport/libs/armeabi-v7a -Wl,-rpath-link=$android_platform/usr/lib --sysroot=$android_platform -llog -Wl,--allow-shlib-undefined $LDFLAGS"
 
     dnl prevent cross compile section from using these flags as host flags
     if test -z "$HOST_CPPFLAGS" ; then
@@ -329,7 +353,8 @@ if test "$target" = "arm-android-eabi" ; then
     AC_SUBST(ANDROID_VERSION)
     CROSS_COMPILE=1
     MOZ_CHROME_FILE_FORMAT=omni
-fi
+    ;;
+esac
 
 AC_SUBST(ANDROID_NDK)
 AC_SUBST(ANDROID_TOOLCHAIN)
@@ -1207,7 +1232,7 @@ if test -n "$CROSS_COMPILE"; then
         darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
     esac
     case "${target}" in
-        arm-android-eabi) OS_ARCH=Linux OS_TARGET=Android ;;
+        *-android*|*-linuxandroid*) OS_ARCH=Linux OS_TARGET=Android ;;
     esac
 else
     OS_TARGET=`uname -s`
@@ -2085,6 +2110,23 @@ ia64*-hpux*)
     fi
     ;;
 
+*-android*|*-linuxandroid*)
+    AC_DEFINE(NO_PW_GECOS)
+    no_x=yes
+    _PLATFORM_DEFAULT_TOOLKIT=cairo-android
+    TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+
+    MOZ_GFX_OPTIMIZE_MOBILE=1
+    # If we're building with --enable-profiling, we need a frame pointer.
+    if test -z "$MOZ_PROFILING"; then
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fomit-frame-pointer"
+    else
+        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fno-omit-frame-pointer"
+    fi
+    # The Maemo builders don't know about this flag
+    MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
+    ;;
+
 *-*linux*)
     # Note: both GNU_CC and INTEL_CC are set when using Intel's C compiler.
     # Similarly for GNU_CXX and INTEL_CXX.
@@ -2613,23 +2655,6 @@ alpha*-*-osf*)
     HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
     ;;
 
-*-android*)
-    AC_DEFINE(NO_PW_GECOS)
-    no_x=yes
-    _PLATFORM_DEFAULT_TOOLKIT=cairo-android
-    TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-
-    MOZ_GFX_OPTIMIZE_MOBILE=1
-    # If we're building with --enable-profiling, we need a frame pointer.
-    if test -z "$MOZ_PROFILING"; then
-        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fomit-frame-pointer"
-    else
-        MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions -fno-omit-frame-pointer"
-    fi
-    # The Maemo builders don't know about this flag
-    MOZ_ARM_VFP_FLAGS="-mfpu=vfp"
-    ;;
-
 esac
 
 dnl Only one oddball right now (QNX), but this gives us flexibility
@@ -2809,7 +2834,7 @@ sparc-*)
 esac
 
 case "$target" in
-*-linux*|*-android-eabi)
+*-linux*|*-android*|*-linuxandroid*)
     AC_DEFINE(AVMPLUS_UNIX)
     AC_DEFINE(AVMPLUS_LINUX)
     ;;
@@ -4197,7 +4222,7 @@ if test "$ac_cv_thread_keyword" = yes; then
     mips*-*)
       :
       ;;
-    *-android*)
+    *-android*|*-linuxandroid*)
       :
       ;;
     *)
@@ -4398,7 +4423,7 @@ MOZ_THUMB2=
 USE_ARM_KUSER=
 
 case "${target}" in
-    arm-android-eabi)
+    *-android*|*-linuxandroid*)
         USE_ARM_KUSER=1
         MOZ_THUMB2=1
         ;;
@@ -4730,6 +4755,10 @@ if test "$MOZ_MEMORY"; then
   *-*freebsd*)
     AC_DEFINE(MOZ_MEMORY_BSD)
     ;;
+  *-android*|*-linuxandroid*)
+    AC_DEFINE(MOZ_MEMORY_LINUX)
+    AC_DEFINE(MOZ_MEMORY_ANDROID)
+    ;;
   *-*linux*)
     AC_DEFINE(MOZ_MEMORY_LINUX)
     ;;
@@ -4743,10 +4772,6 @@ if test "$MOZ_MEMORY"; then
     AC_DEFINE(MOZ_MEMORY_WINDOWS)
     # the interesting bits will get passed down in MOZ_MEMORY_LDFLAGS
     ;;
-  *-android*)
-    AC_DEFINE(MOZ_MEMORY_LINUX)
-    AC_DEFINE(MOZ_MEMORY_ANDROID)
-    ;;
   *)
     AC_MSG_ERROR([--enable-jemalloc not supported on ${target}])
     ;;
@@ -5531,7 +5556,6 @@ AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_UA_NAME)
 AC_SUBST(MOZ_APP_VERSION)
-AC_SUBST(MOZ_UA_FIREFOX_VERSION)
 AC_SUBST(FIREFOX_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
@@ -5852,14 +5876,14 @@ if test "$JS_HAS_CTYPES"; then
   fi
   if test "$CROSS_COMPILE"; then
     case "$target" in
-    *-android*)
+    *-android*|*-linuxandroid*)
       CFLAGS="$ANDROID_CFLAGS"
       CPPFLAGS="$ANDROID_CPPFLAGS"
       LDFLAGS="$ANDROID_LDFLAGS"
 
       export AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS CFLAGS LDFLAGS
 
-      ac_configure_args="$ac_configure_args --build=$build --host=${target_cpu}-${target_os} HOST_CC=\"$HOST_CC\""
+      ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\""
       ;;
     *)
       ac_configure_args="$ac_configure_args --build=$build --host=$target HOST_CC=\"$HOST_CC\" CC=\"$CC\""
diff --git a/js/src/ctypes/libffi/config.sub b/js/src/ctypes/libffi/config.sub
index 17c91458a8a..3fad4d74824 100755
--- a/js/src/ctypes/libffi/config.sub
+++ b/js/src/ctypes/libffi/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-07'
+timestamp='2011-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -126,7 +126,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  storm-chaos* | os2-emx* | rtmk-nova* | wince-winmo*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -287,7 +287,6 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -295,14 +294,13 @@ case $basic_machine in
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -373,7 +371,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -382,7 +380,6 @@ case $basic_machine in
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
-	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -1299,7 +1296,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -winmo*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1341,6 +1338,9 @@ case $os in
         -os400*)
 		os=-os400
 		;;
+	-wince-winmo*)
+		os=-wince-winmo
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1432,6 +1432,9 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -android*)
+	        os=android
+                ;;
 	-none)
 		;;
 	*)
@@ -1686,6 +1689,9 @@ case $basic_machine in
 			-vos*)
 				vendor=stratus
 				;;
+			*-android*|*-linuxandroid*)
+				vendor=linux-
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 71773b2226e..d13c8d877de 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -112,6 +112,16 @@ members = [
     'nsIDOMDocument.defaultView',
     'nsIDOMDocument.createNodeIterator',
     'nsIDOMDocument.createEvent',
+    'nsIDOMDocument.getElementsByClassName',
+    'nsIDOMDocument.title',
+    'nsIDOMDocument.referrer',
+    'nsIDOMDocument.hasFocus',
+    # This property is treated specially in nsDOMClassInfo in a way that
+    # would shadow any quick stub.  Also, document.location is a special
+    # case for security.
+    #'nsIDOMDocument.location',
+    'nsIDOMDocument.elementFromPoint',
+    'nsIDOMDocument.activeElement',
     'nsIDOMElement.removeAttributeNS',
     'nsIDOMElement.removeAttribute',
     'nsIDOMElement.getAttribute',
@@ -161,15 +171,6 @@ members = [
     'nsIDOMNameList.containsNS',
     'nsIDOMNameList.length',
     'nsIDOMNameList.getNamespaceURI',
-    'nsIDOMNSDocument.getElementsByClassName',
-    'nsIDOMNSDocument.title',
-    'nsIDOMNSDocument.hasFocus',
-    # This property is treated specially in nsDOMClassInfo in a way that
-    # would shadow any quick stub.  Also, document.location is a special
-    # case for security.
-    #'nsIDOMNSDocument.location',
-    'nsIDOMNSDocument.elementFromPoint',
-    'nsIDOMNSDocument.activeElement',
     'nsIDOMXULDocument.getBoxObjectFor',
     'nsIDOMNSElement.*',
 
@@ -235,14 +236,15 @@ members = [
     'nsIDOMHTMLDocument.getElementsByName',
     'nsIDOMHTMLDocument.anchors',
     'nsIDOMHTMLDocument.links',
-    'nsIDOMHTMLDocument.title',
     'nsIDOMHTMLDocument.URL',
-    'nsIDOMHTMLDocument.referrer',
     'nsIDOMHTMLDocument.forms',
     'nsIDOMHTMLDocument.cookie',
     'nsIDOMHTMLDocument.images',
     'nsIDOMHTMLDocument.write',
     'nsIDOMHTMLDocument.writeln',
+    'nsIDOMHTMLDocument.domain',
+    'nsIDOMHTMLDocument.getSelection',
+    'nsIDOMHTMLDocument.designMode',
     'nsIDOMHTMLElement.*',
     'nsIDOMHTMLFormElement.elements',
     'nsIDOMHTMLFormElement.name',
@@ -336,9 +338,6 @@ members = [
     'nsIDOMHTMLCanvasElement.height',
     'nsIDOMHTMLCanvasElement.getContext',
     'nsIDOMHTMLCanvasElement.toDataURL',
-    'nsIDOMNSHTMLDocument.domain',
-    'nsIDOMNSHTMLDocument.getSelection',
-    'nsIDOMNSHTMLDocument.designMode',
     'nsIDOMNSHTMLElement.contentEditable',
     'nsIDOMNSHTMLElement.isContentEditable',
     'nsIDOMNSHTMLElement.offsetParent',
@@ -554,7 +553,7 @@ nsIDOMHTMLDocument_Write_customMethodCallCode = """
       str.Append(next_arg);
     }
 
-    rv = self->%s(arg0);
+    rv = self->%s(arg0, cx);
 """
 
 nsIDOMStorage_Clear_customMethodCallCode = """
@@ -670,9 +669,6 @@ customMethodCalls = {
                 'self->GetElementsByName(arg0);',
         'canFail': False
         },
-    'nsIDOMNSHTMLDocument_': {
-        'thisType': 'nsHTMLDocument'
-        },
     'nsIDOMStorage_Clear': {
         'code': nsIDOMStorage_Clear_customMethodCallCode
         },
@@ -784,19 +780,6 @@ customMethodCalls = {
         'thisType': 'nsGenericElement',
         'code': '    PRBool result = self->MozMatchesSelector(arg0, &rv);',
         },
-    'nsIDOM3Text_': {
-        'thisType': 'nsGenericTextNode'
-        },
-    'nsIDOM3Text_IsElementContentWhitespace': {
-        'thisType': 'nsGenericTextNode',
-        'code': '    PRBool result = self->IsElementContentWhitespace();',
-        'canFail': False
-        },
-    'nsIDOM3Text_ReplaceWholeText': {
-        'thisType': 'nsGenericTextNode',
-        'code': '    nsIContent* result = '
-                'self->ReplaceWholeText(PromiseFlatString(arg0), &rv);'
-        },
     'nsIDOMNodeSelector_QuerySelector': {
         'thisType': 'nsINode',
         'code': '    nsIContent* result = '
@@ -893,9 +876,6 @@ customMethodCalls = {
                 'self->GetElementsByTagNameNS(arg0, arg1);',
         'canFail': False
         },
-    'nsIDOMNSDocument_': {
-        'thisType': 'nsDocument'
-        },
     'nsIDOMElement_': {
         'thisType': 'nsGenericElement'
         },
diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in
index 0178c42445b..f86f212b514 100644
--- a/js/src/xpconnect/tests/mochitest/Makefile.in
+++ b/js/src/xpconnect/tests/mochitest/Makefile.in
@@ -93,10 +93,12 @@ _TEST_FILES =	bug500931_helper.html \
 		file_bug650273.html \
 		$(NULL)
 
+ifneq ($(OS_TARGET),Android)
 ifndef MOZ_PLATFORM_MAEMO
 _TEST_FILES +=	test_bug657267.html \
 		bug657267.jar
 endif
+endif
 
 
 		#test_bug484107.html \
diff --git a/js/src/xpconnect/wrappers/WrapperFactory.cpp b/js/src/xpconnect/wrappers/WrapperFactory.cpp
index 0fe963a94ef..d5f14317ecf 100644
--- a/js/src/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/src/xpconnect/wrappers/WrapperFactory.cpp
@@ -236,6 +236,15 @@ WrapperFactory::PrepareForWrapping(JSContext *cx, JSObject *scope, JSObject *obj
     return DoubleWrap(cx, obj, flags);
 }
 
+static XPCWrappedNative *
+GetWrappedNative(JSContext *cx, JSObject *obj)
+{
+    OBJ_TO_INNER_OBJECT(cx, obj);
+    return IS_WN_WRAPPER(obj)
+           ? static_cast<XPCWrappedNative *>(obj->getPrivate())
+           : nsnull;
+}
+
 JSObject *
 WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSObject *parent,
                        uintN flags)
@@ -295,12 +304,10 @@ WrapperFactory::Rewrap(JSContext *cx, JSObject *obj, JSObject *wrappedProto, JSO
             }
         }
 
-        JSObject *inner = obj;
-        OBJ_TO_INNER_OBJECT(cx, inner);
         XPCWrappedNative *wn;
-        if (IS_WN_WRAPPER(inner) &&
-            (wn = static_cast<XPCWrappedNative *>(inner->getPrivate()))->HasProto() &&
-            wn->GetProto()->ClassIsDOMObject()) {
+        if (targetdata &&
+            (wn = GetWrappedNative(cx, obj)) &&
+            wn->HasProto() && wn->GetProto()->ClassIsDOMObject()) {
             typedef XrayWrapper<JSCrossCompartmentWrapper> Xray;
             wrapper = &FilteringWrapper<Xray,
                                         CrossOriginAccessiblePropertiesOnly>::singleton;
diff --git a/layout/Makefile.in b/layout/Makefile.in
index 7964c1a905c..263298d1eb1 100644
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -50,6 +50,7 @@ PARALLEL_DIRS = \
 		generic \
 		forms \
 		tables \
+		svg/base/src \
 		xul/base/public \
 		xul/base/src \
 		ipc \
@@ -65,10 +66,6 @@ PARALLEL_DIRS += \
   $(NULL)
 endif
 
-ifdef MOZ_SVG
-PARALLEL_DIRS += svg/base/src
-endif
-
 PARALLEL_DIRS += inspector/public inspector/src
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += inspector/tests
diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in
index 475adfd83fe..991df4fbb80 100644
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -165,6 +165,7 @@ LOCAL_INCLUDES += \
 		-I$(srcdir)/../../dom/base \
 		-I$(srcdir)/../../content/html/content/src \
 		-I$(srcdir)/../../content/svg/content/src \
+		-I$(srcdir)/../svg/base/src \
 		$(NULL)
 
 ifdef MOZ_MATHML
@@ -172,11 +173,6 @@ LOCAL_INCLUDES += \
         -I$(srcdir)/../mathml
 endif
 
-ifdef MOZ_SVG
-LOCAL_INCLUDES += \
-        -I$(srcdir)/../svg/base/src
-endif
-
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 8c9bd0541f4..d68317534c2 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1328,7 +1328,6 @@ private:
                        nsStyleContext* aStyleContext);
 
 // SVG - rods
-#ifdef MOZ_SVG
   static const FrameConstructionData* FindSVGData(Element* aElement,
                                                   nsIAtom* aTag,
                                                   PRInt32 aNameSpaceID,
@@ -1341,7 +1340,6 @@ private:
                                           const nsStyleDisplay* aStyleDisplay,
                                           nsFrameItems& aFrameItems,
                                           nsIFrame** aNewFrame);
-#endif
 
   /* Not static because it does PropagateScrollToViewport.  If this
      changes, make this static */
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 81fea63abd7..7dc877676c9 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -79,11 +79,9 @@
 #include "nsCSSFrameConstructor.h"
 #include "nsCSSProps.h"
 #include "nsContentUtils.h"
-#ifdef MOZ_SVG
 #include "nsSVGEffects.h"
 #include "nsSVGIntegrationUtils.h"
 #include "gfxDrawable.h"
-#endif
 
 #include "nsCSSRenderingBorders.h"
 
@@ -130,10 +128,8 @@ private:
   nsStyleImageType          mType;
   nsCOMPtr<imgIContainer>   mImageContainer;
   nsRefPtr<nsStyleGradient> mGradientData;
-#ifdef MOZ_SVG
   nsIFrame*                 mPaintServerFrame;
   nsLayoutUtils::SurfaceFromElementResult mImageElementSurface;
-#endif
   PRBool                    mIsReady;
   nsSize                    mSize;
   PRUint32                  mFlags;
@@ -3746,9 +3742,7 @@ ImageRenderer::ImageRenderer(nsIFrame* aForFrame,
   , mType(aImage->GetType())
   , mImageContainer(nsnull)
   , mGradientData(nsnull)
-#ifdef MOZ_SVG
   , mPaintServerFrame(nsnull)
-#endif
   , mIsReady(PR_FALSE)
   , mSize(0, 0)
   , mFlags(aFlags)
@@ -3823,7 +3817,6 @@ ImageRenderer::PrepareImage()
       mGradientData = mImage->GetGradientData();
       mIsReady = PR_TRUE;
       break;
-#ifdef MOZ_SVG
     case eStyleImageType_Element:
     {
       nsAutoString elementId =
@@ -3851,7 +3844,6 @@ ImageRenderer::PrepareImage()
       mIsReady = PR_TRUE;
       break;
     }
-#endif
     case eStyleImageType_Null:
     default:
       break;
@@ -3887,7 +3879,6 @@ ImageRenderer::ComputeSize(const nsSize& aDefault)
     case eStyleImageType_Gradient:
       mSize = aDefault;
       break;
-#ifdef MOZ_SVG
     case eStyleImageType_Element:
     {
       if (mPaintServerFrame) {
@@ -3912,7 +3903,6 @@ ImageRenderer::ComputeSize(const nsSize& aDefault)
       }
       break;
     }
-#endif
     case eStyleImageType_Null:
     default:
       mSize.SizeTo(0, 0);
@@ -3957,7 +3947,6 @@ ImageRenderer::Draw(nsPresContext*       aPresContext,
       nsCSSRendering::PaintGradient(aPresContext, aRenderingContext,
           mGradientData, aDirty, aDest, aFill);
       break;
-#ifdef MOZ_SVG
     case eStyleImageType_Element:
       if (mPaintServerFrame) {
         nsSVGIntegrationUtils::DrawPaintServer(
@@ -3973,7 +3962,6 @@ ImageRenderer::Draw(nsPresContext*       aPresContext,
             aDest, aFill, aAnchor, aDirty);
       }
       break;
-#endif
     case eStyleImageType_Null:
     default:
       break;
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index 04023e9200b..b73ac3f9a77 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -68,6 +68,7 @@
 #include "nsMenuPopupFrame.h"
 #include "nsTextFragment.h"
 #include "nsThemeConstants.h"
+#include "mozilla/Preferences.h"
 
 // The bidi indicator hangs off the caret to one side, to show which
 // direction the typing is in. It needs to be at least 2x2 to avoid looking like 
@@ -79,6 +80,8 @@ static const PRInt32 kMinBidiIndicatorPixels = 2;
 #include "nsContentUtils.h"
 #endif //IBMBIDI
 
+using namespace mozilla;
+
 /**
  * Find the first frame in an in-order traversal of the frame subtree rooted
  * at aFrame which is either a text frame logically at the end of a line,
@@ -225,7 +228,7 @@ nsresult nsCaret::Init(nsIPresShell *inPresShell)
     StartBlinking();
   }
 #ifdef IBMBIDI
-  mBidiUI = nsContentUtils::GetBoolPref("bidi.browser.ui");
+  mBidiUI = Preferences::GetBool("bidi.browser.ui");
 #endif
 
   return NS_OK;
diff --git a/layout/base/nsDisplayItemTypes.h b/layout/base/nsDisplayItemTypes.h
index 97fbd491094..b9ec6ebbcbc 100644
--- a/layout/base/nsDisplayItemTypes.h
+++ b/layout/base/nsDisplayItemTypes.h
@@ -87,6 +87,8 @@ enum Type {
   TYPE_SCROLL_INFO_LAYER,
   TYPE_SELECTION_OVERLAY,
   TYPE_SOLID_COLOR,
+  TYPE_SVG_EFFECTS,
+  TYPE_SVG_EVENT_RECEIVER,
   TYPE_TABLE_CELL_BACKGROUND,
   TYPE_TABLE_CELL_SELECTION,
   TYPE_TABLE_ROW_BACKGROUND,
@@ -105,11 +107,6 @@ enum Type {
   TYPE_REFLOW_COUNT,
 #endif
 
-#ifdef MOZ_SVG
-  TYPE_SVG_EFFECTS,
-  TYPE_SVG_EVENT_RECEIVER,
-#endif
-
 #ifdef MOZ_XUL
   TYPE_XUL_EVENT_REDIRECTOR,
   TYPE_XUL_GROUP_BACKGROUND,
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 8e33c81caa8..44edaaca417 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -54,9 +54,7 @@
 #include "nsStyleStructInlines.h"
 #include "nsStyleTransformMatrix.h"
 #include "gfxMatrix.h"
-#ifdef MOZ_SVG
 #include "nsSVGIntegrationUtils.h"
-#endif
 #include "nsLayoutUtils.h"
 #include "nsIScrollableFrame.h"
 #include "nsThemeConstants.h"
@@ -2664,7 +2662,6 @@ nsRect nsDisplayTransform::UntransformRect(const nsRect &aUntransformedBounds,
                                             factor);
 }
 
-#ifdef MOZ_SVG
 nsDisplaySVGEffects::nsDisplaySVGEffects(nsDisplayListBuilder* aBuilder,
                                          nsIFrame* aFrame, nsDisplayList* aList)
     : nsDisplayWrapList(aBuilder, aFrame, aList), mEffectsFrame(aFrame),
@@ -2740,4 +2737,3 @@ PRBool nsDisplaySVGEffects::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayIt
     other->mBounds + other->mEffectsFrame->GetOffsetTo(mEffectsFrame));
   return PR_TRUE;
 }
-#endif
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index b697f80a37c..f79ea1e9afe 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -2010,7 +2010,6 @@ private:
   PRInt32 mAPD, mParentAPD;
 };
 
-#ifdef MOZ_SVG
 /**
  * A display item to paint a stacking context with effects
  * set by the stacking context root frame's style.
@@ -2044,11 +2043,16 @@ private:
   // relative to mEffectsFrame
   nsRect    mBounds;
 };
-#endif
 
-/* A display item that applies a transformation to all of its descendent
+/* A display item that applies a transformation to all of its descendant
  * elements.  This wrapper should only be used if there is a transform applied
  * to the root element.
+ *
+ * The reason that a "bounds" rect is involved in transform calculations is
+ * because CSS-transforms allow percentage values for the x and y components
+ * of <translation-value>s, where percentages are percentages of the element's
+ * content box.
+ *
  * INVARIANT: The wrapped frame is transformed.
  * INVARIANT: The wrapped frame is non-null.
  */ 
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 98187a4629f..a5ff1afb131 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -68,7 +68,6 @@
 #include "nsISelectionListener.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMHTMLDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMRange.h"
@@ -76,6 +75,7 @@
 #include "nsLayoutCID.h"
 #include "nsContentUtils.h"
 #include "nsLayoutStylesheetCache.h"
+#include "mozilla/Preferences.h"
 
 #include "nsViewsCID.h"
 #include "nsIDeviceContextSpec.h"
@@ -195,6 +195,8 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 //switch to page layout
 #include "nsGfxCIID.h"
 
+using namespace mozilla;
+
 #ifdef NS_DEBUG
 
 #undef NOISY_VIEWER
@@ -2992,13 +2994,14 @@ DocumentViewerImpl::GetDefaultCharacterSet(nsACString& aDefaultCharacterSet)
 {
   if (mDefaultCharacterSet.IsEmpty())
   {
-    const nsAdoptingString& defCharset =
-      nsContentUtils::GetLocalizedStringPref("intl.charset.default");
+    const nsAdoptingCString& defCharset =
+      Preferences::GetLocalizedCString("intl.charset.default");
 
-    if (!defCharset.IsEmpty())
-      LossyCopyUTF16toASCII(defCharset, mDefaultCharacterSet);
-    else
+    if (!defCharset.IsEmpty()) {
+      mDefaultCharacterSet = defCharset;
+    } else {
       mDefaultCharacterSet.AssignLiteral("ISO-8859-1");
+    }
   }
   aDefaultCharacterSet = mDefaultCharacterSet;
   return NS_OK;
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index 5bdb590699a..7859cbc1468 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -96,6 +96,7 @@
 #include "nsAbsoluteContainingBlock.h"
 
 #include "nsFrameManager.h"
+#include "nsRuleProcessorData.h"
 
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -1036,7 +1037,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                       nsRestyleHint      aRestyleHint,
                                       RestyleTracker&    aRestyleTracker,
                                       DesiredA11yNotifications aDesiredA11yNotifications,
-                                      nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement)
+                                      nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement,
+                                      TreeMatchContext &aTreeMatchContext)
 {
   if (!NS_IsHintSubset(nsChangeHint_NeedDirtyReflow, aMinChange)) {
     // If aMinChange doesn't include nsChangeHint_NeedDirtyReflow, clear out
@@ -1144,7 +1146,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                                    aMinChange, aRestyleHint,
                                                    aRestyleTracker,
                                                    aDesiredA11yNotifications,
-                                                   aVisibleKidsOfHiddenElement);
+                                                   aVisibleKidsOfHiddenElement,
+                                                   aTreeMatchContext);
 
       // The provider's new context becomes the parent context of
       // aFrame's context.
@@ -1219,7 +1222,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
           // XXX what other pseudos do we need to treat like this?
           newContext = styleSet->ProbePseudoElementStyle(element,
                                                          pseudoType,
-                                                         parentContext);
+                                                         parentContext,
+                                                         aTreeMatchContext);
           if (!newContext) {
             // This pseudo should no longer exist; gotta reframe
             NS_UpdateHint(aMinChange, nsChangeHint_ReconstructFrame);
@@ -1242,7 +1246,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
       else {
         NS_ASSERTION(localContent,
                      "non pseudo-element frame without content node");
-        newContext = styleSet->ResolveStyleFor(element, parentContext);
+        newContext = styleSet->ResolveStyleFor(element, parentContext,
+                                               aTreeMatchContext);
       }
     }
 
@@ -1365,7 +1370,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
         if (thisChildHint) {
           undisplayedContext =
             styleSet->ResolveStyleFor(undisplayed->mContent->AsElement(),
-                                      newContext);
+                                      newContext,
+                                      aTreeMatchContext);
         } else {
           undisplayedContext =
             styleSet->ReparentStyleContext(undisplayed->mStyle, newContext,
@@ -1528,7 +1534,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                       childRestyleHint,
                                       aRestyleTracker,
                                       kidsDesiredA11yNotification,
-                                      aVisibleKidsOfHiddenElement);
+                                      aVisibleKidsOfHiddenElement,
+                                      aTreeMatchContext);
               } while ((outOfFlowFrame = outOfFlowFrame->GetNextContinuation()));
 
               // reresolve placeholder's context under the same parent
@@ -1538,7 +1545,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                     childRestyleHint,
                                     aRestyleTracker,
                                     kidsDesiredA11yNotification,
-                                    aVisibleKidsOfHiddenElement);
+                                    aVisibleKidsOfHiddenElement,
+                                    aTreeMatchContext);
             }
             else {  // regular child frame
               if (child != resolvedChild) {
@@ -1547,7 +1555,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext     *aPresContext,
                                       childRestyleHint,
                                       aRestyleTracker,
                                       kidsDesiredA11yNotification,
-                                      aVisibleKidsOfHiddenElement);
+                                      aVisibleKidsOfHiddenElement,
+                                      aTreeMatchContext);
               } else {
                 NOISY_TRACE_FRAME("child frame already resolved as descendant, skipping",aFrame);
               }
@@ -1620,6 +1629,9 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame          *aFrame,
 
   FramePropertyTable *propTable = GetPresContext()->PropertyTable();
 
+  TreeMatchContext treeMatchContext(PR_TRUE,
+                                    nsRuleWalker::eRelevantLinkUnvisited,
+                                    mPresShell->GetDocument());
   nsTArray<nsIContent*> visibleKidsOfHiddenElement;
   do {
     // Outer loop over special siblings
@@ -1632,7 +1644,8 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame          *aFrame,
                                 eRestyle_Subtree : eRestyle_Self,
                               aRestyleTracker,
                               eSendAllNotifications,
-                              visibleKidsOfHiddenElement);
+                              visibleKidsOfHiddenElement,
+                              treeMatchContext);
       NS_UpdateHint(topLevelChange, frameChange);
 
       if (topLevelChange & nsChangeHint_ReconstructFrame) {
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index 987bcff6780..a899f005b3c 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -63,6 +63,8 @@ class RestyleTracker;
 } // namespace css
 } // namespace mozilla
 
+struct TreeMatchContext;
+
 /**
  * Frame manager interface. The frame manager serves two purposes:
  * <li>provides a service for mapping from content to frame and from
@@ -225,7 +227,8 @@ private:
                           nsRestyleHint      aRestyleHint,
                           RestyleTracker&    aRestyleTracker,
                           DesiredA11yNotifications aDesiredA11yNotifications,
-                          nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement);
+                          nsTArray<nsIContent*>& aVisibleKidsOfHiddenElement,
+                          TreeMatchContext &aTreeMatchContext);
 };
 
 #endif
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 04714ba28bf..499811a2486 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -92,18 +92,17 @@
 #include "nsCOMPtr.h"
 #include "nsListControlFrame.h"
 #include "ImageLayers.h"
+#include "mozilla/arm.h"
 #include "mozilla/dom/Element.h"
 #include "nsCanvasFrame.h"
 #include "gfxDrawable.h"
 #include "gfxUtils.h"
 #include "nsDataHashtable.h"
 
-#ifdef MOZ_SVG
 #include "nsSVGUtils.h"
 #include "nsSVGIntegrationUtils.h"
 #include "nsSVGForeignObjectFrame.h"
 #include "nsSVGOuterSVGFrame.h"
-#endif
 
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
@@ -1777,13 +1776,11 @@ struct BoxToBorderRect : public nsLayoutUtils::BoxCallback {
     : mRelativeTo(aRelativeTo), mCallback(aCallback) {}
 
   virtual void AddBox(nsIFrame* aFrame) {
-#ifdef MOZ_SVG
     nsRect r;
     nsIFrame* outer = nsSVGUtils::GetOuterSVGFrameAndCoveredRegion(aFrame, &r);
     if (outer) {
       mCallback->AddRect(r + outer->GetOffsetTo(mRelativeTo));
     } else
-#endif
       mCallback->AddRect(nsRect(aFrame->GetOffsetTo(mRelativeTo), aFrame->GetSize()));
   }
 };
@@ -3061,12 +3058,12 @@ nsLayoutUtils::GetClosestLayer(nsIFrame* aFrame)
 GraphicsFilter
 nsLayoutUtils::GetGraphicsFilterForFrame(nsIFrame* aForFrame)
 {
-#ifdef MOZ_GFX_OPTIMIZE_MOBILE
-  GraphicsFilter defaultFilter = gfxPattern::FILTER_NEAREST;
-#else
   GraphicsFilter defaultFilter = gfxPattern::FILTER_GOOD;
+#ifdef MOZ_GFX_OPTIMIZE_MOBILE
+  if (!mozilla::supports_neon()) {
+    defaultFilter = gfxPattern::FILTER_NEAREST;
+  }
 #endif
-#ifdef MOZ_SVG
   nsIFrame *frame = nsCSSRendering::IsCanvasFrame(aForFrame) ?
     nsCSSRendering::FindBackgroundStyleFrame(aForFrame) : aForFrame;
 
@@ -3080,9 +3077,6 @@ nsLayoutUtils::GetGraphicsFilterForFrame(nsIFrame* aForFrame)
   default:
     return defaultFilter;
   }
-#else
-  return defaultFilter;
-#endif
 }
 
 /**
@@ -3654,7 +3648,6 @@ nsLayoutUtils::GetTextRunFlagsForStyle(nsStyleContext* aStyleContext,
   if (IsNonzeroCoord(aStyleText->mLetterSpacing)) {
     result |= gfxTextRunFactory::TEXT_DISABLE_OPTIONAL_LIGATURES;
   }
-#ifdef MOZ_SVG
   switch (aStyleContext->GetStyleSVG()->mTextRendering) {
   case NS_STYLE_TEXT_RENDERING_OPTIMIZESPEED:
     result |= gfxTextRunFactory::TEXT_OPTIMIZE_SPEED;
@@ -3668,7 +3661,6 @@ nsLayoutUtils::GetTextRunFlagsForStyle(nsStyleContext* aStyleContext,
   default:
     break;
   }
-#endif
   return result;
 }
 
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 57fcfb1d2a5..8f0fd86990b 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -112,6 +112,7 @@
 
 #include "nsContentUtils.h"
 #include "nsPIWindowRoot.h"
+#include "mozilla/Preferences.h"
 
 // Needed for Start/Stop of Image Animation
 #include "imgIContainer.h"
@@ -124,14 +125,14 @@ using namespace mozilla;
 using namespace mozilla::dom;
 
 static nscolor
-MakeColorPref(const char *colstr)
+MakeColorPref(const nsCString& aColor)
 {
   PRUint32 red, green, blue;
   nscolor colorref;
 
   // 4.x stored RGB color values as a string rather than as an int,
   // thus we need to do this conversion
-  PR_sscanf(colstr, "#%02x%02x%02x", &red, &green, &blue);
+  PR_sscanf(aColor.get(), "#%02x%02x%02x", &red, &green, &blue);
   colorref = NS_RGB(red, green, blue);
   return colorref;
 }
@@ -288,42 +289,44 @@ nsPresContext::~nsPresContext()
   }
 
   // Unregister preference callbacks
-  nsContentUtils::UnregisterPrefCallback("font.",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("browser.display.",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("browser.underline_anchors",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("browser.anchor_color",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("browser.active_color",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("browser.visited_color",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("image.animation_mode",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "font.",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "browser.display.",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "browser.underline_anchors",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "browser.anchor_color",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "browser.active_color",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "browser.visited_color",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "image.animation_mode",
+                                  this);
 #ifdef IBMBIDI
-  nsContentUtils::UnregisterPrefCallback("bidi.", PrefChangedCallback, this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "bidi.",
+                                  this);
 #endif // IBMBIDI
-  nsContentUtils::UnregisterPrefCallback("dom.send_after_paint_to_content",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("gfx.font_rendering.",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("layout.css.dpi",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
-  nsContentUtils::UnregisterPrefCallback("layout.css.devPixelsPerPx",
-                                         nsPresContext::PrefChangedCallback,
-                                         this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "dom.send_after_paint_to_content",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "gfx.font_rendering.",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "layout.css.dpi",
+                                  this);
+  Preferences::UnregisterCallback(nsPresContext::PrefChangedCallback,
+                                  "layout.css.devPixelsPerPx",
+                                  this);
 
   NS_IF_RELEASE(mDeviceContext);
   NS_IF_RELEASE(mLookAndFeel);
@@ -470,7 +473,7 @@ nsPresContext::GetFontPreferences()
   PRInt32 unit = eUnit_px;
 
   nsAdoptingCString cvalue =
-    nsContentUtils::GetCharPref("font.size.unit");
+    Preferences::GetCString("font.size.unit");
 
   if (!cvalue.IsEmpty()) {
     if (cvalue.Equals("px")) {
@@ -490,7 +493,7 @@ nsPresContext::GetFontPreferences()
   pref.Assign("font.minimum-size.");
   pref.Append(langGroup);
 
-  PRInt32 size = nsContentUtils::GetIntPref(pref.get());
+  PRInt32 size = Preferences::GetInt(pref.get());
   if (unit == eUnit_px) {
     mMinimumFontSizePref = CSSPixelsToAppUnits(size);
   }
@@ -520,14 +523,13 @@ nsPresContext::GetFontPreferences()
     if (eType == eDefaultFont_Variable) {
       MAKE_FONT_PREF_KEY(pref, "font.name", generic_dot_langGroup);
 
-      nsAdoptingString value =
-        nsContentUtils::GetStringPref(pref.get());
+      nsAdoptingString value = Preferences::GetString(pref.get());
       if (!value.IsEmpty()) {
         font->name.Assign(value);
       }
       else {
         MAKE_FONT_PREF_KEY(pref, "font.default.", langGroup);
-        value = nsContentUtils::GetStringPref(pref.get());
+        value = Preferences::GetString(pref.get());
         if (!value.IsEmpty()) {
           mDefaultVariableFont.name.Assign(value);
         }
@@ -556,7 +558,7 @@ nsPresContext::GetFontPreferences()
     // get font.size.[generic].[langGroup]
     // size=0 means 'Auto', i.e., generic fonts retain the size of the variable font
     MAKE_FONT_PREF_KEY(pref, "font.size", generic_dot_langGroup);
-    size = nsContentUtils::GetIntPref(pref.get());
+    size = Preferences::GetInt(pref.get());
     if (size > 0) {
       if (unit == eUnit_px) {
         font->size = CSSPixelsToAppUnits(size);
@@ -569,7 +571,7 @@ nsPresContext::GetFontPreferences()
     // get font.size-adjust.[generic].[langGroup]
     // XXX only applicable on GFX ports that handle |font-size-adjust|
     MAKE_FONT_PREF_KEY(pref, "font.size-adjust", generic_dot_langGroup);
-    cvalue = nsContentUtils::GetCharPref(pref.get());
+    cvalue = Preferences::GetCString(pref.get());
     if (!cvalue.IsEmpty()) {
       font->sizeAdjust = (float)atof(cvalue.get());
     }
@@ -603,20 +605,18 @@ nsPresContext::GetDocumentColorPreferences()
   }
   if (usePrefColors) {
     usePrefColors =
-      !nsContentUtils::GetBoolPref("browser.display.use_system_colors",
-                                   PR_FALSE);
+      !Preferences::GetBool("browser.display.use_system_colors", PR_FALSE);
   }
 
   if (usePrefColors) {
     nsAdoptingCString colorStr =
-      nsContentUtils::GetCharPref("browser.display.foreground_color");
+      Preferences::GetCString("browser.display.foreground_color");
 
     if (!colorStr.IsEmpty()) {
       mDefaultColor = MakeColorPref(colorStr);
     }
 
-    colorStr =
-      nsContentUtils::GetCharPref("browser.display.background_color");
+    colorStr = Preferences::GetCString("browser.display.background_color");
 
     if (!colorStr.IsEmpty()) {
       mBackgroundColor = MakeColorPref(colorStr);
@@ -637,8 +637,8 @@ nsPresContext::GetDocumentColorPreferences()
                                       mBackgroundColor);
 
   mUseDocumentColors = !useAccessibilityTheme &&
-    nsContentUtils::GetBoolPref("browser.display.use_document_colors",
-                                mUseDocumentColors);
+    Preferences::GetBool("browser.display.use_document_colors",
+                         mUseDocumentColors);
 }
 
 void
@@ -651,91 +651,83 @@ nsPresContext::GetUserPreferences()
   }
     
   mFontScaler =
-    nsContentUtils::GetIntPref("browser.display.base_font_scaler",
-                               mFontScaler);
+    Preferences::GetInt("browser.display.base_font_scaler", mFontScaler);
 
 
   mAutoQualityMinFontSizePixelsPref =
-    nsContentUtils::GetIntPref("browser.display.auto_quality_min_font_size");
+    Preferences::GetInt("browser.display.auto_quality_min_font_size");
 
   // * document colors
   GetDocumentColorPreferences();
 
   mSendAfterPaintToContent =
-    nsContentUtils::GetBoolPref("dom.send_after_paint_to_content",
-                                mSendAfterPaintToContent);
+    Preferences::GetBool("dom.send_after_paint_to_content",
+                         mSendAfterPaintToContent);
 
   // * link colors
   mUnderlineLinks =
-    nsContentUtils::GetBoolPref("browser.underline_anchors", mUnderlineLinks);
+    Preferences::GetBool("browser.underline_anchors", mUnderlineLinks);
 
-  nsAdoptingCString colorStr =
-    nsContentUtils::GetCharPref("browser.anchor_color");
+  nsAdoptingCString colorStr = Preferences::GetCString("browser.anchor_color");
 
   if (!colorStr.IsEmpty()) {
     mLinkColor = MakeColorPref(colorStr);
   }
 
-  colorStr =
-    nsContentUtils::GetCharPref("browser.active_color");
+  colorStr = Preferences::GetCString("browser.active_color");
 
   if (!colorStr.IsEmpty()) {
     mActiveLinkColor = MakeColorPref(colorStr);
   }
 
-  colorStr = nsContentUtils::GetCharPref("browser.visited_color");
+  colorStr = Preferences::GetCString("browser.visited_color");
 
   if (!colorStr.IsEmpty()) {
     mVisitedLinkColor = MakeColorPref(colorStr);
   }
 
   mUseFocusColors =
-    nsContentUtils::GetBoolPref("browser.display.use_focus_colors",
-                                mUseFocusColors);
+    Preferences::GetBool("browser.display.use_focus_colors", mUseFocusColors);
 
   mFocusTextColor = mDefaultColor;
   mFocusBackgroundColor = mBackgroundColor;
 
-  colorStr = nsContentUtils::GetCharPref("browser.display.focus_text_color");
+  colorStr = Preferences::GetCString("browser.display.focus_text_color");
 
   if (!colorStr.IsEmpty()) {
     mFocusTextColor = MakeColorPref(colorStr);
   }
 
-  colorStr =
-    nsContentUtils::GetCharPref("browser.display.focus_background_color");
+  colorStr = Preferences::GetCString("browser.display.focus_background_color");
 
   if (!colorStr.IsEmpty()) {
     mFocusBackgroundColor = MakeColorPref(colorStr);
   }
 
   mFocusRingWidth =
-    nsContentUtils::GetIntPref("browser.display.focus_ring_width",
-                               mFocusRingWidth);
+    Preferences::GetInt("browser.display.focus_ring_width", mFocusRingWidth);
 
   mFocusRingOnAnything =
-    nsContentUtils::GetBoolPref("browser.display.focus_ring_on_anything",
-                                mFocusRingOnAnything);
+    Preferences::GetBool("browser.display.focus_ring_on_anything",
+                         mFocusRingOnAnything);
 
   mFocusRingStyle =
-          nsContentUtils::GetIntPref("browser.display.focus_ring_style",
-                                      mFocusRingStyle);
+    Preferences::GetInt("browser.display.focus_ring_style", mFocusRingStyle);
   // * use fonts?
   mUseDocumentFonts =
-    nsContentUtils::GetIntPref("browser.display.use_document_fonts") != 0;
+    Preferences::GetInt("browser.display.use_document_fonts") != 0;
 
   // * replace backslashes with Yen signs? (bug 245770)
   mEnableJapaneseTransform =
-    nsContentUtils::GetBoolPref("layout.enable_japanese_specific_transform");
+    Preferences::GetBool("layout.enable_japanese_specific_transform");
 
-  mPrefScrollbarSide =
-    nsContentUtils::GetIntPref("layout.scrollbar.side");
+  mPrefScrollbarSide = Preferences::GetInt("layout.scrollbar.side");
 
   GetFontPreferences();
 
   // * image animation
   const nsAdoptingCString& animatePref =
-    nsContentUtils::GetCharPref("image.animation_mode");
+    Preferences::GetCString("image.animation_mode");
   if (animatePref.Equals("normal"))
     mImageAnimationModePref = imgIContainer::kNormalAnimMode;
   else if (animatePref.Equals("none"))
@@ -748,24 +740,24 @@ nsPresContext::GetUserPreferences()
   PRUint32 bidiOptions = GetBidi();
 
   PRInt32 prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_TEXTDIRECTION_STR,
-                               GET_BIDI_OPTION_DIRECTION(bidiOptions));
+    Preferences::GetInt(IBMBIDI_TEXTDIRECTION_STR,
+                        GET_BIDI_OPTION_DIRECTION(bidiOptions));
   SET_BIDI_OPTION_DIRECTION(bidiOptions, prefInt);
   mPrefBidiDirection = prefInt;
 
   prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_TEXTTYPE_STR,
-                               GET_BIDI_OPTION_TEXTTYPE(bidiOptions));
+    Preferences::GetInt(IBMBIDI_TEXTTYPE_STR,
+                        GET_BIDI_OPTION_TEXTTYPE(bidiOptions));
   SET_BIDI_OPTION_TEXTTYPE(bidiOptions, prefInt);
 
   prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_NUMERAL_STR,
-                               GET_BIDI_OPTION_NUMERAL(bidiOptions));
+    Preferences::GetInt(IBMBIDI_NUMERAL_STR,
+                        GET_BIDI_OPTION_NUMERAL(bidiOptions));
   SET_BIDI_OPTION_NUMERAL(bidiOptions, prefInt);
 
   prefInt =
-    nsContentUtils::GetIntPref(IBMBIDI_SUPPORTMODE_STR,
-                               GET_BIDI_OPTION_SUPPORT(bidiOptions));
+    Preferences::GetInt(IBMBIDI_SUPPORTMODE_STR,
+                        GET_BIDI_OPTION_SUPPORT(bidiOptions));
   SET_BIDI_OPTION_SUPPORT(bidiOptions, prefInt);
 
   // We don't need to force reflow: either we are initializing a new
@@ -965,42 +957,44 @@ nsPresContext::Init(nsDeviceContext* aDeviceContext)
   mLangService = do_GetService(NS_LANGUAGEATOMSERVICE_CONTRACTID);
 
   // Register callbacks so we're notified when the preferences change
-  nsContentUtils::RegisterPrefCallback("font.",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("browser.display.",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("browser.underline_anchors",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("browser.anchor_color",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("browser.active_color",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("browser.visited_color",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("image.animation_mode",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "font.",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "browser.display.",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "browser.underline_anchors",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "browser.anchor_color",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "browser.active_color",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "browser.visited_color",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "image.animation_mode",
+                                this);
 #ifdef IBMBIDI
-  nsContentUtils::RegisterPrefCallback("bidi.", PrefChangedCallback,
-                                       this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "bidi.",
+                                this);
 #endif
-  nsContentUtils::RegisterPrefCallback("dom.send_after_paint_to_content",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("gfx.font_rendering.", PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("layout.css.dpi",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
-  nsContentUtils::RegisterPrefCallback("layout.css.devPixelsPerPx",
-                                       nsPresContext::PrefChangedCallback,
-                                       this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "dom.send_after_paint_to_content",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "gfx.font_rendering.",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "layout.css.dpi",
+                                this);
+  Preferences::RegisterCallback(nsPresContext::PrefChangedCallback,
+                                "layout.css.devPixelsPerPx",
+                                this);
 
   rv = mEventManager->Init();
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 9430492e46a..142f670ba46 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -209,6 +209,7 @@
 #include "gfxPlatform.h"
 
 #include "mozilla/FunctionTimer.h"
+#include "mozilla/Preferences.h"
 
 #include "Layers.h"
 
@@ -1674,6 +1675,7 @@ NS_NewPresShell(nsIPresShell** aInstancePtrResult)
 }
 
 nsTHashtable<PresShell::PresShellPtrKey> *nsIPresShell::sLiveShells = 0;
+static PRBool sSynthMouseMove = PR_TRUE;
 
 NS_MEMORY_REPORTER_IMPLEMENT(LayoutPresShell,
     "explicit/layout/all",
@@ -1718,6 +1720,8 @@ PresShell::PresShell()
   if (!registeredReporter) {
     NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(LayoutPresShell));
     NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(LayoutBidi));
+    Preferences::AddBoolVarCache(&sSynthMouseMove,
+                                 "layout.reflow.synthMouseMove", PR_TRUE);
     registeredReporter = true;
   }
 
@@ -1859,8 +1863,7 @@ PresShell::Init(nsIDocument* aDocument,
   
   if (gMaxRCProcessingTime == -1) {
     gMaxRCProcessingTime =
-      nsContentUtils::GetIntPref("layout.reflow.timeslice",
-                                 NS_MAX_REFLOW_TIME);
+      Preferences::GetInt("layout.reflow.timeslice", NS_MAX_REFLOW_TIME);
   }
 
   {
@@ -1885,13 +1888,13 @@ PresShell::Init(nsIDocument* aDocument,
 #ifdef MOZ_REFLOW_PERF
     if (mReflowCountMgr) {
       PRBool paintFrameCounts =
-        nsContentUtils::GetBoolPref("layout.reflow.showframecounts");
+        Preferences::GetBool("layout.reflow.showframecounts");
 
       PRBool dumpFrameCounts =
-        nsContentUtils::GetBoolPref("layout.reflow.dumpframecounts");
+        Preferences::GetBool("layout.reflow.dumpframecounts");
 
       PRBool dumpFrameByFrameCounts =
-        nsContentUtils::GetBoolPref("layout.reflow.dumpframebyframecounts");
+        Preferences::GetBool("layout.reflow.dumpframebyframecounts");
 
       mReflowCountMgr->SetDumpFrameCounts(dumpFrameCounts);
       mReflowCountMgr->SetDumpFrameByFrameCounts(dumpFrameByFrameCounts);
@@ -2816,8 +2819,8 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
 
       // Default to PAINTLOCK_EVENT_DELAY if we can't get the pref value.
       PRInt32 delay =
-        nsContentUtils::GetIntPref("nglayout.initialpaint.delay",
-                                   PAINTLOCK_EVENT_DELAY);
+        Preferences::GetInt("nglayout.initialpaint.delay",
+                            PAINTLOCK_EVENT_DELAY);
 
       mPaintSuppressionTimer->InitWithFuncCallback(sPaintSuppressionCallback,
                                                    this, delay, 
@@ -3920,7 +3923,7 @@ PresShell::GoToAnchor(const nsAString& aAnchorName, PRBool aScroll)
 
     // Should we select the target? This action is controlled by a
     // preference: the default is to not select.
-    PRBool selectAnchor = nsContentUtils::GetBoolPref("layout.selectanchor");
+    PRBool selectAnchor = Preferences::GetBool("layout.selectanchor");
 
     // Even if select anchor pref is false, we must still move the
     // caret there. That way tabbing will start from the new
@@ -7856,7 +7859,9 @@ PresShell::DidDoReflow(PRBool aInterruptible)
   mFrameConstructor->EndUpdate();
   
   HandlePostedReflowCallbacks(aInterruptible);
-  SynthesizeMouseMove(PR_FALSE);
+  if (sSynthMouseMove) {
+    SynthesizeMouseMove(PR_FALSE);
+  }
   if (mCaret) {
     // Update the caret's position now to account for any changes created by
     // the reflow.
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 6cf4643fed6..8163d9f50e6 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -52,10 +52,13 @@
 #include "nsEventDispatcher.h"
 #include "jsapi.h"
 #include "nsContentUtils.h"
+#include "mozilla/Preferences.h"
 
 using mozilla::TimeStamp;
 using mozilla::TimeDuration;
 
+using namespace mozilla;
+
 #define DEFAULT_FRAME_RATE 60
 #define DEFAULT_THROTTLED_FRAME_RATE 1
 
@@ -64,9 +67,9 @@ static PRBool sPrecisePref;
 /* static */ void
 nsRefreshDriver::InitializeStatics()
 {
-  nsContentUtils::AddBoolPrefVarCache("layout.frame_rate.precise",
-                                      &sPrecisePref,
-                                      PR_FALSE);
+  Preferences::AddBoolVarCache(&sPrecisePref,
+                               "layout.frame_rate.precise",
+                               PR_FALSE);
 }
 // Compute the interval to use for the refresh driver timer, in
 // milliseconds
@@ -75,7 +78,7 @@ nsRefreshDriver::GetRefreshTimerInterval() const
 {
   const char* prefName =
     mThrottled ? "layout.throttled_frame_rate" : "layout.frame_rate";
-  PRInt32 rate = nsContentUtils::GetIntPref(prefName, -1);
+  PRInt32 rate = Preferences::GetInt(prefName, -1);
   if (rate <= 0) {
     // TODO: get the rate from the platform
     rate = mThrottled ? DEFAULT_THROTTLED_FRAME_RATE : DEFAULT_FRAME_RATE;
diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 37314045129..d13fe3d204e 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -136,6 +136,8 @@ _TEST_FILES =	\
 		     bug632215-ref.html \
 		     bug633044-1.html \
 		     bug633044-1-ref.html \
+		     bug634406-1.html \
+		     bug634406-1-ref.html \
 		     bug644428-1.html \
 		     bug644428-1-ref.html \
 		     bug646382-1.html \
diff --git a/layout/base/tests/bug634406-1-ref.html b/layout/base/tests/bug634406-1-ref.html
new file mode 100644
index 00000000000..639bbf1809c
--- /dev/null
+++ b/layout/base/tests/bug634406-1-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML><html>
+<body>
+<textarea>ab</textarea>
+<script>
+  var t = document.querySelector("textarea");
+  t.focus();
+  t.selectionStart = t.selectionEnd = t.value.length;
+</script>
+</body>
+</html>
diff --git a/layout/base/tests/bug634406-1.html b/layout/base/tests/bug634406-1.html
new file mode 100644
index 00000000000..5015053a139
--- /dev/null
+++ b/layout/base/tests/bug634406-1.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML><html><head>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+</head>
+<body>
+<textarea></textarea>
+<script>
+  var t = document.querySelector("textarea");
+  t.focus();
+
+  synthesizeKey("a", {});
+  synthesizeKey("A", {accelKey: true});
+  synthesizeKey("VK_RIGHT", {});
+  synthesizeKey("b", {});
+</script>
+</body>
+</html>
diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index 132e58cc5df..02680bef7f5 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -122,6 +122,7 @@ var tests = [
     [ 'bug632215-1.html' , 'bug632215-ref.html'   ] ,
     [ 'bug632215-2.html' , 'bug632215-ref.html'   ] ,
     [ 'bug633044-1.html' , 'bug633044-1-ref.html' ] ,
+    [ 'bug634406-1.html' , 'bug634406-1-ref.html' ] ,
     [ 'bug644428-1.html' , 'bug644428-1-ref.html' ] ,
     function() {
       SpecialPowers.setBoolPref("bidi.browser.ui", true);
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index f2170769884..6979a4ec5e3 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -233,15 +233,10 @@ SHARED_LIBRARY_LIBS += \
 		$(NULL)
 endif
 
-ifdef MOZ_SVG
 SHARED_LIBRARY_LIBS += \
 		../svg/base/src/$(LIB_PREFIX)gksvgbase_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/svg/document/src/$(LIB_PREFIX)gkconsvgdoc_s.$(LIB_SUFFIX) \
 		$(DEPTH)/content/svg/content/src/$(LIB_PREFIX)gkcontentsvg_s.$(LIB_SUFFIX) \
-		$(NULL)
-endif
-
-SHARED_LIBRARY_LIBS += \
 		$(DEPTH)/content/smil/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \
 		$(NULL)
 
@@ -336,16 +331,14 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(topsrcdir)/js/src/xpconnect/src \
 		   -I$(topsrcdir)/js/src/xpconnect/loader \
 		   -I$(topsrcdir)/caps/include \
+		   -I$(topsrcdir)/netwerk/base/src \
+		   -I$(topsrcdir)/content/svg/content/src \
 		   $(NULL)
 
 ifdef MOZ_MATHML
 LOCAL_INCLUDES	+= -I$(srcdir)/../mathml
 endif
 
-ifdef MOZ_SVG
-LOCAL_INCLUDES	+= -I$(topsrcdir)/content/svg/content/src
-endif
-
 DEFINES += -D_IMPL_NS_LAYOUT
 
 ifeq ($(OS_ARCH),IRIX)
diff --git a/layout/build/nsContentDLF.h b/layout/build/nsContentDLF.h
index afab4983748..a93a5062b3e 100644
--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -97,13 +97,6 @@ NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
 #define CONTENTDLF_MATHML_CATEGORIES
 #endif
 
-#ifdef MOZ_SVG
-#define CONTENTDLF_SVG_CATEGORIES \
-    { "Gecko-Content-Viewers", IMAGE_SVG_XML, "@mozilla.org/content/document-loader-factory;1" },
-#else
-#define CONTENTDLF_SVG_CATEGORIES
-#endif
-
 #ifdef MOZ_WEBM
 #define CONTENTDLF_WEBM_CATEGORIES \
     { "Gecko-Content-Viewers", VIDEO_WEBM, "@mozilla.org/content/document-loader-factory;1" }, \
@@ -129,8 +122,8 @@ NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
     { "Gecko-Content-Viewers", TEXT_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_CACHED_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", VIEWSOURCE_CONTENT_TYPE, "@mozilla.org/content/document-loader-factory;1" }, \
+    { "Gecko-Content-Viewers", IMAGE_SVG_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     CONTENTDLF_MATHML_CATEGORIES \
-    CONTENTDLF_SVG_CATEGORIES \
     CONTENTDLF_WEBM_CATEGORIES
 
 #endif
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 43dcfa8eaa9..384945da544 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -520,9 +520,7 @@ MAKE_CTOR(CreateDocumentViewer,           nsIDocumentViewer,           NS_NewDoc
 MAKE_CTOR(CreateHTMLDocument,             nsIDocument,                 NS_NewHTMLDocument)
 MAKE_CTOR(CreateDOMImplementation,        nsIDOMDOMImplementation,     NS_NewDOMImplementation)
 MAKE_CTOR(CreateXMLDocument,              nsIDocument,                 NS_NewXMLDocument)
-#ifdef MOZ_SVG
 MAKE_CTOR(CreateSVGDocument,              nsIDocument,                 NS_NewSVGDocument)
-#endif
 MAKE_CTOR(CreateImageDocument,            nsIDocument,                 NS_NewImageDocument)
 MAKE_CTOR(CreateDOMSelection,             nsISelection,                NS_NewDomSelection)
 MAKE_CTOR(CreateRange,                    nsIDOMRange,                 NS_NewRange)
@@ -769,9 +767,7 @@ NS_DEFINE_NAMED_CID(NS_DOCUMENT_VIEWER_CID);
 NS_DEFINE_NAMED_CID(NS_HTMLDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_DOM_IMPLEMENTATION_CID);
 NS_DEFINE_NAMED_CID(NS_XMLDOCUMENT_CID);
-#ifdef MOZ_SVG
 NS_DEFINE_NAMED_CID(NS_SVGDOCUMENT_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_IMAGEDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_DOMSELECTION_CID);
 NS_DEFINE_NAMED_CID(NS_RANGE_CID);
@@ -917,9 +913,7 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
   { &kNS_HTMLDOCUMENT_CID, false, NULL, CreateHTMLDocument },
   { &kNS_DOM_IMPLEMENTATION_CID, false, NULL, CreateDOMImplementation },
   { &kNS_XMLDOCUMENT_CID, false, NULL, CreateXMLDocument },
-#ifdef MOZ_SVG
   { &kNS_SVGDOCUMENT_CID, false, NULL, CreateSVGDocument },
-#endif
   { &kNS_IMAGEDOCUMENT_CID, false, NULL, CreateImageDocument },
   { &kNS_DOMSELECTION_CID, false, NULL, CreateDOMSelection },
   { &kNS_RANGE_CID, false, NULL, CreateRange },
@@ -1055,9 +1049,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { "@mozilla.org/inspector/dom-utils;1", &kIN_DOMUTILS_CID },
   { NS_NAMESPACEMANAGER_CONTRACTID, &kNS_NAMESPACEMANAGER_CID },
   { "@mozilla.org/xml/xml-document;1", &kNS_XMLDOCUMENT_CID },
-#ifdef MOZ_SVG
   { "@mozilla.org/svg/svg-document;1", &kNS_SVGDOCUMENT_CID },
-#endif
   { "@mozilla.org/content/dom-selection;1", &kNS_DOMSELECTION_CID },
   { "@mozilla.org/content/range;1", &kNS_RANGE_CID },
   { "@mozilla.org/content/range-utils;1", &kNS_RANGEUTILS_CID },
@@ -1075,18 +1067,14 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml", &kNS_TEXT_ENCODER_CID },
-#ifdef MOZ_SVG
   { NS_DOC_ENCODER_CONTRACTID_BASE "image/svg+xml", &kNS_TEXT_ENCODER_CID },
-#endif
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/html", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/plain", &kNS_TEXT_ENCODER_CID },
   { NS_HTMLCOPY_ENCODER_CONTRACTID, &kNS_HTMLCOPY_TEXT_ENCODER_CID },
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/xml", &kNS_XMLCONTENTSERIALIZER_CID },
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xml", &kNS_XMLCONTENTSERIALIZER_CID },
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/xhtml+xml", &kNS_XHTMLCONTENTSERIALIZER_CID },
-#ifdef MOZ_SVG
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "image/svg+xml", &kNS_XMLCONTENTSERIALIZER_CID },
-#endif
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/html", &kNS_HTMLCONTENTSERIALIZER_CID },
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "application/vnd.mozilla.xul+xml", &kNS_XMLCONTENTSERIALIZER_CID },
   { NS_CONTENTSERIALIZER_CONTRACTID_PREFIX "text/plain", &kNS_PLAINTEXTSERIALIZER_CID },
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index f8c88a039b0..012a6db8088 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -88,9 +88,7 @@
 #include "nsFrameList.h"
 #include "nsListControlFrame.h"
 #include "nsHTMLInputElement.h"
-#ifdef MOZ_SVG
 #include "nsSVGUtils.h"
-#endif
 
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index f405d91b0e1..bdd526e3151 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -90,8 +90,9 @@
 #include "nsThemeConstants.h"
 #include "nsPLDOMEvent.h"
 #include "nsRenderingContext.h"
+#include "mozilla/Preferences.h"
 
-namespace dom = mozilla::dom;
+using namespace mozilla;
 
 NS_IMETHODIMP
 nsComboboxControlFrame::RedisplayTextEvent::Run()
@@ -1518,6 +1519,6 @@ nsComboboxControlFrame::RestoreState(nsPresState* aState)
 PRBool
 nsComboboxControlFrame::ToolkitHasNativePopup()
 {
-  return nsContentUtils::GetBoolPref("ui.use_native_popup_windows");
+  return Preferences::GetBool("ui.use_native_popup_windows");
 }
 
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index e777abdc3f0..ae4207f43b4 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -456,12 +456,13 @@ nsTextControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
       initializer->Revoke();
     }
     initializer = new EditorInitializer(this);
+    Properties().Set(TextControlInitializer(),initializer);
     if (!nsContentUtils::AddScriptRunner(initializer)) {
       initializer->Revoke(); // paranoia
+      Properties().Delete(TextControlInitializer());
       delete initializer;
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    Properties().Set(TextControlInitializer(),initializer);
   }
 
   return NS_OK;
@@ -1488,7 +1489,7 @@ nsTextControlFrame::UpdateValueDisplay(PRBool aNotify,
   }
 
   if (aBeforeEditorInit && value.IsEmpty()) {
-    rootNode->RemoveChildAt(0, PR_TRUE, PR_FALSE);
+    rootNode->RemoveChildAt(0, PR_TRUE);
     return NS_OK;
   }
 
diff --git a/layout/generic/crashtests/660416.html b/layout/generic/crashtests/660416.html
new file mode 100644
index 00000000000..d9a42d419ea
--- /dev/null
+++ b/layout/generic/crashtests/660416.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+
+function boom()
+{
+  document.documentElement.offsetHeight;
+  var n = document.getElementById("a").firstChild;
+  n.data = "";
+  n.data = "z";
+}
+
+</script>
+</head>
+<body onload="boom();" style="-moz-column-count: 3;"><span id="a">x&#x202E;</span><span>y</span></body>
+</html>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index a42bddf7125..cc5cfe644c2 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -359,3 +359,4 @@ load 646561-1.html
 load 646983-1.html
 load 647332-1.html
 load 650499-1.html
+load 660416.html
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 67cfd9beedb..a563b16a441 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -73,12 +73,7 @@
 #include "nsIAccessible.h"
 #endif
 
-#include "nsIDOMText.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIDOMHTMLHRElement.h"
-#include "nsIDOMHTMLInputElement.h"
+#include "nsIDOMNode.h"
 #include "nsIEditorDocShell.h"
 #include "nsEventStateManager.h"
 #include "nsISelection.h"
@@ -121,15 +116,15 @@
 #include "nsDisplayList.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsExpirationTracker.h"
-#ifdef MOZ_SVG
 #include "nsSVGIntegrationUtils.h"
 #include "nsSVGEffects.h"
-#endif
 
 #include "gfxContext.h"
 #include "CSSCalc.h"
 #include "nsAbsoluteContainingBlock.h"
 
+#include "mozilla/Preferences.h"
+
 using namespace mozilla;
 using namespace mozilla::layers;
 
@@ -451,9 +446,7 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot)
                "Frames should be removed before destruction.");
   NS_ASSERTION(aDestructRoot, "Must specify destruct root");
 
-#ifdef MOZ_SVG
   nsSVGEffects::InvalidateDirectRenderingObservers(this);
-#endif
 
   // Get the view pointer now before the frame properties disappear
   // when we call NotifyDestroyingFrame()
@@ -1489,13 +1482,11 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
                             absPosClip - aBuilder->ToReferenceFrame(this));
   }
 
-#ifdef MOZ_SVG
   PRBool usingSVGEffects = nsSVGIntegrationUtils::UsingEffectsForFrame(this);
   if (usingSVGEffects) {
     dirtyRect =
       nsSVGIntegrationUtils::GetRequiredSourceForInvalidArea(this, dirtyRect);
   }
-#endif
 
   // Mark the display list items for absolutely positioned children
   MarkAbsoluteFramesForDisplayList(aBuilder, dirtyRect);
@@ -1585,7 +1576,6 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
     resultList.AppendToTop(item);
   }
  
-#ifdef MOZ_SVG
   /* If there are any SVG effects, wrap up the list in an effects list. */
   if (usingSVGEffects) {
     /* List now emptied, so add the new list to the top. */
@@ -1594,7 +1584,6 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
     if (NS_FAILED(rv))
       return rv;
   } else
-#endif
 
   /* If there is any opacity, wrap it up in an opacity list.
    * If there's nothing in the list, don't add anything.
@@ -1728,10 +1717,8 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
   // Child is composited if it's transformed, partially transparent, or has
   // SVG effects.
   PRBool isComposited = disp->mOpacity != 1.0f || aChild->IsTransformed()
-#ifdef MOZ_SVG
-    || nsSVGIntegrationUtils::UsingEffectsForFrame(aChild)
-#endif
-    ;
+    || nsSVGIntegrationUtils::UsingEffectsForFrame(aChild);
+
   PRBool isPositioned = disp->IsPositioned();
   if (isComposited || isPositioned || disp->IsFloating() ||
       (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
@@ -2354,7 +2341,7 @@ nsFrame::HandleMultiplePress(nsPresContext* aPresContext,
   if (me->clickCount == 4) {
     beginAmount = endAmount = eSelectParagraph;
   } else if (me->clickCount == 3) {
-    if (nsContentUtils::GetBoolPref("browser.triple_click_selects_paragraph")) {
+    if (Preferences::GetBool("browser.triple_click_selects_paragraph")) {
       beginAmount = endAmount = eSelectParagraph;
     } else {
       beginAmount = eSelectBeginLine;
@@ -2924,7 +2911,7 @@ static FrameTarget GetSelectionClosestFrameForBlock(nsIFrame* aFrame,
     // up with a line or the beginning or end of the frame; 0 on Windows,
     // 1 on other platforms by default at the writing of this code
     PRInt32 dragOutOfFrame =
-            nsContentUtils::GetIntPref("browser.drag_out_of_frame_style");
+      Preferences::GetInt("browser.drag_out_of_frame_style");
 
     if (prevLine == end) {
       if (dragOutOfFrame == 1 || nextLine == end)
@@ -4270,7 +4257,6 @@ void
 nsIFrame::InvalidateInternal(const nsRect& aDamageRect, nscoord aX, nscoord aY,
                              nsIFrame* aForChild, PRUint32 aFlags)
 {
-#ifdef MOZ_SVG
   nsSVGEffects::InvalidateDirectRenderingObservers(this);
   if (nsSVGIntegrationUtils::UsingEffectsForFrame(this)) {
     nsRect r = nsSVGIntegrationUtils::GetInvalidAreaForChangedSource(this,
@@ -4282,7 +4268,6 @@ nsIFrame::InvalidateInternal(const nsRect& aDamageRect, nscoord aX, nscoord aY,
     InvalidateInternalAfterResize(r, 0, 0, aFlags);
     return;
   }
-#endif
   
   InvalidateInternalAfterResize(aDamageRect, aX, aY, aFlags);
 }
@@ -4504,7 +4489,6 @@ ComputeOutlineAndEffectsRect(nsIFrame* aFrame, PRBool* aAnyOutlineOrEffects,
   // only one heap-allocated rect per frame and it will be cleaned up when
   // the frame dies.
 
-#ifdef MOZ_SVG
   if (nsSVGIntegrationUtils::UsingEffectsForFrame(aFrame)) {
     *aAnyOutlineOrEffects = PR_TRUE;
     if (aStoreRectProperties) {
@@ -4513,7 +4497,6 @@ ComputeOutlineAndEffectsRect(nsIFrame* aFrame, PRBool* aAnyOutlineOrEffects,
     }
     r = nsSVGIntegrationUtils::ComputeFrameEffectsRect(aFrame, r);
   }
-#endif
 
   return r;
 }
@@ -5650,7 +5633,7 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct* aPos)
         // This pref only affects whether moving forward by word should go to the end of this word or start of the next word.
         // When going backwards, the start of the word is always used, on every operating system.
         wordSelectEatSpace = aPos->mDirection == eDirNext &&
-          nsContentUtils::GetBoolPref("layout.word_select.eat_space_to_next_word");
+          Preferences::GetBool("layout.word_select.eat_space_to_next_word");
       }
       
       // mSawBeforeType means "we already saw characters of the type
@@ -5958,7 +5941,7 @@ nsFrame::BreakWordBetweenPunctuation(const PeekWordState* aState,
     // We always stop between whitespace and punctuation
     return PR_TRUE;
   }
-  if (!nsContentUtils::GetBoolPref("layout.word_select.stop_at_punctuation")) {
+  if (!Preferences::GetBool("layout.word_select.stop_at_punctuation")) {
     // When this pref is false, we never stop at a punctuation boundary unless
     // it's after whitespace
     return PR_FALSE;
diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp
index fbbe9db6af2..32b53858cd5 100644
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -39,7 +39,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsFrameSetFrame.h"
-#include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
 #include "nsLeafFrame.h"
 #include "nsHTMLContainerFrame.h"
@@ -73,6 +72,9 @@
 #include "nsDisplayList.h"
 #include "nsNodeUtils.h"
 #include "mozAutoDocUpdate.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 // masks for mEdgeVisibility
 #define LEFT_VIS   0x0001
@@ -238,8 +240,8 @@ nsHTMLFramesetFrame::~nsHTMLFramesetFrame()
   delete[] mChildFrameborder;
   delete[] mChildBorderColors;
 
-  nsContentUtils::UnregisterPrefCallback(kFrameResizePref,
-                                         FrameResizePrefCallback, this);
+  Preferences::UnregisterCallback(FrameResizePrefCallback,
+                                  kFrameResizePref, this);
 }
 
 NS_QUERYFRAME_HEAD(nsHTMLFramesetFrame)
@@ -263,8 +265,7 @@ nsHTMLFramesetFrame::FrameResizePrefCallback(const char* aPref, void* aClosure)
   }
 
   frame->mForceFrameResizability =
-    nsContentUtils::GetBoolPref(kFrameResizePref,
-                                frame->mForceFrameResizability);
+    Preferences::GetBool(kFrameResizePref, frame->mForceFrameResizability);
 
   frame->RecalculateBorderResize();
   if (doc) {
@@ -972,10 +973,9 @@ nsHTMLFramesetFrame::Reflow(nsPresContext*          aPresContext,
 
   PRBool firstTime = (GetStateBits() & NS_FRAME_FIRST_REFLOW) != 0;
   if (firstTime) {
-    nsContentUtils::RegisterPrefCallback(kFrameResizePref,
-                                         FrameResizePrefCallback, this);
-    mForceFrameResizability =
-      nsContentUtils::GetBoolPref(kFrameResizePref);
+    Preferences::RegisterCallback(FrameResizePrefCallback,
+                                  kFrameResizePref, this);
+    mForceFrameResizability = Preferences::GetBool(kFrameResizePref);
   }
   
   // subtract out the width of all of the potential borders. There are
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index ccc20b475f1..edac652c220 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1645,12 +1645,10 @@ CanScrollWithBlitting(nsIFrame* aFrame)
     if (f->GetStyleDisplay()->HasTransform()) {
       return PR_FALSE;
     }
-#ifdef MOZ_SVG
     if (nsSVGIntegrationUtils::UsingEffectsForFrame(f) ||
         f->IsFrameOfType(nsIFrame::eSVG)) {
       return PR_FALSE;
     }
-#endif
     nsIScrollableFrame* sf = do_QueryFrame(f);
     if (sf && nsLayoutUtils::HasNonZeroCorner(f->GetStyleBorder()->mBorderRadius))
       return PR_FALSE;
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index bab8a5cabe8..d71c633b9b1 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -52,9 +52,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsQueryFrame.h"
 #include "nsCOMArray.h"
-#ifdef MOZ_SVG
 #include "nsSVGIntegrationUtils.h"
-#endif
 #include "nsExpirationTracker.h"
 
 class nsPresContext;
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 6bc0f1b6df7..1e7aaf81199 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -54,8 +54,8 @@
 #include "nsTableCellFrame.h"
 #include "nsIServiceManager.h"
 #include "nsIPercentHeightObserver.h"
-#include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
+#include "mozilla/Preferences.h"
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
 #endif
@@ -1613,7 +1613,7 @@ static int
 PrefsChanged(const char *aPrefName, void *instance)
 {
   sBlinkIsAllowed =
-    nsContentUtils::GetBoolPref("browser.blink_allowed", sBlinkIsAllowed);
+    Preferences::GetBool("browser.blink_allowed", sBlinkIsAllowed);
 
   return 0; /* PREF_OK */
 }
@@ -1625,8 +1625,7 @@ static PRBool BlinkIsAllowed(void)
 {
   if (!sPrefIsLoaded) {
     // Set up a listener and check the initial value
-    nsContentUtils::RegisterPrefCallback("browser.blink_allowed", PrefsChanged,
-                                         nsnull);
+    Preferences::RegisterCallback(PrefsChanged, "browser.blink_allowed");
     PrefsChanged(nsnull, nsnull);
     sPrefIsLoaded = PR_TRUE;
   }
@@ -1638,9 +1637,10 @@ static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
   if (sNormalLineHeightControl == eUninitialized) {
     // browser.display.normal_lineheight_calc_control is not user
     // changeable, so no need to register callback for it.
-    sNormalLineHeightControl =
-      static_cast<eNormalLineHeightControl>
-                 (nsContentUtils::GetIntPref("browser.display.normal_lineheight_calc_control", eNoExternalLeading));
+    PRInt32 val =
+      Preferences::GetInt("browser.display.normal_lineheight_calc_control",
+                          eNoExternalLeading);
+    sNormalLineHeightControl = static_cast<eNormalLineHeightControl>(val);
   }
   return sNormalLineHeightControl;
 }
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 2bd64634b67..175238b807f 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -74,7 +74,6 @@
 #include "nsINameSpaceManager.h"
 #include "nsTextFragment.h"
 #include "nsIDOMHTMLMapElement.h"
-#include "nsImageMapUtils.h"
 #include "nsIScriptSecurityManager.h"
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -89,8 +88,6 @@
 #include "imgILoader.h"
 
 #include "nsCSSFrameConstructor.h"
-#include "nsIPrefBranch2.h"
-#include "nsIPrefService.h"
 #include "nsIDOMRange.h"
 
 #include "nsIContentPolicy.h"
@@ -103,6 +100,10 @@
 #include "gfxRect.h"
 #include "ImageLayers.h"
 
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
+
 // sizes (pixels) for image icon, padding and border frame
 #define ICON_SIZE        (16)
 #define ICON_PADDING     (3)
@@ -1456,13 +1457,11 @@ nsImageFrame::GetImageMap(nsPresContext* aPresContext)
     nsAutoString usemap;
     mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::usemap, usemap);
 
-    nsCOMPtr<nsIDOMHTMLMapElement> map = nsImageMapUtils::FindImageMap(doc,usemap);
+    nsCOMPtr<nsIContent> map = doc->FindImageMap(usemap);
     if (map) {
       mImageMap = new nsImageMap();
-      if (mImageMap) {
-        NS_ADDREF(mImageMap);
-        mImageMap->Init(aPresContext->PresShell(), this, map);
-      }
+      NS_ADDREF(mImageMap);
+      mImageMap->Init(aPresContext->PresShell(), this, map);
     }
   }
 
@@ -1878,19 +1877,16 @@ nsresult nsImageFrame::LoadIcons(nsPresContext *aPresContext)
 NS_IMPL_ISUPPORTS2(nsImageFrame::IconLoad, nsIObserver,
                    imgIDecoderObserver)
 
-static const char kIconLoadPrefs[][40] = {
+static const char* kIconLoadPrefs[] = {
   "browser.display.force_inline_alttext",
-  "browser.display.show_image_placeholders"
+  "browser.display.show_image_placeholders",
+  nsnull
 };
 
 nsImageFrame::IconLoad::IconLoad()
 {
-  nsIPrefBranch2* prefBranch = nsContentUtils::GetPrefBranch();
-  if (prefBranch) {
-    // register observers
-    for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(kIconLoadPrefs); ++i)
-      prefBranch->AddObserver(kIconLoadPrefs[i], this, PR_FALSE);
-  }
+  // register observers
+  Preferences::AddStrongObservers(this, kIconLoadPrefs);
   GetPrefs();
 }
 
@@ -1916,11 +1912,10 @@ nsImageFrame::IconLoad::Observe(nsISupports *aSubject, const char* aTopic,
 void nsImageFrame::IconLoad::GetPrefs()
 {
   mPrefForceInlineAltText =
-    nsContentUtils::GetBoolPref("browser.display.force_inline_alttext");
+    Preferences::GetBool("browser.display.force_inline_alttext");
 
   mPrefShowPlaceholders =
-    nsContentUtils::GetBoolPref("browser.display.show_image_placeholders",
-                                PR_TRUE);
+    Preferences::GetBool("browser.display.show_image_placeholders", PR_TRUE);
 }
 
 
diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp
index db591ed3678..f715eb86ac6 100644
--- a/layout/generic/nsImageMap.cpp
+++ b/layout/generic/nsImageMap.cpp
@@ -39,21 +39,16 @@
 /* code for HTML client-side image maps */
 
 #include "nsImageMap.h"
+
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "nsRenderingContext.h"
 #include "nsPresContext.h"
 #include "nsIURL.h"
-#include "nsIURL.h"
 #include "nsIServiceManager.h"
 #include "nsNetUtil.h"
 #include "nsTextFragment.h"
 #include "mozilla/dom/Element.h"
-#include "nsIDOMHTMLElement.h"
-#include "nsIDOMHTMLMapElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMHTMLCollection.h"
 #include "nsIDocument.h"
 #include "nsINameSpaceManager.h"
 #include "nsGkAtoms.h"
@@ -749,17 +744,16 @@ nsImageMap::FreeAreas()
 }
 
 nsresult
-nsImageMap::Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIDOMHTMLMapElement* aMap)
+nsImageMap::Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIContent* aMap)
 {
-  NS_PRECONDITION(nsnull != aMap, "null ptr");
-  if (nsnull == aMap) {
+  NS_PRECONDITION(aMap, "null ptr");
+  if (!aMap) {
     return NS_ERROR_NULL_POINTER;
   }
   mPresShell = aPresShell;
   mImageFrame = aImageFrame;
 
-  mMap = do_QueryInterface(aMap);
-  NS_ASSERTION(mMap, "aMap is not an nsIContent!");
+  mMap = aMap;
   mMap->AddMutationObserver(this);
 
   // "Compile" the areas in the map into faster access versions
diff --git a/layout/generic/nsImageMap.h b/layout/generic/nsImageMap.h
index 7f3f8ec2d56..a9d8ba252e3 100644
--- a/layout/generic/nsImageMap.h
+++ b/layout/generic/nsImageMap.h
@@ -37,8 +37,8 @@
 
 /* code for HTML client-side image maps */
 
-#ifndef nsImageMap_h___
-#define nsImageMap_h___
+#ifndef nsImageMap_h
+#define nsImageMap_h
 
 #include "nsISupports.h"
 #include "nsCoord.h"
@@ -47,20 +47,16 @@
 #include "nsIDOMFocusListener.h"
 #include "nsIFrame.h"
 
-class nsIDOMHTMLAreaElement;
-class nsIDOMHTMLMapElement;
-class nsRenderingContext;
-class nsIURI;
-class nsString;
-class nsIDOMEvent;
 class Area;
+class nsIDOMEvent;
+class nsRenderingContext;
 
 class nsImageMap : public nsStubMutationObserver, public nsIDOMFocusListener
 {
 public:
   nsImageMap();
 
-  nsresult Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIDOMHTMLMapElement* aMap);
+  nsresult Init(nsIPresShell* aPresShell, nsIFrame* aImageFrame, nsIContent* aMap);
 
   /**
    * See if the given aX,aY <b>pixel</b> coordinates are in the image
@@ -77,7 +73,7 @@ public:
    * Called just before the nsImageFrame releases us. 
    * Used to break the cycle caused by the DOM listener.
    */
-  void Destroy(void);
+  void Destroy();
   
   // nsISupports
   NS_DECL_ISUPPORTS
@@ -103,7 +99,7 @@ protected:
 
   nsresult UpdateAreas();
   nsresult SearchForAreas(nsIContent* aParent, PRBool& aFoundArea,
-                         PRBool& aFoundAnchor);
+                          PRBool& aFoundAnchor);
 
   nsresult AddArea(nsIContent* aArea);
  
@@ -118,4 +114,4 @@ protected:
   PRBool mContainsBlockContents;
 };
 
-#endif /* nsImageMap_h___ */
+#endif /* nsImageMap_h */
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index ae67cb2f9a0..11f8dbf32bd 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -704,10 +704,8 @@ IsPercentageAware(const nsIFrame* aFrame)
 
     // Handle SVG, which doesn't map width/height into style
     if ((
-#ifdef MOZ_SVG
          fType == nsGkAtoms::svgOuterSVGFrame ||
          fType == nsGkAtoms::imageFrame ||
-#endif
          fType == nsGkAtoms::subDocumentFrame) &&
         const_cast<nsIFrame*>(aFrame)->GetIntrinsicSize().width.GetUnit() ==
         eStyleUnit_Percent) {
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 14630d99ec3..dabf7c0bb01 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -133,6 +133,7 @@ enum { XKeyPress = KeyPress };
 #include "nsComponentManagerUtils.h"
 #include "nsIObserverService.h"
 #include "nsIScrollableFrame.h"
+#include "mozilla/Preferences.h"
 
 // headers for plugin scriptability
 #include "nsIScriptGlobalObject.h"
@@ -533,10 +534,6 @@ private:
   char              **mCachedAttrParamNames;
   char              **mCachedAttrParamValues;
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  nsIntPoint        mLastPoint;
-#endif
-
 #ifdef XP_MACOSX
   NPEventModel mEventModel;
 #endif
@@ -550,10 +547,6 @@ private:
 
   nsresult EnsureCachedAttrParamArrays();
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  nsEventStatus ProcessEventX11Composited(const nsGUIEvent & anEvent);
-#endif
-
 #ifdef MOZ_X11
   class Renderer
 #if defined(MOZ_WIDGET_GTK2)
@@ -1076,7 +1069,7 @@ nsObjectFrame::InstantiatePlugin(nsPluginHost* aPluginHost,
     if (NS_SUCCEEDED(rv))
       pDoc->SetStreamListener(stream);
   } else {   /* embedded mode */
-    rv = aPluginHost->InstantiateEmbeddedPlugin(aMimeType, aURI, mInstanceOwner, PR_TRUE);
+    rv = aPluginHost->InstantiateEmbeddedPlugin(aMimeType, aURI, mInstanceOwner);
   }
 
   // Note that |this| may very well be destroyed already!
@@ -2244,11 +2237,7 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
   if (mInstanceOwner) {
     NPWindow *window;
     mInstanceOwner->GetWindow(window);
-#ifdef MOZ_COMPOSITED_PLUGINS
-    {
-#else
     if (window->type == NPWindowTypeDrawable) {
-#endif
       gfxRect frameGfxRect =
         PresContext()->AppUnitsToGfxUnits(aPluginRect);
       gfxRect dirtyGfxRect =
@@ -3147,10 +3136,6 @@ nsPluginInstanceOwner::nsPluginInstanceOwner()
   mCachedAttrParamValues = nsnull;
   mDestroyWidget = PR_FALSE;
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  mLastPoint = nsIntPoint(0,0);
-#endif
-
 #ifdef XP_MACOSX
 #ifndef NP_NO_QUICKDRAW
   mEventModel = NPEventModelCarbon;
@@ -3373,7 +3358,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetURL(const char *aURL,
   }
 
   PRInt32 blockPopups =
-    nsContentUtils::GetIntPref("privacy.popups.disable_from_plugins");
+    Preferences::GetInt("privacy.popups.disable_from_plugins");
   nsAutoPopupStatePusher popupStatePusher((PopupControlState)blockPopups);
 
   rv = lh->OnLinkClick(mContent, uri, unitarget.get(), 
@@ -4067,7 +4052,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
 
   // "plugins.force.wmode" preference is forcing wmode type for plugins
   // possible values - "opaque", "transparent", "windowed"
-  nsAdoptingCString wmodeType = nsContentUtils::GetCharPref("plugins.force.wmode");
+  nsAdoptingCString wmodeType = Preferences::GetCString("plugins.force.wmode");
   if (!wmodeType.IsEmpty()) {
     mNumCachedAttrs++;
   }
@@ -4623,7 +4608,7 @@ nsresult nsPluginInstanceOwner::KeyPress(nsIDOMEvent* aKeyEvent)
 
 nsresult nsPluginInstanceOwner::DispatchKeyToPlugin(nsIDOMEvent* aKeyEvent)
 {
-#if !defined(XP_MACOSX) && !defined(MOZ_COMPOSITED_PLUGINS)
+#if !defined(XP_MACOSX)
   if (!mPluginWindow || (mPluginWindow->type == NPWindowTypeWindow))
     return aKeyEvent->PreventDefault(); // consume event
   // continue only for cases without child window
@@ -4684,7 +4669,7 @@ nsPluginInstanceOwner::MouseMove(nsIDOMEvent* aMouseEvent)
 nsresult
 nsPluginInstanceOwner::MouseDown(nsIDOMEvent* aMouseEvent)
 {
-#if !defined(XP_MACOSX) && !defined(MOZ_COMPOSITED_PLUGINS)
+#if !defined(XP_MACOSX)
   if (!mPluginWindow || (mPluginWindow->type == NPWindowTypeWindow))
     return aMouseEvent->PreventDefault(); // consume event
   // continue only for cases without child window
@@ -4758,7 +4743,7 @@ nsPluginInstanceOwner::MouseOut(nsIDOMEvent* aMouseEvent)
 
 nsresult nsPluginInstanceOwner::DispatchMouseToPlugin(nsIDOMEvent* aMouseEvent)
 {
-#if !defined(XP_MACOSX) && !defined(MOZ_COMPOSITED_PLUGINS)
+#if !defined(XP_MACOSX)
   if (!mPluginWindow || (mPluginWindow->type == NPWindowTypeWindow))
     return aMouseEvent->PreventDefault(); // consume event
   // continue only for cases without child window
@@ -4821,350 +4806,10 @@ static unsigned int XInputEventState(const nsInputEvent& anEvent)
 }
 #endif
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-static void find_dest_id(XID top, XID *root, XID *dest, int target_x, int target_y)
-{
-  XID target_id = top;
-  XID parent;
-  XID *children;
-  unsigned int nchildren;
-
-  Display *display = DefaultXDisplay();
-
-  while (1) {
-loop:
-    //printf("searching %x\n", target_id);
-    if (!XQueryTree(display, target_id, root, &parent, &children, &nchildren) ||
-        !nchildren)
-      break;
-    for (unsigned int i=0; i<nchildren; i++) {
-      Window root;
-      int x, y;
-      unsigned int width, height;
-      unsigned int border_width, depth;
-      XGetGeometry(display, children[i], &root, &x, &y,
-          &width, &height, &border_width,
-          &depth);
-      //printf("target: %d %d\n", target_x, target_y);
-      //printf("geom: %dx%x @ %dx%d\n", width, height, x, y);
-      // XXX: we may need to be more careful here, i.e. if
-      // this condition matches more than one child
-      if (target_x >= x && target_y >= y &&
-          target_x <= x + int(width) &&
-          target_y <= y + int(height)) {
-        target_id = children[i];
-        // printf("found new target: %x\n", target_id);
-        XFree(children);
-        goto loop;
-      }
-    }
-    XFree(children);
-    /* no children contain the target */
-    break;
-  }
-  *dest = target_id;
-}
-#endif
-
-#ifdef MOZ_COMPOSITED_PLUGINS
-nsEventStatus nsPluginInstanceOwner::ProcessEventX11Composited(const nsGUIEvent& anEvent)
-{
-  //printf("nsGUIEvent.message: %d\n", anEvent.message);
-  nsEventStatus rv = nsEventStatus_eIgnore;
-  if (!mInstance || !mObjectFrame)   // if mInstance is null, we shouldn't be here
-    return rv;
-
-  // this code supports windowless plugins
-  nsIWidget* widget = anEvent.widget;
-  XEvent pluginEvent;
-  pluginEvent.type = 0;
-
-  switch(anEvent.eventStructType)
-    {
-    case NS_MOUSE_EVENT:
-      {
-        switch (anEvent.message)
-          {
-          case NS_MOUSE_CLICK:
-          case NS_MOUSE_DOUBLECLICK:
-            // Button up/down events sent instead.
-            return rv;
-          }
-
-        // Get reference point relative to plugin origin.
-        const nsPresContext* presContext = mObjectFrame->PresContext();
-        nsPoint appPoint =
-          nsLayoutUtils::GetEventCoordinatesRelativeTo(&anEvent, mObjectFrame) -
-          mObjectFrame->GetContentRectRelativeToSelf().TopLeft();
-        nsIntPoint pluginPoint(presContext->AppUnitsToDevPixels(appPoint.x),
-                               presContext->AppUnitsToDevPixels(appPoint.y));
-        mLastPoint = pluginPoint;
-        const nsMouseEvent& mouseEvent =
-          static_cast<const nsMouseEvent&>(anEvent);
-        // Get reference point relative to screen:
-        nsIntPoint rootPoint(-1,-1);
-        if (widget)
-          rootPoint = anEvent.refPoint + widget->WidgetToScreenOffset();
-#ifdef MOZ_WIDGET_GTK2
-        Window root = GDK_ROOT_WINDOW();
-#elif defined(MOZ_WIDGET_QT)
-        Window root = QX11Info::appRootWindow();
-#else
-        Window root = None;
-#endif
-
-        switch (anEvent.message)
-          {
-          case NS_MOUSE_ENTER_SYNTH:
-          case NS_MOUSE_EXIT_SYNTH:
-            {
-              XCrossingEvent& event = pluginEvent.xcrossing;
-              event.type = anEvent.message == NS_MOUSE_ENTER_SYNTH ?
-                EnterNotify : LeaveNotify;
-              event.root = root;
-              event.time = anEvent.time;
-              event.x = pluginPoint.x;
-              event.y = pluginPoint.y;
-              event.x_root = rootPoint.x;
-              event.y_root = rootPoint.y;
-              event.state = XInputEventState(mouseEvent);
-              // information lost
-              event.subwindow = None;
-              event.mode = -1;
-              event.detail = NotifyDetailNone;
-              event.same_screen = True;
-              event.focus = mContentFocused;
-            }
-            break;
-          case NS_MOUSE_MOVE:
-            {
-              XMotionEvent& event = pluginEvent.xmotion;
-              event.type = MotionNotify;
-              event.root = root;
-              event.time = anEvent.time;
-              event.x = pluginPoint.x;
-              event.y = pluginPoint.y;
-              event.x_root = rootPoint.x;
-              event.y_root = rootPoint.y;
-              event.state = XInputEventState(mouseEvent);
-              // information lost
-              event.subwindow = None;
-              event.is_hint = NotifyNormal;
-              event.same_screen = True;
-              XEvent be;
-              be.xmotion = pluginEvent.xmotion;
-              //printf("xmotion: %d %d\n", be.xmotion.x, be.xmotion.y);
-              XID w = (XID)mPluginWindow->window;
-              be.xmotion.window = w;
-              XSendEvent (be.xmotion.display, w,
-                  FALSE, ButtonMotionMask, &be);
-
-            }
-            break;
-          case NS_MOUSE_BUTTON_DOWN:
-          case NS_MOUSE_BUTTON_UP:
-            {
-              XButtonEvent& event = pluginEvent.xbutton;
-              event.type = anEvent.message == NS_MOUSE_BUTTON_DOWN ?
-                ButtonPress : ButtonRelease;
-              event.root = root;
-              event.time = anEvent.time;
-              event.x = pluginPoint.x;
-              event.y = pluginPoint.y;
-              event.x_root = rootPoint.x;
-              event.y_root = rootPoint.y;
-              event.state = XInputEventState(mouseEvent);
-              switch (mouseEvent.button)
-                {
-                case nsMouseEvent::eMiddleButton:
-                  event.button = 2;
-                  break;
-                case nsMouseEvent::eRightButton:
-                  event.button = 3;
-                  break;
-                default: // nsMouseEvent::eLeftButton;
-                  event.button = 1;
-                  break;
-                }
-              // information lost:
-              event.subwindow = None;
-              event.same_screen = True;
-              XEvent be;
-              be.xbutton =  event;
-              XID target;
-              XID root;
-              int wx, wy;
-              unsigned int width, height, border_width, depth;
-
-              //printf("xbutton: %d %d %d\n", anEvent.message, be.xbutton.x, be.xbutton.y);
-              XID w = (XID)mPluginWindow->window;
-              XGetGeometry(DefaultXDisplay(), w, &root, &wx, &wy, &width, &height, &border_width, &depth);
-              find_dest_id(w, &root, &target, pluginPoint.x + wx, pluginPoint.y + wy);
-              be.xbutton.window = target;
-              XSendEvent (DefaultXDisplay(), target,
-                  FALSE, event.type == ButtonPress ? ButtonPressMask : ButtonReleaseMask, &be);
-
-            }
-            break;
-          }
-      }
-      break;
-
-   //XXX case NS_MOUSE_SCROLL_EVENT: not received.
- 
-   case NS_KEY_EVENT:
-      if (anEvent.pluginEvent)
-        {
-          XKeyEvent &event = pluginEvent.xkey;
-#ifdef MOZ_WIDGET_GTK2
-          event.root = GDK_ROOT_WINDOW();
-          event.time = anEvent.time;
-          const GdkEventKey* gdkEvent =
-            static_cast<const GdkEventKey*>(anEvent.pluginEvent);
-          event.keycode = gdkEvent->hardware_keycode;
-          event.state = gdkEvent->state;
-          switch (anEvent.message)
-            {
-            case NS_KEY_DOWN:
-              // Handle NS_KEY_DOWN for modifier key presses
-              // For non-modifiers we get NS_KEY_PRESS
-              if (gdkEvent->is_modifier)
-                event.type = XKeyPress;
-              break;
-            case NS_KEY_PRESS:
-              event.type = XKeyPress;
-              break;
-            case NS_KEY_UP:
-              event.type = KeyRelease;
-              break;
-            }
-#endif
-
-#ifdef MOZ_WIDGET_QT
-          const nsKeyEvent& keyEvent = static_cast<const nsKeyEvent&>(anEvent);
-
-          memset( &event, 0, sizeof(event) );
-          event.time = anEvent.time;
-
-          QWidget* qWidget = static_cast<QWidget*>(widget->GetNativeData(NS_NATIVE_WINDOW));
-          if (qWidget)
-            event.root = qWidget->x11Info().appRootWindow();
-
-          // deduce keycode from the information in the attached QKeyEvent
-          const QKeyEvent* qtEvent = static_cast<const QKeyEvent*>(anEvent.pluginEvent);
-          if (qtEvent) {
-
-            if (qtEvent->nativeModifiers())
-              event.state = qtEvent->nativeModifiers();
-            else // fallback
-              event.state = XInputEventState(keyEvent);
-
-            if (qtEvent->nativeScanCode())
-              event.keycode = qtEvent->nativeScanCode();
-            else // fallback
-              event.keycode = XKeysymToKeycode( (widget ? static_cast<Display*>(widget->GetNativeData(NS_NATIVE_DISPLAY)) : nsnull), qtEvent->key());
-          }
-
-          switch (anEvent.message)
-            {
-            case NS_KEY_DOWN:
-              event.type = XKeyPress;
-              break;
-            case NS_KEY_UP:
-              event.type = KeyRelease;
-              break;
-           }
-#endif
-
-          // Information that could be obtained from pluginEvent but we may not
-          // want to promise to provide:
-          event.subwindow = None;
-          event.x = 0;
-          event.y = 0;
-          event.x_root = -1;
-          event.y_root = -1;
-          event.same_screen = False;
-          XEvent be;
-          be.xkey =  event;
-          XID target;
-          XID root;
-          int wx, wy;
-          unsigned int width, height, border_width, depth;
-
-          //printf("xkey: %d %d %d\n", anEvent.message, be.xkey.keycode, be.xkey.state);
-          XID w = (XID)mPluginWindow->window;
-          XGetGeometry(DefaultXDisplay(), w, &root, &wx, &wy, &width, &height, &border_width, &depth);
-          find_dest_id(w, &root, &target, mLastPoint.x + wx, mLastPoint.y + wy);
-          be.xkey.window = target;
-          XSendEvent (DefaultXDisplay(), target,
-              FALSE, event.type == XKeyPress ? KeyPressMask : KeyReleaseMask, &be);
-
-
-        }
-      else
-        {
-          // If we need to send synthesized key events, then
-          // DOMKeyCodeToGdkKeyCode(keyEvent.keyCode) and
-          // gdk_keymap_get_entries_for_keyval will be useful, but the
-          // mappings will not be unique.
-          NS_WARNING("Synthesized key event not sent to plugin");
-        }
-      break;
-
-    default: 
-      switch (anEvent.message)
-        {
-        case NS_FOCUS_CONTENT:
-        case NS_BLUR_CONTENT:
-          {
-            XFocusChangeEvent &event = pluginEvent.xfocus;
-            event.type =
-              anEvent.message == NS_FOCUS_CONTENT ? FocusIn : FocusOut;
-            // information lost:
-            event.mode = -1;
-            event.detail = NotifyDetailNone;
-          }
-          break;
-        }
-    }
-
-  if (!pluginEvent.type) {
-    PR_LOG(nsObjectFrameLM, PR_LOG_DEBUG,
-           ("Unhandled event message %d with struct type %d\n",
-            anEvent.message, anEvent.eventStructType));
-    return rv;
-  }
-
-  // Fill in (useless) generic event information.
-  XAnyEvent& event = pluginEvent.xany;
-  event.display = widget ?
-    static_cast<Display*>(widget->GetNativeData(NS_NATIVE_DISPLAY)) : nsnull;
-  event.window = None; // not a real window
-  // information lost:
-  event.serial = 0;
-  event.send_event = False;
-
-#if 0
-  /* we've sent the event via XSendEvent so don't send it directly to the plugin */
-  PRInt16 response = kNPEventNotHandled;
-  mInstance->HandleEvent(&pluginEvent, &response);
-  if (response == kNPEventHandled)
-    rv = nsEventStatus_eConsumeNoDefault;
-#endif
-
-  return rv;
-}
-#endif
-
 nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
 {
   // printf("nsGUIEvent.message: %d\n", anEvent.message);
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  if (mPluginWindow && (mPluginWindow->type != NPWindowTypeDrawable))
-    return ProcessEventX11Composited(anEvent);
-#endif
-
   nsEventStatus rv = nsEventStatus_eIgnore;
 
   if (!mInstance || !mObjectFrame)   // if mInstance is null, we shouldn't be here
@@ -6039,9 +5684,6 @@ nsPluginInstanceOwner::Renderer::DrawWithXlib(gfxXlibSurface* xsurface,
   }
 #endif
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  if (mWindow->type == NPWindowTypeDrawable)
-#endif
   {
     if (doupdatewindow)
       instance->SetWindow(mWindow);
@@ -6062,9 +5704,7 @@ nsPluginInstanceOwner::Renderer::DrawWithXlib(gfxXlibSurface* xsurface,
   if (!dirtyRect.IntersectRect(dirtyRect, clipRect))
     return NS_OK;
 
-#ifdef MOZ_COMPOSITED_PLUGINS
-  if (mWindow->type == NPWindowTypeDrawable) {
-#endif
+  {
     XEvent pluginEvent = XEvent();
     XGraphicsExposeEvent& exposeEvent = pluginEvent.xgraphicsexpose;
     // set the drawing info
@@ -6083,34 +5723,7 @@ nsPluginInstanceOwner::Renderer::DrawWithXlib(gfxXlibSurface* xsurface,
     exposeEvent.minor_code = 0;
 
     instance->HandleEvent(&pluginEvent, nsnull);
-#ifdef MOZ_COMPOSITED_PLUGINS
   }
-  else {
-    /* XXX: this is very nasty. We need a better way of getting at mPlugWindow */
-    GtkWidget *plug = (GtkWidget*)(((nsPluginNativeWindow*)mWindow)->mPlugWindow);
-    //GtkWidget *plug = (GtkWidget*)(((nsPluginNativeWindowGtk2*)mWindow)->mSocketWidget);
-
-    /* Cairo has bugs with IncludeInferiors when using paint
-     * so we use XCopyArea directly instead. */
-    XGCValues gcv;
-    gcv.subwindow_mode = IncludeInferiors;
-    gcv.graphics_exposures = False;
-    Drawable drawable = xsurface->XDrawable();
-    GC gc = XCreateGC(DefaultXDisplay(), drawable, GCGraphicsExposures | GCSubwindowMode, &gcv);
-    /* The source and destination appear to always line up, so src and dest
-     * coords should be the same */
-    XCopyArea(DefaultXDisplay(), gdk_x11_drawable_get_xid(plug->window),
-              drawable,
-              gc,
-              mDirtyRect.x,
-              mDirtyRect.y,
-              mDirtyRect.width,
-              mDirtyRect.height,
-              mDirtyRect.x,
-              mDirtyRect.y);
-    XFreeGC(DefaultXDisplay(), gc);
-  }
-#endif
   return NS_OK;
 }
 #endif
diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h
index a15ae485384..a70be8f18d2 100644
--- a/layout/generic/nsObjectFrame.h
+++ b/layout/generic/nsObjectFrame.h
@@ -58,7 +58,6 @@ class nsIAccessible;
 
 class nsPluginInstanceOwner;
 class nsPluginHost;
-class nsIPluginInstance;
 class nsPresContext;
 class nsDisplayPlugin;
 class nsIDOMElement;
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 8b9f5af1ee3..7bf82fb0508 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -87,6 +87,7 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"
+#include "mozilla/Preferences.h"
 
 //included for desired x position;
 #include "nsPresContext.h"
@@ -113,6 +114,8 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 
 #include "nsDOMError.h"
 
+using namespace mozilla;
+
 //#define DEBUG_TABLE 1
 
 static NS_DEFINE_IID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);
@@ -730,7 +733,7 @@ nsFrameSelection::nsFrameSelection()
 
   // Check to see if the autocopy pref is enabled
   //   and add the autocopy listener if it is
-  if (nsContentUtils::GetBoolPref("clipboard.autocopy")) {
+  if (Preferences::GetBool("clipboard.autocopy")) {
     nsAutoCopyListener *autoCopy = nsAutoCopyListener::GetInstance();
 
     if (autoCopy) {
@@ -1081,7 +1084,8 @@ nsFrameSelection::Init(nsIPresShell *aShell, nsIContent *aLimiter)
   mMouseDownState = PR_FALSE;
   mDesiredXSet = PR_FALSE;
   mLimiter = aLimiter;
-  mCaretMovementStyle = nsContentUtils::GetIntPref("bidi.edit.caret_movement_style", 2);
+  mCaretMovementStyle =
+    Preferences::GetInt("bidi.edit.caret_movement_style", 2);
 }
 
 nsresult
@@ -1140,7 +1144,8 @@ nsFrameSelection::MoveCaret(PRUint32          aKeycode,
     SetDesiredX(desiredX);
   }
 
-  PRInt32 caretStyle = nsContentUtils::GetIntPref("layout.selection.caret_style", 0);
+  PRInt32 caretStyle =
+    Preferences::GetInt("layout.selection.caret_style", 0);
 #ifdef XP_MACOSX
   if (caretStyle == 0) {
     caretStyle = 2; // put caret at the selection edge in the |aKeycode| direction
diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp
index e9edcb20774..ba485049709 100644
--- a/layout/generic/nsSimplePageSequence.cpp
+++ b/layout/generic/nsSimplePageSequence.cpp
@@ -49,6 +49,7 @@
 #include "nsCSSFrameConstructor.h"
 #include "nsContentUtils.h"
 #include "nsDisplayList.h"
+#include "mozilla/Preferences.h"
 
 // DateTime Includes
 #include "nsDateTimeFormatCID.h"
@@ -61,6 +62,8 @@
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
 
+using namespace mozilla;
+
 static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1";
 
 //
@@ -226,7 +229,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
   // Compute the size of each page and the x coordinate that each page will
   // be placed at
   nscoord extraThreshold = NS_MAX(pageSize.width, pageSize.height)/10;
-  PRInt32 gapInTwips = nsContentUtils::GetIntPref("print.print_extra_margin");
+  PRInt32 gapInTwips = Preferences::GetInt("print.print_extra_margin");
   gapInTwips = NS_MAX(0, gapInTwips);
 
   nscoord extraGap = aPresContext->CSSTwipsToAppUnits(gapInTwips);
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 33e51e67cf5..6974a9c4392 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -82,7 +82,6 @@ using mozilla::layout::RenderFrameParent;
 #include "nsWeakReference.h"
 #include "nsIDOMWindow.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsDisplayList.h"
 #include "nsUnicharUtils.h"
 #include "nsIScrollableFrame.h"
@@ -1075,12 +1074,10 @@ nsSubDocumentFrame::ObtainIntrinsicSizeFrame()
       }
     }
 
-#ifdef MOZ_SVG
     if (subDocRoot && subDocRoot->GetContent() &&
         subDocRoot->GetContent()->NodeInfo()->Equals(nsGkAtoms::svg, kNameSpaceID_SVG)) {
       return subDocRoot; // SVG documents have an intrinsic size
     }
-#endif
   }
   return nsnull;
 }
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 1d807700e11..e8baf8f0b84 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -626,28 +626,27 @@ PRInt32 nsTextFrame::GetInFlowContentLength() {
     return mContent->TextLength() - mContentOffset;
   }
 
-  nsTextFrame* nextBidi = nsnull;
-  PRInt32      start = -1, end, endFlow;
   FlowLengthProperty* flowLength =
     static_cast<FlowLengthProperty*>(mContent->GetProperty(nsGkAtoms::flowlength));
 
-  if (flowLength && flowLength->mStartOffset <= mContentOffset &&
+  /**
+   * This frame must start inside the cached flow. If the flow starts at
+   * mContentOffset but this frame is empty, logically it might be before the
+   * start of the cached flow.
+   */
+  if (flowLength && 
+      (flowLength->mStartOffset < mContentOffset ||
+       (flowLength->mStartOffset == mContentOffset && GetContentEnd() > mContentOffset)) &&
       flowLength->mEndFlowOffset > mContentOffset) {
 #ifdef DEBUG
-    GetOffsets(start, end);
-    NS_ASSERTION(flowLength->mEndFlowOffset >= end,
-                 "frame crosses fixed continuation boundary");
+    NS_ASSERTION(flowLength->mEndFlowOffset >= GetContentEnd(),
+		 "frame crosses fixed continuation boundary");
 #endif
     return flowLength->mEndFlowOffset - mContentOffset;
   }
 
-  nextBidi = static_cast<nsTextFrame*>(GetLastInFlow()->GetNextContinuation());
-  if (nextBidi) {
-    nextBidi->GetOffsets(start, end);
-    endFlow = start;
-  } else {
-    endFlow = mContent->TextLength();
-  }
+  nsTextFrame* nextBidi = static_cast<nsTextFrame*>(GetLastInFlow()->GetNextContinuation());
+  PRInt32 endFlow = nextBidi ? nextBidi->GetContentOffset() : mContent->TextLength();
 
   if (!flowLength) {
     flowLength = new FlowLengthProperty;
diff --git a/layout/inspector/src/inCSSValueSearch.cpp b/layout/inspector/src/inCSSValueSearch.cpp
index 76f59a00f43..255f1a4b77e 100644
--- a/layout/inspector/src/inCSSValueSearch.cpp
+++ b/layout/inspector/src/inCSSValueSearch.cpp
@@ -41,7 +41,7 @@
 #include "nsIServiceManager.h"
 #include "nsVoidArray.h"
 #include "nsReadableUtils.h"
-#include "nsIDOMDocumentStyle.h"
+#include "nsIDOMDocument.h"
 #include "nsIDOM3Node.h"
 #include "nsIDOMStyleSheetList.h"
 #include "nsIDOMCSSStyleSheet.h"
@@ -120,22 +120,23 @@ inCSSValueSearch::SearchSync()
     dom3Node->GetBaseURI(uri);
     NS_NewURI(getter_AddRefs(baseURL), uri);
   }
-  
-  nsCOMPtr<nsIDOMDocumentStyle> doc = do_QueryInterface(mDocument);
-  if (doc) {
-    nsCOMPtr<nsIDOMStyleSheetList> sheets;
-    nsresult rv = doc->GetStyleSheets(getter_AddRefs(sheets));
-    NS_ENSURE_SUCCESS(rv, NS_OK);
 
-    PRUint32 length;
-    sheets->GetLength(&length);
-    for (PRUint32 i = 0; i < length; ++i) {
-      nsCOMPtr<nsIDOMStyleSheet> sheet;
-      sheets->Item(i, getter_AddRefs(sheet));
-      nsCOMPtr<nsIDOMCSSStyleSheet> cssSheet = do_QueryInterface(sheet);
-      if (cssSheet)
-        SearchStyleSheet(cssSheet, baseURL);
-    }
+  if (!mDocument) {
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIDOMStyleSheetList> sheets;
+  nsresult rv = mDocument->GetStyleSheets(getter_AddRefs(sheets));
+  NS_ENSURE_SUCCESS(rv, NS_OK);
+
+  PRUint32 length;
+  sheets->GetLength(&length);
+  for (PRUint32 i = 0; i < length; ++i) {
+    nsCOMPtr<nsIDOMStyleSheet> sheet;
+    sheets->Item(i, getter_AddRefs(sheet));
+    nsCOMPtr<nsIDOMCSSStyleSheet> cssSheet = do_QueryInterface(sheet);
+    if (cssSheet)
+      SearchStyleSheet(cssSheet, baseURL);
   }
 
   // XXX would be nice to search inline style as well.
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index abcea28ed5b..450573493f1 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -113,8 +113,6 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsISelectionListener.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMHTMLDocument.h"
-#include "nsIDOMNSDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMRange.h"
@@ -123,6 +121,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsContentUtils.h"
 #include "nsIPresShell.h"
 #include "nsLayoutUtils.h"
+#include "mozilla/Preferences.h"
 
 #include "nsViewsCID.h"
 #include "nsWidgetsCID.h"
@@ -165,6 +164,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsIURIFixup.h"
 #include "mozilla/dom/Element.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
 
 //-----------------------------------------------------
@@ -597,8 +597,8 @@ nsPrintEngine::DoCommonPrint(PRBool                  aIsPrintPreview,
     mPrt->mPrintSettings->GetPrintSilent(&printSilently);
 
     // Check prefs for a default setting as to whether we should print silently
-    printSilently = nsContentUtils::GetBoolPref("print.always_print_silent",
-                                                printSilently);
+    printSilently =
+      Preferences::GetBool("print.always_print_silent", printSilently);
 
     // Ask dialog to be Print Shown via the Plugable Printing Dialog Service
     // This service is for the Print Dialog and the Print Progress Dialog
@@ -1012,8 +1012,7 @@ nsPrintEngine::ShowPrintProgress(PRBool aIsForPrinting, PRBool& aDoNotify)
   // if it is already being shown then don't bother to find out if it should be
   // so skip this and leave mShowProgressDialog set to FALSE
   if (!mProgressDialogIsShown) {
-    showProgresssDialog =
-      nsContentUtils::GetBoolPref("print.show_print_progress");
+    showProgresssDialog = Preferences::GetBool("print.show_print_progress");
   }
 
   // Turning off the showing of Print Progress in Prefs overrides
@@ -1188,7 +1187,7 @@ nsPrintEngine::GetDocumentTitleAndURL(nsIDocument* aDoc,
   *aURLStr = nsnull;
 
   nsAutoString docTitle;
-  nsCOMPtr<nsIDOMNSDocument> doc = do_QueryInterface(aDoc);
+  nsCOMPtr<nsIDOMDocument> doc = do_QueryInterface(aDoc);
   doc->GetTitle(docTitle);
   if (!docTitle.IsEmpty()) {
     *aTitle = ToNewUnicode(docTitle);
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index 64bf5d0a268..3a391d8f7c7 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -41,20 +41,20 @@ fails-if(Android) == clipping-3.html clipping-3-ref.xhtml # edge of border-radiu
 
 # Tests for clipping the contents of replaced elements and overflow!=visible
 != clipping-4-ref.html clipping-4-notref.html
-fails-if(Android) fails-if(cocoaWidget) == clipping-4-canvas.html clipping-4-ref.html
+fails-if(cocoaWidget) == clipping-4-canvas.html clipping-4-ref.html
 fails-if(Android) == clipping-4-image.html clipping-4-ref.html
 == clipping-4-overflow-hidden.html clipping-4-ref.html
 == clipping-5-canvas.html clipping-5-refc.html
 == clipping-5-image.html clipping-5-refi.html
 == clipping-5-overflow-hidden.html clipping-5-ref.html
 fails-if(Android) == clipping-5-refi.html clipping-5-ref.html
-fails-if(Android) fails-if(cocoaWidget) == clipping-5-refc.html clipping-5-ref.html
+fails-if(cocoaWidget) == clipping-5-refc.html clipping-5-ref.html
 == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html
 == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
 == intersecting-clipping-1-image.html intersecting-clipping-1-refi.html
 == intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-ref.html
 fails-if(Android) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
-fails-if(Android) fails-if(cocoaWidget) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html
+fails-if(cocoaWidget) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html
 
 # Inheritance
 == inherit-1.html inherit-1-ref.html # border-radius shouldn't inherit
diff --git a/layout/reftests/bugs/605138-1-ref.html b/layout/reftests/bugs/605138-1-ref.html
index 1870bdecbf5..af85153ddb5 100644
--- a/layout/reftests/bugs/605138-1-ref.html
+++ b/layout/reftests/bugs/605138-1-ref.html
@@ -1,6 +1,10 @@
 <html>
 <head>
-  <link href="data:text/css,#master{display:table; width: 100%;}" rel="stylesheet" type="text/css" media="screen">
+  <link href="data:text/css,%23master{display:table; width: 100%;}"
+        rel="stylesheet" type="text/css" media="screen">
+  <style>
+    #master { outline: 1px dashed black; }
+  </style>
 </head>
 <body>
 <div id="master">
diff --git a/layout/reftests/bugs/605138-1.html b/layout/reftests/bugs/605138-1.html
index ce468da6d24..afa224b495e 100644
--- a/layout/reftests/bugs/605138-1.html
+++ b/layout/reftests/bugs/605138-1.html
@@ -1,6 +1,7 @@
 <html>
 <head>
-  <link href="data:text/css,#master{display:table; width: 100%;}" rel="stylesheet" type="text/css" media="screen">
+  <link href="data:text/css,%23master{display:table; width: 100%; outline: 1px dashed black; }"
+        rel="stylesheet" type="text/css" media="screen">
 </head>
 <body>
 <div id="master">
diff --git a/layout/reftests/bugs/658952-ref.html b/layout/reftests/bugs/658952-ref.html
new file mode 100644
index 00000000000..69fd14e3cf7
--- /dev/null
+++ b/layout/reftests/bugs/658952-ref.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=KSC5601">
+</head>
+<body>
+<p>&#xCA25;&#xCA25;&#xC774; &#xC0AC;&#xC8FC;&#xC138;&#xC694; - IE &#xAE30;&#xB85D;<br>&#xCA25;&#xCA25;&#xC774; &#xC0AC;&#xC8FC;&#xC138;&#xC694; - ie9 &#xAE30;&#xB85D;</p>
+</body>
+</html>
diff --git a/layout/reftests/bugs/658952.html b/layout/reftests/bugs/658952.html
new file mode 100644
index 00000000000..1a83de36aac
--- /dev/null
+++ b/layout/reftests/bugs/658952.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=KSC5601">
+</head>
+<body>
+<p>¤z¤zÀÌ »çÁÖ¼¼¿ä - IE ±â·Ï<br>¤z¤zÀÌ »çÁÖ¼¼¿ä - ie9 ±â·Ï</p>
+</body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index f2cc627f9a2..8ec9edfb964 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1637,3 +1637,4 @@ HTTP(..) == 654057-1.html 654057-1-ref.html
 fails-if(layersGPUAccelerated&&cocoaWidget) == 654950-1.html 654950-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
 == 652775-1.html 652775-1-ref.html
 != 656875.html about:blank
+== 658952.html 658952-ref.html
diff --git a/layout/reftests/counters/reftest.list b/layout/reftests/counters/reftest.list
index 2972b90b1d8..8a553f1e363 100644
--- a/layout/reftests/counters/reftest.list
+++ b/layout/reftests/counters/reftest.list
@@ -60,4 +60,4 @@
 == text-boundaries-subpixel.html text-boundaries-subpixel-ref.html
 == counter-hebrew-test.html counter-hebrew-reference.html
 == counters-hebrew-test.html counters-hebrew-reference.html
-== counter-reset-integer-range.html counter-reset-integer-range-ref.html
+fails-if(Android) == counter-reset-integer-range.html counter-reset-integer-range-ref.html
diff --git a/layout/reftests/generated-content/reftest.list b/layout/reftests/generated-content/reftest.list
index cc913fee78e..dfd70ed36d1 100644
--- a/layout/reftests/generated-content/reftest.list
+++ b/layout/reftests/generated-content/reftest.list
@@ -1,4 +1,4 @@
-== display-types-01.html display-types-01-ref.html
+fails-if(Android) == display-types-01.html display-types-01-ref.html
 == dynamic-attr-01.html dynamic-attr-01-ref.html
 == dynamic-restyle-01.html dynamic-restyle-01-ref.html
 == floated-01.html floated-01-ref.html
diff --git a/layout/reftests/image/background-image-zoom-2.html b/layout/reftests/image/background-image-zoom-2.html
new file mode 100644
index 00000000000..18a41ea430f
--- /dev/null
+++ b/layout/reftests/image/background-image-zoom-2.html
@@ -0,0 +1,23 @@
+<html reftest-zoom="1.8">
+<style>
+  a{
+    background-repeat: inherit;
+    background-position: inherit;
+    /* this image has a red pixel at the bottom to
+    prevent image lib from optimizing it into a
+    solid color fill */
+    background-image:url("nearly-white.png");
+    line-height: 20px; /* set the line height so that the red pixel is not drawn */ 
+  }
+</style>
+<div style="background-repeat: no-repeat">
+    <a>&nbsp;</a><a>&nbsp;</a>
+</div>
+<p>
+<div style="background-position: right top">
+    <a>&nbsp;</a><a>&nbsp;</a>
+</div>
+<p>
+<div>
+    <a>&nbsp;</a><a>&nbsp;</a>
+</div>
diff --git a/layout/reftests/image/nearly-white.png b/layout/reftests/image/nearly-white.png
new file mode 100644
index 00000000000..128d1511000
Binary files /dev/null and b/layout/reftests/image/nearly-white.png differ
diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list
index e3c4e7cb73e..6d4578b0c71 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,3 +1,4 @@
 fails-if(Android) == background-image-zoom-1.html background-image-zoom-1-ref.html
+== background-image-zoom-2.html about:blank
 fails-if(Android) == image-zoom-1.html image-zoom-1-ref.html
 == invalid-url-image-1.html invalid-url-image-1-ref.html
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index 9ff90e17abc..9ea4bedad84 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -56,10 +56,10 @@
 #include "nsCOMArray.h"
 #include "nsString.h"
 #include "nsIContent.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMWindow.h"
 #include "nsIDocument.h"
-#include "nsIDOMNSDocumentStyle.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMWindow.h"
 #include "nsICharsetAlias.h"
 #include "nsHashtable.h"
 #include "nsIURI.h"
@@ -457,7 +457,7 @@ Loader::Loader(nsIDocument* aDocument)
   // We can just use the preferred set, since there are no sheets in the
   // document yet (if there are, how did they get there? _we_ load the sheets!)
   // and hence the selected set makes no sense at this time.
-  nsCOMPtr<nsIDOMNSDocumentStyle> domDoc(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(mDocument);
   if (domDoc) {
     domDoc->GetPreferredStyleSheetSet(mPreferredSheet);
   }
@@ -511,7 +511,7 @@ nsresult
 Loader::SetPreferredSheet(const nsAString& aTitle)
 {
 #ifdef DEBUG
-  nsCOMPtr<nsIDOMNSDocumentStyle> doc(do_QueryInterface(mDocument));
+  nsCOMPtr<nsIDOMDocument> doc = do_QueryInterface(mDocument);
   if (doc) {
     nsAutoString currentPreferred;
     doc->GetLastStyleSheetSet(currentPreferred);
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 6a2ba22ad4e..aad64ae58fb 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -878,31 +878,6 @@ nsCSSSelectorList::Clone(PRBool aDeep) const
 namespace mozilla {
 namespace css {
 
-class StyleRule;
-
-class ImportantRule : public nsIStyleRule {
-public:
-  ImportantRule(Declaration *aDeclaration);
-
-  NS_DECL_ISUPPORTS
-
-  // nsIStyleRule interface
-  virtual void MapRuleInfoInto(nsRuleData* aRuleData);
-#ifdef DEBUG
-  virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
-#endif
-
-protected:
-  virtual ~ImportantRule();
-
-  // Not an owning reference; the StyleRule that owns this
-  // ImportantRule also owns the mDeclaration, and any rule node
-  // pointing to this rule keeps that StyleRule alive as well.
-  Declaration* mDeclaration;
-
-  friend class css::StyleRule;
-};
-
 ImportantRule::ImportantRule(Declaration* aDeclaration)
   : mDeclaration(aDeclaration)
 {
@@ -1307,11 +1282,6 @@ NS_INTERFACE_MAP_END
 NS_IMPL_ADDREF_INHERITED(StyleRule, Rule)
 NS_IMPL_RELEASE_INHERITED(StyleRule, Rule)
 
-nsIStyleRule* StyleRule::GetImportantRule()
-{
-  return mImportantRule;
-}
-
 void
 StyleRule::RuleMatched()
 {
diff --git a/layout/style/StyleRule.h b/layout/style/StyleRule.h
index 6fe9889abd8..768016e72f1 100644
--- a/layout/style/StyleRule.h
+++ b/layout/style/StyleRule.h
@@ -291,9 +291,33 @@ namespace mozilla {
 namespace css {
 
 class Declaration;
-class ImportantRule;
 class DOMCSSStyleRule;
 
+class StyleRule;
+
+class ImportantRule : public nsIStyleRule {
+public:
+  ImportantRule(Declaration *aDeclaration);
+
+  NS_DECL_ISUPPORTS
+
+  // nsIStyleRule interface
+  virtual void MapRuleInfoInto(nsRuleData* aRuleData);
+#ifdef DEBUG
+  virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
+#endif
+
+protected:
+  virtual ~ImportantRule();
+
+  // Not an owning reference; the StyleRule that owns this
+  // ImportantRule also owns the mDeclaration, and any rule node
+  // pointing to this rule keeps that StyleRule alive as well.
+  Declaration* mDeclaration;
+
+  friend class StyleRule;
+};
+
 class NS_FINAL_CLASS StyleRule : public Rule
 {
  public:
@@ -330,7 +354,7 @@ public:
   already_AddRefed<StyleRule>
   DeclarationChanged(Declaration* aDecl, PRBool aHandleContainer);
 
-  nsIStyleRule* GetImportantRule();
+  nsIStyleRule* GetImportantRule() const { return mImportantRule; }
 
   /**
    * The rule processor must call this method before calling
diff --git a/layout/style/nsCSSAnonBoxList.h b/layout/style/nsCSSAnonBoxList.h
index 34438b8ff4f..25d40f78b67 100644
--- a/layout/style/nsCSSAnonBoxList.h
+++ b/layout/style/nsCSSAnonBoxList.h
@@ -109,6 +109,4 @@ CSS_ANON_BOX(moztreeprogressmeter, ":-moz-tree-progressmeter")
 CSS_ANON_BOX(moztreedropfeedback, ":-moz-tree-drop-feedback")
 #endif
 
-#ifdef MOZ_SVG
 CSS_ANON_BOX(mozSVGForeignContent, ":-moz-svg-foreign-content")
-#endif
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 606fc6a112b..342b65ad2d3 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -193,9 +193,7 @@ public:
 
   nsresult SetQuirkMode(PRBool aQuirkMode);
 
-#ifdef  MOZ_SVG
   nsresult SetSVGMode(PRBool aSVGMode);
-#endif
 
   nsresult SetChildLoader(mozilla::css::Loader* aChildLoader);
 
@@ -299,11 +297,9 @@ protected:
                    PRUint32 aLineNumber, nsIURI* aBaseURI,
                    nsIPrincipal* aSheetPrincipal);
   void ReleaseScanner(void);
-#ifdef MOZ_SVG
   PRBool IsSVGMode() const {
     return mScanner.IsSVGMode();
   }
-#endif
 
   PRBool GetToken(PRBool aSkipWS);
   void UngetToken();
@@ -544,11 +540,9 @@ protected:
   PRBool ParseAnimation();
 #endif
 
-#ifdef MOZ_SVG
   PRBool ParsePaint(nsCSSProperty aPropID);
   PRBool ParseDasharray();
   PRBool ParseMarker();
-#endif
 
   // Reused utility parsing routines
   void AppendValue(nsCSSProperty aPropID, const nsCSSValue& aValue);
@@ -801,7 +795,6 @@ CSSParserImpl::SetQuirkMode(PRBool aQuirkMode)
   return NS_OK;
 }
 
-#ifdef MOZ_SVG
 nsresult
 CSSParserImpl::SetSVGMode(PRBool aSVGMode)
 {
@@ -810,7 +803,6 @@ CSSParserImpl::SetSVGMode(PRBool aSVGMode)
   mScanner.SetSVGMode(aSVGMode);
   return NS_OK;
 }
-#endif
 
 nsresult
 CSSParserImpl::SetChildLoader(mozilla::css::Loader* aChildLoader)
@@ -825,9 +817,7 @@ CSSParserImpl::Reset()
   NS_ASSERTION(! mScannerInited, "resetting with scanner active");
   SetStyleSheet(nsnull);
   SetQuirkMode(PR_FALSE);
-#ifdef MOZ_SVG
   SetSVGMode(PR_FALSE);
-#endif // MOZ_SVG
   SetChildLoader(nsnull);
 }
 
@@ -4587,7 +4577,6 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
     }
   }
 
-#ifdef  MOZ_SVG
   if (IsSVGMode() && !IsParsingCompoundProperty()) {
     // STANDARD: SVG Spec states that lengths and coordinates can be unitless
     // in which case they default to user-units (1 px = 1 user unit)
@@ -4597,7 +4586,6 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
       return PR_TRUE;
     }
   }
-#endif
 
   if (((aVariantMask & VARIANT_URL) != 0) &&
       eCSSToken_URL == tk->mType) {
@@ -5575,8 +5563,6 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
 #endif
   case eCSSProperty_transition_property:
     return ParseTransitionProperty();
-
-#ifdef MOZ_SVG
   case eCSSProperty_fill:
   case eCSSProperty_stroke:
     return ParsePaint(aPropID);
@@ -5584,8 +5570,6 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
     return ParseDasharray();
   case eCSSProperty_marker:
     return ParseMarker();
-#endif
-
   default:
     NS_ABORT_IF_FALSE(PR_FALSE, "should not be called");
     return PR_FALSE;
@@ -8582,7 +8566,6 @@ CSSParserImpl::SetDefaultNamespaceOnSelector(nsCSSSelector& aSelector)
   }
 }
 
-#ifdef MOZ_SVG
 PRBool
 CSSParserImpl::ParsePaint(nsCSSProperty aPropID)
 {
@@ -8649,7 +8632,6 @@ CSSParserImpl::ParseMarker()
   }
   return PR_FALSE;
 }
-#endif
 
 } // anonymous namespace
 
@@ -8717,14 +8699,12 @@ nsCSSParser::SetQuirkMode(PRBool aQuirkMode)
     SetQuirkMode(aQuirkMode);
 }
 
-#ifdef  MOZ_SVG
 nsresult
 nsCSSParser::SetSVGMode(PRBool aSVGMode)
 {
   return static_cast<CSSParserImpl*>(mImpl)->
     SetSVGMode(aSVGMode);
 }
-#endif
 
 nsresult
 nsCSSParser::SetChildLoader(mozilla::css::Loader* aChildLoader)
diff --git a/layout/style/nsCSSParser.h b/layout/style/nsCSSParser.h
index 0667af497e1..77151caf385 100644
--- a/layout/style/nsCSSParser.h
+++ b/layout/style/nsCSSParser.h
@@ -88,10 +88,8 @@ public:
   // Set whether or not to emulate Nav quirks
   nsresult SetQuirkMode(PRBool aQuirkMode);
 
-#ifdef  MOZ_SVG
   // Set whether or not we are in an SVG element
   nsresult SetSVGMode(PRBool aSVGMode);
-#endif
 
   // Set loader to use for child sheets
   nsresult SetChildLoader(mozilla::css::Loader* aChildLoader);
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index aa1f247b3ea..c299af05fa2 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -94,9 +94,10 @@
 #include "mozilla/dom/Element.h"
 #include "nsGenericElement.h"
 #include "nsNthIndexCache.h"
+#include "mozilla/Preferences.h"
 
+using namespace mozilla;
 using namespace mozilla::dom;
-namespace css = mozilla::css;
 
 #define VISITED_PSEUDO_PREF "layout.css.visited_links_enabled"
 
@@ -961,11 +962,8 @@ NS_IMPL_ISUPPORTS1(nsCSSRuleProcessor, nsIStyleRuleProcessor)
 /* static */ nsresult
 nsCSSRuleProcessor::Startup()
 {
-  nsContentUtils::AddBoolPrefVarCache(VISITED_PSEUDO_PREF,
-                                      &gSupportVisitedPseudo);
-  // We want to default to true, not false as AddBoolPrefVarCache does.
-  gSupportVisitedPseudo =
-    nsContentUtils::GetBoolPref(VISITED_PSEUDO_PREF, PR_TRUE);
+  Preferences::AddBoolVarCache(&gSupportVisitedPseudo, VISITED_PSEUDO_PREF,
+                               PR_TRUE);
 
   gPrivateBrowsingObserver = new nsPrivateBrowsingObserver();
   NS_ENSURE_TRUE(gPrivateBrowsingObserver, NS_ERROR_OUT_OF_MEMORY);
@@ -2172,7 +2170,7 @@ void ContentEnumFunc(css::StyleRule* aRule, nsCSSSelector* aSelector,
                                      data->mTreeMatchContext,
                                      !nodeContext.mIsRelevantLink)) {
       aRule->RuleMatched();
-      data->mRuleWalker->Forward(static_cast<nsIStyleRule*>(aRule));
+      data->mRuleWalker->Forward(aRule);
       // nsStyleSet will deal with the !important rule
     }
   }
@@ -2219,7 +2217,7 @@ nsCSSRuleProcessor::RulesMatching(AnonBoxRuleProcessorData* aData)
       for (RuleValue *value = rules.Elements(), *end = value + rules.Length();
            value != end; ++value) {
         value->mRule->RuleMatched();
-        aData->mRuleWalker->Forward(static_cast<nsIStyleRule*>(value->mRule));
+        aData->mRuleWalker->Forward(value->mRule);
       }
     }
   }
diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index 5124967e571..a3de10928b3 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -56,10 +56,13 @@
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
 #include "nsIStringBundle.h"
-#include "nsContentUtils.h"
+#include "nsIDocument.h"
 #include "mozilla/Services.h"
 #include "mozilla/css/Loader.h"
 #include "nsCSSStyleSheet.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #ifdef CSS_REPORT_PARSE_ERRORS
 static PRBool gReportErrors = PR_TRUE;
@@ -325,7 +328,7 @@ nsCSSScanner::SetLowLevelError(nsresult aErrorCode)
 static int
 CSSErrorsPrefChanged(const char *aPref, void *aClosure)
 {
-  gReportErrors = nsContentUtils::GetBoolPref(CSS_ERRORS_PREF, PR_TRUE);
+  gReportErrors = Preferences::GetBool(CSS_ERRORS_PREF, PR_TRUE);
   return NS_OK;
 }
 #endif
@@ -345,7 +348,7 @@ nsCSSScanner::InitGlobals()
   NS_ASSERTION(gConsoleService && gScriptErrorFactory,
                "unexpected null pointer without failure");
 
-  nsContentUtils::RegisterPrefCallback(CSS_ERRORS_PREF, CSSErrorsPrefChanged, nsnull);
+  Preferences::RegisterCallback(CSSErrorsPrefChanged, CSS_ERRORS_PREF);
   CSSErrorsPrefChanged(CSS_ERRORS_PREF, nsnull);
 #endif
   return PR_TRUE;
@@ -355,7 +358,7 @@ nsCSSScanner::InitGlobals()
 nsCSSScanner::ReleaseGlobals()
 {
 #ifdef CSS_REPORT_PARSE_ERRORS
-  nsContentUtils::UnregisterPrefCallback(CSS_ERRORS_PREF, CSSErrorsPrefChanged, nsnull);
+  Preferences::UnregisterCallback(CSSErrorsPrefChanged, CSS_ERRORS_PREF);
   NS_IF_RELEASE(gConsoleService);
   NS_IF_RELEASE(gScriptErrorFactory);
   NS_IF_RELEASE(gStringBundle);
diff --git a/layout/style/nsIStyleRule.h b/layout/style/nsIStyleRule.h
index 128542a694d..fc42c039bf9 100644
--- a/layout/style/nsIStyleRule.h
+++ b/layout/style/nsIStyleRule.h
@@ -103,8 +103,6 @@ public:
    */
   virtual void MapRuleInfoInto(nsRuleData* aRuleData)=0;
 
-  virtual nsIStyleRule* GetImportantRule(void) { return nsnull; }
-
 #ifdef DEBUG
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const = 0;
 #endif
diff --git a/layout/style/nsRuleWalker.h b/layout/style/nsRuleWalker.h
index 16811e2d713..9faa09e5446 100644
--- a/layout/style/nsRuleWalker.h
+++ b/layout/style/nsRuleWalker.h
@@ -46,6 +46,7 @@
 
 #include "nsRuleNode.h"
 #include "nsIStyleRule.h"
+#include "StyleRule.h"
 
 class nsRuleWalker {
 public:
@@ -55,11 +56,28 @@ public:
     mCurrent = aNode;
   }
 
-  void Forward(nsIStyleRule* aRule) { 
+protected:
+  void DoForward(nsIStyleRule* aRule) {
     mCurrent = mCurrent->Transition(aRule, mLevel, mImportance);
+    NS_POSTCONDITION(mCurrent, "Transition messed up");
+  }
+
+public:
+  void Forward(nsIStyleRule* aRule) {
+    NS_PRECONDITION(!nsRefPtr<mozilla::css::StyleRule>(do_QueryObject(aRule)),
+                    "Calling the wrong Forward() overload");
+    DoForward(aRule);
+  }
+  void Forward(mozilla::css::StyleRule* aRule) {
+    DoForward(aRule);
     mCheckForImportantRules =
       mCheckForImportantRules && !aRule->GetImportantRule();
-    NS_POSTCONDITION(mCurrent, "Transition messed up");
+  }
+  // ForwardOnPossiblyCSSRule should only be used by callers that have
+  // an explicit list of rules they need to walk, with the list
+  // already containing any important rules they care about.
+  void ForwardOnPossiblyCSSRule(nsIStyleRule* aRule) {
+    DoForward(aRule);
   }
 
   void Reset() { mCurrent = mRoot; }
diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp
index 6fe828273f4..22f752a01a7 100644
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -1850,11 +1850,7 @@ BuildStyleRule(nsCSSProperty aProperty,
   nsCSSParser parser(doc->CSSLoader());
 
   if (aUseSVGMode) {
-#ifdef MOZ_SVG
     parser.SetSVGMode(PR_TRUE);
-#else
-    NS_NOTREACHED("aUseSVGMode should not be set");
-#endif
   }
 
   nsCSSProperty propertyToCheck = nsCSSProps::IsShorthand(aProperty) ?
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 99610e212e4..b72aa79c466 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -66,6 +66,7 @@
 #include "mozilla/dom/Element.h"
 
 using namespace mozilla::dom;
+namespace css = mozilla::css;
 
 NS_IMPL_ISUPPORTS1(nsEmptyStyleRule, nsIStyleRule)
 
@@ -632,8 +633,12 @@ nsStyleSet::AddImportantRules(nsRuleNode* aCurrLevelNode,
   for (nsRuleNode *node = aCurrLevelNode; node != aLastPrevLevelNode;
        node = node->GetParent()) {
     // We guarantee that we never walk the root node here, so no need
-    // to null-check GetRule().
-    nsIStyleRule* impRule = node->GetRule()->GetImportantRule();
+    // to null-check GetRule().  Furthermore, it must be a CSS rule.
+    NS_ASSERTION(nsRefPtr<css::StyleRule>(do_QueryObject(node->GetRule())),
+                 "Unexpected non-CSS rule");
+
+    nsIStyleRule* impRule =
+      static_cast<css::StyleRule*>(node->GetRule())->GetImportantRule();
     if (impRule)
       importantRules.AppendElement(impRule);
   }
@@ -656,10 +661,10 @@ nsStyleSet::AssertNoImportantRules(nsRuleNode* aCurrLevelNode,
 
   for (nsRuleNode *node = aCurrLevelNode; node != aLastPrevLevelNode;
        node = node->GetParent()) {
-    nsIStyleRule* rule = node->GetRule();
-    if (rule) {
-      NS_ASSERTION(!rule->GetImportantRule(), "Unexpected important rule");
-    }
+    nsRefPtr<css::StyleRule> rule(do_QueryObject(node->GetRule()));
+    NS_ASSERTION(rule, "Unexpected non-CSS rule");
+
+    NS_ASSERTION(!rule->GetImportantRule(), "Unexpected important rule");
   }
 }
 
@@ -673,7 +678,7 @@ nsStyleSet::AssertNoCSSRules(nsRuleNode* aCurrLevelNode,
   for (nsRuleNode *node = aCurrLevelNode; node != aLastPrevLevelNode;
        node = node->GetParent()) {
     nsIStyleRule *rule = node->GetRule();
-    nsRefPtr<mozilla::css::StyleRule> cssRule(do_QueryObject(rule));
+    nsRefPtr<css::StyleRule> cssRule(do_QueryObject(rule));
     NS_ASSERTION(!cssRule || !cssRule->Selector(), "Unexpected CSS rule");
   }
 }
@@ -700,6 +705,10 @@ nsStyleSet::FileRules(nsIStyleRuleProcessor::EnumFunc aCollectorFunc,
   //  -. transition rules                   = Transition   normal
   // [most important]
 
+  // Save off the last rule before we start walking our agent sheets;
+  // this will be either the root or one of the restriction rules.
+  nsRuleNode* lastRestrictionRN = aRuleWalker->CurrentNode();
+
   aRuleWalker->SetLevel(eAgentSheet, PR_FALSE, PR_TRUE);
   if (mRuleProcessors[eAgentSheet])
     (*aCollectorFunc)(mRuleProcessors[eAgentSheet], aData);
@@ -771,7 +780,6 @@ nsStyleSet::FileRules(nsIStyleRuleProcessor::EnumFunc aCollectorFunc,
 
 #ifdef DEBUG
   AssertNoCSSRules(lastPresHintRN, lastUserRN);
-  AssertNoImportantRules(lastPresHintRN, lastUserRN); // preshints
 #endif
 
   if (haveImportantUserRules) {
@@ -786,14 +794,18 @@ nsStyleSet::FileRules(nsIStyleRuleProcessor::EnumFunc aCollectorFunc,
 
   if (haveImportantUARules) {
     aRuleWalker->SetLevel(eAgentSheet, PR_TRUE, PR_FALSE);
-    AddImportantRules(lastAgentRN, mRuleTree, aRuleWalker);     //agent
+    AddImportantRules(lastAgentRN, lastRestrictionRN, aRuleWalker); //agent
   }
 #ifdef DEBUG
   else {
-    AssertNoImportantRules(lastAgentRN, mRuleTree);
+    AssertNoImportantRules(lastAgentRN, lastRestrictionRN);
   }
 #endif
 
+#ifdef DEBUG
+  AssertNoCSSRules(lastRestrictionRN, mRuleTree);
+#endif
+
 #ifdef DEBUG
   nsRuleNode *lastImportantRN = aRuleWalker->CurrentNode();
 #endif
@@ -801,7 +813,6 @@ nsStyleSet::FileRules(nsIStyleRuleProcessor::EnumFunc aCollectorFunc,
   (*aCollectorFunc)(mRuleProcessors[eTransitionSheet], aData);
 #ifdef DEBUG
   AssertNoCSSRules(aRuleWalker->CurrentNode(), lastImportantRN);
-  AssertNoImportantRules(aRuleWalker->CurrentNode(), lastImportantRN);
 #endif
 
 }
@@ -932,7 +943,7 @@ nsStyleSet::ResolveStyleForRules(nsStyleContext* aParentContext,
   // matter.
   ruleWalker.SetLevel(eDocSheet, PR_FALSE, PR_FALSE);
   for (PRInt32 i = 0; i < aRules.Count(); i++) {
-    ruleWalker.Forward(aRules.ObjectAt(i));
+    ruleWalker.ForwardOnPossiblyCSSRule(aRules.ObjectAt(i));
   }
 
   return GetContext(aParentContext, ruleWalker.CurrentNode(), nsnull,
@@ -953,7 +964,7 @@ nsStyleSet::ResolveStyleByAddingRules(nsStyleContext* aBaseContext,
   // matter.
   ruleWalker.SetLevel(eDocSheet, PR_FALSE, PR_FALSE);
   for (PRInt32 i = 0; i < aRules.Count(); i++) {
-    ruleWalker.Forward(aRules.ObjectAt(i));
+    ruleWalker.ForwardOnPossiblyCSSRule(aRules.ObjectAt(i));
   }
 
   nsRuleNode *ruleNode = ruleWalker.CurrentNode();
@@ -962,7 +973,7 @@ nsStyleSet::ResolveStyleByAddingRules(nsStyleContext* aBaseContext,
   if (aBaseContext->GetStyleIfVisited()) {
     ruleWalker.SetCurrentNode(aBaseContext->GetStyleIfVisited()->GetRuleNode());
     for (PRInt32 i = 0; i < aRules.Count(); i++) {
-      ruleWalker.Forward(aRules.ObjectAt(i));
+      ruleWalker.ForwardOnPossiblyCSSRule(aRules.ObjectAt(i));
     }
     visitedRuleNode = ruleWalker.CurrentNode();
   }
@@ -1022,6 +1033,7 @@ nsStyleSet::ResolvePseudoElementStyle(Element* aParentElement,
   if (treeContext.HaveRelevantLink()) {
     treeContext.ResetForVisitedMatching();
     ruleWalker.Reset();
+    WalkRestrictionRule(aType, &ruleWalker);
     FileRules(EnumRulesMatching<PseudoElementRuleProcessorData>, &data,
               aParentElement, &ruleWalker);
     visitedRuleNode = ruleWalker.CurrentNode();
@@ -1081,6 +1093,7 @@ nsStyleSet::ProbePseudoElementStyle(Element* aParentElement,
   if (aTreeMatchContext.HaveRelevantLink()) {
     aTreeMatchContext.ResetForVisitedMatching();
     ruleWalker.Reset();
+    WalkRestrictionRule(aType, &ruleWalker);
     FileRules(EnumRulesMatching<PseudoElementRuleProcessorData>, &data,
               aParentElement, &ruleWalker);
     visitedRuleNode = ruleWalker.CurrentNode();
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index d83eb989443..0957b8d08d9 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -78,20 +78,20 @@ struct nsCSSValueList;
 
 // Bits for each struct.
 // NS_STYLE_INHERIT_BIT defined in nsStyleStructFwd.h
-#define NS_STYLE_INHERIT_MASK             0x00ffffff
+#define NS_STYLE_INHERIT_MASK             0x007fffff
 
 // Additional bits for nsStyleContext's mBits:
 // See nsStyleContext::HasTextDecorationLines
-#define NS_STYLE_HAS_TEXT_DECORATION_LINES 0x01000000
+#define NS_STYLE_HAS_TEXT_DECORATION_LINES 0x00800000
 // See nsStyleContext::HasPseudoElementData.
-#define NS_STYLE_HAS_PSEUDO_ELEMENT_DATA  0x02000000
+#define NS_STYLE_HAS_PSEUDO_ELEMENT_DATA  0x01000000
 // See nsStyleContext::RelevantLinkIsVisited
-#define NS_STYLE_RELEVANT_LINK_VISITED    0x04000000
+#define NS_STYLE_RELEVANT_LINK_VISITED    0x02000000
 // See nsStyleContext::IsStyleIfVisited
-#define NS_STYLE_IS_STYLE_IF_VISITED      0x08000000
+#define NS_STYLE_IS_STYLE_IF_VISITED      0x04000000
 // See nsStyleContext::GetPseudoEnum
-#define NS_STYLE_CONTEXT_TYPE_MASK        0xf0000000
-#define NS_STYLE_CONTEXT_TYPE_SHIFT       28
+#define NS_STYLE_CONTEXT_TYPE_MASK        0xf8000000
+#define NS_STYLE_CONTEXT_TYPE_SHIFT       27
 
 // Additional bits for nsRuleNode's mDependentBits:
 #define NS_RULE_NODE_GC_MARK              0x02000000
diff --git a/layout/style/nsStyleTransformMatrix.h b/layout/style/nsStyleTransformMatrix.h
index 10401acc2cc..7c418fea4ab 100644
--- a/layout/style/nsStyleTransformMatrix.h
+++ b/layout/style/nsStyleTransformMatrix.h
@@ -46,6 +46,8 @@
 #include "nsRect.h"
 
 struct nsCSSValueList;
+class nsStyleContext;
+class nsPresContext;
 
 /**
  * A class representing a style transformation matrix.  The class actually
@@ -62,8 +64,6 @@ struct nsCSSValueList;
  * Note that unlike the Thebes gfxMatrix, vectors are column vectors and
  * consequently the multiplication of a matrix A and a vector x is Ax, not xA.
  */
-class nsStyleContext;
-class nsPresContext;
 class nsStyleTransformMatrix
 {
  public:
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index c19570d1f82..84f4b72b235 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -48,14 +48,6 @@ MODULE		= layout
 DIRS +=		chrome \
 		$(NULL)
 
-# XXX Yuck.  We can't transfer everything from autoconf to HOST_CFLAGS,
-# but it would be nice to pick up anything affecting nsCSSPropList.h
-# automatically.
-ifdef MOZ_SVG
-HOST_CFLAGS	+= -DMOZ_SVG=1
-HOST_CXXFLAGS	+= -DMOZ_SVG=1
-endif
-
 HOST_CPPSRCS	= \
 		ListCSSProperties.cpp \
 		$(NULL)
diff --git a/layout/style/test/test_bug405818.html b/layout/style/test/test_bug405818.html
index 82c1c641e76..1491097fb7c 100644
--- a/layout/style/test/test_bug405818.html
+++ b/layout/style/test/test_bug405818.html
@@ -8,18 +8,18 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=405818
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <link rel="stylesheet" type="text/css" href="data:text/css,#nosuchid{color:green;}">
+  <link rel="stylesheet" type="text/css" href="data:text/css,%23myDiv{color:green;}">
   <link rel="stylesheet" type="text/css" href="chrome://global/skin/global.css">
   <!-- Script to make sure sheets gets a chance to load fully in Gecko 1.8 and earlier -->
   <script type="text/javascript" src="data:text/javascript,"></script>
-  <link rel="stylesheet" type="text/css" href="data:text/css,#nosuchid{color:green;}">
+  <link rel="stylesheet" type="text/css" href="data:text/css,%23myDiv{color:green;}">
   <link rel="stylesheet" type="text/css" href="chrome://global/skin/global.css">
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=405818">Mozilla Bug 405818</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  
+  <div id="myDiv"></div>
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
@@ -29,10 +29,10 @@ SimpleTest.waitForExplicitFinish();
 
 addLoadEvent(function() {
   is(document.styleSheets[1].href,
-     "data:text/css,#nosuchid{color:green;}",
+     "data:text/css,%23myDiv{color:green;}",
      "Unexpected href for linked sheet before cloning");
   is(document.styleSheets[3].href,
-     "data:text/css,#nosuchid{color:green;}",
+     "data:text/css,%23myDiv{color:green;}",
      "Unexpected href for later linked sheet before cloning");
 
   is(document.styleSheets[2].href,
@@ -50,10 +50,10 @@ addLoadEvent(function() {
   })();
   
   is(document.styleSheets[1].href,
-     "data:text/css,#nosuchid{color:green;}",
+     "data:text/css,%23myDiv{color:green;}",
      "Unexpected href for linked sheet after cloning");
   is(document.styleSheets[3].href,
-     "data:text/css,#nosuchid{color:green;}",
+     "data:text/css,%23myDiv{color:green;}",
      "Unexpected href for later linked sheet after cloning");
 
   is(document.styleSheets[2].href,
@@ -63,6 +63,10 @@ addLoadEvent(function() {
      "chrome://global/skin/global.css",
      "Unexpected href for later linked chrome sheet after cloning");
 
+  var myDiv = document.getElementById("myDiv");
+  is(getComputedStyle(myDiv, "").color, "rgb(0, 128, 0)",
+     "Unexpected color for div (data URI stylesheet not being honored?)");
+
   SimpleTest.finish();
 });
 </script>
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index fc2e392f78a..4c62e34b63c 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -88,6 +88,7 @@
 #include "prdtoa.h"
 #include "mozilla/dom/Element.h"
 #include "gfxUtils.h"
+#include "mozilla/Preferences.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -175,7 +176,7 @@ static const char SMIL_PREF_STR[] = "svg.smil.enabled";
 static int
 SMILPrefChanged(const char *aPref, void *aClosure)
 {
-  PRBool prefVal = nsContentUtils::GetBoolPref(SMIL_PREF_STR);
+  PRBool prefVal = Preferences::GetBool(SMIL_PREF_STR);
   gSMILEnabled = prefVal;
   return 0;
 }
@@ -187,8 +188,8 @@ NS_SMILEnabled()
   
   if (!sInitialized) {
     /* check and register ourselves with the pref */
-    gSMILEnabled = nsContentUtils::GetBoolPref(SMIL_PREF_STR);
-    nsContentUtils::RegisterPrefCallback(SMIL_PREF_STR, SMILPrefChanged, nsnull);
+    gSMILEnabled = Preferences::GetBool(SMIL_PREF_STR);
+    Preferences::RegisterCallback(SMILPrefChanged, SMIL_PREF_STR);
 
     sInitialized = PR_TRUE;
   }
@@ -1299,7 +1300,7 @@ nsSVGUtils::GetBBox(nsIFrame *aFrame)
   if (svg) {
     // It is possible to apply a gradient, pattern, clipping path, mask or
     // filter to text. When one of these facilities is applied to text
-    // the bounding box is the entire ‘text’ element in all
+    // the bounding box is the entire text element in all
     // cases.
     nsSVGTextContainerFrame* metrics = do_QueryFrame(
       GetFirstNonAAncestorFrame(aFrame));
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 133ff3d60f4..10cfe9aff82 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -93,13 +93,15 @@
 #include "nsEventDispatcher.h"
 #include "nsIDOMEvent.h"
 #include "nsIPrivateDOMEvent.h"
-#include "nsContentUtils.h"
 #include "nsDisplayList.h"
+#include "mozilla/Preferences.h"
 
 // Needed for Print Preview
 #include "nsIDocument.h"
 #include "nsIURI.h"
 
+using namespace mozilla;
+
 //define DEBUG_REDRAW
 
 #define DEBUG_SPRING_SIZE 8
@@ -1246,7 +1248,7 @@ nsBoxFrame::AttributeChanged(PRInt32 aNameSpaceID,
 void
 nsBoxFrame::GetDebugPref(nsPresContext* aPresContext)
 {
-    gDebug = nsContentUtils::GetBoolPref("xul.debug.box");
+    gDebug = Preferences::GetBool("xul.debug.box");
 }
 
 class nsDisplayXULDebug : public nsDisplayItem {
diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp
index f78ef0ad4f2..30d99d1fe5e 100644
--- a/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -62,7 +62,6 @@
 #include "nsITimer.h"
 #include "nsAutoPtr.h"
 #include "nsStyleSet.h"
-#include "nsIDOMNSDocument.h"
 #include "nsPIBoxObject.h"
 #include "nsINodeInfo.h"
 #include "nsLayoutUtils.h"
diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp
index d49db84cb70..2a080a215da 100644
--- a/layout/xul/base/src/nsMenuBarListener.cpp
+++ b/layout/xul/base/src/nsMenuBarListener.cpp
@@ -58,6 +58,9 @@
 #include "nsIDOMElement.h"
 
 #include "nsContentUtils.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 /*
  * nsMenuBarListener implementation
@@ -120,7 +123,7 @@ void nsMenuBarListener::InitAccessKey()
 #endif
 
   // Get the menu access key value from prefs, overriding the default:
-  mAccessKey = nsContentUtils::GetIntPref("ui.key.menuAccessKey", mAccessKey);
+  mAccessKey = Preferences::GetInt("ui.key.menuAccessKey", mAccessKey);
   if (mAccessKey == nsIDOMKeyEvent::DOM_VK_SHIFT)
     mAccessKeyMask = MODIFIER_SHIFT;
   else if (mAccessKey == nsIDOMKeyEvent::DOM_VK_CONTROL)
@@ -130,8 +133,7 @@ void nsMenuBarListener::InitAccessKey()
   else if (mAccessKey == nsIDOMKeyEvent::DOM_VK_META)
     mAccessKeyMask = MODIFIER_META;
 
-  mAccessKeyFocuses =
-    nsContentUtils::GetBoolPref("ui.key.menuAccessKeyFocuses");
+  mAccessKeyFocuses = Preferences::GetBool("ui.key.menuAccessKeyFocuses");
 }
 
 void
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index 8727a305ef4..a0180a6ebed 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -53,18 +53,13 @@
 #include "nsINameSpaceManager.h"
 #include "nsMenuPopupFrame.h"
 #include "nsMenuBarFrame.h"
-#include "nsIView.h"
 #include "nsIDocument.h"
-#include "nsIDOMNSDocument.h"
-#include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
-#include "nsIDOMText.h"
 #include "nsILookAndFeel.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"
 #include "nsBoxLayoutState.h"
 #include "nsIScrollableFrame.h"
-#include "nsIViewManager.h"
 #include "nsBindingManager.h"
 #include "nsIServiceManager.h"
 #include "nsCSSFrameConstructor.h"
@@ -83,6 +78,9 @@
 #include "nsEventStateManager.h"
 #include "nsIDOMXULMenuListElement.h"
 #include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define NS_MENU_POPUP_LIST_INDEX 0
 
@@ -1118,7 +1116,7 @@ nsMenuFrame::BuildAcceleratorText(PRBool aNotify)
 #endif
 
     // Get the accelerator key value from prefs, overriding the default:
-    accelKey = nsContentUtils::GetIntPref("ui.key.accelKey", accelKey);
+    accelKey = Preferences::GetInt("ui.key.accelKey", accelKey);
   }
 
   nsAutoString modifiers;
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 82b93d4ef7c..0f80c51a480 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -86,6 +86,9 @@
 #include "nsIScreenManager.h"
 #include "nsIServiceManager.h"
 #include "nsThemeConstants.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 PRInt8 nsMenuPopupFrame::sDefaultLevelIsTop = -1;
 
@@ -130,7 +133,7 @@ nsMenuPopupFrame::nsMenuPopupFrame(nsIPresShell* aShell, nsStyleContext* aContex
   if (sDefaultLevelIsTop >= 0)
     return;
   sDefaultLevelIsTop =
-    nsContentUtils::GetBoolPref("ui.panel.default_level_parent", PR_FALSE);
+    Preferences::GetBool("ui.panel.default_level_parent", PR_FALSE);
 } // ctor
 
 
diff --git a/layout/xul/base/src/nsScrollBoxObject.cpp b/layout/xul/base/src/nsScrollBoxObject.cpp
index 46783ac3bf1..d5d5ec78973 100644
--- a/layout/xul/base/src/nsScrollBoxObject.cpp
+++ b/layout/xul/base/src/nsScrollBoxObject.cpp
@@ -36,6 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+
 #include "nsCOMPtr.h"
 #include "nsIScrollBoxObject.h"
 #include "nsBoxObject.h"
@@ -43,7 +44,6 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMElement.h"
 #include "nsPresContext.h"
 #include "nsIFrame.h"
diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index d36b4a5cf98..591c5a7a1d5 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -70,6 +70,9 @@
 #include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayList.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 PRBool nsSliderFrame::gMiddlePref = PR_FALSE;
 PRInt32 nsSliderFrame::gSnapMultiplier;
@@ -117,8 +120,8 @@ nsSliderFrame::Init(nsIContent*      aContent,
   if (!gotPrefs) {
     gotPrefs = PR_TRUE;
 
-    gMiddlePref = nsContentUtils::GetBoolPref("middlemouse.scrollbarPosition");
-    gSnapMultiplier = nsContentUtils::GetIntPref("slider.snapMultiplier");
+    gMiddlePref = Preferences::GetBool("middlemouse.scrollbarPosition");
+    gSnapMultiplier = Preferences::GetInt("slider.snapMultiplier");
   }
 
   mCurPos = GetCurrentPosition(aContent);
diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp
index 976f68d965b..c5306327703 100644
--- a/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -70,12 +70,15 @@
 #include "nsCSSRendering.h"
 #include "nsIReflowCallback.h"
 #include "nsBoxFrame.h"
+#include "mozilla/Preferences.h"
 
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
 #include "nsBidiPresUtils.h"
 #endif // IBMBIDI
 
+using namespace mozilla;
+
 #define CROP_LEFT   "left"
 #define CROP_RIGHT  "right"
 #define CROP_CENTER "center"
@@ -182,7 +185,7 @@ nsTextBoxFrame::AlwaysAppendAccessKey()
     gAccessKeyPrefInitialized = PR_TRUE;
 
     const char* prefName = "intl.menuitems.alwaysappendaccesskeys";
-    nsAdoptingString val = nsContentUtils::GetLocalizedStringPref(prefName);
+    nsAdoptingString val = Preferences::GetLocalizedString(prefName);
     gAlwaysAppendAccessKey = val.Equals(NS_LITERAL_STRING("true"));
   }
   return gAlwaysAppendAccessKey;
@@ -196,7 +199,7 @@ nsTextBoxFrame::InsertSeparatorBeforeAccessKey()
     gInsertSeparatorPrefInitialized = PR_TRUE;
 
     const char* prefName = "intl.menuitems.insertseparatorbeforeaccesskeys";
-    nsAdoptingString val = nsContentUtils::GetLocalizedStringPref(prefName);
+    nsAdoptingString val = Preferences::GetLocalizedString(prefName);
     gInsertSeparatorBeforeAccessKey = val.EqualsLiteral("true");
   }
   return gInsertSeparatorBeforeAccessKey;
diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp
index cf82c5486e9..8b78d18d27b 100644
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -49,19 +49,20 @@
 #include "nsMenuPopupFrame.h"
 #include "nsIServiceManager.h"
 #ifdef MOZ_XUL
-#include "nsIDOMNSDocument.h"
 #include "nsITreeView.h"
 #endif
 #include "nsGUIEvent.h"
 #include "nsIPrivateDOMEvent.h"
 #include "nsIScriptContext.h"
 #include "nsPIDOMWindow.h"
-#include "nsContentUtils.h"
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
 #endif
 #include "nsIRootBox.h"
 #include "nsEventDispatcher.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 nsXULTooltipListener* nsXULTooltipListener::mInstance = nsnull;
 
@@ -80,8 +81,8 @@ nsXULTooltipListener::nsXULTooltipListener()
 {
   if (sTooltipListenerCount++ == 0) {
     // register the callback so we get notified of updates
-    nsContentUtils::RegisterPrefCallback("browser.chrome.toolbar_tips",
-                                         ToolbarTipsPrefChanged, nsnull);
+    Preferences::RegisterCallback(ToolbarTipsPrefChanged,
+                                  "browser.chrome.toolbar_tips");
 
     // Call the pref callback to initialize our state.
     ToolbarTipsPrefChanged("browser.chrome.toolbar_tips", nsnull);
@@ -97,8 +98,8 @@ nsXULTooltipListener::~nsXULTooltipListener()
 
   if (--sTooltipListenerCount == 0) {
     // Unregister our pref observer
-    nsContentUtils::UnregisterPrefCallback("browser.chrome.toolbar_tips",
-                                           ToolbarTipsPrefChanged, nsnull);
+    Preferences::UnregisterCallback(ToolbarTipsPrefChanged,
+                                    "browser.chrome.toolbar_tips");
   }
 }
 
@@ -323,8 +324,8 @@ int
 nsXULTooltipListener::ToolbarTipsPrefChanged(const char *aPref,
                                              void *aClosure)
 {
-  sShowTooltips = nsContentUtils::GetBoolPref("browser.chrome.toolbar_tips",
-                                              sShowTooltips);
+  sShowTooltips =
+    Preferences::GetBool("browser.chrome.toolbar_tips", sShowTooltips);
 
   return 0;
 }
diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 2f5963e14b5..fd5ac810484 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -69,7 +69,6 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNSDocument.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
diff --git a/layout/xul/base/src/tree/src/nsTreeColFrame.cpp b/layout/xul/base/src/tree/src/nsTreeColFrame.cpp
index 1863365a171..79a397bea35 100644
--- a/layout/xul/base/src/tree/src/nsTreeColFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeColFrame.cpp
@@ -42,7 +42,6 @@
 #include "nsIContent.h"
 #include "nsStyleContext.h"
 #include "nsINameSpaceManager.h" 
-#include "nsIDOMNSDocument.h"
 #include "nsIDocument.h"
 #include "nsIBoxObject.h"
 #include "nsTreeBoxObject.h"
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index 1391fb0f7b1..a0221d31bdc 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -5781,30 +5781,37 @@ RETURN:
 	return (ret);
 }
 
-/* In ELF systems the default visibility allows symbols to be preempted at
-   runtime. This in turn prevents the uses of memalign in this file from
-   being optimized. What we do in here is define two aliasing symbols
-   (they point to the same code): memalign and memalign_internal.
-   The internal version has hidden visibility and is used in every reference
-   from this file.
-   For more information on this technique, see section 2.2.7
-   (Avoid Using Exported Symbols) in
-   http://www.akkadia.org/drepper/dsohowto.pdf */
+/*
+ * In ELF systems the default visibility allows symbols to be preempted at
+ * runtime. This in turn prevents the uses of memalign in this file from being
+ * optimized. What we do in here is define two aliasing symbols (they point to
+ * the same code): memalign and memalign_internal. The internal version has
+ * hidden visibility and is used in every reference from this file.
+ *
+ * For more information on this technique, see section 2.2.7 (Avoid Using
+ * Exported Symbols) in http://www.akkadia.org/drepper/dsohowto.pdf.
+ */
+
+#if defined(__GNUC__) && !defined(MOZ_MEMORY_DARWIN)
+#define MOZ_MEMORY_ELF
+#endif
+
 #ifdef MOZ_MEMORY_SOLARIS
 #  ifdef __SUNPRO_C
 void *
 memalign(size_t alignment, size_t size);
 #pragma no_inline(memalign)
-#  elif (defined(__GNU_C__))
+#  elif (defined(__GNUC__))
 __attribute__((noinline))
 #  endif
 #else
-#if (defined(__GNUC__))
+#if (defined(MOZ_MEMORY_ELF))
 __attribute__((visibility ("hidden")))
 #endif
 #endif
 
-#if (defined(__GNUC__))
+
+#ifdef MOZ_MEMORY_ELF
 #define MEMALIGN memalign_internal
 #else
 #define MEMALIGN memalign
@@ -5850,7 +5857,7 @@ RETURN:
 	return (ret);
 }
 
-#if (defined(__GNUC__))
+#ifdef MOZ_MEMORY_ELF
 extern __typeof(memalign_internal)
         memalign __attribute__((alias ("memalign_internal"),
 				visibility ("default")));
diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js
index 7a8606bb3c3..a33abdc30a7 100644
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -146,6 +146,7 @@ pref("browser.sessionstore.max_tabs_undo", 5);
 pref("mozilla.widget.force-24bpp", true);
 pref("mozilla.widget.use-buffer-pixmap", true);
 pref("mozilla.widget.disable-native-theme", true);
+pref("layout.reflow.synthMouseMove", false);
 
 /* download manager (don't show the window or alert) */
 pref("browser.download.useDownloadDir", true);
diff --git a/mobile/branding/aurora/android-resources.mn b/mobile/branding/aurora/android-resources.mn
index e97d67c9ace..0d9e481b12f 100644
--- a/mobile/branding/aurora/android-resources.mn
+++ b/mobile/branding/aurora/android-resources.mn
@@ -1,3 +1,3 @@
 mobile/app/android/drawable/alertaddons.png
 mobile/app/android/drawable/alertdownloads.png
-mobile/branding/nightly/content/splash.png
+mobile/branding/aurora/content/splash.png
diff --git a/mobile/branding/beta/android-resources.mn b/mobile/branding/beta/android-resources.mn
index e5e89fb2d2d..c66c3dd9dd5 100644
--- a/mobile/branding/beta/android-resources.mn
+++ b/mobile/branding/beta/android-resources.mn
@@ -1,3 +1,3 @@
 mobile/app/android/drawable/alertaddons.png
 mobile/app/android/drawable/alertdownloads.png
-mobile/branding/official/content/splash.png
+mobile/branding/beta/content/splash.png
diff --git a/mobile/build.mk b/mobile/build.mk
index 36712498ccd..30aee7a52be 100644
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -68,7 +68,6 @@ installer:
 	@$(MAKE) -C mobile/installer installer
 
 package:
-	rm -rf dist/fennec*
 	@$(MAKE) -C mobile/installer
 
 install::
diff --git a/mobile/chrome/content/AppMenu.js b/mobile/chrome/content/AppMenu.js
index 192886986eb..42ff45aa86a 100644
--- a/mobile/chrome/content/AppMenu.js
+++ b/mobile/chrome/content/AppMenu.js
@@ -73,24 +73,10 @@ var AppMenu = {
   showAsList: function showAsList() {
     // allow menu to hide to remove the more button before we show the menulist
     setTimeout((function() {
-      this.menu.menupopup.children = this.overflowMenu;
-      MenuListHelperUI.show(this.menu);
+      AppMenuOverflow.show(this.overflowMenu);
     }).bind(this), 0)
   },
 
-  menu : {
-    id: "appmenu-menulist",
-    dispatchEvent: function(aEvent) {
-      let menuitem = AppMenu.overflowMenu[this.selectedIndex];
-      if (menuitem)
-        menuitem.click();
-    },
-    menupopup: {
-      hasAttribute: function(aAttr) { return false; }
-    },
-    selectedIndex: -1
-  },
-
   createMoreButton: function() {
     let button = document.createElement("toolbarbutton");
     button.setAttribute("id", "appmenu-more-button");
@@ -101,3 +87,45 @@ var AppMenu = {
     return button;
   }
 };
+
+
+var AppMenuOverflow = {
+  get container() {
+    delete this.container;
+    return this.container = document.getElementById("appmenu-overflow");
+  },
+  
+  get list() {
+    delete this.list;
+    return this.list = document.getElementById("appmenu-overflow-commands");
+  },
+  
+  show: function show(aList) {
+    let container = this.container;
+    let listbox = this.list;
+    while (listbox.firstChild)
+      listbox.removeChild(listbox.firstChild);
+
+    let children = aList;
+    for (let i = 0; i < children.length; i++) {
+      let child = children[i];
+      let item = document.createElement("richlistitem");
+      item.setAttribute("class", "appmenu-button");
+      item.onclick = function() { child.click(); }
+
+      let label = document.createElement("label");
+      label.setAttribute("value", child.label);
+      item.appendChild(label);
+
+      listbox.appendChild(item);
+    }
+
+    container.hidden = false;
+    BrowserUI.pushPopup(this, [this.container]);
+  },
+
+  hide: function hide() {
+    this.container.hidden = true;
+    BrowserUI.popPopup(this);
+  }
+};
diff --git a/mobile/chrome/content/MenuListHelperUI.js b/mobile/chrome/content/MenuListHelperUI.js
index 840aafab04a..892660088f8 100644
--- a/mobile/chrome/content/MenuListHelperUI.js
+++ b/mobile/chrome/content/MenuListHelperUI.js
@@ -86,7 +86,7 @@ var MenuListHelperUI = {
   },
 
   sizeToContent: function sizeToContent() {
-    this._popup.maxWidth = window.innerWidth * 0.75;
+    this._popup.width = window.innerWidth * 0.8;
   },
 
   handleEvent: function handleEvent(aEvent) {
diff --git a/mobile/chrome/content/Util.js b/mobile/chrome/content/Util.js
index ef7e0f886bf..545f6b078d0 100644
--- a/mobile/chrome/content/Util.js
+++ b/mobile/chrome/content/Util.js
@@ -183,7 +183,8 @@ let Util = {
   },
 
   get isKeyboardOpened() {
-    if (this.isParentProcess())
+    let isChromeWindow = this.isParentProcess() && window["ViewableAreaObserver"];
+    if (isChromeWindow)
       return ViewableAreaObserver.isKeyboardOpened;
 
     return (sendSyncMessage("Content:IsKeyboardOpened", {}))[0];
diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml
index 8e2692fd94d..f5724890f67 100644
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -1380,17 +1380,36 @@
     <implementation>
       <method name="open">
         <body><![CDATA[
+          let self = this;
           this.setAttribute("loading", "true");
 
-          setTimeout(function(self) {
-            let children = self._children;
-            while (children.lastChild)
-              children.removeChild(children.lastChild);
+          if (Weave.Service.isLoggedIn) {
+            setTimeout(function() self._loadChildren(), 0);
+          } else {
+            // Wait until login or setup finishes before loading items.
+            let topics = [
+              "browser:sync:setup:userabort",
+              "weave:service:login:finish",
+              "weave:service:login:error"
+            ];
+            function observe() {
+              topics.forEach(function(topic) Services.obs.removeObserver(observe, topic, false));
+              self._loadChildren();
+            }
+            topics.forEach(function(topic) Services.obs.addObserver(observe, topic, false));
+          }
+        ]]></body>
+      </method>
 
-            let items = self._getRemoteTabs();
-            children.setItems(items.map(self.createItem));
-            self.removeAttribute("loading");
-          }, 0, this);
+      <method name="_loadChildren">
+        <body><![CDATA[
+          let children = this._children;
+          while (children.lastChild)
+            children.removeChild(children.lastChild);
+
+          let items = this._getRemoteTabs();
+          children.setItems(items.map(this.createItem));
+          this.removeAttribute("loading");
         ]]></body>
       </method>
 
@@ -1405,6 +1424,8 @@
           // Don't do anything if the Weave isn't ready
           if (document.getElementById("cmd_remoteTabs").getAttribute("disabled") == "true")
             return [];
+          if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED)
+            return [];
 
           // Don't do anything if the tabs engine isn't ready
           let engine = Weave.Engines.get("tabs");
diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index af7c190fa9d..d2e5330dd4a 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1198,7 +1198,7 @@ var BrowserUI = {
       case "cmd_remoteTabs":
         if (Weave.Status.checkSetup() == Weave.CLIENT_NOT_CONFIGURED) {
           WeaveGlue.open();
-        } else if (!Weave.Service.isLoggedIn) {
+        } else if (!Weave.Service.isLoggedIn && !Services.prefs.getBoolPref("browser.sync.enabled")) {
           // unchecked the relative command button
           document.getElementById("remotetabs-button").removeAttribute("checked");
           this.activePanel = null;
diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index fbfa31b0b59..073e9ee1603 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -3020,12 +3020,15 @@ var ViewableAreaObserver = {
     return (this._height || window.innerHeight);
   },
 
-  _isKeyboardOpened: false,
+  _isKeyboardOpened: true,
   get isKeyboardOpened() {
     return this._isKeyboardOpened;
   },
 
   set isKeyboardOpened(aValue) {
+    if (!this.hasVirtualKeyboard())
+      return this._isKeyboardOpened;
+
     let oldValue = this._isKeyboardOpened;
 
     if (oldValue != aValue) {
@@ -3037,6 +3040,17 @@ var ViewableAreaObserver = {
     }
   },
 
+  hasVirtualKeyboard: function va_hasVirtualKeyboard() {
+#ifndef ANDROID
+#ifndef MOZ_PLATFORM_MAEMO
+    return false;
+#endif
+#endif
+
+    return true;
+  },
+
+
   observe: function va_observe(aSubject, aTopic, aData) {
 #if MOZ_PLATFORM_MAEMO == 6
     let rect = Rect.fromRect(JSON.parse(aData));
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 390df9cb658..a7d59dd639a 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -333,6 +333,7 @@
       </hbox>
 
       <hbox id="pageactions-container" class="window-width" hidden="true">
+#ifndef ANDROID
         <pageaction id="pageaction-findinpage" title="&pageactions.findInPage;"
           onclick="FindHelperUI.show();"/>
 #ifdef NS_PRINTING
@@ -341,6 +342,7 @@
 #endif
         <pageaction id="pageaction-share" title="&pageactions.share.page;"
           onclick="SharingUI.show(getBrowser().currentURI.spec, getBrowser().contentTitle);"/>
+#endif
         <pageaction id="pageaction-password" title="&pageactions.password.forget;"
           onclick="PageActions.forgetPassword(event);"/>
         <pageaction id="pageaction-reset" title="&pageactions.reset;"
@@ -677,6 +679,10 @@
       </vbox>
     </hbox>
 
+    <hbox id="appmenu-overflow" bottom="0" hidden="true" oncommand="AppMenu.hideOverflow();">
+      <richlistbox id="appmenu-overflow-commands" flex="1"/>
+    </hbox>
+
     <hbox id="appmenu" bottom="0" hidden="true" align="stretch" oncommand="AppMenu.hide();">
       <toolbarbutton class="appmenu-site-button appmenu-button"
         label="&appMenu.siteOptions;"
@@ -687,9 +693,20 @@
       <toolbarbutton class="appmenu-addons-button appmenu-button"
         label="&addonsHeader.label;"
         oncommand="BrowserUI.showPanel('addons-container');"/>
+      <toolbarbutton class="appmenu-share-button appmenu-button"
+        label="&pageactions.share.page;"
+        oncommand="SharingUI.show(getBrowser().currentURI.spec, getBrowser().contentTitle);"/>
+      <toolbarbutton class="appmenu-findinpage-button appmenu-button"
+        label="&pageactions.findInPage;"
+        oncommand="FindHelperUI.show();"/>
       <toolbarbutton class="appmenu-downloads-button appmenu-button"
         label="&downloadsHeader.label;"
         oncommand="BrowserUI.showPanel('downloads-container');"/>
+#ifdef NS_PRINTING
+      <toolbarbutton class="appmenu-saveas-button appmenu-button"
+        label="&pageactions.saveas.pdf;"
+        oncommand="PageActions.savePageAsPDF();"/>
+#endif
     </hbox>
   </stack>
 
diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index 12d06796a2e..4ce98ca0508 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -728,6 +728,7 @@ var FormHelperUI = {
 
     this._updateContainerForSelect(lastElement, this._currentElement);
     this._zoom(Rect.fromRect(aElement.rect), Rect.fromRect(aElement.caretRect));
+    this._updateSuggestionsFor(this._currentElement);
 
     // Prevent the view to scroll automatically while typing
     this._currentBrowser.scrollSync = false;
@@ -918,7 +919,7 @@ var FormHelperUI = {
     this._container.dispatchEvent(evt);
   },
 
-  _updateSuggestionsFor: function _formHelperUpdateAutocompleteFor(aElement) {
+  _updateSuggestionsFor: function _formHelperUpdateSuggestionsFor(aElement) {
     let suggestions = this._getAutocompleteSuggestions(aElement);
     if (!suggestions.length) {
       ContentPopupHelper.popup = null;
diff --git a/mobile/chrome/content/content.js b/mobile/chrome/content/content.js
index 6d6379cb2da..030833aa676 100644
--- a/mobile/chrome/content/content.js
+++ b/mobile/chrome/content/content.js
@@ -992,7 +992,7 @@ ContextHandler.registerType("link-shareable", function(aState, aElement) {
 });
 
 ContextHandler.registerType("input-text", function(aState, aElement) {
-    return aElement instanceof Ci.nsIDOMHTMLInputElement;
+    return (aElement instanceof Ci.nsIDOMHTMLInputElement && aElement.mozIsTextField(false)) || aElement instanceof Ci.nsIDOMHTMLTextAreaElement;
 });
 
 ["image", "video"].forEach(function(aType) {
diff --git a/mobile/chrome/content/forms.js b/mobile/chrome/content/forms.js
index 4398b307d60..c8c86095f42 100644
--- a/mobile/chrome/content/forms.js
+++ b/mobile/chrome/content/forms.js
@@ -81,7 +81,8 @@ function FormAssistant() {
   addEventListener("pagehide", this, false);
   addEventListener("submit", this, false);
 
-  this._enabled = Services.prefs.getBoolPref("formhelper.enabled");
+  this._enabled = Services.prefs.prefHasUserValue("formhelper.enabled") ?
+                    Services.prefs.getBoolPref("formhelper.enabled") : false;
 };
 
 FormAssistant.prototype = {
diff --git a/mobile/chrome/content/sync.js b/mobile/chrome/content/sync.js
index 4563b4cc35a..11ee8167272 100644
--- a/mobile/chrome/content/sync.js
+++ b/mobile/chrome/content/sync.js
@@ -124,6 +124,7 @@ let WeaveGlue = {
       },
 
       onComplete: function onComplete(aCredentials) {
+        self.jpake = null;
         self.close();
         self.setupData = aCredentials;
         self.connect();
@@ -132,8 +133,10 @@ let WeaveGlue = {
       onAbort: function onAbort(aError) {
         self.jpake = null;
 
-        if (aError == "jpake.error.userabort" || container.hidden)
+        if (aError == "jpake.error.userabort" || container.hidden) {
+          Services.obs.notifyObservers(null, "browser:sync:setup:userabort", "");
           return;
+        }
 
         // Automatically go to manual setup if we couldn't acquire a channel.
         let brandShortName = Strings.brand.GetStringFromName("brandShortName");
diff --git a/mobile/chrome/content/tabs.xml b/mobile/chrome/content/tabs.xml
index 74c747ca6aa..f8d6a43dfd5 100644
--- a/mobile/chrome/content/tabs.xml
+++ b/mobile/chrome/content/tabs.xml
@@ -60,6 +60,13 @@
         <parameter name="height"/>
         <body>
           <![CDATA[
+            let thumbnail = this.thumbnail;
+            if (browser.currentURI.spec == "about:blank") {
+              thumbnail.setAttribute("empty", "true");
+              return;
+            }
+            thumbnail.removeAttribute("empty");
+
             const tabWidth = 104;
             const tabHeight = 65;
 
@@ -78,9 +85,6 @@
               width = height / ratio;
             }
 
-            let thumbnail = this.thumbnail;
-            thumbnail.removeAttribute("empty");
-
             // Recreate the canvas as it may be tainted and not useable for remote pages
             if (thumbnail.hasAttribute("restored")) {
               thumbnail.removeAttribute("restored");
@@ -172,23 +176,20 @@
               this._closedTab = null;
             }
 
-            if (aTab.ignoreUndo) {
+            let isEmpty = (aTab.thumbnail && aTab.thumbnail.hasAttribute("empty"));
+            if (aTab.ignoreUndo || isEmpty) {
               this.children.removeChild(aTab);
             } else if (!closedTab || closedTab != aTab) {
-              if (aTab.thumbnail && !aTab.thumbnail.hasAttribute("empty")) {
-                // duplicate the old thumbnail to the new one because moving the
-                // tab in the dom clear the canvas
-                let oldThumbnail = aTab.thumbnail.toDataURL("image/png");
-                this._tabsUndo.appendChild(aTab);
-                let thumbnailImg = new Image();
-                thumbnailImg.onload = function() {
-                  if (aTab.thumbnail)
-                    aTab.thumbnail.getContext("2d").drawImage(thumbnailImg, 0, 0);
-                };
-                thumbnailImg.src = oldThumbnail;
-              } else {
-                this._tabsUndo.appendChild(aTab);
-              }
+              // duplicate the old thumbnail to the new one because moving the
+              // tab in the dom clear the canvas
+              let oldThumbnail = aTab.thumbnail.toDataURL("image/png");
+              this._tabsUndo.appendChild(aTab);
+              let thumbnailImg = new Image();
+              thumbnailImg.onload = function() {
+                if (aTab.thumbnail)
+                  aTab.thumbnail.getContext("2d").drawImage(thumbnailImg, 0, 0);
+              };
+              thumbnailImg.src = oldThumbnail;
 
               aTab.setAttribute("reload", "true");
               this._closedTab = aTab;
diff --git a/mobile/chrome/jar.mn b/mobile/chrome/jar.mn
index b3802d921ec..d66d6f579cd 100644
--- a/mobile/chrome/jar.mn
+++ b/mobile/chrome/jar.mn
@@ -52,7 +52,6 @@ chrome.jar:
   content/bindings/arrowbox.xml        (content/bindings/arrowbox.xml)
   content/browser.css                  (content/browser.css)
   content/cursor.css                   (content/cursor.css)
-  content/content.css                  (content/content.css)
   content/checkerboard.png             (content/checkerboard.png)
 % content branding %content/branding/
   content/sanitize.js                  (content/sanitize.js)
diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 812fc5404fa..99ca5a23b1a 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -63,10 +63,6 @@ _BROWSER_FILES = \
   browser_blank_01.html \
   browser_blank_02.html \
   browser_bookmarks.js \
-  browser_bookmarks_star.js \
-  browser_bookmarks_tags.js \
-  browser_click_content.html \
-  browser_click_content.js \
   browser_contacts.js \
   browser_contentpopup.html \
   browser_contentpopup.js \
@@ -78,7 +74,6 @@ _BROWSER_FILES = \
   $(warning browser_formsZoom.js disabled due to failures) \
   browser_history.js \
   browser_mainui.js \
-  browser_navigation.js \
   browser_preferences_text.js \
   browser_rect.js \
   browser_rememberPassword.js \
@@ -93,8 +88,8 @@ _BROWSER_FILES = \
   browser_tap_content.html \
   browser_test.js \
   browser_vkb.js \
-  browser_viewport.js \
-  browser_viewport.sjs \
+  $(warning browser_viewport.js disabled due to failures) \
+  $(warning browser_viewport.sjs disabled due to failures) \
   browser_scrollbar.sjs \
   browser_title.sjs \
   browser_thumbnails.js \
@@ -103,7 +98,14 @@ _BROWSER_FILES = \
   mock_autocomplete.json\
   $(NULL)
 
-ifndef ANDROID
+ifneq ($(OS_TARGET),Android)
+_BROWSER_FILES += \
+  browser_bookmarks_star.js \
+  browser_bookmarks_tags.js \
+  browser_click_content.html \
+  browser_click_content.js \
+  browser_navigation.js \
+  $(NULL)
 ifndef MOZ_PLATFORM_MAEMO
 _BROWSER_FILES +=  browser_sidebars.js
 endif
diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 75299408b1f..7b465e2e5cd 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -104,12 +104,13 @@ function run_next_test() {
   if (gTestsRun > 0)
     info("Test " + gTestsRun + " took " + (Date.now() - gTestStart) + "ms");
 
-  if (gPendingTests.length == 0) {
+   if (!gPendingTests.length) {
     finish();
+    return;
   }
 
   gTestsRun++;
-  var test = gPendingTests.shift();
+  let test = gPendingTests.shift();
   if (test.name)
     info("Running test " + gTestsRun + " (" + test.name + ")");
   else
@@ -129,7 +130,7 @@ function installExtension(elt, aListener) {
   elt.parentNode.ensureElementIsVisible(elt);
   elt.install.addListener(aListener)
 
-  var button = document.getAnonymousElementByAttribute(elt, "class", "addon-install hide-on-install hide-on-restart");
+  let button = document.getAnonymousElementByAttribute(elt, "class", "addon-install hide-on-install hide-on-restart");
   ok(!!button, "Extension has install button");
   ExtensionsView.installFromRepo(elt);
 }
@@ -284,7 +285,7 @@ function open_manager(aView, aCallback) {
 }
 
 function close_manager(aCallback) {
-  var prefsButton = document.getElementById("tool-preferences");
+  let prefsButton = document.getElementById("tool-preferences");
   prefsButton.click();
 
   ExtensionsView.clearSection();
@@ -369,10 +370,10 @@ function installFromURLBar(aAddon) {
               let elt = get_addon_element(aAddon.id);
               if (aAddon.bootstrapped) {
                 checkAddonListing(aAddon, elt, "local");
-                var button = document.getAnonymousElementByAttribute(elt, "anonid", "uninstall-button");
+                let button = document.getAnonymousElementByAttribute(elt, "anonid", "uninstall-button");
                 ok(!!button, "Extension has uninstall button");
 
-                var updateButton = document.getElementById("addons-update-all");
+                let updateButton = document.getElementById("addons-update-all");
                 is(updateButton.disabled, false, "Update button is enabled");
 
                 ExtensionsView.uninstall(elt);
@@ -384,7 +385,7 @@ function installFromURLBar(aAddon) {
               } else {
                 ok(!elt, "Extension not in list");
                 AddonManager.getAllInstalls(function(aInstalls) {
-                  for(var i = 0; i < aInstalls.length; i++) {
+                  for(let i = 0; i < aInstalls.length; i++) {
                     aInstalls[i].cancel();
                   }
                   Browser.closeTab(gCurrentTab);
@@ -413,7 +414,7 @@ function installFromURLBar(aAddon) {
 function installFromAddonsPage(aAddon, aDoUpdate) {
   return function() {
     open_manager(null, function() {
-      var elt = get_addon_element(aAddon.id);
+      let elt = get_addon_element(aAddon.id);
       checkAddonListing(aAddon, elt);
       installExtension(elt, new installListener({
         addon: aAddon,
diff --git a/mobile/chrome/tests/browser_autocomplete.js b/mobile/chrome/tests/browser_autocomplete.js
index 3ac1ead3cf0..5649946722a 100644
--- a/mobile/chrome/tests/browser_autocomplete.js
+++ b/mobile/chrome/tests/browser_autocomplete.js
@@ -11,6 +11,14 @@ function test() {
   // This test is async
   waitForExplicitFinish();
 
+  // Ensure the form helper is initialized
+  try {
+    FormHelperUI.enabled;
+  }
+  catch(e) {
+    FormHelperUI.init();
+  }
+
   // Need to wait until the page is loaded
   messageManager.addMessageListener("pageshow", function(aMessage) {
     if (newTab && newTab.browser.currentURI.spec != "about:blank") {
@@ -20,16 +28,10 @@ function test() {
     }
   });
 
-  let startupInfo = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
-  if (!("firstPaint" in startupInfo))
-    waitFor(function() { newTab = Browser.addTab(testURL, true); }, function() {
-      let startupInfo = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
-      return ("firstPaint" in startupInfo);
-    }, Date.now() + 3000);
-  else
-    newTab = Browser.addTab(testURL, true);
+  newTab = Browser.addTab(testURL, true);
 }
 
+
 //------------------------------------------------------------------------------
 // Iterating tests by shifting test out one by one as runNextTest is called.
 function runNextTest() {
@@ -55,12 +57,12 @@ function runNextTest() {
 }
 
 function waitForAutocomplete(aCallback) {
-  messageManager.addMessageListener("FormAssist:AutoComplete", function(aMessage) {
-    messageManager.removeMessageListener(aMessage.name, arguments.callee);
+  window.addEventListener("contentpopupshown", function(aEvent) {
+    window.removeEventListener(aEvent.type, arguments.callee, false);
     setTimeout(function() {
-      aCallback(aMessage.json.current.list);
+      aCallback(FormHelperUI._currentElement.list);
     }, 0);
-  });
+  }, false);
 };
 
 let data = [
diff --git a/mobile/chrome/tests/browser_dragger.js b/mobile/chrome/tests/browser_dragger.js
index 6450064e1c1..e37a37bebfd 100644
--- a/mobile/chrome/tests/browser_dragger.js
+++ b/mobile/chrome/tests/browser_dragger.js
@@ -14,7 +14,7 @@ gTests.push({
 
   run: function() {
     gCurrentTest.tab = Browser.addTab(testURL_01, true);
-    onMessageOnce(gCurrentTest.tab.browser.messageManager, "MozScrolledAreaChanged", gCurrentTest.checkPan);
+    onMessageOnce(gCurrentTest.tab.browser.messageManager, "Browser:FirstPaint", gCurrentTest.checkPan);
   },
 
   checkPan: function() {
diff --git a/mobile/chrome/tests/browser_tabs.js b/mobile/chrome/tests/browser_tabs.js
index e08fb5e7854..324d0f4ec1b 100644
--- a/mobile/chrome/tests/browser_tabs.js
+++ b/mobile/chrome/tests/browser_tabs.js
@@ -117,14 +117,20 @@ function tab_switch_04() {
   is(new_tab_03.owner, null, "Closing tab 01 nulls tab3 owner");
   is(Browser.selectedTab.notification, Elements.browsers.selectedPanel, "Deck has correct browser");
 
-  // Add a tab then close it
-  new_tab_04 = Browser.addTab("about:home", true);
-  checkExpectedSize();
-  new_tab_04.browser.addEventListener("load", function() {
+  function callback() {
     new_tab_04.browser.removeEventListener("load", arguments.callee, true);
     Browser.closeTab(new_tab_04, { forceClose: true });
     tab_undo();
-  }, true);
+  };
+
+  // Add a tab then close it
+  new_tab_04 = Browser.addTab("about:home", true);
+  waitFor(callback, function() {
+    // Ensure the tab is not empty
+    return !new_tab_04.chromeTab.thumbnail.hasAttribute("empty");
+  });
+
+  checkExpectedSize();
 }
 
 function tab_undo() {
@@ -145,11 +151,12 @@ function tab_on_undo() {
   Browser.loadURI("about:firstrun");
   is(undoBox.firstChild, null, "It should be no tab in the undo box when opening a new local page");
 
-  Browser.closeTab(new_tab_01, { forceClose: true });
-  Browser.closeTab(new_tab_02, { forceClose: true });
-  Browser.closeTab(new_tab_03, { forceClose: true });
-  Browser.closeTab(new_tab_04, { forceClose: true });
-  Browser.closeTab(new_tab_05, { forceClose: true });
+  // loadURI will open a new tab so ensure new_tab_05 point to the newly opened tab
+  new_tab_05 = Browser.selectedTab;
+
+  let tabs = [new_tab_01, new_tab_02, new_tab_03, new_tab_04, new_tab_05];
+  while (tabs.length)
+    Browser.closeTab(tabs.shift(), { forceClose: true });
   checkExpectedSize();
 
   tab_about_empty();
diff --git a/mobile/chrome/tests/browser_tapping.js b/mobile/chrome/tests/browser_tapping.js
index 594d51b150d..364cb764c05 100644
--- a/mobile/chrome/tests/browser_tapping.js
+++ b/mobile/chrome/tests/browser_tapping.js
@@ -167,7 +167,12 @@ gTests.push({
     EventUtils.synthesizeMouse(document.documentElement, width / 2, height / 2, {});
 
     setTimeout(function() {
-      ok(checkEvents(["TapDouble"]), "Fired a good double tap");
+      let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
+      if (sysInfo.get("device"))
+        todo(checkEvents(["TapDouble"]), "Fired a good double tap");
+      else
+        ok(checkEvents(["TapDouble"]), "Fired a good double tap");
+
       clearEvents();
 
       gCurrentTest.doubleTapFailTest();
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index b1609b71f4b..965858ec96f 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -38,9 +38,27 @@ function waitForAndContinue(callback, test, timeout) {
 function onMessageOnce(aMessageManager, aName, aCallback) {
   aMessageManager.addMessageListener(aName, function onMessage(aMessage) {
     aMessageManager.removeMessageListener(aName, onMessage);
-    aCallback(aMessage);
+    setTimeout(function() { 
+      aCallback(aMessage);
+    }, 0);
   });
-}
+};
+
+// This function is useful for debugging one test where you need to wait for
+// application to be ready
+function waitForFirstPaint(aCallback) {
+  function hasFirstPaint() {
+    let startupInfo = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup).getStartupInfo();
+    return ("firstPaint" in startupInfo);
+  }
+
+  if (!hasFirstPaint()) {
+    waitFor(aCallback, hasFirstPaint, Date.now() + 3000);
+    return;
+  }
+  
+  aCallback();
+};
 
 function makeURI(spec) {
   return Services.io.newURI(spec, null, null);
@@ -97,9 +115,8 @@ function runNextTest() {
 }
 
 let serverRoot = "http://example.com/browser/mobile/chrome/tests/";
-let chromeRoot = getRootDirectory(gTestPath);
-// For some security reasons (which?), loading remote_head using chromeRoot
-// instead of baseURI make the browser_formsZoom.js test fails.
 let baseURI = "http://mochi.test:8888/browser/mobile/chrome/tests/";
-messageManager.loadFrameScript(baseURI + "remote_head.js", true);
+
+let chromeRoot = getRootDirectory(gTestPath);
+messageManager.loadFrameScript(chromeRoot + "remote_head.js", true);
 messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);
diff --git a/mobile/chrome/tests/remote_autocomplete.js b/mobile/chrome/tests/remote_autocomplete.js
index 56f4646fdf9..1b5a6efce29 100644
--- a/mobile/chrome/tests/remote_autocomplete.js
+++ b/mobile/chrome/tests/remote_autocomplete.js
@@ -5,9 +5,6 @@ let assistant = Content._formAssistant;
 AsyncTests.add("TestRemoteAutocomplete:Click", function(aMessage, aJson) {
   let element = content.document.getElementById(aJson.id);
   assistant.open(element);
-  assistant._executeDelayed(function(assistant) {
-    sendAsyncMessage("FormAssist:AutoComplete", assistant._getJSON());
-  });
   return true;
 });
 
diff --git a/mobile/chrome/tests/remote_head.js b/mobile/chrome/tests/remote_head.js
index 268e5c0a4a7..2d08274ce41 100644
--- a/mobile/chrome/tests/remote_head.js
+++ b/mobile/chrome/tests/remote_head.js
@@ -1,3 +1,5 @@
+dump("======================== Remote Head loaded ========================\n");
+
 // XXX Those constants are here because EventUtils.js need them
 const window = content.document.defaultView.wrappedJSObject;
 const Element = Components.interfaces.nsIDOMElement;
diff --git a/mobile/components/MobileComponents.manifest b/mobile/components/MobileComponents.manifest
index dd9457f4d52..fda1499da5f 100644
--- a/mobile/components/MobileComponents.manifest
+++ b/mobile/components/MobileComponents.manifest
@@ -39,7 +39,7 @@ category app-startup SessionStore service,@mozilla.org/browser/sessionstore;1
 component {1d542abc-c88b-4636-a4ef-075b49806317} BrowserStartup.js
 contract @mozilla.org/browser/browser-startup;1 {1d542abc-c88b-4636-a4ef-075b49806317}
 category app-startup BrowserStartup service,@mozilla.org/browser/browser-startup;1
-category agent-style-sheets browser-content-stylesheet chrome://browser/content/content.css
+category agent-style-sheets browser-content-stylesheet chrome://browser/skin/content.css
 category agent-style-sheets browser-cursor-stylesheet chrome://browser/content/cursor.css
 
 # ContentPermissionPrompt.js
diff --git a/mobile/confvars.sh b/mobile/confvars.sh
index 32e3fd2de58..a8766a29c2f 100644
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -38,7 +38,7 @@
 MOZ_APP_NAME=fennec
 MOZ_APP_UA_NAME=Fennec
 
-MOZ_APP_VERSION=6.0a1
+MOZ_APP_VERSION=7.0a1
 
 MOZ_BRANDING_DIRECTORY=mobile/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
diff --git a/mobile/installer/debian/fennec.preinst.in b/mobile/installer/debian/fennec.preinst.in
index aa5ae86cabb..446c6b5eef5 100644
--- a/mobile/installer/debian/fennec.preinst.in
+++ b/mobile/installer/debian/fennec.preinst.in
@@ -2,7 +2,7 @@
 
 set -e
 
-RUNNING=`ps ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
+RUNNING=`ps | grep "fennec.*/fennec" | grep -v grep | wc -l`
 
 if [ $RUNNING -gt 0 ];
 then
@@ -11,7 +11,7 @@ then
   while [ $x -lt 10 ]
   do
     sleep 1
-    RUNNING=`ps ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
+    RUNNING=`ps | grep "fennec.*/fennec" | grep -v grep | wc -l`
 
     if [ $RUNNING -eq 0 ];
     then
diff --git a/mobile/installer/debian/fennec.prerm.in b/mobile/installer/debian/fennec.prerm.in
index aa5ae86cabb..446c6b5eef5 100644
--- a/mobile/installer/debian/fennec.prerm.in
+++ b/mobile/installer/debian/fennec.prerm.in
@@ -2,7 +2,7 @@
 
 set -e
 
-RUNNING=`ps ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
+RUNNING=`ps | grep "fennec.*/fennec" | grep -v grep | wc -l`
 
 if [ $RUNNING -gt 0 ];
 then
@@ -11,7 +11,7 @@ then
   while [ $x -lt 10 ]
   do
     sleep 1
-    RUNNING=`ps ax | grep "fennec.*/fennec" | grep -v grep | wc -l`
+    RUNNING=`ps | grep "fennec.*/fennec" | grep -v grep | wc -l`
 
     if [ $RUNNING -eq 0 ];
     then
diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in
index 4a939f019f2..b9c2c67a79b 100644
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -142,7 +142,6 @@
 @BINPATH@/components/content_canvas.xpt
 @BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_xmldoc.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/content_xtf.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css
index e505000c100..9315d3ecdbf 100644
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -1094,8 +1094,8 @@ pageaction {
   -moz-border-left-colors: white;
   border-style: solid;
   border-width: @border_width_tiny@ !important;
-  height: @touch_button_large@;
-  min-height: @touch_button_large@;
+  height: @touch_button_xlarge@;
+  min-height: @touch_button_xlarge@;
   width: 100%;
   min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
 }
@@ -1354,28 +1354,36 @@ pageaction:not([image]) > hbox >.pageaction-image {
   margin-bottom: @margin_small@ !important;
 }
 
-richlistitem.appmenu-site-button > image,
 .appmenu-site-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-site-hdpi.png");
 }
 
-richlistitem.appmenu-addons-button > image,
 .appmenu-addons-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-addons-hdpi.png");
 }
 
-richlistitem.appmenu-preferences-button > image,
 .appmenu-preferences-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-preferences-hdpi.png");
 }
 
-richlistitem.appmenu-downloads-button > image,
 .appmenu-downloads-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-downloads-hdpi.png");
 }
 
+.appmenu-findinpage-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-findinpage-hdpi.png");
+}
+
+.appmenu-saveas-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-downloads-hdpi.png");
+}
+
+.appmenu-share-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-share-hdpi.png");
+}
+
 #appmenu-more-button {
-  list-style-image: url("chrome://browser/skin/images/appmenu-site-hdpi.png");
+  list-style-image: url("chrome://browser/skin/images/appmenu-more-hdpi.png");
   display: none;
 }
 
@@ -1400,6 +1408,30 @@ richlistitem.appmenu-downloads-button > image,
   }
 }
 
+#appmenu-overflow {
+  background: rgba(255,255,255,0.95);
+  box-shadow: 0 @shadow_width_small@ @shadow_width_large@ @shadow_width_small@ black;
+  border-style: solid;
+  border-color: #6d6d6d;
+  border-width: @border_width_large@ @border_width_large@ 0 @border_width_large@;
+  margin: @margin_xxxnormal@ @margin_xxxnormal@ 0 @margin_xxxnormal@;
+}
+
+#appmenu-overflow-commands > .appmenu-button {
+  color: #000;
+  background: transparent;
+  font-size: @font_normal@ !important;
+  height: @touch_button_xlarge@;
+  min-height: @touch_button_xlarge@;
+  width: 100%; 
+  -moz-box-align: center;
+}
+
+#appmenu-overflow-commands > .appmenu-button:hover:active {
+  background-image: url("chrome://browser/skin/images/appmenu-active-hdpi.png");
+  background-size: 100% 100%;
+}
+
 /* Sync setup ------------------------------------------------------------- */
 .syncsetup-center {
   text-align: center;
diff --git a/mobile/chrome/content/content.css b/mobile/themes/core/content.css
similarity index 99%
rename from mobile/chrome/content/content.css
rename to mobile/themes/core/content.css
index 35fa5c0b430..a90ef4d6a59 100644
--- a/mobile/chrome/content/content.css
+++ b/mobile/themes/core/content.css
@@ -36,6 +36,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+%filter substitution
+%include defines.inc
+
 @namespace url("http://www.w3.org/1999/xhtml");
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/mobile/themes/core/gingerbread/browser.css b/mobile/themes/core/gingerbread/browser.css
index e5f3d4d2157..6ae22a1b1a9 100644
--- a/mobile/themes/core/gingerbread/browser.css
+++ b/mobile/themes/core/gingerbread/browser.css
@@ -382,6 +382,28 @@ toolbarbutton.choice-remotetabs {
   list-style-image: url(chrome://browser/skin/images/remotetabs-48.png);
 }
 
+/* awesomescreen panels ---------------------------------------------------- */
+historylist > hbox.history-throbber-box,
+remotetabslist > hbox.remotetabs-throbber-box {
+  display: none;
+}
+
+.history-throbber-box > image,
+.remotetabs-throbber-box > image {
+  list-style-image: url("chrome://browser/skin/images/throbber.png");
+}
+
+historylist[loading="true"] > hbox.history-throbber-box,
+remotetabslist[loading="true"] > hbox.remotetabs-throbber-box {
+  background-color: white;
+  display: -moz-box;
+}
+
+historylist[loading="true"] > richlistbox.history-list-children,
+remotetabslist[loading="true"] > richlistbox.remotetabs-list-children {
+  visibility: collapse;
+}
+
 /* browsers ---------------------------------------------------------------- */
 .input-overlay:-moz-focusring {
   outline: 0 !important;
@@ -400,8 +422,10 @@ toolbarbutton.choice-remotetabs {
   margin: 0;
   padding: @padding_small@ @padding_normal@ @padding_normal@ @padding_normal@;
   font-weight: bold;
-  color: white !important;
-  background-color: rgb(101, 121, 227) !important;
+  color: @color_text_default@ !important;
+  background-image: url(images/row-header-bg.png);
+  background-repeat: repeat-x;
+  background-size: auto 100%;
 }
 
 #tool-addons {
@@ -439,7 +463,7 @@ toolbarbutton.choice-remotetabs {
 @media (@orientation@: portrait) {
   #addons-repo {
     -moz-box-orient: vertical;
-    -moz-box-pack: center;
+    -moz-box-align: stretch;
   }
 }
 
@@ -503,12 +527,6 @@ richlistitem[isDisabled="true"] image {
   opacity: 0.25;
 }
 
-richlistitem[typeName="banner"],
-richlistitem[typeName="showmore"] {
-  background-color: rgb(255,255,255);
-  background: url(chrome://browser/skin/images/browseaddons-bg.jpg) repeat-x center top;
-}
-
 /* downloads panel UI   ---------------------------------------------------- */
 .download-retry-failed {
   color: red !important;
@@ -527,7 +545,7 @@ richlistitem[typeName="showmore"] {
 }
 
 #dl-empty-message:active {
-  background-color: white;
+  background-color: @color_background_default@;
 }
 
 #dl-empty-message > label {
@@ -781,8 +799,7 @@ autocompleteresult:not([badge]) .autocomplete-item-badge,
 
 /* special "no results", "awesome header row" and "title rows" items */
 autocompleteresult[class="history-item-title"],
-autocompleteresult[class="remotetabs-item-title"],
-.settings-title {
+autocompleteresult[class="remotetabs-item-title"] {
   min-height: 0;
   color: @color_text_default@;
   font-size: smaller;
@@ -969,6 +986,7 @@ documenttab[reload="true"] > stack > .documenttab-reload {
 /* Popup Icons */
 #identity-popup-icon {
   padding: 0;
+  padding-top: @padding_snormal@; /* align to top of text */
   list-style-image: url("chrome://browser/skin/images/identity-default-hdpi.png");
 }
 
@@ -1012,6 +1030,7 @@ documenttab[reload="true"] > stack > .documenttab-reload {
 }
 
 #identity-popup-encryption-icon {
+  padding-top: @padding_snormal@; /* align to top of text */
   list-style-image: url("chrome://browser/skin/images/unlocked-hdpi.png");
 }
 
@@ -1040,8 +1059,8 @@ pageaction {
   -moz-border-left-colors: white;
   border-style: solid;
   border-width: @border_width_tiny@ !important;
-  height: @touch_button_large@;
-  min-height: @touch_button_large@;
+  height: @touch_button_xlarge@;
+  min-height: @touch_button_xlarge@;
   width: 100%;
   min-width: @touch_action_minwidth@; /* keep the button from being too narrow */
 }
@@ -1156,6 +1175,17 @@ pageaction:not([image]) > hbox >.pageaction-image {
 }
 
 /* Preferences window   ---------------------------------------------------- */
+.settings-title {
+  min-height: 0;
+  color: @color_text_header@;
+  background-color: @color_background_header@;
+  font-size: smaller;
+  font-weight: bold;
+  margin: 0;
+  padding: @autocompleteresult_padding@ @padding_xnormal@;
+  border-bottom: @border_width_tiny@ solid @color_divider_border@;
+}
+
 .setting {
   padding-left: @padding_xnormal@;
   border-bottom: @border_width_tiny@ solid #cacdd5;
@@ -1164,7 +1194,7 @@ pageaction:not([image]) > hbox >.pageaction-image {
 /* XXX should be a richlistitem */
 .prefbox {
   padding: @padding_xsmall@;
-  border-bottom: @border_width_tiny@ solid rgb(207,207,207);
+  border-bottom: @border_width_tiny@ solid @color_divider_border@;
   min-height: @touch_row@; /* row size */
   -moz-box-align: center;
 }
@@ -1299,28 +1329,36 @@ pageaction:not([image]) > hbox >.pageaction-image {
   margin-bottom: @margin_small@ !important;
 }
 
-richlistitem.appmenu-site-button > image,
 .appmenu-site-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-site-hdpi.png");
 }
 
-richlistitem.appmenu-addons-button > image,
 .appmenu-addons-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-addons-hdpi.png");
 }
 
-richlistitem.appmenu-preferences-button > image,
 .appmenu-preferences-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-preferences-hdpi.png");
 }
 
-richlistitem.appmenu-downloads-button > image,
 .appmenu-downloads-button {
   list-style-image: url("chrome://browser/skin/images/appmenu-downloads-hdpi.png");
 }
 
+.appmenu-findinpage-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-findinpage-hdpi.png");
+}
+
+.appmenu-saveas-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-downloads-hdpi.png");
+}
+
+.appmenu-share-button {
+  list-style-image: url("chrome://browser/skin/images/appmenu-share-hdpi.png");
+}
+
 #appmenu-more-button {
-  list-style-image: url("chrome://browser/skin/images/appmenu-site-hdpi.png");
+  list-style-image: url("chrome://browser/skin/images/appmenu-more-hdpi.png");
   display: none;
 }
 
@@ -1345,6 +1383,29 @@ richlistitem.appmenu-downloads-button > image,
   }
 }
 
+#appmenu-overflow {
+  background: @color_background_default@;
+  border-style: solid;
+  border-color: @color_dialog_border@;
+  border-width: @border_width_small@ @border_width_small@ 0 @border_width_small@;
+  margin: @margin_xxxnormal@ @margin_xxxnormal@ 0 @margin_xxxnormal@;
+}
+
+#appmenu-overflow-commands > .appmenu-button {
+  color: @color_text_default@;
+  background: transparent;
+  font-size: @font_normal@ !important;
+  height: @touch_button_xlarge@;
+  min-height: @touch_button_xlarge@;
+  width: 100%; 
+  -moz-box-align: center;
+}
+
+#appmenu-overflow-commands > .appmenu-button:hover:active {
+  background-image: url("chrome://browser/skin/images/appmenu-active-hdpi.png");
+  background-size: 100% 100%;
+}
+
 /* Sync setup ------------------------------------------------------------- */
 .syncsetup-center {
   /* TODO: remove this dummy when we no longer use it in other themes */
@@ -1376,12 +1437,12 @@ richlistitem.appmenu-downloads-button > image,
 /* content scrollbars */
 .scroller {
   opacity: 0;
-  background-color: rgba(0, 0, 0, 0.4) !important;
+  background-color: @color_background_scroller@ !important;
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
   -moz-border-right-colors: none !important;
   -moz-border-left-colors: none !important;
-  border: @border_width_tiny@ solid rgba(255, 255, 255, 0.4) !important;
+  border: @border_width_tiny@ solid rgba(0, 0, 0, 0.4) !important;
 }
 
 .scroller[panning="true"] {
diff --git a/mobile/themes/core/gingerbread/content.css b/mobile/themes/core/gingerbread/content.css
new file mode 100644
index 00000000000..6a3cad4a0c3
--- /dev/null
+++ b/mobile/themes/core/gingerbread/content.css
@@ -0,0 +1,358 @@
+/* ***** 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 Mobile Browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mark Finkle <mfinkle@mozilla.com>
+ *   Doug Turner <dougt@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 ***** */
+
+%filter substitution
+%include defines.inc
+
+@namespace url("http://www.w3.org/1999/xhtml");
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* make clicking on links stand out a bit (bug 532206) */
+* > *:not(embed):focus, * > *:focus > font {
+  outline: 2px solid #8db8d8 !important;
+  /*
+    XXX How do I preserve mac focusring without blowing focus color on other platforms?
+    outline-color: -moz-mac-focusring !important;
+  */
+}
+
+*:-moz-any-link:focus {
+  outline-offset: -2px;
+}
+
+/* Style the scrollbars */
+html xul|scrollbar {
+  display: none;
+}
+
+xul|window xul|scrollbar {
+  display: block;
+}
+
+xul|scrollbar[orient="vertical"] {
+  -moz-appearance: none !important;
+  opacity: 0;
+  position: relative;
+  margin-left: -8px;
+  min-width: 8px;
+  background-color: transparent !important;
+  background-image: none !important;
+  border: 0px solid transparent !important;
+}
+
+xul|scrollbar[orient="vertical"]:-moz-locale-dir(rtl) {
+  margin-left: 2px;
+  margin-right: -10px;
+}
+
+xul|scrollbar[orient="vertical"] xul|thumb {
+  max-width: 6px !important;
+  min-width: 6px !important;
+}
+
+xul|scrollbar[orient="horizontal"] {
+  -moz-appearance: none !important;
+  opacity: 0;
+  position: relative;
+  min-height: 8px;
+  margin-top: -8px;
+  background-color: transparent !important;
+  background-image: none !important;
+  border: 0px solid transparent !important;
+}
+
+xul|scrollbar[orient="horizontal"] xul|thumb {
+  max-height: 6px !important;
+  min-height: 6px !important;
+}
+
+xul|*[panning="true"] xul|scrollbar {
+  opacity: 1;
+}
+
+xul|scrollbox {
+  overflow-y: scroll;
+  overflow-x: scroll;
+}
+
+xul|scrollbarbutton {
+  min-height: 8px !important;
+  min-width: 8px !important;
+  -moz-appearance: none !important;
+  visibility: hidden;
+}
+
+xul|scrollbarbutton[sbattr="scrollbar-up-top"],
+xul|scrollbarbutton[sbattr="scrollbar-bottom-top"] {
+  display: none;
+}
+
+xul|thumb {
+  background-color: @color_background_scroller@ !important;
+  -moz-border-top-colors: none !important;
+  -moz-border-bottom-colors: none !important;
+  -moz-border-right-colors: none !important;
+  -moz-border-left-colors: none !important;
+  border: 1px solid rgba(255, 255, 255, 0.4) !important;
+  -moz-border-radius: 3px;
+}
+
+select:not([size]):not([multiple]) > xul|scrollbar,
+select[size="1"] > xul|scrollbar,
+select:not([size]):not([multiple]) xul|scrollbarbutton,
+select[size="1"] xul|scrollbarbutton {
+  display: block;
+  margin-left: 0;
+  min-width: 16px;
+}
+
+/* Override inverse OS themes */
+select,
+textarea,
+button,
+xul|button,
+* > input:not([type="image"]) {
+  -moz-appearance: none !important;  /* See bug 598421 for fixing the platform */
+  -moz-border-radius: 3px;
+}
+
+select[size],
+select[multiple],
+select[size][multiple],
+textarea,
+* > input:not([type="image"]) {
+  border-style: solid;
+  border-color: #7d7d7d;
+  color: #414141;
+  background: white -moz-linear-gradient(top, rgba(115,115,115,0.5) 0, rgba(215,215,215,0.5) 3px, rgba(255,255,255,0.2) 16px);
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: GrayText;
+}
+
+select:not([size]):not([multiple]),
+select[size="0"],
+select[size="1"],
+* > input[type="button"],
+* > input[type="submit"],
+* > input[type="reset"],
+button {
+  border-style: solid;
+  border-color: #7d7d7d;
+  color: #414141;
+  background: white -moz-linear-gradient(top, rgba(255,255,255,0.2) 0, rgba(215,215,215,0.5) 18px, rgba(115,115,115,0.5) 100%);
+}
+
+input[type="checkbox"] {
+  background: white -moz-linear-gradient(top, rgba(115,115,115,0.5) 0, rgba(215,215,215,0.5) 2px, rgba(255,255,255,0.2) 6px);
+}
+
+input[type="radio"] {
+  background: -moz-radial-gradient(6px 6px, cover, rgba(255,255,255,0.2) 3px, rgba(195,195,195,0.5) 5px, rgba(115,115,115,0.5) 100%);
+}
+
+select {
+  border-width: 1px;
+  padding: 1px;
+}
+
+select:not([size]):not([multiple]),
+select[size="0"],
+select[size="1"] {
+  padding: 0 1px 0 1px;
+}
+
+* > input:not([type="image"]) {
+  border-width: 1px;
+  padding: 1px;
+}
+
+textarea {
+  resize: none;
+  border-width: 1px;
+  padding: 2px 1px 2px 1px;
+}
+
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+button {
+  border-width: 1px;
+  padding: 0 7px 0 7px;
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  max-width: 14px;
+  max-height: 14px;
+  border: 1px solid #a7a7a7 !important;
+  padding: 2px 1px 2px 1px;
+}
+
+select > input[type="button"] {
+  border-width: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
+  -moz-border-radius: 0;
+  color: #414141;
+
+  background-size: 100% 90%;
+  background-color: transparent;
+  background-image: -moz-radial-gradient(bottom left, #bbbbbb 40%, #f5f5f5) !important;
+  background-position: -15px center !important;
+  background-repeat: no-repeat !important;
+
+  /* Use to position an svg arrow on <select> element */
+  -moz-binding: url("chrome://browser/content/bindings.xml#select-button");
+  position: relative !important;
+  font-size: inherit;
+}
+
+select[size]:focus,
+select[multiple]:focus,
+select[size][multiple]:focus,
+textarea:focus,
+input[type="file"]:focus > input[type="text"],
+* > input:not([type="image"]):focus {
+  outline: 0px !important;
+  border-style: solid;
+  border-color: rgb(94,128,153);
+  background: white -moz-linear-gradient(top, rgba(27,113,177,0.5) 0, rgba(198,225,246,0.2) 3px, rgba(255,255,255,0.2) 16px);
+}
+
+select:not([size]):not([multiple]):focus,
+select[size="0"]:focus,
+select[size="1"]:focus,
+input[type="button"]:focus,
+input[type="submit"]:focus,
+input[type="reset"]:focus,
+button:focus {
+  outline: 0px !important;
+  border-style: solid;
+  border-color: rgb(94,128,153);
+  background: white -moz-linear-gradient(top, rgba(255,255,255,0.2) 0, rgba(198,225,256,0.2) 18px, rgba(27,113,177,0.5) 100%);
+}
+
+input[type="checkbox"]:focus,
+input[type="radio"]:focus {
+  border-color: #99c6e0 !important;
+}
+
+input[type="checkbox"]:focus {
+  background: white -moz-linear-gradient(top, rgba(27,113,177,0.5) 0, rgba(198,225,246,0.2) 2px, rgba(255,255,255,0.2) 6px);
+}
+
+input[type="radio"]:focus {
+  background: -moz-radial-gradient(6px 6px, cover, rgba(255,255,255,0.2) 3px, rgba(198,225,246,0.2) 5px, rgba(27,113,177,0.5) 100%);
+}
+
+/* we need to be specific for selects because the above rules are specific too */
+textarea[disabled],
+select[size][disabled],
+select[multiple][disabled],
+select[size][multiple][disabled],
+select:not([size]):not([multiple])[disabled],
+select[size="0"][disabled],
+select[size="1"][disabled],
+button[disabled],
+* > input:not([type="image"])[disabled] {
+  color: rgba(0,0,0,0.3);
+  border-color: rgba(125,125,125,0.4);
+  border-style: solid;
+  border-width: 1px;
+  background: transparent -moz-linear-gradient(top, rgba(185,185,185,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(255,255,255,0.4) 100%);
+}
+
+select:not([size]):not([multiple])[disabled],
+select[size="0"][disabled],
+select[size="1"][disabled] {
+  background: transparent -moz-linear-gradient(top, rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
+}
+
+input[type="button"][disabled],
+input[type="submit"][disabled],
+input[type="reset"][disabled],
+button[disabled="true"] {
+  padding: 0 7px 0 7px;
+  background: transparent -moz-linear-gradient(top, rgba(255,255,255,0.4) 0, rgba(235,235,235,0.4) 3px, rgba(185,185,185,0.4) 100%);
+}
+
+input[type="radio"][disabled],
+input[type="radio"][disabled]:active,
+input[type="radio"][disabled]:hover,
+input[type="radio"][disabled]:hover:active,
+input[type="checkbox"][disabled],
+input[type="checkbox"][disabled]:active,
+input[type="checkbox"][disabled]:hover,
+input[type="checkbox"][disabled]:hover:active {
+  border:1px solid rgba(125,125,125,0.4) !important;
+}
+
+select[disabled] > input[type="button"] {
+  opacity: 0.6;
+  padding: 1px 7px 1px 7px;
+}
+
+/* -moz-touch-enabled? media elements */
+video > xul|videocontrols,
+audio > xul|videocontrols {
+  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
+}
+
+*:-moz-any-link:active,
+*[role=button]:active,
+button:active,
+input:active,
+option:active,
+select:active,
+label:active,
+textarea:active {
+  background-color: rgba(141, 184, 216, 0.5) !important;
+}
+
+/* 
+ * Generate an additional space after the anonymous div to make it easier to
+ * to position the caret at the end of the text
+ */
+input > .anonymous-div:after {
+  content: "";
+  margin: 16px;
+}
+
diff --git a/mobile/themes/core/gingerbread/defines.inc b/mobile/themes/core/gingerbread/defines.inc
index a03e8482215..6c5b0d86396 100644
--- a/mobile/themes/core/gingerbread/defines.inc
+++ b/mobile/themes/core/gingerbread/defines.inc
@@ -8,6 +8,9 @@
 %define color_dialog_border #5a5a5a
 %define color_background_dlgbuttons #9a9a9a
 %define color_background_panel #d6d6d6
+%define color_background_header #292929
+%define color_text_header #999999
+%define color_background_scroller #9a9a9a
 
 %define color_background_inverse #fff
 %define color_text_inverse #000
diff --git a/mobile/themes/core/gingerbread/forms.css b/mobile/themes/core/gingerbread/forms.css
new file mode 100644
index 00000000000..92e1a50dace
--- /dev/null
+++ b/mobile/themes/core/gingerbread/forms.css
@@ -0,0 +1,266 @@
+/* ***** 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 Mobile Browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mark Finkle <mfinkle@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 ***** */
+
+%filter substitution
+%include defines.inc
+
+/* Content Navigator popup ------------------------------------------------- */
+#content-navigator {
+  display: none;
+  pointer-events: none;
+  padding: 0;
+  background-color: transparent !important;
+}
+
+#content-navigator[type="find"],
+#content-navigator[type="form"]:not([disabled="true"]) {
+  display: -moz-box;
+}
+
+#content-navigator > .previous-button,
+#content-navigator > .next-button {
+  min-width: @touch_button_small@ !important; /* button size */
+  min-height: @touch_button_small@ !important; /* button size */
+  border: @border_width_tiny@ solid rgba(0,0,0,0.2) !important;
+  border-bottom: @border_width_large@ solid #53565a !important;
+  background-color: #5e6166;
+  background-image: none !important;
+  box-shadow: black 0 @border_radius_tiny@ @border_radius_tiny@;
+  pointer-events: auto;
+  -moz-user-focus: ignore !important;
+}
+
+#content-navigator > .previous-button[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/images/previous-disabled-hdpi.png");
+}
+
+#content-navigator > .next-button[disabled="true"] {
+  list-style-image: url("chrome://browser/skin/images/next-disabled-hdpi.png");
+}
+
+#content-navigator > .previous-button {
+  -moz-margin-end: 0;
+  -moz-border-end: @border_width_tiny@ solid rgba(0,0,0,0.2) !important;
+  list-style-image: url("chrome://browser/skin/images/previous-hdpi.png");
+}
+
+#content-navigator:-moz-locale-dir(ltr) > .previous-button {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#content-navigator:-moz-locale-dir(rtl) > .previous-button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#content-navigator > .next-button {
+  -moz-margin-start: 0;
+  -moz-border-start: @border_width_tiny@ solid rgba(255,255,255,0.2) !important;
+  list-style-image: url("chrome://browser/skin/images/next-hdpi.png");
+}
+
+#content-navigator:-moz-locale-dir(ltr) > .next-button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#content-navigator:-moz-locale-dir(rtl) > .next-button {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+/* Find Helper ------------------------------------------------------------- */
+#content-navigator[type="find"] > .previous-button {
+  /* previous button overlap the textbox */
+  -moz-margin-start: -@margin_normal@;
+}
+
+#content-navigator:not([type="find"]) > #find-helper-textbox {
+  display: none;
+}
+
+#find-helper-textbox {
+  pointer-events: auto;
+  margin: @margin_normal@;
+  -moz-margin-end: 0;
+  padding: @padding_xnormal@;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  width: 10em;
+}
+
+#find-helper-textbox[status="1"] { /* Ci.nsITypeAheadFind.FIND_NOTFOUND */
+  background: rgb(255,200,200);
+}
+
+#find-helper-textbox:hover:active {
+  background: #8db8d8;
+}
+
+/* Form Helper Autofill ---------------------------------------------------- */
+#form-helper-suggestions-container .panel-arrowcontent {
+  border-radius: @border_radius_normal@;
+  padding: 0; /* half core spacing & none (autorepeat arrows compensate) */
+  background-color: rgb(235,235,235);
+  background-image: url("chrome://browser/skin/images/button-bg.png");
+}
+
+#form-helper-suggestions {
+  margin: 0;
+  color: black;
+  max-width: 0;
+}
+
+#form-helper-suggestions > .autorepeatbutton-down,
+#form-helper-suggestions > .autorepeatbutton-up {
+  border: none;
+}
+
+#form-helper-suggestions > .autorepeatbutton-down {
+  list-style-image: url("chrome://browser/skin/images/arrowright-16.png");
+}
+
+#form-helper-suggestions > .autorepeatbutton-down:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/images/arrowleft-16.png");
+}
+
+#form-helper-suggestions > .autorepeatbutton-up {
+  list-style-image: url("chrome://browser/skin/images/arrowleft-16.png");
+}
+
+#form-helper-suggestions > .autorepeatbutton-up:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://browser/skin/images/arrowright-16.png");
+}
+
+/* force the autorepeat buttons to create a 'padding' when collapsed */
+#form-helper-suggestions > autorepeatbutton[collapsed="true"],
+#form-helper-suggestions > autorepeatbutton[disabled="true"] {
+  visibility: hidden;
+}
+
+#form-helper-suggestions .form-helper-suggestions-label {
+  padding: @padding_xxnormal@ @padding_normal@; /* 12px helps get row size for the labels */
+  margin: 0;
+  border-color: transparent rgb(215,215,215) transparent rgb(255,255,255);
+  border-style: solid;
+  border-width: @border_width_tiny@;
+}
+
+#form-helper-suggestions .form-helper-suggestions-label:first-child {
+  -moz-padding-start: -moz-initial; /* the arrowscrollbox creates enough left padding */
+  -moz-border-start: none;
+}
+
+#form-helper-suggestions .form-helper-suggestions-label:last-child {
+  -moz-border-end: none;
+}
+
+#form-helper-suggestions .form-helper-suggestions-label:hover:active {
+  background-color: #8db8d8;
+}
+
+/* Select popup ------------------------------------------------------------- */
+#select-container button {
+  display: none;
+  -moz-user-focus: ignore;
+  -moz-user-select: none;
+}
+
+#select-container[multiple="true"] button {
+  display: -moz-box;
+}
+
+#select-commands {
+  background: transparent;
+  border-top: @border_width_tiny@ solid rgb(205,205,205);
+  padding: 0;
+  -moz-user-focus: ignore;
+}
+
+/* listcell elements doesn't have flex="1" so we need to force it */
+#select-commands .option-command > listcell {
+  -moz-box-flex: 1 !important;
+}
+
+/* menulist popup ---------------------------------------------------------- */
+#menulist-commands {
+  display: -moz-box;
+}
+
+/* Common style for Select & Menulist -------------------------------------- */
+.options-title {
+  color: @color_text_default@;
+  background-color: @color_background_default@;
+  padding: @padding_xxnormal@ @padding_small@ @padding_small@ @padding_small@;
+  font-size: @font_small@;
+}
+
+.options-title[value=""] {
+  display: none;
+}
+
+.option-command label {
+  -moz-box-flex: 1; /* push the imageas far right as possible */
+}
+
+.option-command image {
+  width: 46px;
+  height: 46px;
+  margin: @margin_tiny@;
+  -moz-margin-start: @margin_normal@;
+  -moz-box-ordinal-group: 2; /* put the image on the right side */
+}
+
+.option-command {
+  list-style-image: url("chrome://browser/skin/images/radio-unselected-hdpi.png");
+}
+
+.option-command.selected {
+  list-style-image: url("chrome://browser/skin/images/radio-selected-hdpi.png");
+}
+
+.option-command.optgroup {
+  font-weight: bold;
+  font-style: italic;
+  pointer-events: none;
+}
+
+.option-command .in-optgroup {
+  -moz-padding-start: -moz-calc(30px + @padding_large@);
+}
+
diff --git a/mobile/themes/core/gingerbread/images/appmenu-addons-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-addons-hdpi.png
index de7c3294df3..756bba73ac9 100644
Binary files a/mobile/themes/core/gingerbread/images/appmenu-addons-hdpi.png and b/mobile/themes/core/gingerbread/images/appmenu-addons-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-downloads-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-downloads-hdpi.png
index 7096db9d1ce..27a6fb79ab4 100644
Binary files a/mobile/themes/core/gingerbread/images/appmenu-downloads-hdpi.png and b/mobile/themes/core/gingerbread/images/appmenu-downloads-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-findinpage-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-findinpage-hdpi.png
new file mode 100644
index 00000000000..f65ead188ae
Binary files /dev/null and b/mobile/themes/core/gingerbread/images/appmenu-findinpage-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-more-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-more-hdpi.png
index 052f8f2fd89..44097fc9161 100644
Binary files a/mobile/themes/core/gingerbread/images/appmenu-more-hdpi.png and b/mobile/themes/core/gingerbread/images/appmenu-more-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-preferences-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-preferences-hdpi.png
index 5bff07cbb3d..cc3fc9ac968 100644
Binary files a/mobile/themes/core/gingerbread/images/appmenu-preferences-hdpi.png and b/mobile/themes/core/gingerbread/images/appmenu-preferences-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-share-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-share-hdpi.png
new file mode 100644
index 00000000000..b89f4d861d7
Binary files /dev/null and b/mobile/themes/core/gingerbread/images/appmenu-share-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/appmenu-site-hdpi.png b/mobile/themes/core/gingerbread/images/appmenu-site-hdpi.png
index 3ebe83dd7ad..b5aa496610c 100644
Binary files a/mobile/themes/core/gingerbread/images/appmenu-site-hdpi.png and b/mobile/themes/core/gingerbread/images/appmenu-site-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/check-selected-46.png b/mobile/themes/core/gingerbread/images/check-selected-hdpi.png
similarity index 100%
rename from mobile/themes/core/gingerbread/images/check-selected-46.png
rename to mobile/themes/core/gingerbread/images/check-selected-hdpi.png
diff --git a/mobile/themes/core/gingerbread/images/check-unselected-46.png b/mobile/themes/core/gingerbread/images/check-unselected-hdpi.png
similarity index 100%
rename from mobile/themes/core/gingerbread/images/check-unselected-46.png
rename to mobile/themes/core/gingerbread/images/check-unselected-hdpi.png
diff --git a/mobile/themes/core/gingerbread/images/close-active-hdpi.png b/mobile/themes/core/gingerbread/images/close-active-hdpi.png
index eb4f3d0bf47..1f19cd10638 100644
Binary files a/mobile/themes/core/gingerbread/images/close-active-hdpi.png and b/mobile/themes/core/gingerbread/images/close-active-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/close-default-hdpi.png b/mobile/themes/core/gingerbread/images/close-default-hdpi.png
index f2a81238611..7e4b9f7d8d8 100644
Binary files a/mobile/themes/core/gingerbread/images/close-default-hdpi.png and b/mobile/themes/core/gingerbread/images/close-default-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/locked-hdpi.png b/mobile/themes/core/gingerbread/images/locked-hdpi.png
index 16dc8e17626..a21c3a15828 100644
Binary files a/mobile/themes/core/gingerbread/images/locked-hdpi.png and b/mobile/themes/core/gingerbread/images/locked-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/popup-selected-item-hdpi.png b/mobile/themes/core/gingerbread/images/popup-selected-item-hdpi.png
index 9cac088e929..a11bd508f68 100644
Binary files a/mobile/themes/core/gingerbread/images/popup-selected-item-hdpi.png and b/mobile/themes/core/gingerbread/images/popup-selected-item-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/radio-selected-hdpi.png b/mobile/themes/core/gingerbread/images/radio-selected-hdpi.png
new file mode 100644
index 00000000000..9b3ad38a62a
Binary files /dev/null and b/mobile/themes/core/gingerbread/images/radio-selected-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/radio-unselected-hdpi.png b/mobile/themes/core/gingerbread/images/radio-unselected-hdpi.png
new file mode 100644
index 00000000000..17e346ae8ef
Binary files /dev/null and b/mobile/themes/core/gingerbread/images/radio-unselected-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/tab-active-hdpi.png b/mobile/themes/core/gingerbread/images/tab-active-hdpi.png
index 98621cf091a..3c40b30520f 100644
Binary files a/mobile/themes/core/gingerbread/images/tab-active-hdpi.png and b/mobile/themes/core/gingerbread/images/tab-active-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/images/unlocked-hdpi.png b/mobile/themes/core/gingerbread/images/unlocked-hdpi.png
index 6ed6ff1bc9e..e21b80fa3c6 100644
Binary files a/mobile/themes/core/gingerbread/images/unlocked-hdpi.png and b/mobile/themes/core/gingerbread/images/unlocked-hdpi.png differ
diff --git a/mobile/themes/core/gingerbread/platform.css b/mobile/themes/core/gingerbread/platform.css
index 41c6aa43175..f75c87e1cef 100644
--- a/mobile/themes/core/gingerbread/platform.css
+++ b/mobile/themes/core/gingerbread/platform.css
@@ -66,10 +66,9 @@ label {
 }
 
 /* Override any OS inverse themes */
-richlistbox,
 textbox {
-  color: black;
-  background-color: white;
+  color: @color_text_inverse@;
+  background-color: @color_background_inverse@;
 }
 
 /* textboxes --------------------------------------------------------------- */
@@ -274,11 +273,11 @@ toolbarbutton[open="true"] {
 
 .button-checkbox > .button-image-icon {
   -moz-margin-end: @margin_normal@;
-  list-style-image: url("chrome://browser/skin/images/check-unselected-46.png");
+  list-style-image: url("chrome://browser/skin/images/check-unselected-hdpi.png");
 }
 
 .button-checkbox[checked="true"] > .button-image-icon {
-  list-style-image: url("chrome://browser/skin/images/check-selected-46.png");
+  list-style-image: url("chrome://browser/skin/images/check-selected-hdpi.png");
 }
 
 .button-checkbox:hover:active > .button-box,
@@ -344,34 +343,40 @@ radio[focused="true"] > .radio-label-box {
   border: @border_width_tiny@ solid transparent;
 }
 
-/* checkbox radios --------------------------------------------------------- */
+/* checkbox  --------------------------------------------------------------- */
 checkbox {
   margin: @margin_tiny@ @margin_small@ @margin_tiny@ @margin_small@; /* match platform style for buttons */
+  -moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing") !important;
 }
 
-radio.checkbox-radio-on:not([selected]) {
-  border-right: @border_width_tiny@ solid @color_button_border@;
+/* stop the focus from moving/showing the border around the label, which we don't use */
+checkbox:focus > .checkbox-label-center-box > .checkbox-label-box {
+  border: 1px solid transparent;
 }
 
-radio.checkbox-radio-on:not([selected]):-moz-locale-dir(rtl) {
-  border-left: none;
-  border-left: @border_width_tiny@ solid @color_button_border@;
+.checkbox-check {
+  border: 2px transparent;
+  -moz-border-top-colors: -moz-initial;
+  -moz-border-right-colors: -moz-initial;
+  -moz-border-bottom-colors: -moz-initial;
+  -moz-border-left-colors: -moz-initial;
+  min-width: 46px;
+  min-height: 46px;
+  background: url("chrome://browser/skin/images/check-unselected-hdpi.png") no-repeat 50% 50%;
 }
 
-radio.checkbox-radio-off[selected],
-radio.checkbox-radio-off:hover:active {
-  background-image: url("chrome://browser/skin/images/toggle-off.png");
-  color: black;
-  background-repeat: repeat-x;
+checkbox[checked="true"] > .checkbox-spacer-box > .checkbox-check {
+  background-image: url("chrome://browser/skin/images/check-selected-hdpi.png");
 }
 
-radio.checkbox-radio-on:not([selected]) .radio-label-box,
-radio.checkbox-radio-off:not([selected]) .radio-label-box {
-  visibility: hidden;
+checkbox[checked="true"][disabled="true"] > .checkbox-spacer-box > .checkbox-check {
+  background-image: url("chrome://browser/skin/images/check-selected-hdpi.png");
 }
 
 /* richlistbox ------------------------------------------------------------- */
 richlistbox {
+  color: @color_text_default@;
+  background-color: @color_background_default@;
   -moz-user-focus: ignore;
   margin: 0;
 }
@@ -380,7 +385,7 @@ richlistitem {
   -moz-user-focus: ignore;
   min-height: @touch_row@; /* row size */
   padding: @padding_small@;
-  border-bottom: @border_width_tiny@ solid rgb(207,207,207);
+  border-bottom: @border_width_tiny@ solid @color_divider_border@;
 }
 
 richlistitem label.title,
@@ -412,8 +417,8 @@ richlistitem description.normal-bold {
 }
 
 richlistitem[selected="true"] {
-  color: black;
-  background-color: white;
+  color: @color_text_default@;
+  background-color: @color_background_default@;
 }
 
 richlistitem:hover:active:not([selected="true"]):not([nohighlight="true"]) {
@@ -423,8 +428,8 @@ richlistitem:hover:active:not([selected="true"]):not([nohighlight="true"]) {
 richlistitem.section-header,
 richlistitem[selected="true"].section-header {
   font-weight: bold;
-  color: #000;
-  background-color: lightgray;
+  color: @color_text_header@;
+  background-color: @color_background_header@;
 }
 
 richlistitem .show-on-select {
diff --git a/mobile/themes/core/honeycomb/images/appmenu-addons-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-addons-hdpi.png
index 904ddbfd7dc..209e29ed1f1 100644
Binary files a/mobile/themes/core/honeycomb/images/appmenu-addons-hdpi.png and b/mobile/themes/core/honeycomb/images/appmenu-addons-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-downloads-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-downloads-hdpi.png
index 9327b0f8197..bcee3ed14a8 100644
Binary files a/mobile/themes/core/honeycomb/images/appmenu-downloads-hdpi.png and b/mobile/themes/core/honeycomb/images/appmenu-downloads-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-findinpage-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-findinpage-hdpi.png
new file mode 100644
index 00000000000..d795b57b1d7
Binary files /dev/null and b/mobile/themes/core/honeycomb/images/appmenu-findinpage-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-more-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-more-hdpi.png
index 052f8f2fd89..4cffd557db1 100644
Binary files a/mobile/themes/core/honeycomb/images/appmenu-more-hdpi.png and b/mobile/themes/core/honeycomb/images/appmenu-more-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-preferences-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-preferences-hdpi.png
index 190ac8b4edc..8098faa323d 100644
Binary files a/mobile/themes/core/honeycomb/images/appmenu-preferences-hdpi.png and b/mobile/themes/core/honeycomb/images/appmenu-preferences-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-share-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-share-hdpi.png
new file mode 100644
index 00000000000..1a37ca27650
Binary files /dev/null and b/mobile/themes/core/honeycomb/images/appmenu-share-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/appmenu-site-hdpi.png b/mobile/themes/core/honeycomb/images/appmenu-site-hdpi.png
index b01d29cbbca..829e2df01f6 100644
Binary files a/mobile/themes/core/honeycomb/images/appmenu-site-hdpi.png and b/mobile/themes/core/honeycomb/images/appmenu-site-hdpi.png differ
diff --git a/mobile/themes/core/honeycomb/images/popup-selected-item-hdpi.png b/mobile/themes/core/honeycomb/images/popup-selected-item-hdpi.png
index 9cac088e929..dd511023c1f 100644
Binary files a/mobile/themes/core/honeycomb/images/popup-selected-item-hdpi.png and b/mobile/themes/core/honeycomb/images/popup-selected-item-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-addons-hdpi.png b/mobile/themes/core/images/appmenu-addons-hdpi.png
index 904ddbfd7dc..209e29ed1f1 100644
Binary files a/mobile/themes/core/images/appmenu-addons-hdpi.png and b/mobile/themes/core/images/appmenu-addons-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-downloads-hdpi.png b/mobile/themes/core/images/appmenu-downloads-hdpi.png
index 9327b0f8197..bcee3ed14a8 100644
Binary files a/mobile/themes/core/images/appmenu-downloads-hdpi.png and b/mobile/themes/core/images/appmenu-downloads-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-findinpage-hdpi.png b/mobile/themes/core/images/appmenu-findinpage-hdpi.png
new file mode 100644
index 00000000000..d795b57b1d7
Binary files /dev/null and b/mobile/themes/core/images/appmenu-findinpage-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-more-hdpi.png b/mobile/themes/core/images/appmenu-more-hdpi.png
index 052f8f2fd89..4cffd557db1 100644
Binary files a/mobile/themes/core/images/appmenu-more-hdpi.png and b/mobile/themes/core/images/appmenu-more-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-preferences-hdpi.png b/mobile/themes/core/images/appmenu-preferences-hdpi.png
index 190ac8b4edc..8098faa323d 100644
Binary files a/mobile/themes/core/images/appmenu-preferences-hdpi.png and b/mobile/themes/core/images/appmenu-preferences-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-share-hdpi.png b/mobile/themes/core/images/appmenu-share-hdpi.png
new file mode 100644
index 00000000000..1a37ca27650
Binary files /dev/null and b/mobile/themes/core/images/appmenu-share-hdpi.png differ
diff --git a/mobile/themes/core/images/appmenu-site-hdpi.png b/mobile/themes/core/images/appmenu-site-hdpi.png
index b01d29cbbca..829e2df01f6 100644
Binary files a/mobile/themes/core/images/appmenu-site-hdpi.png and b/mobile/themes/core/images/appmenu-site-hdpi.png differ
diff --git a/mobile/themes/core/images/popup-selected-item-hdpi.png b/mobile/themes/core/images/popup-selected-item-hdpi.png
index 9cac088e929..dd511023c1f 100644
Binary files a/mobile/themes/core/images/popup-selected-item-hdpi.png and b/mobile/themes/core/images/popup-selected-item-hdpi.png differ
diff --git a/mobile/themes/core/jar.mn b/mobile/themes/core/jar.mn
index ea8ff717f2d..9f97432efad 100644
--- a/mobile/themes/core/jar.mn
+++ b/mobile/themes/core/jar.mn
@@ -10,6 +10,7 @@ chrome.jar:
   skin/about.css                            (about.css)
   skin/aboutHome.css                        (aboutHome.css)
 * skin/browser.css                          (browser.css)
+* skin/content.css                          (content.css)
   skin/config.css                           (config.css)
   skin/firstRun.css                         (firstRun.css)
 * skin/forms.css                            (forms.css)
@@ -23,8 +24,10 @@ chrome.jar:
   skin/images/appmenu-addons-hdpi.png       (images/appmenu-addons-hdpi.png)
   skin/images/appmenu-active-hdpi.png       (images/appmenu-active-hdpi.png)
   skin/images/appmenu-downloads-hdpi.png    (images/appmenu-downloads-hdpi.png)
+  skin/images/appmenu-findinpage-hdpi.png   (images/appmenu-findinpage-hdpi.png)
   skin/images/appmenu-more-hdpi.png         (images/appmenu-more-hdpi.png)
   skin/images/appmenu-preferences-hdpi.png  (images/appmenu-preferences-hdpi.png)
+  skin/images/appmenu-share-hdpi.png        (images/appmenu-share-hdpi.png)
   skin/images/appmenu-site-hdpi.png         (images/appmenu-site-hdpi.png)
   skin/images/aboutBackground.jpg           (images/aboutBackground.jpg)
   skin/images/button-bg.png                 (images/button-bg.png)
@@ -127,9 +130,10 @@ chrome.jar:
   skin/gingerbread/about.css                            (about.css)
   skin/gingerbread/aboutHome.css                        (aboutHome.css)
 * skin/gingerbread/browser.css                          (gingerbread/browser.css)
+* skin/gingerbread/content.css                          (gingerbread/content.css)
   skin/gingerbread/config.css                           (config.css)
   skin/gingerbread/firstRun.css                         (firstRun.css)
-* skin/gingerbread/forms.css                            (forms.css)
+* skin/gingerbread/forms.css                            (gingerbread/forms.css)
   skin/gingerbread/header.css                           (header.css)
 * skin/gingerbread/notification.css                     (notification.css)
 * skin/gingerbread/platform.css                         (gingerbread/platform.css)
@@ -140,8 +144,10 @@ chrome.jar:
   skin/gingerbread/images/appmenu-addons-hdpi.png       (gingerbread/images/appmenu-addons-hdpi.png)
   skin/gingerbread/images/appmenu-active-hdpi.png       (gingerbread/images/appmenu-active-hdpi.png)
   skin/gingerbread/images/appmenu-downloads-hdpi.png    (gingerbread/images/appmenu-downloads-hdpi.png)
+  skin/gingerbread/images/appmenu-findinpage-hdpi.png   (gingerbread/images/appmenu-findinpage-hdpi.png)
   skin/gingerbread/images/appmenu-more-hdpi.png         (gingerbread/images/appmenu-more-hdpi.png)
   skin/gingerbread/images/appmenu-preferences-hdpi.png  (gingerbread/images/appmenu-preferences-hdpi.png)
+  skin/gingerbread/images/appmenu-share-hdpi.png        (gingerbread/images/appmenu-share-hdpi.png)
   skin/gingerbread/images/appmenu-site-hdpi.png         (gingerbread/images/appmenu-site-hdpi.png)
   skin/gingerbread/images/aboutBackground.jpg           (gingerbread/images/aboutBackground.jpg)
   skin/gingerbread/images/button-bg.png                 (gingerbread/images/button-bg.png)
@@ -161,8 +167,10 @@ chrome.jar:
   skin/gingerbread/images/arrowbox-up.png               (gingerbread/images/arrowbox-up.png)
   skin/gingerbread/images/arrowbox-down.png             (gingerbread/images/arrowbox-down.png)
   skin/gingerbread/images/arrowbox-horiz.png            (gingerbread/images/arrowbox-horiz.png)
-  skin/gingerbread/images/check-selected-46.png         (gingerbread/images/check-selected-46.png)
-  skin/gingerbread/images/check-unselected-46.png       (gingerbread/images/check-unselected-46.png)
+  skin/gingerbread/images/check-selected-hdpi.png       (gingerbread/images/check-selected-hdpi.png)
+  skin/gingerbread/images/check-unselected-hdpi.png     (gingerbread/images/check-unselected-hdpi.png)
+  skin/gingerbread/images/radio-selected-hdpi.png       (gingerbread/images/radio-selected-hdpi.png)
+  skin/gingerbread/images/radio-unselected-hdpi.png     (gingerbread/images/radio-unselected-hdpi.png)
   skin/gingerbread/images/dropmarker-hdpi.png           (gingerbread/images/dropmarker-hdpi.png)
   skin/gingerbread/images/ratings-18.png                (images/ratings-18.png)
   skin/gingerbread/images/favicon-default-32.png        (gingerbread/images/favicon-default-32.png)
@@ -239,6 +247,7 @@ chrome.jar:
   skin/honeycomb/about.css                            (about.css)
   skin/honeycomb/aboutHome.css                        (aboutHome.css)
 * skin/honeycomb/browser.css                          (browser.css)
+* skin/honeycomb/content.css                          (content.css)
   skin/honeycomb/config.css                           (config.css)
   skin/honeycomb/firstRun.css                         (firstRun.css)
 * skin/honeycomb/forms.css                            (forms.css)
@@ -252,8 +261,10 @@ chrome.jar:
   skin/honeycomb/images/appmenu-addons-hdpi.png       (honeycomb/images/appmenu-addons-hdpi.png)
   skin/honeycomb/images/appmenu-active-hdpi.png       (honeycomb/images/appmenu-active-hdpi.png)
   skin/honeycomb/images/appmenu-downloads-hdpi.png    (honeycomb/images/appmenu-downloads-hdpi.png)
+  skin/honeycomb/images/appmenu-findinpage-hdpi.png   (honeycomb/images/appmenu-findinpage-hdpi.png)
   skin/honeycomb/images/appmenu-more-hdpi.png         (honeycomb/images/appmenu-more-hdpi.png)
   skin/honeycomb/images/appmenu-preferences-hdpi.png  (honeycomb/images/appmenu-preferences-hdpi.png)
+  skin/honeycomb/images/appmenu-share-hdpi.png        (honeycomb/images/appmenu-share-hdpi.png)
   skin/honeycomb/images/appmenu-site-hdpi.png         (honeycomb/images/appmenu-site-hdpi.png)
   skin/honeycomb/images/aboutBackground.jpg           (honeycomb/images/aboutBackground.jpg)
   skin/honeycomb/images/button-bg.png                 (honeycomb/images/button-bg.png)
diff --git a/modules/libpref/public/Preferences.h b/modules/libpref/public/Preferences.h
index cfada7ff482..abd143b110d 100644
--- a/modules/libpref/public/Preferences.h
+++ b/modules/libpref/public/Preferences.h
@@ -54,6 +54,13 @@
 class nsIFile;
 class nsCString;
 class nsString;
+class nsAdoptingString;
+class nsAdoptingCString;
+
+#ifndef have_PrefChangedFunc_typedef
+typedef int (*PR_CALLBACK PrefChangedFunc)(const char *, void *);
+#define have_PrefChangedFunc_typedef
+#endif
 
 namespace mozilla {
 
@@ -119,6 +126,18 @@ public:
     return result;
   }
 
+  static PRUint32 GetUint(const char* aPref, PRUint32 aDefault = 0)
+  {
+    PRUint32 result = aDefault;
+    GetUint(aPref, &result);
+    return result;
+  }
+
+  static nsAdoptingCString GetCString(const char* aPref);
+  static nsAdoptingString GetString(const char* aPref);
+  static nsAdoptingCString GetLocalizedCString(const char* aPref);
+  static nsAdoptingString GetLocalizedString(const char* aPref);
+
   /**
    * Gets int or bool type pref value with raw return value of nsIPrefBranch.
    *
@@ -128,6 +147,15 @@ public:
    */
   static nsresult GetBool(const char* aPref, PRBool* aResult);
   static nsresult GetInt(const char* aPref, PRInt32* aResult);
+  static nsresult GetUint(const char* aPref, PRUint32* aResult)
+  {
+    PRInt32 result;
+    nsresult rv = GetInt(aPref, &result);
+    if (NS_SUCCEEDED(rv)) {
+      *aResult = static_cast<PRUint32>(result);
+    }
+    return rv;
+  }
 
   /**
    * Gets string type pref value with raw return value of nsIPrefBranch.
@@ -136,19 +164,24 @@ public:
    * @param aResult     Must not be NULL.  The value is never modified when
    *                    these methods fail.
    */
-  static nsresult GetChar(const char* aPref, nsCString* aResult);
-  static nsresult GetChar(const char* aPref, nsString* aResult);
-  static nsresult GetLocalizedString(const char* aPref, nsString* aResult);
+  static nsresult GetCString(const char* aPref, nsACString* aResult);
+  static nsresult GetString(const char* aPref, nsAString* aResult);
+  static nsresult GetLocalizedCString(const char* aPref, nsACString* aResult);
+  static nsresult GetLocalizedString(const char* aPref, nsAString* aResult);
 
   /**
    * Sets various type pref values.
    */
   static nsresult SetBool(const char* aPref, PRBool aValue);
   static nsresult SetInt(const char* aPref, PRInt32 aValue);
-  static nsresult SetChar(const char* aPref, const char* aValue);
-  static nsresult SetChar(const char* aPref, const nsCString &aValue);
-  static nsresult SetChar(const char* aPref, const PRUnichar* aValue);
-  static nsresult SetChar(const char* aPref, const nsString &aValue);
+  static nsresult SetUint(const char* aPref, PRUint32 aValue)
+  {
+    return SetInt(aPref, static_cast<PRInt32>(aValue));
+  }
+  static nsresult SetCString(const char* aPref, const char* aValue);
+  static nsresult SetCString(const char* aPref, const nsACString &aValue);
+  static nsresult SetString(const char* aPref, const PRUnichar* aValue);
+  static nsresult SetString(const char* aPref, const nsAString &aValue);
 
   /**
    * Clears user set pref.
@@ -165,6 +198,43 @@ public:
   static nsresult AddWeakObserver(nsIObserver* aObserver, const char* aPref);
   static nsresult RemoveObserver(nsIObserver* aObserver, const char* aPref);
 
+  /**
+   * Adds/Removes two or more observers for the root pref branch.
+   * Pass to aPrefs an array of const char* whose last item is NULL.
+   */
+  static nsresult AddStrongObservers(nsIObserver* aObserver,
+                                     const char** aPrefs);
+  static nsresult AddWeakObservers(nsIObserver* aObserver,
+                                   const char** aPrefs);
+  static nsresult RemoveObservers(nsIObserver* aObserver,
+                                  const char** aPrefs);
+
+  /**
+   * Registers/Unregisters the callback function for the aPref.
+   */
+  static nsresult RegisterCallback(PrefChangedFunc aCallback,
+                                   const char* aPref,
+                                   void* aClosure = nsnull);
+  static nsresult UnregisterCallback(PrefChangedFunc aCallback,
+                                     const char* aPref,
+                                     void* aClosure = nsnull);
+
+  /**
+   * Adds the aVariable to cache table.  aVariable must be a pointer for a
+   * static variable.  The value will be modified when the pref value is
+   * changed but note that even if you modified it, the value isn't assigned to
+   * the pref.
+   */
+  static nsresult AddBoolVarCache(PRBool* aVariable,
+                                  const char* aPref,
+                                  PRBool aDefault = PR_FALSE);
+  static nsresult AddIntVarCache(PRInt32* aVariable,
+                                 const char* aPref,
+                                 PRInt32 aDefault = 0);
+  static nsresult AddUintVarCache(PRUint32* aVariable,
+                                  const char* aPref,
+                                  PRUint32 aDefault = 0);
+
 protected:
   nsresult NotifyServiceObservers(const char *aSubject);
   nsresult UseDefaultPrefFile();
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
index 10167fdd099..fbbfa873ca2 100644
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
@@ -73,6 +73,9 @@
 #include "mozilla/Omnijar.h"
 #include "nsZipArchive.h"
 
+#include "nsTArray.h"
+#include "nsRefPtrHashtable.h"
+
 namespace mozilla {
 
 // Definitions
@@ -87,6 +90,105 @@ static nsresult pref_LoadPrefsInDirList(const char *listId);
 Preferences* Preferences::sPreferences = nsnull;
 PRBool Preferences::sShutdown = PR_FALSE;
 
+class ValueObserverHashKey : public PLDHashEntryHdr {
+public:
+  typedef ValueObserverHashKey* KeyType;
+  typedef const ValueObserverHashKey* KeyTypePointer;
+
+  static const ValueObserverHashKey* KeyToPointer(ValueObserverHashKey *aKey)
+  {
+    return aKey;
+  }
+
+  static PLDHashNumber HashKey(const ValueObserverHashKey *aKey)
+  {
+    PRUint32 strHash = nsCRT::HashCode(aKey->mPrefName.BeginReading(),
+                                       aKey->mPrefName.Length());
+    return PR_ROTATE_LEFT32(strHash, 4) ^ NS_PTR_TO_UINT32(aKey->mCallback);
+  }
+
+  ValueObserverHashKey(const char *aPref, PrefChangedFunc aCallback) :
+    mPrefName(aPref), mCallback(aCallback) { }
+
+  ValueObserverHashKey(const ValueObserverHashKey *aOther) :
+    mPrefName(aOther->mPrefName), mCallback(aOther->mCallback)
+  { }
+
+  PRBool KeyEquals(const ValueObserverHashKey *aOther) const
+  {
+    return mCallback == aOther->mCallback && mPrefName == aOther->mPrefName;
+  }
+
+  ValueObserverHashKey *GetKey() const
+  {
+    return const_cast<ValueObserverHashKey*>(this);
+  }
+
+  enum { ALLOW_MEMMOVE = PR_TRUE };
+
+  nsCString mPrefName;
+  PrefChangedFunc mCallback;
+};
+
+class ValueObserver : public nsIObserver,
+                      public ValueObserverHashKey
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
+  ValueObserver(const char *aPref, PrefChangedFunc aCallback)
+    : ValueObserverHashKey(aPref, aCallback) { }
+
+  ~ValueObserver() {
+    Preferences::RemoveObserver(this, mPrefName.get());
+  }
+
+  void AppendClosure(void *aClosure) {
+    mClosures.AppendElement(aClosure);
+  }
+
+  void RemoveClosure(void *aClosure) {
+    mClosures.RemoveElement(aClosure);
+  }
+
+  PRBool HasNoClosures() {
+    return mClosures.Length() == 0;
+  }
+
+  nsTArray<void*> mClosures;
+};
+
+NS_IMPL_ISUPPORTS1(ValueObserver, nsIObserver)
+
+NS_IMETHODIMP
+ValueObserver::Observe(nsISupports     *aSubject,
+                       const char      *aTopic,
+                       const PRUnichar *aData)
+{
+  NS_ASSERTION(!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID),
+               "invalid topic");
+  NS_ConvertUTF16toUTF8 data(aData);
+  for (PRUint32 i = 0; i < mClosures.Length(); i++) {
+    mCallback(data.get(), mClosures.ElementAt(i));
+  }
+
+  return NS_OK;
+}
+
+struct CacheData {
+  void* cacheLocation;
+  union {
+    PRBool defaultValueBool;
+    PRInt32 defaultValueInt;
+    PRUint32 defaultValueUint;
+  };
+};
+
+static nsTArray<nsAutoPtr<CacheData> >* gCacheData = nsnull;
+static nsRefPtrHashtable<ValueObserverHashKey,
+                         ValueObserver>* gObserverTable = nsnull;
+
 // static
 Preferences*
 Preferences::GetInstance()
@@ -115,8 +217,15 @@ Preferences::InitStaticMembers()
   NS_ADDREF(sPreferences);
   if (NS_FAILED(sPreferences->Init()) || !sPreferences->mRootBranch) {
     NS_RELEASE(sPreferences);
+    return PR_FALSE;
   }
-  return sPreferences != nsnull;
+
+  gCacheData = new nsTArray<nsAutoPtr<CacheData> >();
+
+  gObserverTable = new nsRefPtrHashtable<ValueObserverHashKey, ValueObserver>();
+  gObserverTable->Init();
+
+  return PR_TRUE;
 }
 
 // static
@@ -125,6 +234,12 @@ Preferences::Shutdown()
 {
   sShutdown = PR_TRUE; // Don't create the singleton instance after here.
   NS_IF_RELEASE(sPreferences);
+
+  delete gCacheData;
+  gCacheData = nsnull;
+
+  delete gObserverTable;
+  gObserverTable = nsnull;
 }
 
 //-----------------------------------------------------------------------------
@@ -1019,13 +1134,31 @@ Preferences::GetInt(const char* aPref, PRInt32* aResult)
   return sPreferences->mRootBranch->GetIntPref(aPref, aResult);
 }
 
+// static
+nsAdoptingCString
+Preferences::GetCString(const char* aPref)
+{
+  nsAdoptingCString result;
+  GetCString(aPref, &result);
+  return result;
+}
+
+// static
+nsAdoptingString
+Preferences::GetString(const char* aPref)
+{
+  nsAdoptingString result;
+  GetString(aPref, &result);
+  return result;
+}
+
 // static
 nsresult
-Preferences::GetChar(const char* aPref, nsCString* aResult)
+Preferences::GetCString(const char* aPref, nsACString* aResult)
 {
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  nsAdoptingCString result;
+  nsCAutoString result;
   nsresult rv =
     sPreferences->mRootBranch->GetCharPref(aPref, getter_Copies(result));
   if (NS_SUCCEEDED(rv)) {
@@ -1036,11 +1169,11 @@ Preferences::GetChar(const char* aPref, nsCString* aResult)
 
 // static
 nsresult
-Preferences::GetChar(const char* aPref, nsString* aResult)
+Preferences::GetString(const char* aPref, nsAString* aResult)
 {
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
-  nsAdoptingCString result;
+  nsCAutoString result;
   nsresult rv =
     sPreferences->mRootBranch->GetCharPref(aPref, getter_Copies(result));
   if (NS_SUCCEEDED(rv)) {
@@ -1049,9 +1182,40 @@ Preferences::GetChar(const char* aPref, nsString* aResult)
   return rv;
 }
 
+// static
+nsAdoptingCString
+Preferences::GetLocalizedCString(const char* aPref)
+{
+  nsAdoptingCString result;
+  GetLocalizedCString(aPref, &result);
+  return result;
+}
+
+// static
+nsAdoptingString
+Preferences::GetLocalizedString(const char* aPref)
+{
+  nsAdoptingString result;
+  GetLocalizedString(aPref, &result);
+  return result;
+}
+
 // static
 nsresult
-Preferences::GetLocalizedString(const char* aPref, nsString* aResult)
+Preferences::GetLocalizedCString(const char* aPref, nsACString* aResult)
+{
+  NS_PRECONDITION(aResult, "aResult must not be NULL");
+  nsAutoString result;
+  nsresult rv = GetLocalizedString(aPref, &result);
+  if (NS_SUCCEEDED(rv)) {
+    CopyUTF16toUTF8(result, *aResult);
+  }
+  return rv;
+}
+
+// static
+nsresult
+Preferences::GetLocalizedString(const char* aPref, nsAString* aResult)
 {
   NS_PRECONDITION(aResult, "aResult must not be NULL");
   NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
@@ -1060,18 +1224,15 @@ Preferences::GetLocalizedString(const char* aPref, nsString* aResult)
                                              NS_GET_IID(nsIPrefLocalizedString),
                                              getter_AddRefs(prefLocalString));
   if (NS_SUCCEEDED(rv)) {
-    if (prefLocalString) {
-      prefLocalString->GetData(getter_Copies(*aResult));
-    } else {
-      aResult->Truncate();
-    }
+    NS_ASSERTION(prefLocalString, "Succeeded but the result is NULL");
+    prefLocalString->GetData(getter_Copies(*aResult));
   }
   return rv;
 }
 
 // static
 nsresult
-Preferences::SetChar(const char* aPref, const char* aValue)
+Preferences::SetCString(const char* aPref, const char* aValue)
 {
   NS_ENSURE_TRUE(InitStaticMembers(), PR_FALSE);
   return sPreferences->mRootBranch->SetCharPref(aPref, aValue);
@@ -1079,25 +1240,25 @@ Preferences::SetChar(const char* aPref, const char* aValue)
 
 // static
 nsresult
-Preferences::SetChar(const char* aPref, const nsCString &aValue)
+Preferences::SetCString(const char* aPref, const nsACString &aValue)
 {
-  return SetChar(aPref, nsPromiseFlatCString(aValue).get());
+  return SetCString(aPref, PromiseFlatCString(aValue).get());
 }
 
 // static
 nsresult
-Preferences::SetChar(const char* aPref, const PRUnichar* aValue)
+Preferences::SetString(const char* aPref, const PRUnichar* aValue)
 {
   NS_ConvertUTF16toUTF8 utf8(aValue);
-  return SetChar(aPref, utf8.get());
+  return SetCString(aPref, utf8.get());
 }
 
 // static
 nsresult
-Preferences::SetChar(const char* aPref, const nsString &aValue)
+Preferences::SetString(const char* aPref, const nsAString &aValue)
 {
   NS_ConvertUTF16toUTF8 utf8(aValue);
-  return SetChar(aPref, utf8.get());
+  return SetCString(aPref, utf8.get());
 }
 
 // static
@@ -1151,4 +1312,156 @@ Preferences::RemoveObserver(nsIObserver* aObserver,
   return sPreferences->mRootBranch->RemoveObserver(aPref, aObserver);
 }
 
+// static
+nsresult
+Preferences::AddStrongObservers(nsIObserver* aObserver,
+                                const char** aPrefs)
+{
+  for (PRUint32 i = 0; aPrefs[i]; i++) {
+    nsresult rv = AddStrongObserver(aObserver, aPrefs[i]);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  return NS_OK;
+}
+
+// static
+nsresult
+Preferences::AddWeakObservers(nsIObserver* aObserver,
+                              const char** aPrefs)
+{
+  for (PRUint32 i = 0; aPrefs[i]; i++) {
+    nsresult rv = AddWeakObserver(aObserver, aPrefs[i]);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  return NS_OK;
+}
+
+// static
+nsresult
+Preferences::RemoveObservers(nsIObserver* aObserver,
+                             const char** aPrefs)
+{
+  for (PRUint32 i = 0; aPrefs[i]; i++) {
+    nsresult rv = RemoveObserver(aObserver, aPrefs[i]);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+  return NS_OK;
+}
+
+// static
+nsresult
+Preferences::RegisterCallback(PrefChangedFunc aCallback,
+                              const char* aPref,
+                              void* aClosure)
+{
+  NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
+
+  ValueObserverHashKey hashKey(aPref, aCallback);
+  nsRefPtr<ValueObserver> observer;
+  gObserverTable->Get(&hashKey, getter_AddRefs(observer));
+  if (observer) {
+    observer->AppendClosure(aClosure);
+    return NS_OK;
+  }
+
+  observer = new ValueObserver(aPref, aCallback);
+  observer->AppendClosure(aClosure);
+  nsresult rv = AddStrongObserver(observer, aPref);
+  NS_ENSURE_SUCCESS(rv, rv);
+  return gObserverTable->Put(observer, observer) ? NS_OK :
+                                                   NS_ERROR_OUT_OF_MEMORY;
+}
+
+// static
+nsresult
+Preferences::UnregisterCallback(PrefChangedFunc aCallback,
+                                const char* aPref,
+                                void* aClosure)
+{
+  NS_ENSURE_TRUE(InitStaticMembers(), NS_ERROR_NOT_AVAILABLE);
+
+  ValueObserverHashKey hashKey(aPref, aCallback);
+  nsRefPtr<ValueObserver> observer;
+  gObserverTable->Get(&hashKey, getter_AddRefs(observer));
+  if (!observer) {
+    return NS_OK;
+  }
+
+  observer->RemoveClosure(aClosure);
+  if (observer->HasNoClosures()) {
+    // Delete the callback since its list of closures is empty.
+    gObserverTable->Remove(observer);
+  }
+  return NS_OK;
+}
+
+static int BoolVarChanged(const char* aPref, void* aClosure)
+{
+  CacheData* cache = static_cast<CacheData*>(aClosure);
+  *((PRBool*)cache->cacheLocation) =
+    Preferences::GetBool(aPref, cache->defaultValueBool);
+  return 0;
+}
+
+// static
+nsresult
+Preferences::AddBoolVarCache(PRBool* aCache,
+                             const char* aPref,
+                             PRBool aDefault)
+{
+  NS_ASSERTION(aCache, "aCache must not be NULL");
+  *aCache = GetBool(aPref, aDefault);
+  CacheData* data = new CacheData();
+  data->cacheLocation = aCache;
+  data->defaultValueBool = aDefault;
+  gCacheData->AppendElement(data);
+  return RegisterCallback(BoolVarChanged, aPref, data);
+}
+
+static int IntVarChanged(const char* aPref, void* aClosure)
+{
+  CacheData* cache = static_cast<CacheData*>(aClosure);
+  *((PRInt32*)cache->cacheLocation) =
+    Preferences::GetInt(aPref, cache->defaultValueInt);
+  return 0;
+}
+
+// static
+nsresult
+Preferences::AddIntVarCache(PRInt32* aCache,
+                            const char* aPref,
+                            PRInt32 aDefault)
+{
+  NS_ASSERTION(aCache, "aCache must not be NULL");
+  *aCache = Preferences::GetInt(aPref, aDefault);
+  CacheData* data = new CacheData();
+  data->cacheLocation = aCache;
+  data->defaultValueInt = aDefault;
+  gCacheData->AppendElement(data);
+  return RegisterCallback(IntVarChanged, aPref, data);
+}
+
+static int UintVarChanged(const char* aPref, void* aClosure)
+{
+  CacheData* cache = static_cast<CacheData*>(aClosure);
+  *((PRUint32*)cache->cacheLocation) =
+    Preferences::GetUint(aPref, cache->defaultValueUint);
+  return 0;
+}
+
+// static
+nsresult
+Preferences::AddUintVarCache(PRUint32* aCache,
+                             const char* aPref,
+                             PRUint32 aDefault)
+{
+  NS_ASSERTION(aCache, "aCache must not be NULL");
+  *aCache = Preferences::GetUint(aPref, aDefault);
+  CacheData* data = new CacheData();
+  data->cacheLocation = aCache;
+  data->defaultValueUint = aDefault;
+  gCacheData->AppendElement(data);
+  return RegisterCallback(UintVarChanged, aPref, data);
+}
+
 } // namespace mozilla
diff --git a/netwerk/base/public/nsIUploadChannel2.idl b/netwerk/base/public/nsIUploadChannel2.idl
index 33af467711a..26662b443b4 100644
--- a/netwerk/base/public/nsIUploadChannel2.idl
+++ b/netwerk/base/public/nsIUploadChannel2.idl
@@ -39,7 +39,7 @@
 
 interface nsIInputStream;
 
-[scriptable, uuid(8821E259-7252-4464-B874-A55D8EF6B222)]
+[scriptable, uuid(AD9D3F1C-A8DE-4d0b-9714-1B922297AD65)]
 interface nsIUploadChannel2 : nsISupports
 {
     /**
@@ -70,4 +70,11 @@ interface nsIUploadChannel2 : nsISupports
                                  in long long aContentLength,
                                  in ACString aMethod,
                                  in boolean aStreamHasHeaders);
+
+    /**
+     * Value of aStreamHasHeaders from the last successful call to
+     * explicitSetUploadStream.  TRUE indicates the attached upload stream
+     * contians request headers.
+     */
+    readonly attribute boolean uploadStreamHasHeaders;
 };
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index 5bacdbe4024..1c1c36d8c84 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -140,6 +140,11 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_TARGET),Android)
+# this works around a "branch out of range" error when compiling this file opt
+nsURLParsers.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
+endif
+
 DEFINES += -DIMPL_NS_NET
 
 ifdef MOZ_ENABLE_LIBCONIC
diff --git a/netwerk/base/src/nsSimpleURI.cpp b/netwerk/base/src/nsSimpleURI.cpp
index e291a6ff0c2..5cf48fc336f 100644
--- a/netwerk/base/src/nsSimpleURI.cpp
+++ b/netwerk/base/src/nsSimpleURI.cpp
@@ -449,15 +449,22 @@ nsSimpleURI::EqualsInternal(nsIURI* other,
         return NS_OK;
     }
 
-    *result = (mScheme == otherUri->mScheme &&
-               mPath   == otherUri->mPath);
+    *result = EqualsInternal(otherUri, refHandlingMode);
+    return NS_OK;
+}
 
-    if (*result && refHandlingMode == eHonorRef) {
-        *result = (mIsRefValid == otherUri->mIsRefValid &&
-                   (!mIsRefValid || mRef == otherUri->mRef));
+bool
+nsSimpleURI::EqualsInternal(nsSimpleURI* otherUri, RefHandlingEnum refHandlingMode)
+{
+    bool result = (mScheme == otherUri->mScheme &&
+                   mPath   == otherUri->mPath);
+
+    if (result && refHandlingMode == eHonorRef) {
+        result = (mIsRefValid == otherUri->mIsRefValid &&
+                  (!mIsRefValid || mRef == otherUri->mRef));
     }
 
-    return NS_OK;
+    return result;
 }
 
 NS_IMETHODIMP
diff --git a/netwerk/base/src/nsSimpleURI.h b/netwerk/base/src/nsSimpleURI.h
index 1c9415ddfd6..2a4972fc3f2 100644
--- a/netwerk/base/src/nsSimpleURI.h
+++ b/netwerk/base/src/nsSimpleURI.h
@@ -85,6 +85,11 @@ protected:
                                     RefHandlingEnum refHandlingMode,
                                     PRBool* result);
 
+    // Helper to be used by inherited classes who want to test
+    // equality given an assumed nsSimpleURI.  This must NOT check
+    // the passed-in other for QI to our CID.
+    bool EqualsInternal(nsSimpleURI* otherUri, RefHandlingEnum refHandlingMode);
+
     // NOTE: This takes the refHandlingMode as an argument because
     // nsSimpleNestedURI's specialized version needs to know how to clone
     // its inner URI.
diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp
index 2f08b8af51c..984351b136c 100644
--- a/netwerk/base/src/nsStandardURL.cpp
+++ b/netwerk/base/src/nsStandardURL.cpp
@@ -710,6 +710,8 @@ nsStandardURL::SegmentIs(const URLSegment &seg1, const char *val, const URLSegme
         return PR_FALSE;
     if (seg1.mLen == -1 || (!val && mSpec.IsEmpty()))
         return PR_TRUE; // both are empty
+    if (!val)
+        return PR_FALSE;
     if (ignoreCase)
         return !PL_strncasecmp(mSpec.get() + seg1.mPos, val + seg2.mPos, seg1.mLen); 
     else
diff --git a/netwerk/mime/nsMimeTypes.h b/netwerk/mime/nsMimeTypes.h
index 290e74dcdb8..b0e5a406671 100644
--- a/netwerk/mime/nsMimeTypes.h
+++ b/netwerk/mime/nsMimeTypes.h
@@ -98,6 +98,7 @@
 #define APPLICATION_XPINSTALL               "application/x-xpinstall"
 #define APPLICATION_XML                     "application/xml"
 #define APPLICATION_XHTML_XML               "application/xhtml+xml"
+#define APPLICATION_XSLT_XML                "application/xslt+xml"
 #define APPLICATION_MATHML_XML              "application/mathml+xml"
 #define APPLICATION_RDF_XML                 "application/rdf+xml"
 
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index d6802e5fc05..aaefffd082c 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -498,6 +498,15 @@ HttpBaseChannel::ExplicitSetUploadStream(nsIInputStream *aStream,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+HttpBaseChannel::GetUploadStreamHasHeaders(PRBool *hasHeaders)
+{
+  NS_ENSURE_ARG(hasHeaders);
+
+  *hasHeaders = mUploadStreamHasHeaders;
+  return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsIEncodedChannel
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 8734f83dfb4..e1f1022de8f 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -2556,8 +2556,14 @@ nsHttpChannel::CheckCache()
     PRBool doValidation = PR_FALSE;
     PRBool canAddImsHeader = PR_TRUE;
 
-    // If the LOAD_FROM_CACHE flag is set, any cached data can simply be used.
-    if (mLoadFlags & LOAD_FROM_CACHE) {
+    // Cached entry is not the entity we request (see bug #633743)
+    if (ResponseWouldVary()) {
+        LOG(("Validating based on Vary headers returning TRUE\n"));
+        canAddImsHeader = PR_FALSE;
+        doValidation = PR_TRUE;
+    }
+    // If the LOAD_FROM_CACHE flag is set, any cached data can simply be used
+    else if (mLoadFlags & LOAD_FROM_CACHE) {
         LOG(("NOT validating based on LOAD_FROM_CACHE load flag\n"));
         doValidation = PR_FALSE;
     }
@@ -2589,12 +2595,6 @@ nsHttpChannel::CheckCache()
         doValidation = PR_TRUE;
     }
 
-    else if (ResponseWouldVary()) {
-        LOG(("Validating based on Vary headers returning TRUE\n"));
-        canAddImsHeader = PR_FALSE;
-        doValidation = PR_TRUE;
-    }
-    
     else if (MustValidateBasedOnQueryUrl()) {
         LOG(("Validating based on RFC 2616 section 13.9 "
              "(query-url w/o explicit expiration-time)\n"));
@@ -2719,9 +2719,6 @@ nsHttpChannel::CheckCache()
                 mRequestHead.SetHeader(nsHttp::If_None_Match,
                                        nsDependentCString(val));
         }
-
-        // We don't need this info anymore
-        CleanRedirectCacheChainIfNecessary();
     }
 
     LOG(("nsHTTPChannel::CheckCache exit [this=%p doValidation=%d]\n", this, doValidation));
diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 1e84ead5a29..92eb39333f3 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -82,6 +82,7 @@ nsHttpConnection::nsHttpConnection()
     , mIsActivated(PR_FALSE)
     , mCompletedProxyConnect(PR_FALSE)
     , mLastTransactionExpectedNoContent(PR_FALSE)
+    , mIdleMonitoring(PR_FALSE)
 {
     LOG(("Creating nsHttpConnection @%x\n", this));
 
@@ -170,6 +171,10 @@ nsHttpConnection::Activate(nsAHttpTransaction *trans, PRUint8 caps)
     mTransaction = trans;
     mIsActivated = PR_TRUE;
 
+    NS_ABORT_IF_FALSE(!mIdleMonitoring,
+                      "Activating a connection with an Idle Monitor");
+    mIdleMonitoring = PR_FALSE;
+
     // set mKeepAlive according to what will be requested
     mKeepAliveMask = mKeepAlive = (caps & NS_HTTP_ALLOW_KEEPALIVE);
 
@@ -203,6 +208,9 @@ nsHttpConnection::Close(nsresult reason)
     NS_ABORT_IF_FALSE(PR_GetCurrentThread() == gSocketThread, "wrong thread");
 
     if (NS_FAILED(reason)) {
+        if (mIdleMonitoring)
+            EndIdleMonitoring();
+
         if (mSocketTransport) {
             mSocketTransport->SetSecurityCallbacks(nsnull);
             mSocketTransport->SetEventSink(nsnull, nsnull);
@@ -580,6 +588,34 @@ nsHttpConnection::ResumeRecv()
     return NS_ERROR_UNEXPECTED;
 }
 
+void
+nsHttpConnection::BeginIdleMonitoring()
+{
+    LOG(("nsHttpConnection::BeginIdleMonitoring [this=%p]\n", this));
+    NS_ABORT_IF_FALSE(PR_GetCurrentThread() == gSocketThread, "wrong thread");
+    NS_ABORT_IF_FALSE(!mTransaction, "BeginIdleMonitoring() while active");
+    
+    LOG(("Entering Idle Monitoring Mode [this=%p]", this));
+    mIdleMonitoring = PR_TRUE;
+    if (mSocketIn)
+        mSocketIn->AsyncWait(this, 0, 0, nsnull);
+}
+
+void
+nsHttpConnection::EndIdleMonitoring()
+{
+    LOG(("nsHttpConnection::EndIdleMonitoring [this=%p]\n", this));
+    NS_ABORT_IF_FALSE(PR_GetCurrentThread() == gSocketThread, "wrong thread");
+    NS_ABORT_IF_FALSE(!mTransaction, "EndIdleMonitoring() while active");
+
+    if (mIdleMonitoring) {
+        LOG(("Leaving Idle Monitoring Mode [this=%p]", this));
+        mIdleMonitoring = PR_FALSE;
+        if (mSocketIn)
+            mSocketIn->AsyncWait(nsnull, 0, 0, nsnull);
+    }
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpConnection <private>
 //-----------------------------------------------------------------------------
@@ -856,6 +892,25 @@ nsHttpConnection::OnInputStreamReady(nsIAsyncInputStream *in)
     NS_ASSERTION(in == mSocketIn, "unexpected stream");
     NS_ASSERTION(PR_GetCurrentThread() == gSocketThread, "wrong thread");
 
+    if (mIdleMonitoring) {
+        NS_ABORT_IF_FALSE(!mTransaction, "Idle Input Event While Active");
+
+        // The only read event that is protocol compliant for an idle connection
+        // is an EOF, which we check for with CanReuse(). If the data is
+        // something else then just ignore it and suspend checking for EOF -
+        // our normal timers or protocol stack are the place to deal with
+        // any exception logic.
+
+        if (!CanReuse()) {
+            LOG(("Server initiated close of idle conn %p\n", this));
+            gHttpHandler->ConnMgr()->CloseIdleConnection(this);
+            return NS_OK;
+        }
+
+        LOG(("Input data on idle conn %p, but not closing yet\n", this));
+        return NS_OK;
+    }
+
     // if the transaction was dropped...
     if (!mTransaction) {
         LOG(("  no transaction; ignoring event\n"));
diff --git a/netwerk/protocol/http/nsHttpConnection.h b/netwerk/protocol/http/nsHttpConnection.h
index 0461faa786f..01a08be7c3b 100644
--- a/netwerk/protocol/http/nsHttpConnection.h
+++ b/netwerk/protocol/http/nsHttpConnection.h
@@ -146,6 +146,13 @@ public:
     static NS_METHOD ReadFromStream(nsIInputStream *, void *, const char *,
                                     PRUint32, PRUint32, PRUint32 *);
 
+    // When a persistent connection is in the connection manager idle 
+    // connection pool, the nsHttpConnection still reads errors and hangups
+    // on the socket so that it can be proactively released if the server
+    // initiates a termination. Only call on socket thread.
+    void BeginIdleMonitoring();
+    void EndIdleMonitoring();
+
 private:
     // called to cause the underlying socket to start speaking SSL
     nsresult ProxyStartSSL();
@@ -196,6 +203,7 @@ private:
     PRPackedBool                    mIsActivated;
     PRPackedBool                    mCompletedProxyConnect;
     PRPackedBool                    mLastTransactionExpectedNoContent;
+    PRPackedBool                    mIdleMonitoring;
 };
 
 #endif // nsHttpConnection_h__
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index 108f2c58750..45ad333933f 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -383,6 +383,31 @@ nsHttpConnectionMgr::ProcessPendingQ(nsHttpConnectionInfo *ci)
     return rv;
 }
 
+nsresult
+nsHttpConnectionMgr::CloseIdleConnection(nsHttpConnection *conn)
+{
+    NS_ABORT_IF_FALSE(PR_GetCurrentThread() == gSocketThread, "wrong thread");
+    LOG(("nsHttpConnectionMgr::CloseIdleConnection %p conn=%p",
+         this, conn));
+
+    nsHttpConnectionInfo *ci = conn->ConnectionInfo();
+    if (!ci)
+        return NS_ERROR_UNEXPECTED;
+
+    nsCStringKey key(ci->HashKey());
+    nsConnectionEntry *ent = (nsConnectionEntry *) mCT.Get(&key);
+
+    if (!ent || !ent->mIdleConns.RemoveElement(conn))
+        return NS_ERROR_UNEXPECTED;
+
+    conn->Close(NS_ERROR_ABORT);
+    NS_RELEASE(conn);
+    mNumIdleConns--;
+    if (0 == mNumIdleConns)
+        StopPruneDeadConnectionsTimer();
+    return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // enumeration callbacks
 
@@ -689,8 +714,11 @@ nsHttpConnectionMgr::GetConnection(nsConnectionEntry *ent,
                 conn->Close(NS_ERROR_ABORT);
                 NS_RELEASE(conn);
             }
-            else
+            else {
                 LOG(("   reusing connection [conn=%x]\n", conn));
+                conn->EndIdleMonitoring();
+            }
+
             ent->mIdleConns.RemoveElementAt(0);
             mNumIdleConns--;
 
@@ -1091,6 +1119,7 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(PRInt32, void *param)
             NS_ADDREF(conn);
             ent->mIdleConns.InsertElementAt(idx, conn);
             mNumIdleConns++;
+            conn->BeginIdleMonitoring();
 
             // If the added connection was first idle connection or has shortest
             // time to live among the idle connections, pruning dead
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h
index fc3ed1d463c..b8e7f395fe3 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.h
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
@@ -138,6 +138,11 @@ public:
     // preference to the specified connection.
     nsresult ProcessPendingQ(nsHttpConnectionInfo *);
 
+    // This is used to force an idle connection to be closed and removed from
+    // the idle connection list. It is called when the idle connection detects
+    // that the network peer has closed the transport.
+    nsresult CloseIdleConnection(nsHttpConnection *);
+
 private:
     virtual ~nsHttpConnectionMgr();
     class nsHalfOpenSocket;
diff --git a/netwerk/protocol/viewsource/nsViewSourceHandler.cpp b/netwerk/protocol/viewsource/nsViewSourceHandler.cpp
index aece5f6eda7..3fca6c63c80 100644
--- a/netwerk/protocol/viewsource/nsViewSourceHandler.cpp
+++ b/netwerk/protocol/viewsource/nsViewSourceHandler.cpp
@@ -91,7 +91,7 @@ nsViewSourceHandler::NewURI(const nsACString &aSpec,
 
     nsCOMPtr<nsIURI> innerURI;
     nsresult rv = NS_NewURI(getter_AddRefs(innerURI),
-                            Substring(aSpec, colon + 1), aCharset);
+                            Substring(aSpec, colon + 1), aCharset, aBaseURI);
     if (NS_FAILED(rv))
         return rv;
 
diff --git a/netwerk/test/unit/test_URIs.js b/netwerk/test/unit/test_URIs.js
index 911b09f079d..2f7054a3567 100644
--- a/netwerk/test/unit/test_URIs.js
+++ b/netwerk/test/unit/test_URIs.js
@@ -53,6 +53,36 @@ var gTests = [
     path:    "/myFile.html",
     ref:     "",
     nsIURL:  true, nsINestedURI: false },
+  { spec:    "ftp://",
+    scheme:  "ftp",
+    prePath: "ftp://",
+    path:    "/",
+    ref:     "",
+    nsIURL:  true, nsINestedURI: false },
+  { spec:    "ftp:///",
+    scheme:  "ftp",
+    prePath: "ftp://",
+    path:    "/",
+    ref:     "",
+    nsIURL:  true, nsINestedURI: false },
+  { spec:    "ftp://ftp.mozilla.org/pub/mozilla.org/README",
+    scheme:  "ftp",
+    prePath: "ftp://ftp.mozilla.org",
+    path:    "/pub/mozilla.org/README",
+    ref:     "",
+    nsIURL:  true, nsINestedURI: false },
+  { spec:    "ftp://foo:bar@ftp.mozilla.org:100/pub/mozilla.org/README",
+    scheme:  "ftp",
+    prePath: "ftp://foo:bar@ftp.mozilla.org:100",
+    path:    "/pub/mozilla.org/README",
+    ref:     "",
+    nsIURL:  true, nsINestedURI: false },
+  { spec:    "gopher://mozilla.org/",
+    scheme:  "gopher",
+    prePath: "gopher:",
+    path:    "//mozilla.org/",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false },
   { spec:    "http://",
     scheme:  "http",
     prePath: "http://",
@@ -83,6 +113,24 @@ var gTests = [
     path:    "resource://gre/chrome.toolkit.jar!/",
     ref:     "",
     nsIURL:  true, nsINestedURI: true },
+  { spec:    "mailto:webmaster@mozilla.com",
+    scheme:  "mailto",
+    prePath: "mailto:",
+    path:    "webmaster@mozilla.com",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false },
+  { spec:    "javascript:new Date()",
+    scheme:  "javascript",
+    prePath: "javascript:",
+    path:    "new%20Date()",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false },
+  { spec:    "moz-filedata:123456",
+    scheme:  "moz-filedata",
+    prePath: "moz-filedata:",
+    path:    "123456",
+    ref:     "",
+    nsIURL:  false, nsINestedURI: false, immutable: true },
   { spec:    "place:redirectsMode=2&sort=8&maxResults=10",
     scheme:  "place",
     prePath: "place:",
@@ -215,6 +263,20 @@ function do_test_uri_basic(aTest) {
   do_check_eq(URI instanceof Ci.nsINestedURI,
               aTest.nsINestedURI);
 
+  do_info("testing that " + aTest.spec + " throws or returns false " +
+          "from equals(null)");
+  // XXXdholbert At some point it'd probably be worth making this behavior
+  // (throwing vs. returning false) consistent across URI implementations.
+  var threw = false;
+  var isEqualToNull;
+  try {
+    isEqualToNull = URI.equals(null);
+  } catch(e) {
+    threw = true;
+  }
+  do_check_true(threw || !isEqualToNull);
+
+
   // Check the various components
   do_check_property(aTest, URI, "scheme");
   do_check_property(aTest, URI, "prePath");
@@ -251,7 +313,7 @@ function do_test_uri_with_hash_suffix(aTest, aSuffix) {
   do_info("testing cloneIgnoringRef on " + testURI.spec +
           " is equal to no-ref version but not equal to ref version");
   var cloneNoRef = testURI.cloneIgnoringRef();
-  if (aTest.spec == "http://" && aSuffix == "#") {
+  if ((aTest.spec == "http://" || aTest.spec == "ftp://") && aSuffix == "#") {
     do_info("TODO: bug 657033");
     do_check_uri_eq(cloneNoRef, origURI, todo_check_true);
   } else {
@@ -314,7 +376,7 @@ function do_test_mutate_ref(aTest, aSuffix) {
           specWithSuffix + " and then clearing ref does what we expect");
   testURI.spec = specWithSuffix
   testURI.ref = "";
-  if (aTest.spec == "http://" && aSuffix == "#") {
+  if ((aTest.spec == "http://" || aTest.spec == "ftp://") && aSuffix == "#") {
     do_info("TODO: bug 657033");
     do_check_uri_eq(testURI, refURIWithoutSuffix, todo_check_true);
     do_check_uri_eqExceptRef(testURI, refURIWithSuffix, todo_check_true);
diff --git a/netwerk/test/unit/test_bug633743.js b/netwerk/test/unit/test_bug633743.js
new file mode 100644
index 00000000000..c98e4bf28be
--- /dev/null
+++ b/netwerk/test/unit/test_bug633743.js
@@ -0,0 +1,193 @@
+do_load_httpd_js();
+
+const VALUE_HDR_NAME = "X-HTTP-VALUE-HEADER";
+const VARY_HDR_NAME = "X-HTTP-VARY-HEADER";
+const CACHECTRL_HDR_NAME = "X-CACHE-CONTROL-HEADER";
+
+var httpserver = null;
+
+var _CSvc;
+function get_cache_service() {
+  if (_CSvc)
+    return _CSvc;
+
+  return _CSvc = Cc["@mozilla.org/network/cache-service;1"].
+    getService(Ci.nsICacheService);
+}
+
+function make_channel(flags, vary, value) {
+  var ios = Cc["@mozilla.org/network/io-service;1"].
+    getService(Ci.nsIIOService);
+  var chan = ios.newChannel("http://localhost:4444/bug633743", null, null);
+  return chan.QueryInterface(Ci.nsIHttpChannel);
+}
+
+function Test(flags, varyHdr, sendValue, expectValue, cacheHdr) {
+    this._flags = flags;
+    this._varyHdr = varyHdr;
+    this._sendVal = sendValue;
+    this._expectVal = expectValue;
+    this._cacheHdr = cacheHdr;
+}
+
+Test.prototype = {
+  _buffer: "",
+  _flags: null,
+  _varyHdr: null,
+  _sendVal: null,
+  _expectVal: null,
+  _cacheHdr: null,
+
+  QueryInterface: function(iid) {
+    if (iid.equals(Ci.nsIStreamListener) ||
+        iid.equals(Ci.nsIRequestObserver) ||
+        iid.equals(Ci.nsISupports))
+      return this;
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  },
+
+  onStartRequest: function(request, context) { },
+
+  onDataAvailable: function(request, context, stream, offset, count) {
+    this._buffer = this._buffer.concat(read_stream(stream, count));
+  },
+
+  onStopRequest: function(request, context, status) {
+    do_check_eq(this._buffer, this._expectVal);
+    do_timeout(0, run_next_test);
+  },
+
+  run: function() {
+    var channel = make_channel();
+    channel.loadFlags = this._flags;
+    channel.setRequestHeader(VALUE_HDR_NAME, this._sendVal, false);
+    channel.setRequestHeader(VARY_HDR_NAME, this._varyHdr, false);
+    if (this._cacheHdr)
+        channel.setRequestHeader(CACHECTRL_HDR_NAME, this._cacheHdr, false);
+
+    channel.asyncOpen(this, null);
+  }
+};
+
+var gTests = [
+// Test LOAD_FROM_CACHE: Load cache-entry
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-initial", // hdr-value used to vary
+          "request1", // echoed by handler
+          "request1"  // value expected to receive in channel
+          ),
+// Verify that it was cached
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-initial", // hdr-value used to vary
+          "fresh value with LOAD_NORMAL",  // echoed by handler
+          "request1"  // value expected to receive in channel
+          ),
+// Load same entity with LOAD_FROM_CACHE-flag
+  new Test(Ci.nsIRequest.LOAD_FROM_CACHE,
+          "entity-initial", // hdr-value used to vary
+          "fresh value with LOAD_FROM_CACHE",  // echoed by handler
+          "request1"  // value expected to receive in channel
+          ),
+// Load different entity with LOAD_FROM_CACHE-flag
+  new Test(Ci.nsIRequest.LOAD_FROM_CACHE,
+          "entity-l-f-c", // hdr-value used to vary
+          "request2", // echoed by handler
+          "request2"  // value expected to receive in channel
+          ),
+// Verify that new value was cached
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-l-f-c", // hdr-value used to vary
+          "fresh value with LOAD_NORMAL",  // echoed by handler
+          "request2"  // value expected to receive in channel
+          ),
+
+// Test VALIDATE_NEVER: Note previous cache-entry
+  new Test(Ci.nsIRequest.VALIDATE_NEVER,
+          "entity-v-n", // hdr-value used to vary
+          "request3",  // echoed by handler
+          "request3"  // value expected to receive in channel
+          ),
+// Verify that cache-entry was replaced
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-v-n", // hdr-value used to vary
+          "fresh value with LOAD_NORMAL",  // echoed by handler
+          "request3"  // value expected to receive in channel
+          ),
+
+// Test combination VALIDATE_NEVER && no-store: Load new cache-entry
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-2",// hdr-value used to vary
+          "request4",  // echoed by handler
+          "request4",  // value expected to receive in channel
+          "no-store"   // set no-store on response
+          ),
+// Ensure we validate without IMS header in this case (verified in handler)
+  new Test(Ci.nsIRequest.VALIDATE_NEVER,
+          "entity-2-v-n",// hdr-value used to vary
+          "request5",  // echoed by handler
+          "request5"  // value expected to receive in channel
+          ),
+
+// Test VALIDATE-ALWAYS: Load new entity
+  new Test(Ci.nsIRequest.LOAD_NORMAL,
+          "entity-3",// hdr-value used to vary
+          "request6",  // echoed by handler
+          "request6",  // value expected to receive in channel
+          "no-cache"   // set no-cache on response
+          ),
+// Ensure we don't send IMS header also in this case (verified in handler)
+  new Test(Ci.nsIRequest.VALIDATE_ALWAYS,
+          "entity-3-v-a",// hdr-value used to vary
+          "request7",  // echoed by handler
+          "request7"  // value expected to receive in channel
+          ),
+  ];
+
+function run_next_test()
+{
+  if (gTests.length == 0) {
+    httpserver.stop(do_test_finished);
+    return;
+  }
+
+  var test = gTests.shift();
+  test.run();
+}
+
+function handler(metadata, response) {
+
+  // None of the tests above should send an IMS
+  do_check_false(metadata.hasHeader("If-Modified-Since"));
+
+  // Pick up requested value to echo
+  var hdr = "default value";
+  try {
+    hdr = metadata.getHeader(VALUE_HDR_NAME);
+  } catch(ex) { }
+
+  // Pick up requested cache-control header-value
+  var cctrlVal = "max-age=10000";
+  try {
+      cctrlVal = metadata.getHeader(CACHECTRL_HDR_NAME);
+  } catch(ex) { }
+
+  response.setStatusLine(metadata.httpVersion, 200, "OK");
+  response.setHeader("Content-Type", "text/plain", false);
+  response.setHeader("Cache-Control", cctrlVal, false);
+  response.setHeader("Vary", VARY_HDR_NAME, false);
+  response.setHeader("Last-Modified", "Tue, 15 Nov 1994 12:45:26 GMT", false);
+  response.bodyOutputStream.write(hdr, hdr.length);
+}
+
+function run_test() {
+
+  // clear the cache
+  get_cache_service().evictEntries(Ci.nsICache.STORE_ANYWHERE);
+
+  httpserver = new nsHttpServer();
+  httpserver.registerPathHandler("/bug633743", handler);
+  httpserver.start(4444);
+
+  run_next_test();
+  do_test_pending();
+}
diff --git a/netwerk/test/unit/test_bug659569.js b/netwerk/test/unit/test_bug659569.js
new file mode 100644
index 00000000000..8dd643c863a
--- /dev/null
+++ b/netwerk/test/unit/test_bug659569.js
@@ -0,0 +1,59 @@
+do_load_httpd_js();
+var httpserver = new nsHttpServer();
+
+function getCacheService()
+{
+    return Components.classes["@mozilla.org/network/cache-service;1"]
+           .getService(Components.interfaces.nsICacheService);
+}
+
+function setupChannel(suffix)
+{
+    var ios =
+        Components.classes["@mozilla.org/network/io-service;1"]
+        .getService(Ci.nsIIOService);
+    var chan = ios.newChannel("http://localhost:4444" + suffix, "", null);
+    return chan;
+}
+
+function checkValueAndTrigger(request, data, ctx)
+{
+    do_check_eq("Ok", data);
+    httpserver.stop(do_test_finished);
+}
+
+function run_test()
+{
+    httpserver.registerPathHandler("/redirect1", redirectHandler1);
+    httpserver.registerPathHandler("/redirect2", redirectHandler2);
+    httpserver.start(4444);
+
+    // clear cache
+    getCacheService().
+        evictEntries(Components.interfaces.nsICache.STORE_ANYWHERE);
+
+    // load first time
+    var channel = setupChannel("/redirect1");
+    channel.asyncOpen(new ChannelListener(checkValueAndTrigger, null), null);
+    do_test_pending();
+}
+
+function redirectHandler1(metadata, response)
+{
+	if (!metadata.hasHeader("Cookie")) {
+	    response.setStatusLine(metadata.httpVersion, 302, "Found");
+	    response.setHeader("Cache-Control", "max-age=600", false);
+	    response.setHeader("Location", "/redirect2?query", false);
+	    response.setHeader("Set-Cookie", "MyCookie=1", false);
+    } else {
+	    response.setStatusLine(metadata.httpVersion, 200, "Ok");
+        response.setHeader("Content-Type", "text/plain");
+        response.bodyOutputStream.write("Ok", "Ok".length);
+    }
+}
+
+function redirectHandler2(metadata, response)
+{
+    response.setStatusLine(metadata.httpVersion, 302, "Found");
+    response.setHeader("Location", "/redirect1", false);
+}
diff --git a/netwerk/test/unit/test_bug660066.js b/netwerk/test/unit/test_bug660066.js
new file mode 100644
index 00000000000..abfc391ddf2
--- /dev/null
+++ b/netwerk/test/unit/test_bug660066.js
@@ -0,0 +1,43 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+Components.utils.import("resource://gre/modules/NetUtil.jsm");
+const Ci = Components.interfaces;
+const SIMPLEURI_SPEC = "data:text/plain,hello world";
+const FILEDATA_SPEC = "moz-filedata:123456";
+
+function do_info(text, stack) {
+  if (!stack)
+    stack = Components.stack.caller;
+
+  dump( "\n" +
+       "TEST-INFO | " + stack.filename + " | [" + stack.name + " : " +
+       stack.lineNumber + "] " + text + "\n");
+}
+
+function do_check_uri_neq(uri1, uri2)
+{
+  do_info("Checking equality in forward direction...");
+  do_check_false(uri1.equals(uri2));
+  do_check_false(uri1.equalsExceptRef(uri2));
+
+  do_info("Checking equality in reverse direction...");
+  do_check_false(uri2.equals(uri1));
+  do_check_false(uri2.equalsExceptRef(uri1));
+}
+
+function run_test()
+{
+  var simpleURI = NetUtil.newURI(SIMPLEURI_SPEC);
+  var fileDataURI = NetUtil.newURI(FILEDATA_SPEC);
+
+  do_info("Checking that " + SIMPLEURI_SPEC + " != " + FILEDATA_SPEC);
+  do_check_uri_neq(simpleURI, fileDataURI);
+
+  do_info("Changing the nsSimpleURI spec to match the nsFileDataURI");
+  simpleURI.spec = FILEDATA_SPEC;
+
+  do_info("Verifying that .spec matches");
+  do_check_eq(simpleURI.spec, fileDataURI.spec);
+
+  do_info("Checking that nsSimpleURI != nsFileDataURI despite their .spec matching")
+  do_check_uri_neq(simpleURI, fileDataURI);
+}
diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini
index c46c2e5b8b7..8e11bae6442 100644
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -56,8 +56,11 @@ tail =
 [test_bug586908.js]
 [test_bug588389.js]
 [test_bug596443.js]
+[test_bug633743.js]
 [test_bug652761.js]
 [test_bug651100.js]
+[test_bug659569.js]
+[test_bug660066.js]
 [test_cacheflags.js]
 [test_channel_close.js]
 [test_compareURIs.js]
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 14cb336877f..79ade8dab22 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_8_9_BETA1
+NSPR_4_8_9_BETA2
diff --git a/nsprpub/build/autoconf/config.sub b/nsprpub/build/autoconf/config.sub
index 72438295912..3fad4d74824 100755
--- a/nsprpub/build/autoconf/config.sub
+++ b/nsprpub/build/autoconf/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-04'
+timestamp='2011-01-03'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1432,6 +1432,9 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+        -android*)
+	        os=android
+                ;;
 	-none)
 		;;
 	*)
@@ -1686,6 +1689,9 @@ case $basic_machine in
 			-vos*)
 				vendor=stratus
 				;;
+			*-android*|*-linuxandroid*)
+				vendor=linux-
+				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
diff --git a/nsprpub/build/win32/pgomerge.py b/nsprpub/build/win32/pgomerge.py
new file mode 100644
index 00000000000..383457bf2ee
--- /dev/null
+++ b/nsprpub/build/win32/pgomerge.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+# Usage: pgomerge.py <binary basename> <dist/bin>
+# Gathers .pgc files from dist/bin and merges them into
+# $PWD/$basename.pgd using pgomgr, then deletes them.
+# No errors if any of these files don't exist.
+
+import sys, os, os.path, subprocess
+if not sys.platform == "win32":
+    raise Exception("This script was only meant for Windows.")
+
+def MergePGOFiles(basename, pgddir, pgcdir):
+  """Merge pgc files produced from an instrumented binary
+     into the pgd file for the second pass of profile-guided optimization
+     with MSVC.  |basename| is the name of the DLL or EXE without the
+     extension.  |pgddir| is the path that contains <basename>.pgd
+     (should be the objdir it was built in).  |pgcdir| is the path
+     containing basename!N.pgc files, which is probably dist/bin.
+     Calls pgomgr to merge each pgc file into the pgd, then deletes
+     the pgc files."""
+  if not os.path.isdir(pgddir) or not os.path.isdir(pgcdir):
+    return
+  pgdfile = os.path.abspath(os.path.join(pgddir, basename + ".pgd"))
+  if not os.path.isfile(pgdfile):
+    return
+  for file in os.listdir(pgcdir):
+    if file.startswith(basename+"!") and file.endswith(".pgc"):
+      try:
+        pgcfile = os.path.normpath(os.path.join(pgcdir, file))
+        subprocess.call(['pgomgr', '-merge',
+                         pgcfile,
+                         pgdfile])
+        os.remove(pgcfile)
+      except OSError:
+        pass
+
+if __name__ == '__main__':
+  if len(sys.argv) != 3:
+      print >>sys.stderr, "Usage: pgomerge.py <binary basename> <dist/bin>"
+      sys.exit(1)
+  MergePGOFiles(sys.argv[1], os.getcwd(), sys.argv[2])
diff --git a/nsprpub/config/config.mk b/nsprpub/config/config.mk
index f47d8fee805..cfb9f3f2552 100644
--- a/nsprpub/config/config.mk
+++ b/nsprpub/config/config.mk
@@ -78,11 +78,13 @@ LDFLAGS		= $(OS_LDFLAGS)
 ifdef MOZ_PROFILE_GENERATE
 CFLAGS += $(PROFILE_GEN_CFLAGS)
 LDFLAGS += $(PROFILE_GEN_LDFLAGS)
+DLLFLAGS += $(PROFILE_GEN_LDFLAGS)
 endif # MOZ_PROFILE_GENERATE
 
 ifdef MOZ_PROFILE_USE
 CFLAGS += $(PROFILE_USE_CFLAGS)
 LDFLAGS += $(PROFILE_USE_LDFLAGS)
+DLLFLAGS += $(PROFILE_USE_LDFLAGS)
 endif # MOZ_PROFILE_USE
 
 define MAKE_OBJDIR
diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk
index 344ad2e5ff6..a8ee19548d9 100644
--- a/nsprpub/config/rules.mk
+++ b/nsprpub/config/rules.mk
@@ -280,6 +280,13 @@ $(NFSPWD):
 $(PROGRAM): $(OBJS)
 	@$(MAKE_OBJDIR)
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
+ifdef MOZ_PROFILE_USE
+# In the second pass, we need to merge the pgc files into the pgd file.
+# The compiler would do this for us automatically if they were in the right
+# place, but they're in dist/bin.
+	python $(topsrcdir)/build/win32/pgomerge.py \
+		$(notdir $(PROGRAM:.exe=)) $(DIST)/bin
+endif	# MOZ_PROFILE_USE
 	$(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
 ifdef MT
 	@if test -f $@.manifest; then \
@@ -287,6 +294,11 @@ ifdef MT
 		rm -f $@.manifest; \
 	fi
 endif	# MSVC with manifest tool
+ifdef MOZ_PROFILE_GENERATE
+# touch it a few seconds into the future to work around FAT's
+# 2-second granularity
+	touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
+endif	# MOZ_PROFILE_GENERATE
 else	# WINNT && !GCC
 	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
 endif	# WINNT && !GCC
@@ -326,6 +338,10 @@ ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
 		-bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS)
 else	# AIX 4.1
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
+ifdef MOZ_PROFILE_USE
+	python $(topsrcdir)/build/win32/pgomerge.py \
+		$(notdir $(SHARED_LIBRARY:.$(DLL_SUFFIX)=)) $(DIST)/bin
+endif	# MOZ_PROFILE_USE
 	$(LINK_DLL) -MAP $(DLLBASE) $(DLL_LIBS) $(EXTRA_LIBS) $(OBJS) $(RES)
 ifdef MT
 	@if test -f $@.manifest; then \
@@ -333,6 +349,9 @@ ifdef MT
 		rm -f $@.manifest; \
 	fi
 endif	# MSVC with manifest tool
+ifdef MOZ_PROFILE_GENERATE
+	touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
+endif	# MOZ_PROFILE_GENERATE
 else	# WINNT && !GCC
 	$(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS)
 endif	# WINNT && !GCC
@@ -341,6 +360,24 @@ ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 
+################################################################################
+
+ifdef MOZ_PROFILE_USE
+ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
+# When building with PGO, we have to make sure to re-link
+# in the MOZ_PROFILE_USE phase if we linked in the
+# MOZ_PROFILE_GENERATE phase. We'll touch this pgo.relink
+# file in the link rule in the GENERATE phase to indicate
+# that we need a relink.
+$(SHARED_LIBRARY): pgo.relink
+
+$(PROGRAM): pgo.relink
+
+endif	# WINNT && !GCC
+endif	# MOZ_PROFILE_USE
+
+################################################################################
+
 ifeq ($(OS_ARCH),WINNT)
 $(RES): $(RESNAME)
 	@$(MAKE_OBJDIR)
diff --git a/nsprpub/configure b/nsprpub/configure
index 7c0b6434c3d..18c10eb2e37 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -842,7 +842,20 @@ if test "${with_android_platform+set}" = set; then
 fi
 
 
-if test "$target" = "arm-android-eabi" ; then
+case "$target" in
+arm-linux*-android*|*-linuxandroid*)
+    android_tool_prefix="arm-linux-androideabi"
+    ;;
+arm-android-eabi)
+    android_tool_prefix="arm-eabi"
+    ;;
+*)
+    android_tool_prefix="$target_os"
+    ;;
+esac
+
+case "$target" in
+*-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
        { echo "configure: error: You must specify --with-android-ndk=/path/to/ndk when targeting Android." 1>&2; exit 1; }
     fi
@@ -855,14 +868,14 @@ if test "$target" = "arm-android-eabi" ; then
        android_platform="$android_ndk"/build/platforms/android-5/arch-arm
     fi
 
-        AS="$android_toolchain"/bin/arm-eabi-as
-    CC="$android_toolchain"/bin/arm-eabi-gcc
-    CXX="$android_toolchain"/bin/arm-eabi-g++
-    CPP="$android_toolchain"/bin/arm-eabi-cpp
-    LD="$android_toolchain"/bin/arm-eabi-ld
-    AR="$android_toolchain"/bin/arm-eabi-ar
-    RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
-    STRIP="$android_toolchain"/bin/arm-eabi-strip
+        AS="$android_toolchain"/bin/"$android_tool_prefix"-as
+    CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc
+    CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++
+    CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp
+    LD="$android_toolchain"/bin/"$android_tool_prefix"-ld
+    AR="$android_toolchain"/bin/"$android_tool_prefix"-ar
+    RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib
+    STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip
 
     CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
     CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS"
@@ -888,7 +901,8 @@ if test "$target" = "arm-android-eabi" ; then
 #define ANDROID 1
 EOF
 
-fi
+    ;;
+esac
 
 dist_prefix='${MOD_DEPTH}/dist'
 dist_bindir='${dist_prefix}/bin'
@@ -1182,7 +1196,7 @@ if test -z "$SKIP_PATH_CHECKS"; then
     # Extract the first word of "$WHOAMI whoami", so it can be a program name with args.
 set dummy $WHOAMI whoami; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1186: checking for $ac_word" >&5
+echo "configure:1200: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1253,13 +1267,13 @@ if test "$target" != "$host"; then
     _SAVE_LDFLAGS="$LDFLAGS"
 
     echo $ac_n "checking for $host compiler""... $ac_c" 1>&6
-echo "configure:1257: checking for $host compiler" >&5
+echo "configure:1271: checking for $host compiler" >&5
     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1263: checking for $ac_word" >&5
+echo "configure:1277: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1305,16 +1319,16 @@ test -n "$HOST_CC" || HOST_CC=""""
     LDFLAGS="$HOST_LDFLAGS"
 
     echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1309: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1323: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1311 "configure"
+#line 1325 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:1318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -1343,7 +1357,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1347: checking for $ac_word" >&5
+echo "configure:1361: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1377,7 +1391,7 @@ test -n "$CC" || CC="echo"
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1381: checking for $ac_word" >&5
+echo "configure:1395: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1407,7 +1421,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1411: checking for $ac_word" >&5
+echo "configure:1425: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1458,7 +1472,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1462: checking for $ac_word" >&5
+echo "configure:1476: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1490,7 +1504,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1494: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1508: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1501,12 +1515,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1505 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1532,12 +1546,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1536: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1550: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1541: checking whether we are using GNU C" >&5
+echo "configure:1555: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1546,7 +1560,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1565,7 +1579,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1569: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1583: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1602,7 +1616,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1606: checking for $ac_word" >&5
+echo "configure:1620: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1638,7 +1652,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1642: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1670,7 +1684,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1674: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1688: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1681,12 +1695,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1685 "configure"
+#line 1699 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1712,12 +1726,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1716: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1730: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1721: checking whether we are using GNU C++" >&5
+echo "configure:1735: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1726,7 +1740,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1745,7 +1759,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1749: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1763: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1790,7 +1804,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1794: checking for $ac_word" >&5
+echo "configure:1808: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1825,7 +1839,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1829: checking for $ac_word" >&5
+echo "configure:1843: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1860,7 +1874,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1864: checking for $ac_word" >&5
+echo "configure:1878: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1895,7 +1909,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1899: checking for $ac_word" >&5
+echo "configure:1913: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1930,7 +1944,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1934: checking for $ac_word" >&5
+echo "configure:1948: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1965,7 +1979,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1969: checking for $ac_word" >&5
+echo "configure:1983: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2000,7 +2014,7 @@ else
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2004: checking for $ac_word" >&5
+echo "configure:2018: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2030,7 +2044,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2034: checking for $ac_word" >&5
+echo "configure:2048: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2081,7 +2095,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2085: checking for $ac_word" >&5
+echo "configure:2099: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2113,7 +2127,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2117: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2131: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2124,12 +2138,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2128 "configure"
+#line 2142 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2155,12 +2169,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2159: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2173: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2164: checking whether we are using GNU C" >&5
+echo "configure:2178: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2169,7 +2183,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2188,7 +2202,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2192: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2206: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2228,7 +2242,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2232: checking for $ac_word" >&5
+echo "configure:2246: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2260,7 +2274,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2264: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2278: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2271,12 +2285,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2275 "configure"
+#line 2289 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2302,12 +2316,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2306: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2320: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:2311: checking whether we are using GNU C++" >&5
+echo "configure:2325: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2316,7 +2330,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -2335,7 +2349,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2339: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2353: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2369,7 +2383,7 @@ fi
         fi
     fi
     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2373: checking how to run the C preprocessor" >&5
+echo "configure:2387: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2384,13 +2398,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2388 "configure"
+#line 2402 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2401,13 +2415,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2405 "configure"
+#line 2419 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2418,13 +2432,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 2436 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2451,7 +2465,7 @@ echo "$ac_t""$CPP" 1>&6
     # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2455: checking for $ac_word" >&5
+echo "configure:2469: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2483,7 +2497,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2487: checking for $ac_word" >&5
+echo "configure:2501: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2524,7 +2538,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2528: checking for $ac_word" >&5
+echo "configure:2542: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2565,7 +2579,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2569: checking for $ac_word" >&5
+echo "configure:2583: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2606,7 +2620,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2610: checking for $ac_word" >&5
+echo "configure:2624: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2647,7 +2661,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2651: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2715,7 +2729,7 @@ else
 fi
 
 echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
-echo "configure:2719: checking for gcc -pipe support" >&5
+echo "configure:2733: checking for gcc -pipe support" >&5
 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
     echo '#include <stdio.h>' > dummy-hello.c
     echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c
@@ -2730,14 +2744,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
         _SAVE_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS -pipe"
         cat > conftest.$ac_ext <<EOF
-#line 2734 "configure"
+#line 2748 "configure"
 #include "confdefs.h"
  #include <stdio.h> 
 int main() {
 printf("Hello World\n");
 ; return 0; }
 EOF
-if { (eval echo configure:2741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _res_gcc_pipe="yes"
 else
@@ -2767,16 +2781,16 @@ _SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction"
 
 echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:2771: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:2785: checking whether C compiler supports -fprofile-generate" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
+#line 2787 "configure"
 #include "confdefs.h"
 
 int main() {
 return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    PROFILE_GEN_CFLAGS="-fprofile-generate"
                  result="yes" 
@@ -2799,7 +2813,7 @@ CFLAGS="$_SAVE_CFLAGS"
 
 if test "$GNU_CC"; then
     echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
-echo "configure:2803: checking for visibility(hidden) attribute" >&5
+echo "configure:2817: checking for visibility(hidden) attribute" >&5
 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2823,7 +2837,7 @@ echo "$ac_t""$ac_cv_visibility_hidden" 1>&6
 EOF
 
         echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
-echo "configure:2827: checking for visibility pragma support" >&5
+echo "configure:2841: checking for visibility pragma support" >&5
 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2876,7 +2890,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2880: checking for $ac_word" >&5
+echo "configure:2894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3162,17 +3176,17 @@ EOF
     DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
     ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
-echo "configure:3166: checking for sys/atomic_op.h" >&5
+echo "configure:3180: checking for sys/atomic_op.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3171 "configure"
+#line 3185 "configure"
 #include "confdefs.h"
 #include <sys/atomic_op.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3301,6 +3315,45 @@ EOF
     RESOLVE_LINK_SYMBOLS=1
     ;;
         
+*-android*|*-linuxandroid*)
+    if test -z "$USE_NSPR_THREADS"; then
+        USE_PTHREADS=1
+        IMPL_STRATEGY=_PTH
+    fi
+    cat >> confdefs.h <<\EOF
+#define XP_UNIX 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define _GNU_SOURCE 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define HAVE_FCNTL_FILE_LOCKING 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define LINUX 1
+EOF
+
+    CFLAGS="$CFLAGS -Wall"
+    CXXFLAGS="$CXXFLAGS -Wall"
+    MDCPUCFG_H=_linux.cfg
+    PR_MD_CSRCS=linux.c
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
+    DSO_CFLAGS=-fPIC
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+    _OPTIMIZE_FLAGS=-O2
+    _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
+                                   # combo is not yet good at debugging inlined
+                                   # functions (even when using DWARF2 as the
+                                   # debugging format)
+    COMPILER_TAG=_glibc
+    CPU_ARCH=arm
+    CPU_ARCH_TAG=_arm
+    OS_TARGET=Android
+    ;;
+
 *-beos*)
     cat >> confdefs.h <<\EOF
 #define XP_BEOS 1
@@ -3329,7 +3382,7 @@ EOF
         _DEBUG_FLAGS='-gdwarf-2 -O0'
         MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
         echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6
-echo "configure:3333: checking for gethostbyaddr in -lbind" >&5
+echo "configure:3386: checking for gethostbyaddr in -lbind" >&5
 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3337,7 +3390,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3341 "configure"
+#line 3394 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3348,7 +3401,7 @@ int main() {
 gethostbyaddr()
 ; return 0; }
 EOF
-if { (eval echo configure:3352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4056,45 +4109,6 @@ EOF
 	esac
     ;;
 
-arm-android-eabi)
-    if test -z "$USE_NSPR_THREADS"; then
-        USE_PTHREADS=1
-        IMPL_STRATEGY=_PTH
-    fi
-    cat >> confdefs.h <<\EOF
-#define XP_UNIX 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define _GNU_SOURCE 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define HAVE_FCNTL_FILE_LOCKING 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define LINUX 1
-EOF
-
-    CFLAGS="$CFLAGS -Wall"
-    CXXFLAGS="$CXXFLAGS -Wall"
-    MDCPUCFG_H=_linux.cfg
-    PR_MD_CSRCS=linux.c
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-    _OPTIMIZE_FLAGS=-O2
-    _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                   # combo is not yet good at debugging inlined
-                                   # functions (even when using DWARF2 as the
-                                   # debugging format)
-    COMPILER_TAG=_glibc
-    CPU_ARCH=arm
-    CPU_ARCH_TAG=_arm
-    OS_TARGET=Android
-    ;;
-
 *-linux*|*-gnu*|*-k*bsd*-gnu)
     if test -z "$USE_NSPR_THREADS"; then
         USE_PTHREADS=1
@@ -4206,8 +4220,8 @@ EOF
     RESOLVE_LINK_SYMBOLS=1
 
     if test -n "$GNU_CC"; then
-        CC="$CC -mno-cygwin"
-        CXX="$CXX -mno-cygwin"
+        CC="$CC -mwindows"
+        CXX="$CXX -mwindows"
         DLL_SUFFIX=dll
         MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))'
         RC=$WINDRES
@@ -4739,17 +4753,17 @@ EOF
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4743: checking for machine/builtins.h" >&5
+echo "configure:4757: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4748 "configure"
+#line 4762 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5398,7 +5412,7 @@ case $target in
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5402: checking for dlopen in -ldl" >&5
+echo "configure:5416: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5406,7 +5420,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5410 "configure"
+#line 5424 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5417,7 +5431,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5434,17 +5448,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5438: checking for dlfcn.h" >&5
+echo "configure:5452: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5443 "configure"
+#line 5457 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5477,13 +5491,13 @@ esac
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5495: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5487 "configure"
+#line 5501 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -5501,7 +5515,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5505 "configure"
+#line 5519 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -5525,12 +5539,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5529: checking for $ac_func" >&5
+echo "configure:5543: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5534 "configure"
+#line 5548 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5553,7 +5567,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5604,7 +5618,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5608: checking for $ac_word" >&5
+echo "configure:5622: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5663,7 +5677,7 @@ hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5667: checking for +Olit support" >&5
+echo "configure:5681: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5705,7 +5719,7 @@ wince*)
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5709: checking for pthread_create in -lpthreads" >&5
+echo "configure:5723: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5727,7 +5741,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5731: checking for pthread_create in -lpthread" >&5
+echo "configure:5745: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5749,7 +5763,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5753: checking for pthread_create in -lc_r" >&5
+echo "configure:5767: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5771,7 +5785,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5775: checking for pthread_create in -lc" >&5
+echo "configure:5789: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5889,7 +5903,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5907: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5912,7 +5926,7 @@ echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5930: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index d9406aeaf39..80e6d2ea137 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -152,7 +152,20 @@ AC_ARG_WITH(android-platform,
                            location of platform dir, default NDK/build/platforms/android-5/arch-arm],
     android_platform=$withval)
 
-if test "$target" = "arm-android-eabi" ; then
+case "$target" in
+arm-linux*-android*|*-linuxandroid*)
+    android_tool_prefix="arm-linux-androideabi"
+    ;;
+arm-android-eabi)
+    android_tool_prefix="arm-eabi"
+    ;;
+*)
+    android_tool_prefix="$target_os"
+    ;;
+esac
+
+case "$target" in
+*-android*|*-linuxandroid*)
     if test -z "$android_ndk" ; then
        AC_MSG_ERROR([You must specify --with-android-ndk=/path/to/ndk when targeting Android.])
     fi
@@ -166,14 +179,14 @@ if test "$target" = "arm-android-eabi" ; then
     fi
 
     dnl set up compilers
-    AS="$android_toolchain"/bin/arm-eabi-as
-    CC="$android_toolchain"/bin/arm-eabi-gcc
-    CXX="$android_toolchain"/bin/arm-eabi-g++
-    CPP="$android_toolchain"/bin/arm-eabi-cpp
-    LD="$android_toolchain"/bin/arm-eabi-ld
-    AR="$android_toolchain"/bin/arm-eabi-ar
-    RANLIB="$android_toolchain"/bin/arm-eabi-ranlib
-    STRIP="$android_toolchain"/bin/arm-eabi-strip
+    AS="$android_toolchain"/bin/"$android_tool_prefix"-as
+    CC="$android_toolchain"/bin/"$android_tool_prefix"-gcc
+    CXX="$android_toolchain"/bin/"$android_tool_prefix"-g++
+    CPP="$android_toolchain"/bin/"$android_tool_prefix"-cpp
+    LD="$android_toolchain"/bin/"$android_tool_prefix"-ld
+    AR="$android_toolchain"/bin/"$android_tool_prefix"-ar
+    RANLIB="$android_toolchain"/bin/"$android_tool_prefix"-ranlib
+    STRIP="$android_toolchain"/bin/"$android_tool_prefix"-strip
 
     CPPFLAGS="-I$android_platform/usr/include $CPPFLAGS"
     CFLAGS="-mandroid -I$android_platform/usr/include -msoft-float -fno-short-enums -fno-exceptions $CFLAGS"
@@ -197,7 +210,8 @@ if test "$target" = "arm-android-eabi" ; then
     WRAP_MALLOC_CFLAGS="-Wl,--wrap=dlopen -Wl,--wrap=dlclose -Wl,--wrap=dlerror -Wl,--wrap=dlsym -Wl,--wrap=dladdr"
 
     AC_DEFINE(ANDROID)
-fi
+    ;;
+esac
 
 dnl ========================================================
 dnl =
@@ -1036,6 +1050,33 @@ case "$target" in
     RESOLVE_LINK_SYMBOLS=1
     ;;
         
+*-android*|*-linuxandroid*)
+    if test -z "$USE_NSPR_THREADS"; then
+        USE_PTHREADS=1
+        IMPL_STRATEGY=_PTH
+    fi
+    AC_DEFINE(XP_UNIX)
+    AC_DEFINE(_GNU_SOURCE)
+    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
+    AC_DEFINE(LINUX)
+    CFLAGS="$CFLAGS -Wall"
+    CXXFLAGS="$CXXFLAGS -Wall"
+    MDCPUCFG_H=_linux.cfg
+    PR_MD_CSRCS=linux.c
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
+    DSO_CFLAGS=-fPIC
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+    _OPTIMIZE_FLAGS=-O2
+    _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
+                                   # combo is not yet good at debugging inlined
+                                   # functions (even when using DWARF2 as the
+                                   # debugging format)
+    COMPILER_TAG=_glibc
+    CPU_ARCH=arm
+    CPU_ARCH_TAG=_arm
+    OS_TARGET=Android
+    ;;
+
 *-beos*)
     AC_DEFINE(XP_BEOS)
     AC_DEFINE(BeOS)
@@ -1561,33 +1602,6 @@ tools are selected during the Xcode/Developer Tools installation.])
 	esac
     ;;
 
-arm-android-eabi)
-    if test -z "$USE_NSPR_THREADS"; then
-        USE_PTHREADS=1
-        IMPL_STRATEGY=_PTH
-    fi
-    AC_DEFINE(XP_UNIX)
-    AC_DEFINE(_GNU_SOURCE)
-    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-    AC_DEFINE(LINUX)
-    CFLAGS="$CFLAGS -Wall"
-    CXXFLAGS="$CXXFLAGS -Wall"
-    MDCPUCFG_H=_linux.cfg
-    PR_MD_CSRCS=linux.c
-    MKSHLIB='$(CC) $(DSO_LDOPTS) $(WRAP_MALLOC_LIB) -o $@'
-    DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-    _OPTIMIZE_FLAGS=-O2
-    _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                   # combo is not yet good at debugging inlined
-                                   # functions (even when using DWARF2 as the
-                                   # debugging format)
-    COMPILER_TAG=_glibc
-    CPU_ARCH=arm
-    CPU_ARCH_TAG=_arm
-    OS_TARGET=Android
-    ;;
-
 *-linux*|*-gnu*|*-k*bsd*-gnu)
     if test -z "$USE_NSPR_THREADS"; then
         USE_PTHREADS=1
@@ -1669,8 +1683,8 @@ arm-android-eabi)
     RESOLVE_LINK_SYMBOLS=1
 
     if test -n "$GNU_CC"; then
-        CC="$CC -mno-cygwin"
-        CXX="$CXX -mno-cygwin"
+        CC="$CC -mwindows"
+        CXX="$CXX -mwindows"
         DLL_SUFFIX=dll
         MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))'
         RC=$WINDRES
diff --git a/nsprpub/pr/src/misc/prnetdb.c b/nsprpub/pr/src/misc/prnetdb.c
index b8e32db4a0a..2bd7f5c70b3 100644
--- a/nsprpub/pr/src/misc/prnetdb.c
+++ b/nsprpub/pr/src/misc/prnetdb.c
@@ -2078,7 +2078,7 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInfoByName(const char  *hostname,
 
         rv = GETADDRINFO(hostname, NULL, &hints, &res);
 #ifdef AI_ADDRCONFIG
-        if (rv == EAI_BADFLAGS) {
+        if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
             hints.ai_flags &= ~AI_ADDRCONFIG;
             rv = GETADDRINFO(hostname, NULL, &hints, &res);
         }
diff --git a/other-licenses/android/APKOpen.cpp b/other-licenses/android/APKOpen.cpp
index e02435999e9..a0408303f83 100644
--- a/other-licenses/android/APKOpen.cpp
+++ b/other-licenses/android/APKOpen.cpp
@@ -121,7 +121,7 @@ struct cdir_end {
 
 static size_t zip_size;
 static int zip_fd;
-static struct mapping_info * lib_mapping;
+static struct mapping_info * lib_mapping = NULL;
 
 NS_EXPORT const struct mapping_info *
 getLibraryMapping()
@@ -646,8 +646,8 @@ loadLibs(const char *apkName)
 
   struct cdir_entry *cdir_start = (struct cdir_entry *)(zip + cdir_offset);
 
-#ifdef MOZ_CRASHREPORTER
   lib_mapping = (struct mapping_info *)calloc(MAX_MAPPING_INFO, sizeof(*lib_mapping));
+#ifdef MOZ_CRASHREPORTER
   file_ids = (char *)extractBuf("lib.id", zip, cdir_start, cdir_entries);
 #endif
 
diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in
index fbd62d9c2b9..236d377db59 100644
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -49,13 +49,8 @@ LIBXUL_LIBRARY	= 1
 EXPORTS		= \
 		nsHtml5Module.h \
 		nsAHtml5FragmentParser.h \
-		$(NULL)
-
-ifdef MOZ_SVG
-EXPORTS += \
 		nsHtml5SVGLoadDispatcher.h \
 		$(NULL)
-endif
 
 CPPSRCS		= \
 		nsHtml5Atoms.cpp \
@@ -83,13 +78,8 @@ CPPSRCS		= \
 		nsHtml5StreamParser.cpp \
 		nsHtml5Speculation.cpp \
 		nsHtml5SpeculativeLoad.cpp \
-		$(NULL)
-
-ifdef MOZ_SVG
-CPPSRCS += \
 		nsHtml5SVGLoadDispatcher.cpp \
 		$(NULL)
-endif
 
 FORCE_STATIC_LIB = 1
 
diff --git a/parser/html/nsHtml5Module.cpp b/parser/html/nsHtml5Module.cpp
index 075c264258e..6742e722664 100644
--- a/parser/html/nsHtml5Module.cpp
+++ b/parser/html/nsHtml5Module.cpp
@@ -35,7 +35,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsContentUtils.h"
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
 #include "nsHtml5HtmlAttributes.h"
@@ -49,6 +48,9 @@
 #include "nsIObserverService.h"
 #include "nsIServiceManager.h"
 #include "mozilla/Services.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 // static
 PRBool nsHtml5Module::sEnabled = PR_FALSE;
@@ -60,8 +62,8 @@ nsIThread* nsHtml5Module::sMainThread = nsnull;
 void
 nsHtml5Module::InitializeStatics()
 {
-  nsContentUtils::AddBoolPrefVarCache("html5.parser.enable", &sEnabled);
-  nsContentUtils::AddBoolPrefVarCache("html5.offmainthread", &sOffMainThread);
+  Preferences::AddBoolVarCache(&sEnabled, "html5.parser.enable");
+  Preferences::AddBoolVarCache(&sOffMainThread, "html5.offmainthread");
   nsHtml5Atoms::AddRefAtoms();
   nsHtml5AttributeName::initializeStatics();
   nsHtml5ElementName::initializeStatics();
diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp
index b4e2ef0ad43..ea36550478c 100644
--- a/parser/html/nsHtml5StreamParser.cpp
+++ b/parser/html/nsHtml5StreamParser.cpp
@@ -52,6 +52,9 @@
 #include "nsHtml5Module.h"
 #include "nsHtml5RefPtr.h"
 #include "nsIScriptError.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID);
 
@@ -62,10 +65,10 @@ PRInt32 nsHtml5StreamParser::sTimerSubsequentDelay = 120;
 void
 nsHtml5StreamParser::InitializeStatics()
 {
-  nsContentUtils::AddIntPrefVarCache("html5.flushtimer.initialdelay",
-                                     &sTimerInitialDelay);
-  nsContentUtils::AddIntPrefVarCache("html5.flushtimer.subsequentdelay",
-                                     &sTimerSubsequentDelay);
+  Preferences::AddIntVarCache(&sTimerInitialDelay,
+                              "html5.flushtimer.initialdelay");
+  Preferences::AddIntVarCache(&sTimerSubsequentDelay,
+                              "html5.flushtimer.subsequentdelay");
 }
 
 /*
@@ -200,12 +203,12 @@ nsHtml5StreamParser::nsHtml5StreamParser(nsHtml5TreeOpExecutor* aExecutor,
   // Chardet is initialized here even if it turns out to be useless
   // to make the chardet refcount its observer (nsHtml5StreamParser)
   // on the main thread.
-  const nsAdoptingString& detectorName = 
-    nsContentUtils::GetLocalizedStringPref("intl.charset.detector");
+  const nsAdoptingCString& detectorName =
+    Preferences::GetLocalizedCString("intl.charset.detector");
   if (!detectorName.IsEmpty()) {
     nsCAutoString detectorContractID;
     detectorContractID.AssignLiteral(NS_CHARSET_DETECTOR_CONTRACTID_BASE);
-    AppendUTF16toUTF8(detectorName, detectorContractID);
+    detectorContractID += detectorName;
     if ((mChardet = do_CreateInstance(detectorContractID.get()))) {
       (void) mChardet->Init(this);
       mFeedChardet = PR_TRUE;
diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h
index 4282251e77f..02cd9ccfb52 100644
--- a/parser/html/nsHtml5TreeBuilderCppSupplement.h
+++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h
@@ -504,13 +504,11 @@ nsHtml5TreeBuilder::elementPopped(PRInt32 aNamespace, nsIAtom* aName, nsIContent
     return;
   }
   if (aNamespace == kNameSpaceID_SVG) {
-#ifdef MOZ_SVG
     if (aName == nsHtml5Atoms::svg) {
       nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
       NS_ASSERTION(treeOp, "Tree op allocation failed.");
       treeOp->Init(eTreeOpSvgLoad, aElement);
     }
-#endif
     return;
   }
   // we now have only HTML
diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp
index c8b81c490e3..84b3df6f09c 100644
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -64,10 +64,7 @@
 #include "nsIServiceManager.h"
 #include "nsEscape.h"
 #include "mozilla/dom/Element.h"
-
-#ifdef MOZ_SVG
 #include "nsHtml5SVGLoadDispatcher.h"
-#endif
 
 namespace dom = mozilla::dom;
 
@@ -287,7 +284,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
                                      aBuilder->GetDocument());
         PRUint32 pos = parent->IndexOf(node);
         NS_ASSERTION((pos >= 0), "Element not found as child of its parent");
-        rv = parent->RemoveChildAt(pos, PR_TRUE, PR_FALSE);
+        rv = parent->RemoveChildAt(pos, PR_TRUE);
         NS_ENSURE_SUCCESS(rv, rv);
       }
       return rv;
@@ -304,7 +301,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
       PRBool didAppend = PR_FALSE;
       while (node->GetChildCount()) {
         nsCOMPtr<nsIContent> child = node->GetChildAt(0);
-        rv = node->RemoveChildAt(0, PR_TRUE, PR_FALSE);
+        rv = node->RemoveChildAt(0, PR_TRUE);
         NS_ENSURE_SUCCESS(rv, rv);
         rv = parent->AppendChildTo(child, PR_FALSE);
         NS_ENSURE_SUCCESS(rv, rv);
@@ -358,40 +355,10 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
         nsCOMPtr<nsIAtom> localName = Reget(attributes->getLocalName(i));
         PRInt32 nsuri = attributes->getURI(i);
         if (!node->HasAttr(nsuri, localName)) {
-
-          // the manual notification code is based on nsGenericElement
-          
-          nsEventStates stateMask = node->IntrinsicState();
-          nsNodeUtils::AttributeWillChange(node, 
-                                           nsuri,
-                                           localName,
-                                           static_cast<PRUint8>(nsIDOMMutationEvent::ADDITION));
-
           // prefix doesn't need regetting. it is always null or a static atom
           // local name is never null
-          node->SetAttr(nsuri, localName, attributes->getPrefix(i), *(attributes->getValue(i)), PR_FALSE);
+          node->SetAttr(nsuri, localName, attributes->getPrefix(i), *(attributes->getValue(i)), PR_TRUE);
           // XXX what to do with nsresult?
-          
-          if (document || node->HasFlag(NODE_FORCE_XBL_BINDINGS)) {
-            nsIDocument* ownerDoc = node->GetOwnerDoc();
-            if (ownerDoc) {
-              nsRefPtr<nsXBLBinding> binding =
-                ownerDoc->BindingManager()->GetBinding(node);
-              if (binding) {
-                binding->AttributeChanged(localName, nsuri, PR_FALSE, PR_FALSE);
-              }
-            }
-          }
-          
-          stateMask ^= node->IntrinsicState();
-          if (!stateMask.IsEmpty() && document) {
-            MOZ_AUTO_DOC_UPDATE(document, UPDATE_CONTENT_STATE, PR_TRUE);
-            document->ContentStateChanged(node, stateMask);
-          }
-          nsNodeUtils::AttributeChanged(node, 
-                                        nsuri, 
-                                        localName, 
-                                        static_cast<PRUint8>(nsIDOMMutationEvent::ADDITION));
         }
       }
       
@@ -726,7 +693,6 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
       sele->FreezeUriAsyncDefer();
       return rv;
     }
-#ifdef MOZ_SVG
     case eTreeOpSvgLoad: {
       nsIContent* node = *(mOne.node);
       nsCOMPtr<nsIRunnable> event = new nsHtml5SVGLoadDispatcher(node);
@@ -735,7 +701,6 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
       }
       return rv;
     }
-#endif
     default: {
       NS_NOTREACHED("Bogus tree op");
     }
diff --git a/parser/html/nsHtml5TreeOperation.h b/parser/html/nsHtml5TreeOperation.h
index 4283e4ace56..50e4f35cfa5 100644
--- a/parser/html/nsHtml5TreeOperation.h
+++ b/parser/html/nsHtml5TreeOperation.h
@@ -82,9 +82,7 @@ enum eHtml5TreeOperation {
   eTreeOpStreamEnded,
   eTreeOpSetStyleLineNumber,
   eTreeOpSetScriptLineNumberAndFreeze,
-#ifdef MOZ_SVG
   eTreeOpSvgLoad,
-#endif
   eTreeOpStartLayout
 };
 
diff --git a/parser/htmlparser/src/CParserContext.cpp b/parser/htmlparser/src/CParserContext.cpp
index 28765c356b2..82e54b83f8a 100644
--- a/parser/htmlparser/src/CParserContext.cpp
+++ b/parser/htmlparser/src/CParserContext.cpp
@@ -87,9 +87,7 @@ CParserContext::SetMimeType(const nsACString& aMimeType)
            mMimeType.EqualsLiteral(APPLICATION_XML)       ||
            mMimeType.EqualsLiteral(APPLICATION_XHTML_XML) ||
            mMimeType.EqualsLiteral(TEXT_XUL)              ||
-#ifdef MOZ_SVG
            mMimeType.EqualsLiteral(IMAGE_SVG_XML)         ||
-#endif
 #ifdef MOZ_MATHML
            mMimeType.EqualsLiteral(APPLICATION_MATHML_XML) ||
 #endif
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index dada28dc7a7..ae9f8f26ed1 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -537,7 +537,9 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
   SECItem **rawArray;
   int numcerts;
   int i;
-  
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
   nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
   if (!inss)
     return nsrv;
@@ -601,8 +603,6 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
    * valid chains, then import them.
    */
   now = PR_Now();
-  CERTValOutParam cvout[1];
-  cvout[0].type = cert_po_end;
 
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node,certList);
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index 7edb8c6882a..5ada1446616 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -24,7 +24,6 @@
  *   Dean Tessman <dean_tessman@hotmail.com>
  *   Johnny Stenback <jst@mozilla.jstenback.com>
  *   Masayuki Nakano <masayuki@d-toybox.com>
- *   Michael Ventnor <m.ventnor@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -55,7 +54,6 @@
 #include "nsIDOMKeyEvent.h"
 #include "mozilla/Services.h"
 #include "mozilla/ModuleUtils.h"
-#include "mozilla/Util.h"
 
 static const char *kAutoCompleteSearchCID = "@mozilla.org/autocomplete/search;1?name=";
 
@@ -96,43 +94,6 @@ nsAutoCompleteController::~nsAutoCompleteController()
   SetInput(nsnull);
 }
 
-////////////////////////////////////////////////////////////////////////
-//// Helper methods
-
-/**
- * Cuts any URL prefixes from a given string, making it suitable for search
- * comparisons.
- *
- * @param aOrigSpec
- *        The string to look for prefixes in.
- * @return A substring, with any URL prefixes removed, that depends on the
- *         same buffer as aOrigSpec (to save allocations).
- */
-static const nsDependentSubstring
-RemoveURIPrefixes(const nsAString &aOrigSpec)
-{
-  nsDependentSubstring result(aOrigSpec, 0);
-
-  if (StringBeginsWith(result, NS_LITERAL_STRING("moz-action:"))) {
-    PRUint32 locationOfComma = result.FindChar(',', 11);
-    result.Rebind(result, locationOfComma + 1);
-  }
-
-  if (StringBeginsWith(result, NS_LITERAL_STRING("http://"))) {
-    result.Rebind(result, 7);
-  } else if (StringBeginsWith(result, NS_LITERAL_STRING("https://"))) {
-    result.Rebind(result, 8);
-  } else if (StringBeginsWith(result, NS_LITERAL_STRING("ftp://"))) {
-    result.Rebind(result, 6);
-  }
-
-  if (StringBeginsWith(result, NS_LITERAL_STRING("www."))) {
-    result.Rebind(result, 4);
-  }
-
-  return result;
-}
-
 ////////////////////////////////////////////////////////////////////////
 //// nsIAutoCompleteController
 
@@ -1432,64 +1393,6 @@ nsAutoCompleteController::CompleteDefaultIndex(PRInt32 aSearchIndex)
   return NS_OK;
 }
 
-nsresult
-nsAutoCompleteController::GetDefaultCompleteURLValue(nsIAutoCompleteResult *aResult,
-                                                     PRBool aPreserveCasing,
-                                                     nsAString &_retval)
-{
-  MOZ_ASSERT(aResult);
-
-  PRUint32 rowCount;
-  (void)aResult->GetMatchCount(&rowCount);
-  if (rowCount == 0) {
-    // Return early if we have no entries, so that we don't waste time
-    // fixing up mSearchString below
-    return NS_ERROR_FAILURE;
-  }
-
-  const nsDependentSubstring& fixedSearchTerm = RemoveURIPrefixes(mSearchString);
-  for (PRUint32 i = 0; i < rowCount; ++i) {
-    nsAutoString resultValue;
-    aResult->GetValueAt(i, resultValue);
-    const nsDependentSubstring& fixedResult = RemoveURIPrefixes(resultValue);
-
-    if (!StringBeginsWith(fixedResult, fixedSearchTerm,
-                          nsCaseInsensitiveStringComparator())) {
-      // Not a matching URL
-      continue;
-    }
-
-    // Found a matching item!  Figure out what needs to be assigned/appended.
-    if (aPreserveCasing) {
-      // Use nsDependentString here so we have access to FindCharInSet.
-      const nsDependentString appendValue(Substring(fixedResult, fixedSearchTerm.Length()));
-
-      // We only want to autocomplete up to the next separator.  This lets a user
-      // go to a toplevel domain, if a longer path in that domain is higher in
-      // the autocomplete.
-      // eg. if the user types "m" and "mozilla.org/credits" is the top hit,
-      // autocomplete only to "mozilla.org/" in case that's where they want to go.
-      // They're one keystroke away from "/credits", anyway.
-      PRInt32 separatorIndex = appendValue.FindCharInSet("/?#");
-      if (separatorIndex != kNotFound && appendValue[separatorIndex] == '/') {
-        // Add 1 so we include the directory separator
-        separatorIndex++;
-      }
-
-      nsAutoString returnValue;
-      returnValue.Assign(mSearchString);
-      returnValue.Append(Substring(appendValue, 0, separatorIndex));
-      _retval = returnValue;
-    } else {
-      _retval.Assign(fixedResult);
-    }
-    return NS_OK;
-  }
-
-  // No match at all
-  return NS_ERROR_FAILURE;
-}
-
 nsresult
 nsAutoCompleteController::GetDefaultCompleteValue(PRInt32 aSearchIndex,
                                                   PRBool aPreserveCasing,
@@ -1513,14 +1416,6 @@ nsAutoCompleteController::GetDefaultCompleteValue(PRInt32 aSearchIndex,
   nsIAutoCompleteResult *result = mResults.SafeObjectAt(index);
   NS_ENSURE_TRUE(result != nsnull, NS_ERROR_FAILURE);
 
-  PRBool isURL;
-  result->GetIsURLResult(&isURL);
-  if (isURL) {
-    // For URLs, we remove needless prefixes, then iterate over all values
-    // to find a suitable default.
-    return GetDefaultCompleteURLValue(result, aPreserveCasing, _retval);
-  }
-
   if (defaultIndex < 0) {
     // The search must explicitly provide a default index in order
     // for us to be able to complete.
@@ -1571,11 +1466,37 @@ nsAutoCompleteController::CompleteValue(nsString &aValue)
     // autocomplete to aValue.
     mInput->SetTextValue(aValue);
   } else {
-    // Autocompleting something from the middle.
-    // Use the format "searchstring >> full string" to indicate to the user
-    // what we are going to replace their search string with.
-    mInput->SetTextValue(mSearchString + NS_LITERAL_STRING(" >> ") + aValue);
-    endSelect = mSearchString.Length() + 4 + aValue.Length();
+    nsresult rv;
+    nsCOMPtr<nsIIOService> ios = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
+    nsCAutoString scheme;
+    if (NS_SUCCEEDED(ios->ExtractScheme(NS_ConvertUTF16toUTF8(aValue), scheme))) {
+      // Trying to autocomplete a URI from somewhere other than the beginning.
+      // Only succeed if the missing portion is "http://"; otherwise do not
+      // autocomplete.  This prevents us from "helpfully" autocompleting to a
+      // URI that isn't equivalent to what the user expected.
+      const PRInt32 findIndex = 7; // length of "http://"
+
+      if ((endSelect < findIndex + mSearchStringLength) ||
+          !scheme.LowerCaseEqualsLiteral("http") ||
+          !Substring(aValue, findIndex, mSearchStringLength).Equals(
+            mSearchString, nsCaseInsensitiveStringComparator())) {
+        return NS_OK;
+      }
+
+      mInput->SetTextValue(mSearchString +
+                           Substring(aValue, mSearchStringLength + findIndex,
+                                     endSelect));
+
+      endSelect -= findIndex; // We're skipping this many characters of aValue.
+    } else {
+      // Autocompleting something other than a URI from the middle.
+      // Use the format "searchstring >> full string" to indicate to the user
+      // what we are going to replace their search string with.
+      mInput->SetTextValue(mSearchString + NS_LITERAL_STRING(" >> ") + aValue);
+
+      endSelect = mSearchString.Length() + 4 + aValue.Length();
+    }
   }
 
   mInput->SelectTextRange(mSearchStringLength, endSelect);
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.h b/toolkit/components/autocomplete/nsAutoCompleteController.h
index b2ce200a7ed..c188f4edfd2 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.h
@@ -97,21 +97,6 @@ protected:
 private:
   nsresult GetResultValueLabelAt(PRInt32 aIndex, PRBool aValueOnly,
                                  PRBool aGetValue, nsAString & _retval);
-  /**
-   * Searches for a suitable value to complete to, by comparing all values
-   * as URLs, and completing only up to the next URL separator.
-   *
-   * @param aResult
-   *        An autocomplete result to search in.
-   * @param aPreserveCasing
-   *        Preserve the casing of what the user typed in.
-   * @param [out] _retval
-   *        The value to complete to.
-   * @return A result, NS_OK if there is a value to complete to.
-   */
-  nsresult GetDefaultCompleteURLValue(nsIAutoCompleteResult *aResult,
-                                      PRBool aPreserveCasing,
-                                      nsAString &_retval);
 protected:
   nsresult GetDefaultCompleteValue(PRInt32 aSearchIndex, PRBool aPreserveCasing,
                                    nsAString &_retval);
diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
index 7c540be6a13..af0c06bdbec 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
@@ -43,8 +43,7 @@ NS_IMPL_ISUPPORTS2(nsAutoCompleteSimpleResult,
 
 nsAutoCompleteSimpleResult::nsAutoCompleteSimpleResult() :
   mDefaultIndex(-1),
-  mSearchResult(RESULT_NOMATCH),
-  mIsURLResult(PR_FALSE)
+  mSearchResult(RESULT_NOMATCH)
 {
 }
 
@@ -105,21 +104,6 @@ nsAutoCompleteSimpleResult::SetErrorDescription(
   return NS_OK;
 }
 
-// isURLResult
-NS_IMETHODIMP
-nsAutoCompleteSimpleResult::GetIsURLResult(PRBool *aIsURLResult)
-{
-  *aIsURLResult = mIsURLResult;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsAutoCompleteSimpleResult::SetIsURLResult(PRBool aIsURLResult)
-{
-  mIsURLResult = aIsURLResult;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsAutoCompleteSimpleResult::AppendMatch(const nsAString& aValue,
                                         const nsAString& aComment,
diff --git a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
index 65765fb0fbe..adb0b3037e8 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
@@ -78,8 +78,6 @@ protected:
   PRInt32 mDefaultIndex;
   PRUint32 mSearchResult;
 
-  PRBool mIsURLResult;
-
   nsCOMPtr<nsIAutoCompleteSimpleResultListener> mListener;
 };
 
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteResult.idl b/toolkit/components/autocomplete/nsIAutoCompleteResult.idl
index 2b2f0510413..7645a46559b 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteResult.idl
+++ b/toolkit/components/autocomplete/nsIAutoCompleteResult.idl
@@ -82,14 +82,6 @@ interface nsIAutoCompleteResult : nsISupports
    */
   readonly attribute unsigned long matchCount;
 
-  /**
-   * Whether the values in this result are URLs. This will cause
-   * slightly different behaviour where defaultIndex is intelligently chosen
-   * for you (while the attribute defaultIndex is ignored), and
-   * searching is fine-tuned for URLs.
-   */
-  readonly attribute boolean isURLResult;
-
   /**
    * Get the value of the result at the given index
    */
diff --git a/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl b/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl
index 2f4375f7bf5..523fb641a8a 100644
--- a/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl
+++ b/toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl
@@ -74,12 +74,6 @@ interface nsIAutoCompleteSimpleResult : nsIAutoCompleteResult
    */
   void setSearchResult(in unsigned short aSearchResult);
 
-  /**
-   * A writer for the readonly attribute 'isURLResult'.
-   * Sets whether the values in this result are URLs.
-   */
-  void setIsURLResult(in boolean aIsURLResult);
-
   /**
    * Appends a result item consisting of the given value, comment, image and style.
    * This is how you add results.  Note:  image and style are optional. 
diff --git a/toolkit/components/autocomplete/tests/unit/test_autofill.js b/toolkit/components/autocomplete/tests/unit/test_autofill.js
deleted file mode 100644
index dfb2696187a..00000000000
--- a/toolkit/components/autocomplete/tests/unit/test_autofill.js
+++ /dev/null
@@ -1,344 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-/**
- * Unit test for Bug 566489 - Inline Autocomplete.
- */
-
-
-/**
- * Dummy nsIAutoCompleteInput source that returns
- * the given list of AutoCompleteSearch names. 
- */
-function AutoCompleteInput(aSearches) {
-  this.searches = aSearches;
-}
-AutoCompleteInput.prototype = {
-  constructor: AutoCompleteInput, 
-  
-  // Array of AutoCompleteSearch names
-  searches: null,
-  
-  minResultsForPopup: 0,
-  timeout: 10,
-  searchParam: "",
-  textValue: "",
-  disableAutoComplete: false,  
-  completeDefaultIndex: true,
-
-  // Text selection range
-  selStart: 0,
-  selEnd: 0,
-  get selectionStart() {
-    return selStart;
-  },
-  get selectionEnd() {
-    return selEnd;
-  },
-  selectTextRange: function(aStart, aEnd) {
-    selStart = aStart;
-    selEnd = aEnd;
-  },
-  
-  get searchCount() {
-    return this.searches.length;
-  },
-  
-  getSearchAt: function(aIndex) {
-    return this.searches[aIndex];
-  },
-  
-  onSearchBegin: function() {},
-  onSearchComplete: function() {},
-  
-  popupOpen: false,  
-  
-  popup: { 
-    setSelectedIndex: function(aIndex) {},
-    invalidate: function() {},
-
-    // nsISupports implementation
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
-                                           Ci.nsIAutoCompletePopup])
-  },
-    
-  // nsISupports implementation
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
-                                         Ci.nsIAutoCompleteInput])
-}
-
-
-
-/** 
- * nsIAutoCompleteResult implementation
- */
-function AutoCompleteResult(aValues, aComments, aStyles) {
-  this._values = aValues;
-  this._comments = aComments;
-  this._styles = aStyles;
-}
-AutoCompleteResult.prototype = {
-  constructor: AutoCompleteResult,
-  
-  // Arrays
-  _values: null,
-  _comments: null,
-  _styles: null,
-  
-  searchString: "",
-  searchResult: Ci.nsIAutoCompleteResult.RESULT_SUCCESS,
-  
-  defaultIndex: 0,
-  isURLResult: true,
-
-  get matchCount() {
-    return this._values.length;
-  },
-
-  getValueAt: function(aIndex) {
-    return this._values[aIndex];
-  },
-
-  getLabelAt: function(aIndex) {
-    return this.getValueAt(aIndex);
-  },
-  
-  getCommentAt: function(aIndex) {
-    return this._comments[aIndex];
-  },
-  
-  getStyleAt: function(aIndex) {
-    return this._styles[aIndex];
-  },
-  
-  getImageAt: function(aIndex) {
-    return "";
-  },
-
-  removeValueAt: function (aRowIndex, aRemoveFromDb) {},
-
-  // nsISupports implementation
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
-                                         Ci.nsIAutoCompleteResult])
-}
-
-
-/** 
- * nsIAutoCompleteSearch implementation that always returns
- * the same result set.
- */
-function AutoCompleteSearch(aName, aResult) {
-  this.name = aName;
-  this._result = aResult;
-}
-AutoCompleteSearch.prototype = {
-  constructor: AutoCompleteSearch,
-  
-  // Search name. Used by AutoCompleteController
-  name: null,
-
-  // AutoCompleteResult
-  _result: null,
-
-  
-  /**
-   * Return the same result set for every search
-   */
-  startSearch: function(aSearchString, 
-                        aSearchParam, 
-                        aPreviousResult, 
-                        aListener) 
-  {
-    aListener.onSearchResult(this, this._result);
-  },
-  
-  stopSearch: function() {},
-
-  // nsISupports implementation
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports,
-                                         Ci.nsIFactory,
-                                         Ci.nsIAutoCompleteSearch]),
-  
-  // nsIFactory implementation
-  createInstance: function(outer, iid) {
-    return this.QueryInterface(iid);
-  }
-}
-
-
-/** 
- * Helper to register an AutoCompleteSearch with the given name.
- * Allows the AutoCompleteController to find the search.
- */
-function registerAutoCompleteSearch(aSearch) {
-  var name = "@mozilla.org/autocomplete/search;1?name=" + aSearch.name;
-
-  var uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].
-                      getService(Ci.nsIUUIDGenerator);
-  var cid = uuidGenerator.generateUUID();
-
-  var desc = "Test AutoCompleteSearch";
-  
-  var componentManager = Components.manager
-                                   .QueryInterface(Ci.nsIComponentRegistrar);
-  componentManager.registerFactory(cid, desc, name, aSearch);
-
-  // Keep the id on the object so we can unregister later
-  aSearch.cid = cid; 
-}
-
-
-/** 
- * Helper to unregister an AutoCompleteSearch. 
- */
-function unregisterAutoCompleteSearch(aSearch) {
-  var componentManager = Components.manager
-                                   .QueryInterface(Ci.nsIComponentRegistrar);  
-  componentManager.unregisterFactory(aSearch.cid, aSearch);
-}
-
-
-/**
- * The array of autocomplete test data to run.
- */
-var tests = [
-  {
-    searchValues: ["mozilla.org"],        // Autocomplete results
-    inputString: "moz",                   // The search string
-    expectedAutocomplete: "mozilla.org",  // The string we expect to be autocompleted to
-    expectedSelStart: 3,                  // The range of the selection we expect
-    expectedSelEnd: 11
-  },
-  {
-    // Test URL schemes
-    searchValues: ["http://www.mozilla.org", "mozNotFirstMatch.org"],
-    inputString: "moz",
-    expectedAutocomplete: "mozilla.org",
-    expectedSelStart: 3,
-    expectedSelEnd: 11
-  },
-  {
-    // Test URL schemes
-    searchValues: ["ftp://ftp.mozilla.org/"],
-    inputString: "ft",
-    expectedAutocomplete: "ftp.mozilla.org/",
-    expectedSelStart: 2,
-    expectedSelEnd: 16
-  },
-  {
-    // Test the moz-action scheme, used internally for things like switch-to-tab
-    searchValues: ["moz-action:someaction,http://www.mozilla.org", "mozNotFirstMatch.org"],
-    inputString: "moz",
-    expectedAutocomplete: "mozilla.org",
-    expectedSelStart: 3,
-    expectedSelEnd: 11
-  },
-  {
-    // Test that we autocomplete to the first match, not necessarily the first entry
-    searchValues: ["unimportantTLD.org/moz", "mozilla.org"],
-    inputString: "moz",
-    expectedAutocomplete: "mozilla.org",
-    expectedSelStart: 3,
-    expectedSelEnd: 11
-  },
-  {
-    // Test that we only autocomplete to the next URL separator (/)
-    searchValues: ["http://mozilla.org/credits/morecredits"],
-    inputString: "moz",
-    expectedAutocomplete: "mozilla.org/",
-    expectedSelStart: 3,
-    expectedSelEnd: 12
-  },
-  {
-    // Test that we only autocomplete to the next URL separator (/)
-    searchValues: ["http://mozilla.org/credits/morecredits"],
-    inputString: "mozilla.org/cr",
-    expectedAutocomplete: "mozilla.org/credits/",
-    expectedSelStart: 14,
-    expectedSelEnd: 20
-  },
-  {
-    // Test that we only autocomplete to before the next URL separator (#)
-    searchValues: ["http://mozilla.org/credits#VENTNOR"],
-    inputString: "mozilla.org/cr",
-    expectedAutocomplete: "mozilla.org/credits",
-    expectedSelStart: 14,
-    expectedSelEnd: 19
-  },
-  {
-    // Test that we only autocomplete to before the next URL separator (?)
-    searchValues: ["http://mozilla.org/credits?mozilla=awesome"],
-    inputString: "mozilla.org/cr",
-    expectedAutocomplete: "mozilla.org/credits",
-    expectedSelStart: 14,
-    expectedSelEnd: 19
-  },
-  {
-    // Test that schemes are removed from the input
-    searchValues: ["http://www.mozilla.org/credits"],
-    inputString: "http://mozi",
-    expectedAutocomplete: "http://mozilla.org/",
-    expectedSelStart: 11,
-    expectedSelEnd: 19
-  },
-];
-
-
-/**
- * Run an individual autocomplete search, one at a time.
- */
-function run_search() {
-  if (tests.length == 0) {
-    do_test_finished();
-    return;
-  }
-
-  var test = tests.shift();
-
-  var search = new AutoCompleteSearch("test-autofill1",
-    new AutoCompleteResult(test.searchValues, ["", ""], ["", ""]));
-
-  // Register search so AutoCompleteController can find them
-  registerAutoCompleteSearch(search);
-
-  var controller = Cc["@mozilla.org/autocomplete/controller;1"].
-                   getService(Ci.nsIAutoCompleteController);
-
-  // Make an AutoCompleteInput that uses our search
-  // and confirms results on search complete
-  var input = new AutoCompleteInput([search.name]);
-  input.textValue = test.inputString;
-
-  // Caret must be at the end. Autofill doesn't happen unless you're typing
-  // characters at the end.
-  var strLen = test.inputString.length;
-  input.selectTextRange(strLen, strLen);
-
-  input.onSearchComplete = function() {
-    do_check_eq(input.textValue, test.expectedAutocomplete);
-    do_check_eq(input.selectionStart, test.expectedSelStart);
-    do_check_eq(input.selectionEnd, test.expectedSelEnd);
-
-    // Unregister searches
-    unregisterAutoCompleteSearch(search);
-    run_search();
-  };
-
-  controller.input = input;
-  controller.startSearch(test.inputString);
-}
-
-
-/** 
- */
-function run_test() {
-  // Search is asynchronous, so don't let the test finish immediately
-  do_test_pending();
-  run_search();
-}
-
diff --git a/toolkit/components/autocomplete/tests/unit/xpcshell.ini b/toolkit/components/autocomplete/tests/unit/xpcshell.ini
index cc414969607..a6765bb5bcb 100644
--- a/toolkit/components/autocomplete/tests/unit/xpcshell.ini
+++ b/toolkit/components/autocomplete/tests/unit/xpcshell.ini
@@ -9,4 +9,3 @@ tail =
 [test_autocomplete_multiple.js]
 [test_previousResult.js]
 [test_stopSearch.js]
-[test_autofill.js]
diff --git a/toolkit/components/filepicker/nsFileView.cpp b/toolkit/components/filepicker/nsFileView.cpp
index aa18630a2b8..502909d0d8a 100644
--- a/toolkit/components/filepicker/nsFileView.cpp
+++ b/toolkit/components/filepicker/nsFileView.cpp
@@ -154,13 +154,6 @@ NS_IMETHODIMP nsFileResult::GetErrorDescription(nsAString & aErrorDescription)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsFileResult::GetIsURLResult(PRBool *aIsURLResult)
-{
-  NS_ENSURE_ARG_POINTER(aIsURLResult);
-  *aIsURLResult = PR_FALSE;
-  return NS_OK;
-}
-
 NS_IMETHODIMP nsFileResult::GetMatchCount(PRUint32 *aMatchCount)
 {
   NS_ENSURE_ARG_POINTER(aMatchCount);
diff --git a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
index 7ce57b8b56f..ec433a73428 100644
--- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
@@ -189,6 +189,26 @@ function sendFakeAutocompleteEvent(element) {
     element.dispatchEvent(acEvent);
 }
 
+function hitEventLoop(func, times) {
+  if (times > 0) {
+    setTimeout(hitEventLoop, 0, func, times - 1);
+  } else {
+    setTimeout(func, 0);
+  }
+}
+
+var gNextTestWillOpenPopup = true;
+var gLastTest = 704;
+
+function addPopupListener(eventName, func, capture) {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  autocompletePopup.addEventListener(eventName, func, capture);
+}
+
+function removePopupListener(eventName, func, capture) {
+  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+  autocompletePopup.removeEventListener(eventName, func, capture);
+}
 
 /*
  * Main section of test...
@@ -207,6 +227,31 @@ function runTest(testNum) {
     netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
   ok(true, "Starting test #" + testNum);
 
+  if (gNextTestWillOpenPopup) {
+    addPopupListener("popupshown", function() {
+      removePopupListener("popupshown", arguments.callee, false);
+
+      if (testNum != gLastTest) {
+        window.setTimeout(runTest, 0, testNum + 1);
+      }
+    }, false);
+  } else {
+    var unexpectedPopup = function() {
+      removePopupListener("popupshown", arguments.callee, false);
+
+      ok(false, "Test " + testNum + " should not show a popup");
+    };
+    addPopupListener("popupshown", unexpectedPopup, false);
+    if (testNum == gLastTest) {
+      removePopupListener("popupshown", unexpectedPopup, false);
+    } else {
+      hitEventLoop(function() {
+        removePopupListener("popupshown", unexpectedPopup, false);
+        runTest(testNum + 1);
+      }, 100);
+    }
+  }
+
   switch(testNum) {
     case 1:
         // Make sure initial form is empty.
@@ -358,6 +403,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 13:
@@ -367,6 +413,7 @@ function runTest(testNum) {
         doKey("return");
         checkACForm("zzzuser4", "zzzpass4");
         restoreForm();
+        gNextTestWillOpenPopup = false;
         break;
 
     case 14:
@@ -375,6 +422,7 @@ function runTest(testNum) {
         uname.value = "zzzuser4";
         sendFakeAutocompleteEvent(uname);
         checkACForm("zzzuser4", "");
+        gNextTestWillOpenPopup = true;
         break;
 
     case 15:
@@ -477,6 +525,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 56:
@@ -489,6 +538,7 @@ function runTest(testNum) {
         is(numLogins, 1, "Correct number of logins after deleting one");
         pwmgr.removeLogin(login0); // remove the login that's not shown in the list.
         testNum = 99;
+        gNextTestWillOpenPopup = true;
         break;
 
 
@@ -503,6 +553,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 101:
@@ -512,6 +563,7 @@ function runTest(testNum) {
         doKey("return"); // not "enter"!
         checkACForm("singleuser5", "singlepass5");
         restoreForm(); // clear field, so reloading test doesn't fail
+        gNextTestWillOpenPopup = true;
         break;
 
     case 102:
@@ -523,6 +575,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 103:
@@ -531,6 +584,7 @@ function runTest(testNum) {
         checkACForm("", ""); // value shouldn't update
         doKey("return"); // not "enter"!
         checkACForm("singleuser5", "singlepass5");
+        gNextTestWillOpenPopup = true;
         break;
 
     case 104:
@@ -542,6 +596,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 105:
@@ -550,6 +605,7 @@ function runTest(testNum) {
         checkACForm("", ""); // value shouldn't update
         doKey("return"); // not "enter"!
         checkACForm("singleuser5", "singlepass5");
+        gNextTestWillOpenPopup = true;
         break;
 
     case 106:
@@ -561,6 +617,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 107:
@@ -569,6 +626,7 @@ function runTest(testNum) {
         checkACForm("", ""); // value shouldn't update
         doKey("return"); // not "enter"!
         checkACForm("singleuser5", "singlepass5");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 108:
@@ -578,6 +636,7 @@ function runTest(testNum) {
         uname = $_(6, "uname");
         pword = $_(6, "pword");
         checkACForm("singleuser5", "singlepass5");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 109:
@@ -592,6 +651,7 @@ function runTest(testNum) {
 
         pwmgr.removeLogin(login5);
         testNum = 499;
+        gNextTestWillOpenPopup = true;
         break;
 
     case 500:
@@ -616,6 +676,7 @@ function runTest(testNum) {
         // Trigger autocomplete popup
         restoreForm();
         doKey("down");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 501:
@@ -632,6 +693,7 @@ function runTest(testNum) {
 
         pwmgr.removeLogin(login6A);
         testNum = 599;
+        gNextTestWillOpenPopup = false;
         break;
 
     case 600:
@@ -640,17 +702,20 @@ function runTest(testNum) {
         pword = $_(8, "pword");
         checkACForm("form8user", "form8pass");
         restoreForm();
+        gNextTestWillOpenPopup = false;
         break;
 
     case 601:
         checkACForm("", "");
         // Focus the previous form to trigger a blur.
         $_(7, "uname").focus();
+        gNextTestWillOpenPopup = false;
         break;
 
     case 602:
         checkACForm("", "");
         restoreForm();
+        gNextTestWillOpenPopup = false;
         break;
 
     case 603:
@@ -658,6 +723,7 @@ function runTest(testNum) {
         pwmgr.removeLogin(login7);
 
         testNum = 699;
+        gNextTestWillOpenPopup = false;
         break;
 
     case 700:
@@ -665,6 +731,7 @@ function runTest(testNum) {
         uname = $_(9, "uname");
         pword = $_(9, "pword");
         sendString("form9userAB", uname);
+        gNextTestWillOpenPopup = true;
         break;
 
     case 701:
@@ -672,6 +739,7 @@ function runTest(testNum) {
         uname.focus();
         doKey("left");
         sendChar("A", uname);
+        gNextTestWillOpenPopup = false;
         break;
 
     case 702:
@@ -681,11 +749,13 @@ function runTest(testNum) {
         doKey("down");
         doKey("return");
         checkACForm("form9userAAB", "form9pass");
+        gNextTestWillOpenPopup = false;
         break;
 
     case 703:
         pwmgr.addLogin(login8C);
         sendChar("z", uname);
+        gNextTestWillOpenPopup = false;
         break;
 
     case 704:
@@ -700,8 +770,6 @@ function runTest(testNum) {
         SimpleTest.finish();
         return;
   }
-
-  setTimeout(runTest, 50, testNum + 1); // XXX 40ms was too slow, why?
 }
 
 
diff --git a/toolkit/components/places/nsPlacesAutoComplete.js b/toolkit/components/places/nsPlacesAutoComplete.js
index 2fded4c6745..ac496285c00 100644
--- a/toolkit/components/places/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/nsPlacesAutoComplete.js
@@ -458,7 +458,6 @@ nsPlacesAutoComplete.prototype = {
                  createInstance(Ci.nsIAutoCompleteSimpleResult);
     result.setSearchString(aSearchString);
     result.setListener(this);
-    result.setIsURLResult(true);
     this._result = result;
 
     // If we are not enabled, we need to return now.
@@ -738,6 +737,7 @@ nsPlacesAutoComplete.prototype = {
     if (aSearchOngoing)
       resultCode += "_ONGOING";
     result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
+    result.setDefaultIndex(result.matchCount ? 0 : -1);
     this._listener.onSearchResult(this, result);
   },
 
diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
index 3f2204f42fc..e1cbf1b5f33 100644
--- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
+++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
@@ -67,7 +67,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIImageDocument.h"
 #include "nsIDOMHTMLDocument.h"
-#include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDocument.h"
 #include "nsISelection.h"
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index a8c92a6e630..ba69f10d73f 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -75,7 +75,8 @@ const PREFS_WHITELIST = [
   "places.",
   "print.",
   "privacy.",
-  "security."
+  "security.",
+  "webgl."
 ];
 
 // The blacklist, unlike the whitelist, is a list of regular expressions.
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 4638715084f..df75c78e463 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -80,6 +80,4 @@ toolkit.jar:
 #ifdef XP_MACOSX
 *  content/global/macWindowMenu.js             (macWindowMenu.js)
 #endif
-#ifdef MOZ_SVG
    content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
-#endif
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
index ba0f31989dd..ec6d7d55de5 100644
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -100,6 +100,8 @@ endif
 
 ifeq ($(OS_TARGET),Android)
 DIRS += fileid
+# NDK5 workarounds
+DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
 endif
 
 DIRS += client
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
index 989dece66da..140a91627d0 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -68,4 +68,9 @@ CPPSRCS	= \
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
+ifeq ($(OS_TARGET),Android)
+# NDK5 workarounds
+DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
index 8aea159464a..488566d775c 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
@@ -99,6 +99,8 @@
 #include "common/linux/guid_creator.h"
 #include "common/linux/eintr_wrapper.h"
 
+#include "linux/sched.h"
+
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
index a749cb5fc30..d150258b3ee 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -57,6 +57,7 @@
 #endif
 #include <stdio.h>
 #include <unistd.h>
+#include <ctype.h>
 #if !defined(__ANDROID__)
 #include <sys/ucontext.h>
 #include <sys/user.h>
diff --git a/toolkit/mozapps/downloads/jar.mn b/toolkit/mozapps/downloads/jar.mn
index a70597d449e..8b5e7215018 100644
--- a/toolkit/mozapps/downloads/jar.mn
+++ b/toolkit/mozapps/downloads/jar.mn
@@ -1,9 +1,9 @@
-toolkit.jar:
-% content mozapps %content/mozapps/
-* content/mozapps/downloads/helperApps.js                       (content/helperApps.js)
-* content/mozapps/downloads/unknownContentType.xul              (content/unknownContentType.xul)
-* content/mozapps/downloads/downloads.xul                       (content/downloads.xul)
-* content/mozapps/downloads/downloads.js                        (content/downloads.js)
-* content/mozapps/downloads/DownloadProgressListener.js         (content/DownloadProgressListener.js)
-  content/mozapps/downloads/downloads.css                       (content/downloads.css)
-* content/mozapps/downloads/download.xml                        (content/download.xml)
+toolkit.jar:
+% content mozapps %content/mozapps/
+* content/mozapps/downloads/helperApps.js                       (content/helperApps.js)
+* content/mozapps/downloads/unknownContentType.xul              (content/unknownContentType.xul)
+* content/mozapps/downloads/downloads.xul                       (content/downloads.xul)
+* content/mozapps/downloads/downloads.js                        (content/downloads.js)
+* content/mozapps/downloads/DownloadProgressListener.js         (content/DownloadProgressListener.js)
+  content/mozapps/downloads/downloads.css                       (content/downloads.css)
+* content/mozapps/downloads/download.xml                        (content/download.xml)
diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
index 4d99cab6025..0293fd68961 100644
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -39,6 +39,10 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
+ifeq (,$(filter aurora beta release,$(MOZ_UPDATE_CHANNEL)))
+DEFINES += -DMOZ_COMPATABILITY_NIGHTLY=1
+endif
+
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = extensions
diff --git a/toolkit/mozapps/extensions/PluginProvider.jsm b/toolkit/mozapps/extensions/PluginProvider.jsm
index b6c25db05a3..5045d5ef652 100644
--- a/toolkit/mozapps/extensions/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/PluginProvider.jsm
@@ -236,6 +236,12 @@ function PluginWrapper(aId, aName, aDescription, aTags) {
     return bs.getPluginBlocklistState(aTags[0]);
   });
 
+  this.__defineGetter__("blocklistURL", function() {
+    let bs = Cc["@mozilla.org/extensions/blocklist;1"].
+             getService(Ci.nsIBlocklistService);
+    return bs.getPluginBlocklistURL(aTags[0]);
+  });
+
   this.__defineGetter__("size", function() {
     function getDirectorySize(aFile) {
       let size = 0;
diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index 864f42c5328..81311f3eca8 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -60,7 +60,7 @@ const PREF_EM_DSS_ENABLED             = "extensions.dss.enabled";
 const PREF_DSS_SWITCHPENDING          = "extensions.dss.switchPending";
 const PREF_DSS_SKIN_TO_SELECT         = "extensions.lastSelectedSkin";
 const PREF_GENERAL_SKINS_SELECTEDSKIN = "general.skins.selectedSkin";
-const PREF_EM_CHECK_COMPATIBILITY     = "extensions.checkCompatibility";
+const PREF_EM_CHECK_COMPATIBILITY_BASE = "extensions.checkCompatibility";
 const PREF_EM_CHECK_UPDATE_SECURITY   = "extensions.checkUpdateSecurity";
 const PREF_EM_UPDATE_URL              = "extensions.update.url";
 const PREF_EM_ENABLED_ADDONS          = "extensions.enabledAddons";
@@ -121,6 +121,14 @@ const BRANCH_REGEXP                   = /^([^\.]+\.[0-9]+[a-z]*).*/gi;
 const DB_SCHEMA                       = 4;
 const REQ_VERSION                     = 2;
 
+#ifdef MOZ_COMPATABILITY_NIGHTLY
+const PREF_EM_CHECK_COMPATIBILITY = PREF_EM_CHECK_COMPATIBILITY_BASE +
+                                    ".nightly";
+#else
+const PREF_EM_CHECK_COMPATIBILITY = PREF_EM_CHECK_COMPATIBILITY_BASE + "." +
+                                    Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
+#endif
+
 // Properties that exist in the install manifest
 const PROP_METADATA      = ["id", "version", "type", "internalName", "updateURL",
                             "updateKey", "optionsURL", "aboutURL", "iconURL",
@@ -1380,9 +1388,6 @@ var XPIProvider = {
   // will be the same as currentSkin when it is the skin to be used when the
   // application is restarted
   selectedSkin: null,
-  // The name of the checkCompatibility preference for the current application
-  // version
-  checkCompatibilityPref: null,
   // The value of the checkCompatibility preference
   checkCompatibility: true,
   // The value of the checkUpdateSecurity preference
@@ -1516,15 +1521,13 @@ var XPIProvider = {
     this.selectedSkin = this.currentSkin;
     this.applyThemeChange();
 
-    var version = Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
-    this.checkCompatibilityPref = PREF_EM_CHECK_COMPATIBILITY + "." + version;
-    this.checkCompatibility = Prefs.getBoolPref(this.checkCompatibilityPref,
+    this.checkCompatibility = Prefs.getBoolPref(PREF_EM_CHECK_COMPATIBILITY,
                                                 true)
     this.checkUpdateSecurity = Prefs.getBoolPref(PREF_EM_CHECK_UPDATE_SECURITY,
                                                  true)
     this.enabledAddons = [];
 
-    Services.prefs.addObserver(this.checkCompatibilityPref, this, false);
+    Services.prefs.addObserver(PREF_EM_CHECK_COMPATIBILITY, this, false);
     Services.prefs.addObserver(PREF_EM_CHECK_UPDATE_SECURITY, this, false);
 
     let flushCaches = this.checkForChanges(aAppChanged, aOldAppVersion,
@@ -1613,7 +1616,7 @@ var XPIProvider = {
   shutdown: function XPI_shutdown() {
     LOG("shutdown");
 
-    Services.prefs.removeObserver(this.checkCompatibilityPref, this);
+    Services.prefs.removeObserver(PREF_EM_CHECK_COMPATIBILITY, this);
     Services.prefs.removeObserver(PREF_EM_CHECK_UPDATE_SECURITY, this);
 
     this.bootstrappedAddons = {};
@@ -3119,9 +3122,9 @@ var XPIProvider = {
    */
   observe: function XPI_observe(aSubject, aTopic, aData) {
     switch (aData) {
-    case this.checkCompatibilityPref:
+    case PREF_EM_CHECK_COMPATIBILITY:
     case PREF_EM_CHECK_UPDATE_SECURITY:
-      this.checkCompatibility = Prefs.getBoolPref(this.checkCompatibilityPref,
+      this.checkCompatibility = Prefs.getBoolPref(PREF_EM_CHECK_COMPATIBILITY,
                                                   true);
       this.checkUpdateSecurity = Prefs.getBoolPref(PREF_EM_CHECK_UPDATE_SECURITY,
                                                    true);
@@ -6624,6 +6627,12 @@ AddonInternal.prototype = {
     return bs.getAddonBlocklistState(this.id, this.version);
   },
 
+  get blocklistURL() {
+    let bs = Cc["@mozilla.org/extensions/blocklist;1"].
+             getService(Ci.nsIBlocklistService);
+    return bs.getAddonBlocklistURL(this.id, this.version);
+  },
+
   applyCompatibilityUpdate: function(aUpdate, aSyncCompatibility) {
     this.targetApplications.forEach(function(aTargetApp) {
       aUpdate.targetApplications.forEach(function(aUpdateTarget) {
@@ -6778,7 +6787,7 @@ function AddonWrapper(aAddon) {
   }
 
   ["id", "version", "type", "isCompatible", "isPlatformCompatible",
-   "providesUpdatesSecurely", "blocklistState", "appDisabled",
+   "providesUpdatesSecurely", "blocklistState", "blocklistURL", "appDisabled",
    "softDisabled", "skinnable", "size"].forEach(function(aProp) {
      this.__defineGetter__(aProp, function() aAddon[aProp]);
   }, this);
diff --git a/toolkit/mozapps/extensions/content/blocklist.js b/toolkit/mozapps/extensions/content/blocklist.js
index ae7d75c1566..4486422e3e4 100644
--- a/toolkit/mozapps/extensions/content/blocklist.js
+++ b/toolkit/mozapps/extensions/content/blocklist.js
@@ -79,11 +79,14 @@ function init() {
   else
     document.getElementById("softBlockMessage").hidden = false;
 
-  var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
-                            .getService(Components.interfaces.nsIURLFormatter);
-  var url = formatter.formatURLPref("extensions.blocklist.detailsURL");
   var link = document.getElementById("moreInfo");
-  link.setAttribute("href", url);
+  if (list.length == 1 && list[0].url) {
+    link.setAttribute("href", list[0].url);
+  }
+  else {
+    var url = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
+    link.setAttribute("href", url);
+  }
 }
 
 function finish(shouldRestartNow) {
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 02a9e81bdf5..2d43aacef78 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -50,7 +50,7 @@ Cu.import("resource://gre/modules/AddonRepository.jsm");
 
 const PREF_DISCOVERURL = "extensions.webservice.discoverURL";
 const PREF_MAXRESULTS = "extensions.getAddons.maxResults";
-const PREF_CHECK_COMPATIBILITY = "extensions.checkCompatibility";
+const PREF_CHECK_COMPATIBILITY_BASE = "extensions.checkCompatibility";
 const PREF_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";
 const PREF_AUTOUPDATE_DEFAULT = "extensions.update.autoUpdateDefault";
 const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
@@ -60,6 +60,14 @@ const PREF_UI_LASTCATEGORY = "extensions.ui.lastCategory";
 
 const BRANCH_REGEXP = /^([^\.]+\.[0-9]+[a-z]*).*/gi;
 
+#ifdef MOZ_COMPATABILITY_NIGHTLY
+const PREF_CHECK_COMPATIBILITY = PREF_CHECK_COMPATIBILITY_BASE +
+                                 ".nightly";
+#else
+const PREF_CHECK_COMPATIBILITY = PREF_CHECK_COMPATIBILITY_BASE + "." +
+                                 Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
+#endif
+
 const LOADING_MSG_DELAY = 100;
 
 const SEARCH_SCORE_MULTIPLIER_NAME = 2;
@@ -306,7 +314,6 @@ else {
 var gEventManager = {
   _listeners: {},
   _installListeners: [],
-  checkCompatibilityPref: "",
 
   initialize: function() {
     var self = this;
@@ -329,11 +336,8 @@ var gEventManager = {
     });
     AddonManager.addInstallListener(this);
     AddonManager.addAddonListener(this);
-    
-    var version = Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
-    this.checkCompatibilityPref = PREF_CHECK_COMPATIBILITY + "." + version;
 
-    Services.prefs.addObserver(this.checkCompatibilityPref, this, false);
+    Services.prefs.addObserver(PREF_CHECK_COMPATIBILITY, this, false);
     Services.prefs.addObserver(PREF_CHECK_UPDATE_SECURITY, this, false);
     Services.prefs.addObserver(PREF_AUTOUPDATE_DEFAULT, this, false);
 
@@ -361,7 +365,7 @@ var gEventManager = {
   },
 
   shutdown: function() {
-    Services.prefs.removeObserver(this.checkCompatibilityPref, this);
+    Services.prefs.removeObserver(PREF_CHECK_COMPATIBILITY, this);
     Services.prefs.removeObserver(PREF_CHECK_UPDATE_SECURITY, this);
     Services.prefs.removeObserver(PREF_AUTOUPDATE_DEFAULT, this, false);
 
@@ -462,7 +466,7 @@ var gEventManager = {
 
     var checkCompatibility = true;
     try {
-      checkCompatibility = Services.prefs.getBoolPref(this.checkCompatibilityPref);
+      checkCompatibility = Services.prefs.getBoolPref(PREF_CHECK_COMPATIBILITY);
     } catch(e) { }
     if (!checkCompatibility) {
       page.setAttribute("warning", "checkcompatibility");
@@ -485,7 +489,7 @@ var gEventManager = {
   
   observe: function(aSubject, aTopic, aData) {
     switch (aData) {
-    case this.checkCompatibilityPref:
+    case PREF_CHECK_COMPATIBILITY:
     case PREF_CHECK_UPDATE_SECURITY:
       this.refreshGlobalWarning();
       break;
@@ -720,7 +724,7 @@ var gViewController = {
     cmd_enableCheckCompatibility: {
       isEnabled: function() true,
       doCommand: function() {
-        Services.prefs.clearUserPref(gEventManager.checkCompatibilityPref);
+        Services.prefs.clearUserPref(PREF_CHECK_COMPATIBILITY);
       }
     },
 
@@ -2747,7 +2751,7 @@ var gDetailView = {
         );
         var errorLink = document.getElementById("detail-error-link");
         errorLink.value = gStrings.ext.GetStringFromName("details.notification.blocked.link");
-        errorLink.href = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
+        errorLink.href = this._addon.blocklistURL;
         errorLink.hidden = false;
       } else if (!this._addon.isCompatible) {
         this.node.setAttribute("notification", "warning");
@@ -2764,7 +2768,7 @@ var gDetailView = {
         );
         var warningLink = document.getElementById("detail-warning-link");
         warningLink.value = gStrings.ext.GetStringFromName("details.notification.softblocked.link");
-        warningLink.href = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
+        warningLink.href = this._addon.blocklistURL;
         warningLink.hidden = false;
       } else if (this._addon.blocklistState == Ci.nsIBlocklistService.STATE_OUTDATED) {
         this.node.setAttribute("notification", "warning");
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 33e2a6344f7..99edcc2fbf7 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -1217,7 +1217,7 @@
                 [this.mAddon.name], 1
               );
               this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link");
-              this._errorLink.href = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
+              this._errorLink.href = this.mAddon.blocklistURL;
               this._errorLink.hidden = false;
             } else if (!isUpgrade && !this.mAddon.isCompatible) {
               this.setAttribute("notification", "warning");
@@ -1234,7 +1234,7 @@
                 [this.mAddon.name], 1
               );
               this._warningLink.value = gStrings.ext.GetStringFromName("notification.softblocked.link");
-              this._warningLink.href = Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL");
+              this._warningLink.href = this.mAddon.blocklistURL;
               this._warningLink.hidden = false;
               this._warningBtn.hidden = true;
             } else if (!isUpgrade && this.mAddon.blocklistState == Ci.nsIBlocklistService.STATE_OUTDATED) {
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index c44638743ea..4aab3dfdd56 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -2,7 +2,7 @@ toolkit.jar:
 % content mozapps %content/mozapps/
 * content/mozapps/extensions/extensions.xul                     (content/extensions.xul)
   content/mozapps/extensions/extensions.css                     (content/extensions.css)
-  content/mozapps/extensions/extensions.js                      (content/extensions.js)
+* content/mozapps/extensions/extensions.js                      (content/extensions.js)
 * content/mozapps/extensions/extensions.xml                     (content/extensions.xml)
   content/mozapps/extensions/updateinfo.xsl                     (content/updateinfo.xsl)
   content/mozapps/extensions/extensions-content.js              (content/extensions-content.js)
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
index dcfb88cd6fc..1797aeef49d 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -55,6 +55,7 @@ const KEY_APPDIR                      = "XCurProcD";
 const FILE_BLOCKLIST                  = "blocklist.xml";
 const PREF_BLOCKLIST_LASTUPDATETIME   = "app.update.lastUpdateTime.blocklist-background-update-timer";
 const PREF_BLOCKLIST_URL              = "extensions.blocklist.url";
+const PREF_BLOCKLIST_ITEM_URL         = "extensions.blocklist.itemURL";
 const PREF_BLOCKLIST_ENABLED          = "extensions.blocklist.enabled";
 const PREF_BLOCKLIST_INTERVAL         = "extensions.blocklist.interval";
 const PREF_BLOCKLIST_LEVEL            = "extensions.blocklist.level";
@@ -417,6 +418,28 @@ Blocklist.prototype = {
     return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
   },
 
+  /* See nsIBlocklistService */
+  getAddonBlocklistURL: function(id, version, appVersion, toolkitVersion) {
+    if (!gBlocklistEnabled)
+      return "";
+
+    if (!this._addonEntries)
+      this._loadBlocklist();
+
+    let blItem = this._addonEntries[id];
+    if (!blItem || !blItem.blockID)
+      return null;
+
+    return this._createBlocklistURL(blItem.blockID);
+  },
+
+  _createBlocklistURL: function(id) {
+    let url = Services.urlFormatter.formatURLPref(PREF_BLOCKLIST_ITEM_URL);
+    url = url.replace(/%blockID%/g, id);
+
+    return url;
+  },
+
   notify: function(aTimer) {
     if (!gBlocklistEnabled)
       return;
@@ -610,7 +633,7 @@ Blocklist.prototype = {
 #
 #    <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
 #      <emItems>
-#        <emItem id="item_1@domain">
+#        <emItem id="item_1@domain" blockID="i1">
 #          <versionRange minVersion="1.0" maxVersion="2.0.*">
 #            <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
 #              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
@@ -629,7 +652,7 @@ Blocklist.prototype = {
 #            </targetApplication>
 #          </versionRange>
 #        </emItem>
-#        <emItem id="item_2@domain">
+#        <emItem id="item_2@domain" blockID="i2">
 #          <versionRange minVersion="3.1" maxVersion="4.*"/>
 #        </emItem>
 #        <emItem id="item_3@domain">
@@ -639,7 +662,7 @@ Blocklist.prototype = {
 #            </targetApplication>
 #          </versionRange>
 #        </emItem>
-#        <emItem id="item_4@domain">
+#        <emItem id="item_4@domain" blockID="i3">
 #          <versionRange>
 #            <targetApplication>
 #              <versionRange minVersion="1.5" maxVersion="1.5.*"/>
@@ -648,7 +671,7 @@ Blocklist.prototype = {
 #        <emItem id="item_5@domain"/>
 #      </emItems>
 #      <pluginItems>
-#        <pluginItem>
+#        <pluginItem blockID="i4">
 #          <!-- All match tags must match a plugin to blocklist a plugin -->
 #          <match name="name" exp="some plugin"/>
 #          <match name="description" exp="1[.]2[.]3"/>
@@ -743,6 +766,8 @@ Blocklist.prototype = {
     // extension for the current application.
     if (result[id].length == 0)
       result[id].push(new BlocklistItemData(null));
+
+    result[id].blockID = blocklistElement.getAttribute("blockID");
   },
 
   _handlePluginItemNode: function(blocklistElement, result) {
@@ -752,7 +777,8 @@ Blocklist.prototype = {
     var matchNodes = blocklistElement.childNodes;
     var blockEntry = {
       matches: {},
-      versions: []
+      versions: [],
+      blockID: null,
     };
     var hasMatch = false;
     for (var x = 0; x < matchNodes.length; ++x) {
@@ -778,6 +804,9 @@ Blocklist.prototype = {
     // Add a default versionRange if there wasn't one specified
     if (blockEntry.versions.length == 0)
       blockEntry.versions.push(new BlocklistItemData(null));
+
+    blockEntry.blockID = blocklistElement.getAttribute("blockID");
+
     result.push(blockEntry);
   },
 
@@ -844,6 +873,34 @@ Blocklist.prototype = {
     return Ci.nsIBlocklistService.STATE_NOT_BLOCKED;
   },
 
+  /* See nsIBlocklistService */
+  getPluginBlocklistURL: function(plugin) {
+    if (!gBlocklistEnabled)
+      return "";
+
+    if (!this._pluginEntries)
+      this._loadBlocklist();
+
+    for each (let blockEntry in this._pluginEntries) {
+      let matchFailed = false;
+      for (let name in blockEntry.matches) {
+        if (!(name in plugin) ||
+            typeof(plugin[name]) != "string" ||
+            !blockEntry.matches[name].test(plugin[name])) {
+          matchFailed = true;
+          break;
+        }
+      }
+
+      if (!matchFailed) {
+        if(!blockEntry.blockID)
+          return null;
+        else
+          return this._createBlocklistURL(blockEntry.blockID);
+      }
+    }
+  },
+
   _blocklistUpdated: function(oldAddonEntries, oldPluginEntries) {
     var addonList = [];
 
@@ -891,7 +948,8 @@ Blocklist.prototype = {
           icon: addons[i].iconURL,
           disable: false,
           blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-          item: addons[i]
+          item: addons[i],
+          url: self.getAddonBlocklistURL(addons[i].id),
         });
       }
 
@@ -927,7 +985,8 @@ Blocklist.prototype = {
               icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
               disable: false,
               blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
-              item: plugins[i]
+              item: plugins[i],
+              url: self.getPluginBlocklistURL(plugins[i]),
             });
           }
         }
@@ -958,25 +1017,39 @@ Blocklist.prototype = {
       // This lets the dialog get the raw js object
       args.wrappedJSObject = args;
 
-      var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
-               getService(Ci.nsIWindowWatcher);
-      ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
-                    "chrome,centerscreen,dialog,modal,titlebar", args);
+      /*
+        Some tests run without UI, so the async code listens to a message
+        that can be sent programatically
+      */
+      let applyBlocklistChanges = function() {
+        for (let i = 0; i < addonList.length; i++) {
+          if (!addonList[i].disable)
+            continue;
 
-      for (let i = 0; i < addonList.length; i++) {
-        if (!addonList[i].disable)
-          continue;
+          if (addonList[i].item instanceof Ci.nsIPluginTag)
+            addonList[i].item.disabled = true;
+          else
+            addonList[i].item.softDisabled = true;
+        }
 
-        if (addonList[i].item instanceof Ci.nsIPluginTag)
-          addonList[i].item.disabled = true;
-        else
-          addonList[i].item.softDisabled = true;
+        if (args.restart)
+          restartApp();
+
+        Services.obs.notifyObservers(self, "blocklist-updated", "");
+        Services.obs.removeObserver(arguments.callee, "addon-blocklist-closed");
       }
 
-      if (args.restart)
-        restartApp();
+      Services.obs.addObserver(applyBlocklistChanges, "addon-blocklist-closed", false)
 
-      Services.obs.notifyObservers(self, "blocklist-updated", "");
+      let blocklistWindow = Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
+                              "chrome,centerscreen,dialog,titlebar", args);
+
+      blocklistWindow.addEventListener("unload", function(event) {
+        if(event.target.location == URI_BLOCKLIST_DIALOG) {
+          applyBlocklistChanges();
+          blocklistWindow.removeEventListener("unload", arguments.callee);
+        }
+      },false)
     });
   },
 
diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in
index fa422f18a73..4a0f40e0a47 100644
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -74,6 +74,6 @@ libs::
 			(cd $$dir && zip -r $(TESTXPI)/$$base.xpi *) \
 		done \
 	fi
-	cd $(TESTROOT)/xpcshell/ && tar -cPf - . | (cd $(TESTROOT)/xpcshell-unpack && tar -xPvf - )
+	cd $(TESTROOT)/xpcshell/ && $(TAR) -cPf - . | (cd $(TESTROOT)/xpcshell-unpack && $(TAR) -xPvf - )
 	sed s/head_addons.js/head_addons.js\ head_unpack.js/ $(TESTROOT)/xpcshell-unpack/xpcshell.ini > $(TESTROOT)/xpcshell-unpack/xpcshell.in_
 	mv $(TESTROOT)/xpcshell-unpack/xpcshell.in_ $(TESTROOT)/xpcshell-unpack/xpcshell.ini
diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js b/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
index 2cd9a471bb9..3f162644cea 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
@@ -19,6 +19,7 @@ let args = {
     icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
     disable: false,
     blocked: false,
+    url: 'http://example.com/bug523784_1',
   }],
 };
 
@@ -49,6 +50,7 @@ function bug523784_test1(win) {
   let bundle = Services.strings.
               createBundle("chrome://mozapps/locale/update/updates.properties");
   let cancelButton = win.document.documentElement.getButton("cancel");
+  let moreInfoLink = win.document.getElementById("moreInfo");
 
   is(cancelButton.getAttribute("label"),
      bundle.GetStringFromName("restartLaterButton"),
@@ -56,7 +58,9 @@ function bug523784_test1(win) {
   is(cancelButton.getAttribute("accesskey"),
      bundle.GetStringFromName("restartLaterButton.accesskey"),
      "Accesskey should also be changed on Cancel button");
-
+  is(moreInfoLink.getAttribute("href"),
+     'http://example.com/bug523784_1',
+     "More Info link should link to a detailed blocklist page.");
   let windowObserver = function(aSubject, aTopic, aData) {
     if (aTopic != "domwindowclosed")
       return;
@@ -66,9 +70,56 @@ function bug523784_test1(win) {
     ok(args.list[0].disable, "Should be blocking add-on");
     ok(!args.restart, "Should not restart browser immediately");
 
-    executeSoon(finish);
+    executeSoon(bug523784_test2);
   };
   Services.ww.registerNotification(windowObserver);
 
   cancelButton.doCommand();
 }
+
+function bug523784_test2(win) {
+  let windowObserver = function(aSubject, aTopic, aData) {
+    if (aTopic != "domwindowopened")
+      return;
+
+    Services.ww.unregisterNotification(windowObserver);
+    let win = aSubject.QueryInterface(Ci.nsIDOMWindow);
+    win.addEventListener("load", function() {
+      win.removeEventListener("load", arguments.callee, false);
+
+    executeSoon(function(){
+      let moreInfoLink = win.document.getElementById("moreInfo");
+      let cancelButton = win.document.documentElement.getButton("cancel");
+      is(moreInfoLink.getAttribute("href"),
+         Services.urlFormatter.formatURLPref("extensions.blocklist.detailsURL"),
+         "More Info link should link to the general blocklist page.");
+      cancelButton.doCommand();
+      executeSoon(finish);
+    })
+    }, false);
+  };
+  Services.ww.registerNotification(windowObserver);
+
+  // Add 2 more addons to the blocked list to check that the more info link
+  // points to the general blocked list page.
+  args.list.push({
+    name: "Bug 523784 softblocked addon 2",
+    version: "2",
+    icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
+    disable: false,
+    blocked: false,
+    url: 'http://example.com/bug523784_2'
+  });
+  args.list.push({
+    name: "Bug 523784 softblocked addon 3",
+    version: "4",
+    icon: "chrome://mozapps/skin/plugins/pluginGeneric.png",
+    disable: false,
+    blocked: false,
+    url: 'http://example.com/bug523784_3'
+  });
+
+  args.wrappedJSObject = args;
+  Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
+                         "chrome,centerscreen,dialog,titlebar", args);
+}
\ No newline at end of file
diff --git a/toolkit/mozapps/extensions/test/browser/browser_details.js b/toolkit/mozapps/extensions/test/browser/browser_details.js
index 44275339650..43a409a8417 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_details.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_details.js
@@ -105,27 +105,32 @@ function test() {
     }],
   }, {
     id: "addon4@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon4@tests.mozilla.org",
     name: "Test add-on 4",
     _userDisabled: true,
     isActive: false,
     blocklistState: Ci.nsIBlocklistService.STATE_SOFTBLOCKED
   }, {
     id: "addon5@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon5@tests.mozilla.org",
     name: "Test add-on 5",
     isActive: false,
     blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
     appDisabled: true
   }, {
     id: "addon6@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon6@tests.mozilla.org",
     name: "Test add-on 6",
     operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE
   }, {
     id: "addon7@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon7@tests.mozilla.org",
     name: "Test add-on 7",
     _userDisabled: true,
     isActive: false
   }, {
     id: "addon8@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon8@tests.mozilla.org",
     name: "Test add-on 8",
     blocklistState: Ci.nsIBlocklistService.STATE_OUTDATED
   }]);
@@ -382,7 +387,7 @@ add_test(function() {
     is(get("detail-warning").textContent, "Test add-on 4 is known to cause security or stability issues.", "Warning message should be correct");
     is_element_visible(get("detail-warning-link"), "Warning link should be visible");
     is(get("detail-warning-link").value, "More Information", "Warning link text should be correct");
-    is(get("detail-warning-link").href, gBlocklistURL, "Warning link should be correct");
+    is(get("detail-warning-link").href, "http://example.com/addon4@tests.mozilla.org", "Warning link should be correct");
     is_element_hidden(get("detail-error"), "Error message should be hidden");
     is_element_hidden(get("detail-error-link"), "Error link should be hidden");
     is_element_hidden(get("detail-pending"), "Pending message should be hidden");
@@ -426,7 +431,7 @@ add_test(function() {
       is(get("detail-warning").textContent, "Test add-on 4 is known to cause security or stability issues.", "Warning message should be correct");
       is_element_visible(get("detail-warning-link"), "Warning link should be visible");
       is(get("detail-warning-link").value, "More Information", "Warning link text should be correct");
-      is(get("detail-warning-link").href, gBlocklistURL, "Warning link should be correct");
+      is(get("detail-warning-link").href, "http://example.com/addon4@tests.mozilla.org", "Warning link should be correct");
       is_element_hidden(get("detail-error"), "Error message should be hidden");
       is_element_hidden(get("detail-error-link"), "Error link should be hidden");
       is_element_hidden(get("detail-pending"), "Pending message should be hidden");
@@ -452,7 +457,7 @@ add_test(function() {
     is(get("detail-error").textContent, "Test add-on 5 has been disabled due to security or stability issues.", "Error message should be correct");
     is_element_visible(get("detail-error-link"), "Error link should be visible");
     is(get("detail-error-link").value, "More Information", "Error link text should be correct");
-    is(get("detail-error-link").href, gBlocklistURL, "Error link should be correct");
+    is(get("detail-error-link").href, "http://example.com/addon5@tests.mozilla.org", "Error link should be correct");
     is_element_hidden(get("detail-pending"), "Pending message should be hidden");
 
     run_next_test();
diff --git a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
index a0a7fdaacd9..dc2646abae2 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_globalwarnings.js
@@ -16,7 +16,20 @@ function end_test() {
 add_test(function() {
   info("Testing compatibility checking warning");
 
-  var version = Services.appinfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1");
+  var channel = "default";
+  try {
+    channel = Services.prefs.getCharPref("app.update.channel");
+  }
+  catch (e) { }
+  if (channel != "aurora" &&
+      channel != "beta" &&
+      channel != "release") {
+    var version = "nightly";
+  }
+  else {
+    version = Services.appinfo.version.replace(/^([^\.]+\.[0-9]+[a-z]*).*/gi, "$1");
+  }
+
   var pref = "extensions.checkCompatibility." + version;
   info("Setting " + pref + " pref to false")
   Services.prefs.setBoolPref(pref, false);
diff --git a/toolkit/mozapps/extensions/test/browser/browser_list.js b/toolkit/mozapps/extensions/test/browser/browser_list.js
index 532261e325f..8d55d576ab9 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_list.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_list.js
@@ -62,22 +62,26 @@ function test() {
                  AddonManager.PERM_CAN_UPGRADE
   }, {
     id: "addon4@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon4@tests.mozilla.org",
     name: "Test add-on 4",
     _userDisabled: true,
     isActive: false,
     blocklistState: Ci.nsIBlocklistService.STATE_SOFTBLOCKED
   }, {
     id: "addon5@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon5@tests.mozilla.org",
     name: "Test add-on 5",
     isActive: false,
     blocklistState: Ci.nsIBlocklistService.STATE_BLOCKED,
     appDisabled: true
   }, {
     id: "addon6@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon6@tests.mozilla.org",
     name: "Test add-on 6",
     operationsRequiringRestart: AddonManager.OP_NEEDS_RESTART_NONE
   }, {
     id: "addon7@tests.mozilla.org",
+    blocklistURL: "http://example.com/addon7@tests.mozilla.org",
     name: "Test add-on 7",
     blocklistState: Ci.nsIBlocklistService.STATE_OUTDATED,
   }]);
@@ -230,7 +234,7 @@ add_test(function() {
     is(get_node(addon, "warning").textContent, "Test add-on 4 is known to cause security or stability issues.", "Warning message should be correct");
     is_element_visible(get_node(addon, "warning-link"), "Warning link should be visible");
     is(get_node(addon, "warning-link").value, "More Information", "Warning link text should be correct");
-    is(get_node(addon, "warning-link").href, gBlocklistURL, "Warning link should be correct");
+    is(get_node(addon, "warning-link").href, "http://example.com/addon4@tests.mozilla.org", "Warning link should be correct");
     is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
     is_element_hidden(get_node(addon, "error-link"), "Error link should be hidden");
     is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
@@ -265,7 +269,7 @@ add_test(function() {
     is(get_node(addon, "error").textContent, "Test add-on 5 has been disabled due to security or stability issues.", "Error message should be correct");
     is_element_visible(get_node(addon, "error-link"), "Error link should be visible");
     is(get_node(addon, "error-link").value, "More Information", "Error link text should be correct");
-    is(get_node(addon, "error-link").href, gBlocklistURL, "Error link should be correct");
+    is(get_node(addon, "error-link").href, "http://example.com/addon5@tests.mozilla.org", "Error link should be correct");
     is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
 
     info("Addon 6");
@@ -461,7 +465,7 @@ add_test(function() {
       is(get_node(addon, "warning").textContent, "Test add-on 4 is known to cause security or stability issues.", "Warning message should be correct");
       is_element_visible(get_node(addon, "warning-link"), "Warning link should be visible");
       is(get_node(addon, "warning-link").value, "More Information", "Warning link text should be correct");
-      is(get_node(addon, "warning-link").href, gBlocklistURL, "Warning link should be correct");
+      is(get_node(addon, "warning-link").href, "http://example.com/addon4@tests.mozilla.org", "Warning link should be correct");
       is_element_hidden(get_node(addon, "error"), "Error message should be hidden");
       is_element_hidden(get_node(addon, "error-link"), "Error link should be hidden");
       is_element_hidden(get_node(addon, "pending"), "Pending message should be hidden");
diff --git a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml b/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml
index 159b8f9a1e7..1f673ef2fb5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml
+++ b/toolkit/mozapps/extensions/test/xpcshell/data/bug455906_block.xml
@@ -2,16 +2,16 @@
 
 <blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
   <emItems>
-    <emItem id="test_bug455906_1@tests.mozilla.org"/>
-    <emItem id="test_bug455906_2@tests.mozilla.org"/>
-    <emItem id="test_bug455906_3@tests.mozilla.org"/>
-    <emItem id="test_bug455906_4@tests.mozilla.org"/>
-    <emItem id="test_bug455906_5@tests.mozilla.org"/>
-    <emItem id="test_bug455906_6@tests.mozilla.org"/>
-    <emItem id="test_bug455906_7@tests.mozilla.org"/>
+    <emItem id="test_bug455906_1@tests.mozilla.org" blockID="test_bug455906_1@tests.mozilla.org"/>
+    <emItem id="test_bug455906_2@tests.mozilla.org" blockID="test_bug455906_2@tests.mozilla.org"/>
+    <emItem id="test_bug455906_3@tests.mozilla.org" blockID="test_bug455906_3@tests.mozilla.org"/>
+    <emItem id="test_bug455906_4@tests.mozilla.org" blockID="test_bug455906_4@tests.mozilla.org"/>
+    <emItem id="test_bug455906_5@tests.mozilla.org" blockID="test_bug455906_5@tests.mozilla.org"/>
+    <emItem id="test_bug455906_6@tests.mozilla.org" blockID="test_bug455906_6@tests.mozilla.org"/>
+    <emItem id="test_bug455906_7@tests.mozilla.org" blockID="test_bug455906_7@tests.mozilla.org"/>
   </emItems>
   <pluginItems>
-    <pluginItem>
+    <pluginItem blockID="test_bug455906_plugin">
       <match name="name" exp="^test_bug455906"/>
     </pluginItem>
   </pluginItems>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
index 402f3b206b0..f984c02ab47 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklistchange.js
@@ -288,6 +288,10 @@ var WindowWatcher = {
       if (!aItem.blocked)
         aItem.disable = true;
     });
+
+    //run the code after the blocklist is closed
+    Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
+
   },
 
   QueryInterface: function(iid) {
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
index 767c5437f11..57092c8776d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug455906.js
@@ -37,6 +37,10 @@
  */
 const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
 
+// Workaround for Bug 658720 - URL formatter can leak during xpcshell tests
+const PREF_BLOCKLIST_ITEM_URL = "extensions.blocklist.itemURL";
+Services.prefs.setCharPref(PREF_BLOCKLIST_ITEM_URL, "http://localhost:4444/blocklist/%blockID%");
+
 do_load_httpd_js();
 
 var ADDONS = [{
@@ -173,6 +177,9 @@ var WindowWatcher = {
       gNotificationCheck(args);
     }
 
+    //run the code after the blocklist is closed
+    Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
+
     // Call the next test after the blocklist has finished up
     do_timeout(0, gTestCheck);
   },
@@ -246,6 +253,12 @@ function check_plugin_state(plugin) {
   return plugin.disabled + "," + plugin.blocklisted;
 }
 
+function create_blocklistURL(blockID){
+  let url = Services.urlFormatter.formatURLPref(PREF_BLOCKLIST_ITEM_URL);
+  url = url.replace(/%blockID%/g, blockID);
+  return url;
+}
+
 // Performs the initial setup
 function run_test() {
   // Setup for test
@@ -458,6 +471,9 @@ function check_test_pt3() {
   restartManager();
   dump("Checking results pt 3\n");
 
+  let blocklist = Cc["@mozilla.org/extensions/blocklist;1"].
+                  getService(Ci.nsIBlocklistService);
+
   AddonManager.getAddonsByIDs([a.id for each (a in ADDONS)], function(addons) {
     // All should have gained the blocklist state, user disabled as previously
     do_check_eq(check_addon_state(addons[0]), "true,false,true");
@@ -473,6 +489,20 @@ function check_test_pt3() {
     // Should have gained the blocklist state but no longer be soft disabled
     do_check_eq(check_addon_state(addons[3]), "false,false,true");
 
+    // Check blockIDs are correct
+    do_check_eq(blocklist.getAddonBlocklistURL(addons[0].id,''),create_blocklistURL(addons[0].id));
+    do_check_eq(blocklist.getAddonBlocklistURL(addons[1].id,''),create_blocklistURL(addons[1].id));
+    do_check_eq(blocklist.getAddonBlocklistURL(addons[2].id,''),create_blocklistURL(addons[2].id));
+    do_check_eq(blocklist.getAddonBlocklistURL(addons[3].id,''),create_blocklistURL(addons[3].id));
+    do_check_eq(blocklist.getAddonBlocklistURL(addons[4].id,''),create_blocklistURL(addons[4].id));
+
+    // All plugins have the same blockID on the test
+    do_check_eq(blocklist.getPluginBlocklistURL(PLUGINS[0]), create_blocklistURL('test_bug455906_plugin'));
+    do_check_eq(blocklist.getPluginBlocklistURL(PLUGINS[1]), create_blocklistURL('test_bug455906_plugin'));
+    do_check_eq(blocklist.getPluginBlocklistURL(PLUGINS[2]), create_blocklistURL('test_bug455906_plugin'));
+    do_check_eq(blocklist.getPluginBlocklistURL(PLUGINS[3]), create_blocklistURL('test_bug455906_plugin'));
+    do_check_eq(blocklist.getPluginBlocklistURL(PLUGINS[4]), create_blocklistURL('test_bug455906_plugin'));
+
     // Shouldn't be changed
     do_check_eq(check_addon_state(addons[5]), "false,false,true");
     do_check_eq(check_addon_state(addons[6]), "false,false,true");
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js
index 285126a48b4..2cecdfe29b9 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_2.js
@@ -39,7 +39,20 @@
 // Disables security checking our updates which haven't been signed
 Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
 // Disables compatibility checking
-Services.prefs.setBoolPref("extensions.checkCompatibility.2", false);
+var channel = "default";
+try {
+  channel = Services.prefs.getCharPref("app.update.channel");
+}
+catch (e) { }
+
+if (channel != "aurora" &&
+    channel != "beta" &&
+    channel != "release") {
+  Services.prefs.setBoolPref("extensions.checkCompatibility.nightly", false);
+}
+else {
+  Services.prefs.setBoolPref("extensions.checkCompatibility.2", false);
+}
 
 var ADDONS = [
   "test_bug470377_1",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js
index 6b943f71f31..83a0539d293 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_3.js
@@ -101,7 +101,20 @@ function run_test_1() {
 
 function run_test_2() {
   // Disable compatibility checks
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.2", false);
+  var channel = "default";
+  try {
+    channel = Services.prefs.getCharPref("app.update.channel");
+  }
+  catch (e) { }
+
+  if (channel != "aurora" &&
+      channel != "beta" &&
+      channel != "release") {
+    Services.prefs.setBoolPref("extensions.checkCompatibility.nightly", false);
+  }
+  else {
+    Services.prefs.setBoolPref("extensions.checkCompatibility.2.2", false);
+  }
   restartManager();
 
   AddonManager.getAddonsByIDs(["bug470377_1@tests.mozilla.org",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js
index e9782c343cb..3958ad681da 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug470377_4.js
@@ -36,6 +36,21 @@
  * ***** END LICENSE BLOCK *****
  */
 
+var channel = "default";
+try {
+  channel = Services.prefs.getCharPref("app.update.channel");
+}
+catch (e) { }
+
+if (channel != "aurora" &&
+    channel != "beta" &&
+    channel != "release") {
+  var checkCompatPref = "extensions.checkCompatibility.nightly";
+}
+else {
+  checkCompatPref = "extensions.checkCompatibility.2.1a";
+}
+
 function run_test() {
   do_test_pending();
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2.1a4", "2");
@@ -74,7 +89,7 @@ function run_test() {
 
 function run_test_1() {
   // Disable compatibility checks
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", false);
+  Services.prefs.setBoolPref(checkCompatPref, false);
   startupManager();
 
   AddonManager.getAddonsByIDs(["bug470377_1@tests.mozilla.org",
@@ -100,7 +115,7 @@ function run_test_1() {
 
 function run_test_2() {
   // Enable compatibility checks
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", true);
+  Services.prefs.setBoolPref(checkCompatPref, true);
   restartManager();
 
   AddonManager.getAddonsByIDs(["bug470377_1@tests.mozilla.org",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
index 3a515486b25..2981432b4d6 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug514327_2.js
@@ -68,9 +68,13 @@ function run_test() {
   if (!plugin)
     do_throw("Plugin tag not found");
 
-  // should be marked as outdated by the blocklist
-  do_check_true(blocklist.getPluginBlocklistState(plugin, "1", "1.9") == nsIBLS.STATE_OUTDATED);
+  //run the code after the blocklist is closed
+  Services.obs.notifyObservers(null, "addon-blocklist-closed", null);
+  do_execute_soon(function() {
+    // should be marked as outdated by the blocklist
+    do_check_true(blocklist.getPluginBlocklistState(plugin, "1", "1.9") == nsIBLS.STATE_OUTDATED);
 
-  // should indicate that a warning should be shown
-  do_check_true(prefs.getBoolPref("plugins.update.notifyUser"));
+    // should indicate that a warning should be shown
+    do_check_true(prefs.getBoolPref("plugins.update.notifyUser"));
+  });
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js
index 502c95788ca..1bbb1b40369 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug521905.js
@@ -45,6 +45,20 @@ Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
 Services.prefs.setBoolPref("extensions.checkCompatibility.2.0pre", false);
 
 function run_test() {
+  var channel = "default";
+  try {
+    channel = Services.prefs.getCharPref("app.update.channel");
+  }
+  catch (e) { }
+
+  // This test is only relevant on builds where the version is included in the
+  // checkCompatibility preference name
+  if (channel != "aurora" &&
+      channel != "beta" &&
+      channel != "release") {
+    return;
+  }
+
   do_test_pending();
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2.0pre", "2");
 
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
index 17ae02a4b0b..0b2383e5346 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bug594058.js
@@ -14,10 +14,6 @@ const Ci = Components.interfaces;
 const extDir = gProfD.clone();
 extDir.append("extensions");
 
-var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
-                       getService(AM_Ci.nsIFastLoadService);
-var gFastLoadFile = null;
-
 var gCachePurged = false;
 
 // Override the window watcher
@@ -64,19 +60,12 @@ function run_test() {
   }, "startupcache-invalidate", false);
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
 
-  gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
-
   startupManager();
   // nsAppRunner takes care of clearing this when a new app is installed
-  do_check_true(gFastLoadFile.exists());
   do_check_false(gCachePurged);
 
   installAllFiles([do_get_addon("test_bug594058")], function() {
     restartManager();
-    do_check_false(gFastLoadFile.exists());
-    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     do_check_true(gCachePurged);
     gCachePurged = false;
 
@@ -93,19 +82,14 @@ function run_test() {
     otherFile.lastModifiedTime = pastTime;
 
     restartManager();
-    do_check_false(gFastLoadFile.exists());
-    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     gCachePurged = false;
 
     otherFile.lastModifiedTime = pastTime + 5000;
     restartManager();
-    do_check_false(gFastLoadFile.exists());
-    gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
     do_check_true(gCachePurged);
     gCachePurged = false;
 
     restartManager();
-    do_check_true(gFastLoadFile.exists());
     do_check_false(gCachePurged);
 
     // Upgrading the app should force a cache flush due to potentially showing
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js b/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js
index 289ab26f96a..a49cafc7bd2 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_checkcompatibility.js
@@ -59,6 +59,8 @@ var ADDONS = [{
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 
+var gIsNightly = false;
+
 function run_test() {
   do_test_pending();
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "2.2.3", "2");
@@ -67,6 +69,16 @@ function run_test() {
     writeInstallRDFForExtension(a, profileDir);
   });
 
+  var channel = "default";
+  try {
+    channel = Services.prefs.getCharPref("app.update.channel");
+  }
+  catch (e) { }
+
+  gIsNightly = channel != "aurora" &&
+               channel != "beta" &&
+               channel != "release";
+
   startupManager();
 
   run_test_1();
@@ -133,7 +145,10 @@ function run_test_1() {
 // Tests that with compatibility checking disabled we see the incompatible
 // add-ons enabled
 function run_test_2() {
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.2", false);
+  if (gIsNightly)
+    Services.prefs.setBoolPref("extensions.checkCompatibility.nightly", false);
+  else
+    Services.prefs.setBoolPref("extensions.checkCompatibility.2.2", false);
   restartManager();
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
@@ -151,7 +166,8 @@ function run_test_2() {
 // Tests that with compatibility checking disabled we see the incompatible
 // add-ons enabled.
 function run_test_3() {
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", false);
+  if (!gIsNightly)
+    Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", false);
   restartManager("2.1a4");
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
@@ -169,7 +185,10 @@ function run_test_3() {
 // Tests that with compatibility checking enabled we see the incompatible
 // add-ons disabled.
 function run_test_4() {
-  Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", true);
+  if (gIsNightly)
+    Services.prefs.setBoolPref("extensions.checkCompatibility.nightly", true);
+  else
+    Services.prefs.setBoolPref("extensions.checkCompatibility.2.1a", true);
   restartManager();
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
index e3a4d87d2d8..61dfc164c6d 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_startup.js
@@ -85,18 +85,21 @@ registerDirectory("XREUSysExt", userDir.parent);
 const profileDir = gProfD.clone();
 profileDir.append("extensions");
 
-var gFastLoadService = AM_Cc["@mozilla.org/fast-load-service;1"].
-                       getService(AM_Ci.nsIFastLoadService);
-var gFastLoadFile = null;
+var gCachePurged = false;
 
 // Set up the profile
 function run_test() {
   do_test_pending();
-  startupManager();
 
-  gFastLoadFile = gFastLoadService.newFastLoadFile("XUL");
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  let obs = AM_Cc["@mozilla.org/observer-service;1"].
+    getService(AM_Ci.nsIObserverService);
+  obs.addObserver({
+    observe: function(aSubject, aTopic, aData) {
+      gCachePurged = true;
+    }
+  }, "startupcache-invalidate", false);
+
+  startupManager();
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -134,9 +137,9 @@ function run_test_1() {
   writeInstallRDFForExtension(addon4, profileDir);
   writeInstallRDFForExtension(addon5, profileDir);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -213,9 +216,9 @@ function run_test_2() {
   dest.append(do_get_expected_addon_name("addon3@tests.mozilla.org"));
   dest.remove(true);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -269,9 +272,9 @@ function run_test_3() {
   dest.remove(true);
   writeInstallRDFForExtension(addon3, profileDir, "addon4@tests.mozilla.org");
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -322,9 +325,9 @@ function run_test_3() {
 function run_test_4() {
   Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_SYSTEM);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -356,9 +359,9 @@ function run_test_4() {
 function run_test_5() {
   Services.prefs.setIntPref("extensions.enabledScopes", AddonManager.SCOPE_USER);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -396,9 +399,9 @@ function run_test_5() {
 function run_test_6() {
   Services.prefs.clearUserPref("extensions.enabledScopes");
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -440,9 +443,9 @@ function run_test_7() {
   dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
   dest.remove(true);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -489,9 +492,9 @@ function run_test_7() {
 function run_test_8() {
   Services.prefs.setIntPref("extensions.enabledScopes", 0);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -532,9 +535,9 @@ function run_test_9() {
   addon2.version = "2.4";
   writeInstallRDFForExtension(addon2, profileDir);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -584,9 +587,9 @@ function run_test_10() {
   addon1.version = "1.3";
   writeInstallRDFForExtension(addon1, userDir);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
@@ -636,9 +639,9 @@ function run_test_11() {
   dest.append(do_get_expected_addon_name("addon2@tests.mozilla.org"));
   dest.remove(true);
 
+  gCachePurged = false;
   restartManager();
-  do_check_false(gFastLoadFile.exists());
-  gFastLoadFile.create(AM_Ci.nsIFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+  do_check_true(gCachePurged);
 
   AddonManager.getAddonsByIDs(["addon1@tests.mozilla.org",
                                "addon2@tests.mozilla.org",
diff --git a/toolkit/mozapps/handling/jar.mn b/toolkit/mozapps/handling/jar.mn
index 9fd5ece71ae..ce09ee1c506 100644
--- a/toolkit/mozapps/handling/jar.mn
+++ b/toolkit/mozapps/handling/jar.mn
@@ -1,6 +1,6 @@
-toolkit.jar:
-% content mozapps %content/mozapps/
-  content/mozapps/handling/handler.css                          (content/handler.css)
-  content/mozapps/handling/handler.xml                          (content/handler.xml)
-  content/mozapps/handling/dialog.xul                           (content/dialog.xul)
-  content/mozapps/handling/dialog.js                            (content/dialog.js)
+toolkit.jar:
+% content mozapps %content/mozapps/
+  content/mozapps/handling/handler.css                          (content/handler.css)
+  content/mozapps/handling/handler.xml                          (content/handler.xml)
+  content/mozapps/handling/dialog.xul                           (content/dialog.xul)
+  content/mozapps/handling/dialog.js                            (content/dialog.js)
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index 5b9870ce151..fbf4e5e8410 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -98,7 +98,7 @@ COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
 # PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
 PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar
 PKG_LANGPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).langpack
-PKG_LANGPACK_PATH = install/
+PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
 LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
 PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).source
 PKG_SRCPACK_PATH =
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 7038e14a3d2..9e4f126bc5d 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -709,10 +709,12 @@ ifdef INSTALL_SDK # Here comes the hard part
 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
 # SDK directory is the libs + a bunch of symlinks
 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
+	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
 	if test -f $(DIST)/include/xpcom-config.h; then \
 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
 	fi
 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
+	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
diff --git a/toolkit/mozapps/plugins/jar.mn b/toolkit/mozapps/plugins/jar.mn
index eb2589bf659..8a908e87151 100644
--- a/toolkit/mozapps/plugins/jar.mn
+++ b/toolkit/mozapps/plugins/jar.mn
@@ -1,11 +1,11 @@
-toolkit.jar:
-% content mozapps %content/mozapps/
-  content/mozapps/plugins/pluginInstallerWizard.xul             (content/pluginInstallerWizard.xul)
-  content/mozapps/plugins/pluginInstallerWizard.js              (content/pluginInstallerWizard.js)
-  content/mozapps/plugins/pluginInstallerWizard.css             (content/pluginInstallerWizard.css)
-  content/mozapps/plugins/pluginInstallerDatasource.js          (content/pluginInstallerDatasource.js)
-  content/mozapps/plugins/pluginInstallerService.js             (content/pluginInstallerService.js)
-  content/mozapps/plugins/pluginProblem.xml                     (content/pluginProblem.xml)
-  content/mozapps/plugins/pluginProblemContent.css              (content/pluginProblemContent.css)
-  content/mozapps/plugins/pluginProblemBinding.css              (content/pluginProblemBinding.css)
-  content/mozapps/plugins/pluginFinderBinding.css               (content/pluginFinderBinding.css)
+toolkit.jar:
+% content mozapps %content/mozapps/
+  content/mozapps/plugins/pluginInstallerWizard.xul             (content/pluginInstallerWizard.xul)
+  content/mozapps/plugins/pluginInstallerWizard.js              (content/pluginInstallerWizard.js)
+  content/mozapps/plugins/pluginInstallerWizard.css             (content/pluginInstallerWizard.css)
+  content/mozapps/plugins/pluginInstallerDatasource.js          (content/pluginInstallerDatasource.js)
+  content/mozapps/plugins/pluginInstallerService.js             (content/pluginInstallerService.js)
+  content/mozapps/plugins/pluginProblem.xml                     (content/pluginProblem.xml)
+  content/mozapps/plugins/pluginProblemContent.css              (content/pluginProblemContent.css)
+  content/mozapps/plugins/pluginProblemBinding.css              (content/pluginProblemBinding.css)
+  content/mozapps/plugins/pluginFinderBinding.css               (content/pluginFinderBinding.css)
diff --git a/toolkit/mozapps/preferences/jar.mn b/toolkit/mozapps/preferences/jar.mn
index 4f6f4aa20e8..908f77eb9e6 100644
--- a/toolkit/mozapps/preferences/jar.mn
+++ b/toolkit/mozapps/preferences/jar.mn
@@ -1,9 +1,9 @@
-toolkit.jar:
-% content mozapps %content/mozapps/
-* content/mozapps/preferences/ocsp.js                           (ocsp.js)
-* content/mozapps/preferences/ocsp.xul                          (ocsp.xul)
-* content/mozapps/preferences/fontbuilder.js                    (fontbuilder.js)
-* content/mozapps/preferences/changemp.js                       (changemp.js)
-* content/mozapps/preferences/changemp.xul                      (changemp.xul)
-* content/mozapps/preferences/removemp.js                       (removemp.js)
-* content/mozapps/preferences/removemp.xul                      (removemp.xul)
+toolkit.jar:
+% content mozapps %content/mozapps/
+* content/mozapps/preferences/ocsp.js                           (ocsp.js)
+* content/mozapps/preferences/ocsp.xul                          (ocsp.xul)
+* content/mozapps/preferences/fontbuilder.js                    (fontbuilder.js)
+* content/mozapps/preferences/changemp.js                       (changemp.js)
+* content/mozapps/preferences/changemp.xul                      (changemp.xul)
+* content/mozapps/preferences/removemp.js                       (removemp.js)
+* content/mozapps/preferences/removemp.xul                      (removemp.xul)
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index d438bcef195..2ae4f436705 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -68,6 +68,7 @@ MAKEFILES_dom="
   dom/interfaces/sidebar/Makefile
   dom/interfaces/storage/Makefile
   dom/interfaces/stylesheets/Makefile
+  dom/interfaces/svg/Makefile
   dom/interfaces/threads/Makefile
   dom/interfaces/traversal/Makefile
   dom/interfaces/xbl/Makefile
@@ -236,6 +237,11 @@ MAKEFILES_content="
   content/html/document/Makefile
   content/html/document/public/Makefile
   content/html/document/src/Makefile
+  content/svg/Makefile
+  content/svg/document/Makefile
+  content/svg/document/src/Makefile
+  content/svg/content/Makefile
+  content/svg/content/src/Makefile
   content/xml/Makefile
   content/xml/content/Makefile
   content/xml/content/src/Makefile
@@ -284,6 +290,7 @@ MAKEFILES_layout="
   layout/style/Makefile
   layout/style/xbl-marquee/Makefile
   layout/tables/Makefile
+  layout/svg/base/src/Makefile
   layout/xul/base/public/Makefile
   layout/xul/base/src/Makefile
   layout/xul/base/src/grid/Makefile
@@ -1104,18 +1111,6 @@ if [ "$MOZ_MATHML" ]; then
   "
 fi
 
-if [ "$MOZ_SVG" ]; then
-  add_makefiles "
-    content/svg/Makefile
-    content/svg/document/Makefile
-    content/svg/document/src/Makefile
-    content/svg/content/Makefile
-    content/svg/content/src/Makefile
-    dom/interfaces/svg/Makefile
-    layout/svg/base/src/Makefile
-  "
-fi
-
 if [ "$MOZ_SMIL" ]; then
   add_makefiles "
     content/smil/Makefile
diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp
index 6d82b614aea..e0110b828b1 100644
--- a/toolkit/xre/nsSigHandlers.cpp
+++ b/toolkit/xre/nsSigHandlers.cpp
@@ -60,7 +60,9 @@
 #include <sys/resource.h>
 #include <unistd.h>
 #include <stdlib.h> // atoi
-#include <ucontext.h>
+#ifndef __arm__ // no arm impl
+#  include <ucontext.h>
+#endif
 #endif
 
 #if defined(SOLARIS)
@@ -188,7 +190,7 @@ static void fpehandler(int signum, siginfo_t *si, void *context)
   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
 #endif
 #endif
-#ifdef LINUX
+#if defined(LINUX) && !defined(__arm__)
   ucontext_t *uc = (ucontext_t *)context;
 
 #if defined(__i386__)
diff --git a/uriloader/exthandler/unix/nsExternalSharingAppService.h b/uriloader/exthandler/unix/nsExternalSharingAppService.h
index 4ccd019a1df..800298c19d4 100644
--- a/uriloader/exthandler/unix/nsExternalSharingAppService.h
+++ b/uriloader/exthandler/unix/nsExternalSharingAppService.h
@@ -43,7 +43,7 @@ class  ShareUiInterface;
 
 #define NS_EXTERNALSHARINGAPPSERVICE_CID \
   {0xea782c90, 0xc6ec, 0x11df, \
-  {0xbd3, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66, 0x74}}
+  {0xbd, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66, 0x74}}
 
 class nsExternalSharingAppService : public nsIExternalSharingAppService
 {
diff --git a/uriloader/prefetch/nsOfflineCacheUpdate.cpp b/uriloader/prefetch/nsOfflineCacheUpdate.cpp
index cabb0ecc816..2ce5da14c2d 100644
--- a/uriloader/prefetch/nsOfflineCacheUpdate.cpp
+++ b/uriloader/prefetch/nsOfflineCacheUpdate.cpp
@@ -508,8 +508,6 @@ nsOfflineCacheUpdateItem::AsyncOnChannelRedirect(nsIChannel *aOldChannel,
     if (NS_FAILED(rv))
         return rv;
 
-    nsCOMPtr<nsICachingChannel> oldCachingChannel =
-        do_QueryInterface(aOldChannel);
     nsCOMPtr<nsICachingChannel> newCachingChannel =
         do_QueryInterface(aNewChannel);
     if (newCachingChannel) {
diff --git a/uriloader/prefetch/nsPrefetchService.cpp b/uriloader/prefetch/nsPrefetchService.cpp
index 9da5e59444c..3fae53bac9f 100644
--- a/uriloader/prefetch/nsPrefetchService.cpp
+++ b/uriloader/prefetch/nsPrefetchService.cpp
@@ -374,9 +374,6 @@ nsPrefetchNode::AsyncOnChannelRedirect(nsIChannel *aOldChannel,
     if (NS_FAILED(rv))
         return rv;
 
-    nsCOMPtr<nsICachingChannel> oldCachingChannel =
-        do_QueryInterface(aOldChannel);
-
     PRBool match;
     rv = newURI->SchemeIs("http", &match); 
     if (NS_FAILED(rv) || !match) {
diff --git a/view/public/nsIViewManager.h b/view/public/nsIViewManager.h
index 77d78b788cb..e3c595aa67e 100644
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@@ -378,6 +378,12 @@ public:
    * @param aTime Last user event time in microseconds
    */
   NS_IMETHOD GetLastUserEventTime(PRUint32& aTime)=0;
+
+  /**
+   * Find the nearest display root view for the view aView. This is the view for
+   * the nearest enclosing popup or the root view for the root document.
+   */
+  static nsIView* GetDisplayRootFor(nsIView* aView);
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIViewManager, NS_IVIEWMANAGER_IID)
diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
index 271ec81749d..d711239fecf 100644
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -344,16 +344,32 @@ static nsRegion ConvertRegionBetweenViews(const nsRegion& aIn,
   return out;
 }
 
-static nsView* GetDisplayRootFor(nsView* aView)
+nsIView* nsIViewManager::GetDisplayRootFor(nsIView* aView)
 {
-  nsView *displayRoot = aView;
+  nsIView *displayRoot = aView;
   for (;;) {
-    nsView *displayParent = displayRoot->GetParent();
+    nsIView *displayParent = displayRoot->GetParent();
     if (!displayParent)
       return displayRoot;
 
     if (displayRoot->GetFloating() && !displayParent->GetFloating())
       return displayRoot;
+
+    // If we have a combobox dropdown popup within a panel popup, both the view
+    // for the dropdown popup and its parent will be floating, so we need to
+    // distinguish this situation. We do this by looking for a widget. Any view
+    // with a widget is a display root, except for plugins.
+    nsIWidget* widget = displayRoot->GetWidget();
+    if (widget) {
+      nsWindowType type;
+      widget->GetWindowType(type);
+      if (type == eWindowType_popup) {
+        NS_ASSERTION(displayRoot->GetFloating() && displayParent->GetFloating(),
+          "this should only happen with floating views that have floating parents");
+        return displayRoot;
+      }
+    }
+
     displayRoot = displayParent;
   }
 }
@@ -658,7 +674,7 @@ NS_IMETHODIMP nsViewManager::UpdateViewNoSuppression(nsIView *aView,
     return NS_OK;
   }
 
-  nsView* displayRoot = GetDisplayRootFor(view);
+  nsView* displayRoot = static_cast<nsView*>(GetDisplayRootFor(view));
   nsViewManager* displayRootVM = displayRoot->GetViewManager();
   // Propagate the update to the displayRoot, since iframes, for example,
   // can overlap each other and be translucent.  So we have to possibly
@@ -1011,7 +1027,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent,
         if (NS_IsEventUsingCoordinates(aEvent)) {
           // will dispatch using coordinates. Pretty bogus but it's consistent
           // with what presshell does.
-          view = GetDisplayRootFor(baseView);
+          view = static_cast<nsView*>(GetDisplayRootFor(baseView));
         }
 
         if (nsnull != view) {
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 85126c4e47a..df2663e6ae2 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -108,10 +108,8 @@ class nsHashKey;
 #endif
 
 #define NS_UI_EVENT                       28
-#ifdef MOZ_SVG
 #define NS_SVG_EVENT                      30
 #define NS_SVGZOOM_EVENT                  31
-#endif // MOZ_SVG
 #ifdef MOZ_SMIL
 #define NS_SMIL_TIME_EVENT                32
 #endif // MOZ_SMIL
@@ -360,7 +358,6 @@ class nsHashKey;
 #define NS_PAGE_SHOW               (NS_PAGETRANSITION_START + 1)
 #define NS_PAGE_HIDE               (NS_PAGETRANSITION_START + 2)
 
-#ifdef MOZ_SVG
 // SVG events
 #define NS_SVG_EVENT_START              2800
 #define NS_SVG_LOAD                     (NS_SVG_EVENT_START)
@@ -373,7 +370,6 @@ class nsHashKey;
 // SVG Zoom events
 #define NS_SVGZOOM_EVENT_START          2900
 #define NS_SVG_ZOOM                     (NS_SVGZOOM_EVENT_START)
-#endif // MOZ_SVG
 
 // XUL command events
 #define NS_XULCOMMAND_EVENT_START       3000
diff --git a/widget/src/cocoa/ComplexTextInputPanel.mm b/widget/src/cocoa/ComplexTextInputPanel.mm
index c3748dc71e4..41b1344a7db 100644
--- a/widget/src/cocoa/ComplexTextInputPanel.mm
+++ b/widget/src/cocoa/ComplexTextInputPanel.mm
@@ -26,9 +26,10 @@
  */
 
 #import "ComplexTextInputPanel.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsServiceManagerUtils.h"
+
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #define kInputWindowHeight 20
 
@@ -91,12 +92,10 @@
     return;
   }
   if (sDoCancel < 0) {
-    nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    NS_ENSURE_TRUE(prefs, );
     PRBool cancelComposition = PR_FALSE;
-    nsresult rv =
-      prefs->GetBoolPref("ui.plugin.cancel_composition_at_input_source_changed",
-                         &cancelComposition);
+    static const char* kPrefName =
+      "ui.plugin.cancel_composition_at_input_source_changed";
+    nsresult rv = Preferences::GetBool(kPrefName, &cancelComposition);
     NS_ENSURE_SUCCESS(rv, );
     sDoCancel = cancelComposition ? 1 : 0;
   }
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 56d37364289..18ef2117845 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -55,15 +55,12 @@
 #include "nsCOMPtr.h"
 #include "nsToolkit.h"
 #include "nsCRT.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 
 #include "nsFontMetrics.h"
 #include "nsIRegion.h"
 #include "nsIRollupListener.h"
 #include "nsIViewManager.h"
 #include "nsIInterfaceRequestor.h"
-#include "nsIServiceManager.h"
 #include "nsILocalFile.h"
 #include "nsILocalFileMac.h"
 #include "nsGfxCIID.h"
@@ -90,6 +87,8 @@
 #include "LayerManagerOGL.h"
 #include "GLContext.h"
 
+#include "mozilla/Preferences.h"
+
 #include <dlfcn.h>
 
 #include <ApplicationServices/ApplicationServices.h>
@@ -97,6 +96,7 @@
 using namespace mozilla::layers;
 using namespace mozilla::gl;
 using namespace mozilla::widget;
+using namespace mozilla;
 
 #undef DEBUG_IME
 #undef DEBUG_UPDATE
@@ -2938,12 +2938,8 @@ NSEvent* gLastDragMouseDownEvent = nil;
   if (!gRollupWidget)
     return;
 
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    PRBool useNativeContextMenus;
-    nsresult rv = prefs->GetBoolPref("ui.use_native_popup_windows", &useNativeContextMenus);
-    if (NS_SUCCEEDED(rv) && useNativeContextMenus)
-      return;
+  if (Preferences::GetBool("ui.use_native_popup_windows", PR_FALSE)) {
+    return;
   }
 
   NSWindow *popupWindow = (NSWindow*)gRollupWidget->GetNativeData(NS_NATIVE_WINDOW);
@@ -3766,11 +3762,8 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
   float scrollDelta = 0;
   float scrollDeltaPixels = 0;
-  PRBool checkPixels = PR_TRUE;
-
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs)
-    prefs->GetBoolPref("mousewheel.enable_pixel_scrolling", &checkPixels);
+  PRBool checkPixels =
+    Preferences::GetBool("mousewheel.enable_pixel_scrolling", PR_TRUE);
 
   // Calling deviceDeltaX or deviceDeltaY on theEvent will trigger a Cocoa
   // assertion and an Objective-C NSInternalInconsistencyException if the
diff --git a/widget/src/cocoa/nsCocoaWindow.mm b/widget/src/cocoa/nsCocoaWindow.mm
index 4cdf91821d6..b739c3154d8 100644
--- a/widget/src/cocoa/nsCocoaWindow.mm
+++ b/widget/src/cocoa/nsCocoaWindow.mm
@@ -52,11 +52,8 @@
 #include "nsIBaseWindow.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIXULWindow.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 #include "nsToolkit.h"
 #include "nsPrintfCString.h"
-#include "nsIServiceManager.h"
 #include "nsIDOMWindow.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMElement.h"
@@ -71,12 +68,15 @@
 #include "gfxPlatform.h"
 #include "qcms.h"
 
+#include "mozilla/Preferences.h"
+
 namespace mozilla {
 namespace layers {
 class LayerManager;
 }
 }
 using namespace mozilla::layers;
+using namespace mozilla;
 
 // defined in nsAppShell.mm
 extern nsCocoaAppModalWindowList *gCocoaAppModalWindowList;
@@ -227,13 +227,7 @@ static void FitRectToVisibleAreaForScreen(nsIntRect &aRect, NSScreen *screen)
 // (native context menus, native tooltips)
 static PRBool UseNativePopupWindows()
 {
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (!prefs)
-    return PR_FALSE;
-
-  PRBool useNativePopupWindows;
-  nsresult rv = prefs->GetBoolPref("ui.use_native_popup_windows", &useNativePopupWindows);
-  return (NS_SUCCEEDED(rv) && useNativePopupWindows);
+  return Preferences::GetBool("ui.use_native_popup_windows", PR_FALSE);
 }
 
 nsresult nsCocoaWindow::Create(nsIWidget *aParent,
diff --git a/widget/src/cocoa/nsFilePicker.mm b/widget/src/cocoa/nsFilePicker.mm
index d4c4594f37e..d63a4324e0c 100644
--- a/widget/src/cocoa/nsFilePicker.mm
+++ b/widget/src/cocoa/nsFilePicker.mm
@@ -53,10 +53,11 @@
 #include "nsIURL.h"
 #include "nsArrayEnumerator.h"
 #include "nsIStringBundle.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 #include "nsCocoaUtils.h"
 #include "nsToolkit.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 const float kAccessoryViewPadding = 5;
 const int   kSaveTypeControlTag = 1;
@@ -92,11 +93,8 @@ static void SetShowHiddenFileState(NSSavePanel* panel)
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   PRBool show = PR_FALSE;
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    nsresult rv = prefs->GetBoolPref(kShowHiddenFilesPref, &show);
-    if (NS_SUCCEEDED(rv))
-      gCallSecretHiddenFileAPI = PR_TRUE;
+  if (NS_SUCCEEDED(Preferences::GetBool(kShowHiddenFilesPref, &show))) {
+    gCallSecretHiddenFileAPI = PR_TRUE;
   }
 
   if (gCallSecretHiddenFileAPI) {
@@ -147,12 +145,8 @@ nsFilePicker::InitNative(nsIWidget *aParent, const nsAString& aTitle,
   mMode = aMode;
 
   // read in initial type index from prefs
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    int prefIndex;
-    if (NS_SUCCEEDED(prefs->GetIntPref(kLastTypeIndexPref, &prefIndex)))
-      mSelectedTypeIndex = prefIndex;
-  }
+  mSelectedTypeIndex =
+    Preferences::GetInt(kLastTypeIndexPref, mSelectedTypeIndex);
 }
 
 NSView* nsFilePicker::GetAccessoryView()
@@ -512,9 +506,7 @@ nsFilePicker::PutLocalFile(const nsString& inTitle, const nsString& inDefaultNam
   if (popupButton) {
     mSelectedTypeIndex = [popupButton indexOfSelectedItem];
     // save out to prefs for initializing other file picker instances
-    nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (prefs)
-      prefs->SetIntPref(kLastTypeIndexPref, mSelectedTypeIndex);
+    Preferences::SetInt(kLastTypeIndexPref, mSelectedTypeIndex);
   }
 
   NSURL* fileURL = [thePanel URL];
diff --git a/widget/src/cocoa/nsPrintSettingsX.mm b/widget/src/cocoa/nsPrintSettingsX.mm
index f9e8d3d4036..047fdc1e86d 100644
--- a/widget/src/cocoa/nsPrintSettingsX.mm
+++ b/widget/src/cocoa/nsPrintSettingsX.mm
@@ -40,17 +40,16 @@
 #include "nsPrintSettingsX.h"
 #include "nsObjCExceptions.h"
 
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
-#include "nsServiceManagerUtils.h"
-
 #include "plbase64.h"
 #include "plstr.h"
 
 #include "nsCocoaUtils.h"
 
-#define PRINTING_PREF_BRANCH            "print."
-#define MAC_OS_X_PAGE_SETUP_PREFNAME    "macosx.pagesetup-2"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
+
+#define MAC_OS_X_PAGE_SETUP_PREFNAME    "print.macosx.pagesetup-2"
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsPrintSettingsX, nsPrintSettings, nsPrintSettingsX)
 
@@ -136,19 +135,12 @@ NS_IMETHODIMP nsPrintSettingsX::ReadPageFormatFromPrefs()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  nsresult rv;
-  nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  if (NS_FAILED(rv))
-    return rv;
-  nsCOMPtr<nsIPrefBranch> prefBranch;
-  rv = prefService->GetBranch(PRINTING_PREF_BRANCH, getter_AddRefs(prefBranch));
-  if (NS_FAILED(rv))
-    return rv;
-      
-  nsXPIDLCString encodedData;
-  rv = prefBranch->GetCharPref(MAC_OS_X_PAGE_SETUP_PREFNAME, getter_Copies(encodedData));
-  if (NS_FAILED(rv))
+  nsCAutoString encodedData;
+  nsresult rv =
+    Preferences::GetCString(MAC_OS_X_PAGE_SETUP_PREFNAME, &encodedData);
+  if (NS_FAILED(rv)) {
     return rv;
+  }
 
   // decode the base64
   char* decodedData = PL_Base64Decode(encodedData.get(), encodedData.Length(), nsnull);
@@ -176,26 +168,17 @@ NS_IMETHODIMP nsPrintSettingsX::WritePageFormatToPrefs()
   if (pageFormat == kPMNoPageFormat)
     return NS_ERROR_NOT_INITIALIZED;
 
-  nsresult rv;
-  nsCOMPtr<nsIPrefService> prefService(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  if (NS_FAILED(rv))
-    return rv;
-  nsCOMPtr<nsIPrefBranch> prefBranch;
-  rv = prefService->GetBranch(PRINTING_PREF_BRANCH, getter_AddRefs(prefBranch));
-  if (NS_FAILED(rv))
-    return rv;
-
   NSData* data = nil;
   OSStatus err = ::PMPageFormatCreateDataRepresentation(pageFormat, (CFDataRef*)&data, kPMDataFormatXMLDefault);
   if (err != noErr)
     return NS_ERROR_FAILURE;
 
-  nsXPIDLCString encodedData;
+  nsCAutoString encodedData;
   encodedData.Adopt(PL_Base64Encode((char*)[data bytes], [data length], nsnull));
   if (!encodedData.get())
     return NS_ERROR_OUT_OF_MEMORY;
 
-  return prefBranch->SetCharPref(MAC_OS_X_PAGE_SETUP_PREFNAME, encodedData);
+  return Preferences::SetCString(MAC_OS_X_PAGE_SETUP_PREFNAME, encodedData);
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
 }
diff --git a/widget/src/cocoa/nsToolkit.mm b/widget/src/cocoa/nsToolkit.mm
index 041f29974d1..9459796adf6 100644
--- a/widget/src/cocoa/nsToolkit.mm
+++ b/widget/src/cocoa/nsToolkit.mm
@@ -69,8 +69,10 @@ extern "C" {
 
 #include "nsIObserverService.h"
 #include "nsIServiceManager.h"
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
+
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 // defined in nsChildView.mm
 extern nsIRollupListener * gRollupListener;
@@ -269,13 +271,8 @@ nsToolkit::RegisterForAllProcessMouseEvents()
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
   // Don't do this for apps that (like Camino) use native context menus.
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    PRBool useNativeContextMenus;
-    nsresult rv = prefs->GetBoolPref("ui.use_native_popup_windows",
-                                     &useNativeContextMenus);
-    if (NS_SUCCEEDED(rv) && useNativeContextMenus)
-      return;
+  if (Preferences::GetBool("ui.use_native_popup_windows", PR_FALSE)) {
+    return;
   }
   if (!mEventMonitorHandler) {
     EventTypeSpec kEvents[] = {{kEventClassMouse, kEventMouseMoved}};
diff --git a/widget/src/gtk2/nsDeviceContextSpecG.cpp b/widget/src/gtk2/nsDeviceContextSpecG.cpp
index a840a9a4682..c84d6686d9f 100644
--- a/widget/src/gtk2/nsDeviceContextSpecG.cpp
+++ b/widget/src/gtk2/nsDeviceContextSpecG.cpp
@@ -53,8 +53,6 @@
 
 #include "nsDeviceContextSpecG.h"
 
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
 #include "prenv.h" /* for PR_GetEnv */
 
 #include "nsPrintfCString.h"
@@ -71,10 +69,14 @@
 #include "nsILocalFile.h"
 #include "nsTArray.h"
 
+#include "mozilla/Preferences.h"
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+using namespace mozilla;
+
 /* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */
 #define MAKE_PR_BOOL(val) ((val)?(PR_TRUE):(PR_FALSE))
 
@@ -193,30 +195,34 @@ private:
   void SetCharValue(  const char *tagname, const char *value );
 
   nsXPIDLCString          mPrinterName;
-  nsCOMPtr<nsIPrefBranch> mPrefs;
 };
 
 void nsPrinterFeatures::SetBoolValue( const char *tagname, PRBool value )
 {
-  mPrefs->SetBoolPref(nsPrintfCString(256, PRINTERFEATURES_PREF ".%s.%s", mPrinterName.get(), tagname).get(), value);
+  nsPrintfCString prefName(256, PRINTERFEATURES_PREF ".%s.%s",
+                           mPrinterName.get(), tagname);
+  Preferences::SetBool(prefName.get(), value);
 }
 
 void nsPrinterFeatures::SetIntValue(  const char *tagname, PRInt32 value )
 {
-  mPrefs->SetIntPref(nsPrintfCString(256, PRINTERFEATURES_PREF ".%s.%s", mPrinterName.get(), tagname).get(), value);
+  nsPrintfCString prefName(256, PRINTERFEATURES_PREF ".%s.%s",
+                           mPrinterName.get(), tagname);
+  Preferences::SetInt(prefName.get(), value);
 }
 
 void nsPrinterFeatures::SetCharValue(  const char *tagname, const char *value )
 {
-  mPrefs->SetCharPref(nsPrintfCString(256, PRINTERFEATURES_PREF ".%s.%s", mPrinterName.get(), tagname).get(), value);
+  nsPrintfCString prefName(256, PRINTERFEATURES_PREF ".%s.%s",
+                           mPrinterName.get(), tagname);
+  Preferences::SetCString(prefName.get(), value);
 }
 
 nsPrinterFeatures::nsPrinterFeatures( const char *printername )
 {
   DO_PR_DEBUG_LOG(("nsPrinterFeatures::nsPrinterFeatures('%s')\n", printername));
   mPrinterName.Assign(printername);
-  mPrefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
- 
+
   SetBoolValue("has_special_printerfeatures", PR_TRUE);
 }
 
@@ -659,8 +665,8 @@ NS_IMETHODIMP nsDeviceContextSpecGTK::EndDocument()
  * - Get prefs
  */
 static
-nsresult CopyPrinterCharPref(nsIPrefBranch *pref, const char *modulename, const char *printername,
-                             const char *prefname, nsXPIDLCString &return_buf)
+nsresult CopyPrinterCharPref(const char *modulename, const char *printername,
+                             const char *prefname, nsCString &return_buf)
 {
   DO_PR_DEBUG_LOG(("CopyPrinterCharPref('%s', '%s', '%s')\n", modulename, printername, prefname));
 
@@ -670,7 +676,7 @@ nsresult CopyPrinterCharPref(nsIPrefBranch *pref, const char *modulename, const
     /* Get prefs per printer name and module name */
     nsPrintfCString name(512, "print.%s.printer_%s.%s", modulename, printername, prefname);
     DO_PR_DEBUG_LOG(("trying to get '%s'\n", name.get()));
-    rv = pref->GetCharPref(name.get(), getter_Copies(return_buf));
+    rv = Preferences::GetCString(name.get(), &return_buf);
   }
   
   if (NS_FAILED(rv)) { 
@@ -678,7 +684,7 @@ nsresult CopyPrinterCharPref(nsIPrefBranch *pref, const char *modulename, const
       /* Get prefs per printer name */
       nsPrintfCString name(512, "print.printer_%s.%s", printername, prefname);
       DO_PR_DEBUG_LOG(("trying to get '%s'\n", name.get()));
-      rv = pref->GetCharPref(name.get(), getter_Copies(return_buf));
+      rv = Preferences::GetCString(name.get(), &return_buf);
     }
 
     if (NS_FAILED(rv)) {
@@ -686,14 +692,14 @@ nsresult CopyPrinterCharPref(nsIPrefBranch *pref, const char *modulename, const
         /* Get prefs per module name */
         nsPrintfCString name(512, "print.%s.%s", modulename, prefname);
         DO_PR_DEBUG_LOG(("trying to get '%s'\n", name.get()));
-        rv = pref->GetCharPref(name.get(), getter_Copies(return_buf));
+        rv = Preferences::GetCString(name.get(), &return_buf);
       }
       
       if (NS_FAILED(rv)) {
         /* Get prefs */
         nsPrintfCString name(512, "print.%s", prefname);
         DO_PR_DEBUG_LOG(("trying to get '%s'\n", name.get()));
-        rv = pref->GetCharPref(name.get(), getter_Copies(return_buf));
+        rv = Preferences::GetCString(name.get(), &return_buf);
       }
     }
   }
@@ -769,10 +775,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
   NS_ENSURE_TRUE(*aPrinterName, NS_ERROR_FAILURE);
   NS_ENSURE_TRUE(aPrintSettings, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIPrefBranch> pPrefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-
   nsXPIDLCString fullPrinterName, /* Full name of printer incl. driver-specific prefix */ 
                  printerName;     /* "Stripped" name of printer */
   fullPrinterName.Assign(NS_ConvertUTF16toUTF8(aPrinterName));
@@ -795,13 +797,16 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
 
 #ifdef SET_PRINTER_FEATURES_VIA_PREFS
   /* Defaults to FALSE */
-  pPrefs->SetBoolPref(nsPrintfCString(256, PRINTERFEATURES_PREF ".%s.has_special_printerfeatures", fullPrinterName.get()).get(), PR_FALSE);
+  nsPrintfCString  prefName(256,
+    PRINTERFEATURES_PREF ".%s.has_special_printerfeatures",
+    fullPrinterName.get());
+  Preferences::SetBool(prefName.get(), PR_FALSE);
 #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
 
   
   /* Set filename */
-  nsXPIDLCString filename;
-  if (NS_FAILED(CopyPrinterCharPref(pPrefs, nsnull, printerName, "filename", filename))) {
+  nsCAutoString filename;
+  if (NS_FAILED(CopyPrinterCharPref(nsnull, printerName, "filename", filename))) {
     const char *path;
   
     if (!(path = PR_GetEnv("PWD")))
@@ -834,8 +839,9 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
     printerFeatures.SetCanChangeOrientation(PR_TRUE);
 #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
 
-    nsXPIDLCString orientation;
-    if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "orientation", orientation))) {
+    nsCAutoString orientation;
+    if (NS_SUCCEEDED(CopyPrinterCharPref("postscript", printerName,
+                                         "orientation", orientation))) {
       if (orientation.LowerCaseEqualsLiteral("portrait")) {
         DO_PR_DEBUG_LOG(("setting default orientation to 'portrait'\n"));
         aPrintSettings->SetOrientation(nsIPrintSettings::kPortraitOrientation);
@@ -891,11 +897,12 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
 #ifdef SET_PRINTER_FEATURES_VIA_PREFS
     printerFeatures.SetCanChangePaperSize(PR_TRUE);
 #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
-    nsXPIDLCString papername;
-    if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", papername))) {
+    nsCAutoString papername;
+    if (NS_SUCCEEDED(CopyPrinterCharPref("postscript", printerName,
+                                         "paper_size", papername))) {
       nsPaperSizePS paper;
 
-      if (paper.Find(papername)) {
+      if (paper.Find(papername.get())) {
         DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n",
               paper.Name(), paper.Width_mm(), paper.Height_mm()));
 	aPrintSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
@@ -938,8 +945,8 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
 #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
 
     if (hasSpoolerCmd) {
-      nsXPIDLCString command;
-      if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript",
+      nsCAutoString command;
+      if (NS_SUCCEEDED(CopyPrinterCharPref("postscript",
             printerName, "print_command", command))) {
         DO_PR_DEBUG_LOG(("setting default print command to '%s'\n",
             command.get()));
@@ -973,11 +980,6 @@ nsresult GlobalPrinters::InitializeGlobalPrinters ()
   if (!mGlobalPrinterList) 
     return NS_ERROR_OUT_OF_MEMORY;
 
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> pPrefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
-  if (NS_FAILED(rv))
-    return rv;
-      
   nsPSPrinterList psMgr;
   if (NS_SUCCEEDED(psMgr.Init()) && psMgr.Enabled()) {
     /* Get the list of PostScript-module printers */
diff --git a/widget/src/gtk2/nsGtkIMModule.cpp b/widget/src/gtk2/nsGtkIMModule.cpp
index 5cc0e008311..85e85bdc951 100644
--- a/widget/src/gtk2/nsGtkIMModule.cpp
+++ b/widget/src/gtk2/nsGtkIMModule.cpp
@@ -49,14 +49,16 @@
 
 #include "nsGtkIMModule.h"
 #include "nsWindow.h"
+#include "mozilla/Preferences.h"
 
 #ifdef MOZ_PLATFORM_MAEMO
 #include "nsServiceManagerUtils.h"
 #include "nsIObserverService.h"
-#include "nsIPrefService.h"
 #include "mozilla/Services.h"
 #endif
 
+using namespace mozilla;
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* gGtkIMLog = nsnull;
 
@@ -594,14 +596,11 @@ nsGtkIMModule::SetInputMode(nsWindow* aCaller, const IMEContext* aContext)
             if (mIMEContext.mStatus != nsIWidget::IME_STATUS_DISABLED && 
                 mIMEContext.mStatus != nsIWidget::IME_STATUS_PLUGIN) {
 
-                nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
-
-                PRBool useStrictPolicy = PR_FALSE;
-                if (NS_SUCCEEDED(prefs->GetBoolPref("content.ime.strict_policy", &useStrictPolicy))) {
-                    if (useStrictPolicy && !mIMEContext.FocusMovedByUser() && 
-                        mIMEContext.FocusMovedInContentProcess()) {
-                        return NS_OK;
-                    }
+                PRBool useStrictPolicy =
+                    Preferences::GetBool("content.ime.strict_policy", PR_FALSE);
+                if (useStrictPolicy && !mIMEContext.FocusMovedByUser() && 
+                    mIMEContext.FocusMovedInContentProcess()) {
+                    return NS_OK;
                 }
             }
 
diff --git a/widget/src/gtk2/nsPSPrinters.cpp b/widget/src/gtk2/nsPSPrinters.cpp
index f8c8582efc4..d5710faac20 100644
--- a/widget/src/gtk2/nsPSPrinters.cpp
+++ b/widget/src/gtk2/nsPSPrinters.cpp
@@ -38,18 +38,19 @@
 
 #include "nscore.h"
 #include "nsCUPSShim.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
 #include "nsIServiceManager.h"
 #include "nsPrintfCString.h"
 #include "nsPSPrinters.h"
 #include "nsReadableUtils.h"        // StringBeginsWith()
 #include "nsCUPSShim.h"
+#include "mozilla/Preferences.h"
 
 #include "prlink.h"
 #include "prenv.h"
 #include "plstr.h"
 
+using namespace mozilla;
+
 #define NS_CUPS_PRINTER "CUPS/"
 #define NS_CUPS_PRINTER_LEN (sizeof(NS_CUPS_PRINTER) - 1)
 
@@ -64,16 +65,12 @@ nsPSPrinterList::Init()
 {
     nsresult rv;
 
-    mPrefSvc = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
-    if (NS_SUCCEEDED(rv))
-        rv = mPrefSvc->GetBranch("print.", getter_AddRefs(mPref));
-    NS_ENSURE_SUCCESS(rv, NS_ERROR_NOT_INITIALIZED);
-
     // Should we try cups?
-    PRBool useCups = PR_TRUE;
-    rv = mPref->GetBoolPref("postscript.cups.enabled", &useCups);
-    if (useCups && !gCupsShim.IsInitialized())
+    PRBool useCups =
+        Preferences::GetBool("print.postscript.cups.enabled", PR_TRUE);
+    if (useCups && !gCupsShim.IsInitialized()) {
         gCupsShim.Init();
+    }
     return NS_OK;
 }
 
@@ -87,9 +84,7 @@ nsPSPrinterList::Enabled()
         return PR_FALSE;
 
     // is the PS module enabled?
-    PRBool setting = PR_TRUE;
-    mPref->GetBoolPref("postscript.enabled", &setting);
-    return setting;
+    return Preferences::GetBool("print.postscript.enabled", PR_TRUE);
 }
 
 
@@ -131,10 +126,10 @@ nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& aList)
     aList.AppendElement(
             NS_LITERAL_CSTRING(NS_POSTSCRIPT_DRIVER_NAME "default"));
 
-    nsXPIDLCString list;
-    list.Assign(PR_GetEnv("MOZILLA_POSTSCRIPT_PRINTER_LIST"));
-    if (list.IsEmpty())
-        mPref->GetCharPref("printer_list", getter_Copies(list));
+    nsCAutoString list(PR_GetEnv("MOZILLA_POSTSCRIPT_PRINTER_LIST"));
+    if (list.IsEmpty()) {
+        list = Preferences::GetCString("print.printer_list");
+    }
     if (!list.IsEmpty()) {
         // For each printer (except "default" which was already added),
         // construct a string "PostScript/<name>" and append it to the list.
diff --git a/widget/src/gtk2/nsPSPrinters.h b/widget/src/gtk2/nsPSPrinters.h
index b5cb6ead4cf..1bfb8150138 100644
--- a/widget/src/gtk2/nsPSPrinters.h
+++ b/widget/src/gtk2/nsPSPrinters.h
@@ -43,8 +43,6 @@
 #include "nsTArray.h"
 #include "prtypes.h"
 
-class nsIPrefService;
-class nsIPrefBranch;
 class nsCUPSShim;
 
 class nsPSPrinterList {
@@ -90,10 +88,6 @@ class nsPSPrinterList {
          * @return The PrinterType value for this name.
          */
         static PrinterType GetPrinterType(const nsACString& aName);
-
-    private:
-        nsCOMPtr<nsIPrefService> mPrefSvc;
-        nsCOMPtr<nsIPrefBranch> mPref;
 };
 
 #endif /* nsPSPrinters_h___ */
diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp
index 19641db09d9..34312438370 100644
--- a/widget/src/gtk2/nsWidgetFactory.cpp
+++ b/widget/src/gtk2/nsWidgetFactory.cpp
@@ -62,8 +62,8 @@
 #include "nsDeviceContextSpecG.h"
 #endif
 
-#include "nsIPrefService.h"
-#include "nsIPrefBranch.h"
+#include "mozilla/Preferences.h"
+
 #include "nsImageToPixbuf.h"
 #include "nsPrintDialogGTK.h"
 
@@ -81,6 +81,8 @@
 #include "nsAutoPtr.h"
 #include <gtk/gtk.h>
 
+using namespace mozilla;
+
 /* from nsFilePicker.js */
 #define XULFILEPICKER_CID \
   { 0x54ae32f8, 0x1dd2, 0x11b2, \
@@ -164,17 +166,9 @@ nsFilePickerConstructor(nsISupports *aOuter, REFNSIID aIID,
     return NS_ERROR_NO_AGGREGATION;
   }
 
-  PRBool allowPlatformPicker = PR_TRUE;
-  nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    PRBool prefAllow;
-    nsresult rv = prefs->GetBoolPref("ui.allow_platform_file_picker",
-                                     &prefAllow);
-    if (NS_SUCCEEDED(rv)) {
-        allowPlatformPicker = prefAllow;
-    }
-  }
-  
+  PRBool allowPlatformPicker =
+      Preferences::GetBool("ui.allow_platform_file_picker", PR_TRUE);
+
   nsCOMPtr<nsIFilePicker> picker;
   if (allowPlatformPicker && gtk_check_version(2,6,3) == NULL) {
       picker = new nsFilePicker;
diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index 8e40828136b..d421dc0df95 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -82,6 +82,7 @@
 #include <startup-notification-1.0/libsn/sn.h>
 #endif
 
+#include "mozilla/Preferences.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsIServiceManager.h"
@@ -97,6 +98,9 @@
 #include "nsIAccessibleDocument.h"
 #include "prenv.h"
 #include "stdlib.h"
+
+using namespace mozilla;
+
 static PRBool sAccessibilityChecked = PR_FALSE;
 /* static */
 PRBool nsWindow::sAccessibilityEnabled = PR_FALSE;
@@ -1093,6 +1097,12 @@ nsWindow::Show(PRBool aState)
         }
     }
 
+#ifdef ACCESSIBILITY
+    if (aState && sAccessibilityEnabled) {
+        CreateRootAccessible();
+    }
+#endif
+
     NativeShow(aState);
 
     return NS_OK;
@@ -4243,10 +4253,6 @@ nsWindow::Create(nsIWidget        *aParent,
 
         }
     }
-    if (sAccessibilityEnabled) {
-        LOG(("nsWindow:: Create Toplevel Accessibility\n"));
-        CreateRootAccessible();
-    }
 #endif
 
 #ifdef MOZ_DFB
@@ -6151,20 +6157,10 @@ drag_data_received_event_cb(GtkWidget *aWidget,
 static nsresult
 initialize_prefs(void)
 {
-    nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (!prefs)
-        return NS_OK;
-
-    PRBool val = PR_TRUE;
-    nsresult rv;
-
-    rv = prefs->GetBoolPref("mozilla.widget.raise-on-setfocus", &val);
-    if (NS_SUCCEEDED(rv))
-        gRaiseWindows = val;
-
-    rv = prefs->GetBoolPref("mozilla.widget.disable-native-theme", &val);
-    if (NS_SUCCEEDED(rv))
-        gDisableNativeTheme = val;
+    gRaiseWindows =
+        Preferences::GetBool("mozilla.widget.raise-on-setfocus", PR_TRUE);
+    gDisableNativeTheme =
+        Preferences::GetBool("mozilla.widget.disable-native-theme", PR_FALSE);
 
     return NS_OK;
 }
@@ -6334,6 +6330,7 @@ void
 nsWindow::CreateRootAccessible()
 {
     if (mIsTopLevel && !mRootAccessible) {
+        LOG(("nsWindow:: Create Toplevel Accessibility\n"));
         nsAccessible *acc = DispatchAccessibleEvent();
 
         if (acc) {
diff --git a/widget/src/qt/nsScreenQt.cpp b/widget/src/qt/nsScreenQt.cpp
index c818ab61b0d..7915ecc0145 100644
--- a/widget/src/qt/nsScreenQt.cpp
+++ b/widget/src/qt/nsScreenQt.cpp
@@ -51,8 +51,20 @@
 #include "mozqorientationsensorfilter.h"
 #endif
 
+#ifdef MOZ_ENABLE_QMSYSTEM2
+#include <qmdisplaystate.h>
+using namespace mozilla;
+
+const int DISPLAY_BLANK_TIMEOUT = 10800; /*3 * 60 * 60 seconds*/
+const int DISPLAY_DIM_TIMEOUT = 10620; /*3 * 59 * 60 seconds*/
+
+#endif
+
 nsScreenQt::nsScreenQt(int aScreen)
     : mScreen(aScreen)
+#ifdef MOZ_ENABLE_QMSYSTEM2
+    , mDisplayState(nsnull)
+#endif
 {
     // nothing else to do. I guess we could cache a bunch of information
     // here, but we want to ask the device at runtime in case anything
@@ -61,11 +73,18 @@ nsScreenQt::nsScreenQt(int aScreen)
 
 nsScreenQt::~nsScreenQt()
 {
-    // nothing to see here.
+#ifdef MOZ_ENABLE_QMSYSTEM2
+    delete mDisplayState;
+    mDisplayState = nsnull;
+#endif
 }
 
 // addref, release, QI
+#ifdef MOZ_ENABLE_QMSYSTEM2
+NS_IMPL_ISUPPORTS2(nsScreenQt, nsIScreen, nsIScreen_MOZILLA_2_0_BRANCH)
+#else
 NS_IMPL_ISUPPORTS1(nsScreenQt, nsIScreen)
+#endif
 
 NS_IMETHODIMP
 nsScreenQt::GetRect(PRInt32 *outLeft,PRInt32 *outTop,
@@ -115,3 +134,27 @@ nsScreenQt::GetColorDepth(PRInt32 *aColorDepth)
     // ###############
     return GetPixelDepth(aColorDepth);
 }
+
+#ifdef MOZ_ENABLE_QMSYSTEM2
+void
+nsScreenQt::ApplyMinimumBrightness(PRUint32 aType)
+{
+    // resets all we did before,
+    // 1) there is no interface to get default values
+    // 2) user might have changed system settings while fennec is running
+    //    there is no notification about that.
+    delete mDisplayState;
+    mDisplayState = nsnull;
+
+    if( aType == BRIGHTNESS_FULL) {
+        mDisplayState = new MeeGo::QmDisplayState();
+
+        // no way to keep display from blanking than setting a huge timeout
+        // parameter is seconds. setting timeout to huge time this should work for 99.9% of our usecases
+        mDisplayState->setDisplayBlankTimeout( DISPLAY_BLANK_TIMEOUT /*in seconds*/ );
+        mDisplayState->setDisplayDimTimeout( DISPLAY_DIM_TIMEOUT /*in seconds*/ );
+        mDisplayState->setDisplayBrightnessValue( mDisplayState->getMaxDisplayBrightnessValue() );
+        mDisplayState->set(MeeGo::QmDisplayState::On);
+     }
+}
+#endif
diff --git a/widget/src/qt/nsScreenQt.h b/widget/src/qt/nsScreenQt.h
index b4ab2139f93..e5bf5733ae8 100644
--- a/widget/src/qt/nsScreenQt.h
+++ b/widget/src/qt/nsScreenQt.h
@@ -43,9 +43,21 @@
 
 #include "nsIScreen.h"
 
+#ifdef MOZ_ENABLE_QMSYSTEM2
+#include "WidgetUtils.h"
+namespace MeeGo
+{
+    class QmDisplayState;
+}
+#endif
+
+
 //------------------------------------------------------------------------
 
 class nsScreenQt : public nsIScreen
+#ifdef MOZ_ENABLE_QMSYSTEM2
+                , public mozilla::widget::BrightnessLockingWidget
+#endif
 {
 public:
   nsScreenQt (int aScreen);
@@ -54,6 +66,11 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISCREEN
 
+#ifdef MOZ_ENABLE_QMSYSTEM2
+  void ApplyMinimumBrightness(PRUint32 aType);
+private:
+  MeeGo::QmDisplayState* mDisplayState;
+#endif
 private:
   int mScreen;
 };
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 7975db48082..435777c2849 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -2660,6 +2660,7 @@ nsNativeThemeWin::ClassicGetMinimumWidgetSize(nsRenderingContext* aContext, nsIF
 nsresult nsNativeThemeWin::ClassicGetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
                                  PRInt32& aPart, PRInt32& aState, PRBool& aFocused)
 {  
+  aFocused = PR_FALSE;
   switch (aWidgetType) {
     case NS_THEME_BUTTON: {
       nsEventStates contentState;
diff --git a/widget/src/windows/nsTextStore.cpp b/widget/src/windows/nsTextStore.cpp
index 26ff1fd5ece..457ccfe3e99 100644
--- a/widget/src/windows/nsTextStore.cpp
+++ b/widget/src/windows/nsTextStore.cpp
@@ -41,10 +41,11 @@
 #include "nscore.h"
 #include "nsTextStore.h"
 #include "nsWindow.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
 #include "prlog.h"
 #include "nsPrintfCString.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 /******************************************************************/
 /* nsTextStore                                                    */
@@ -1331,19 +1332,8 @@ GetLayoutChangeIntervalTime()
   if (sTime > 0)
     return PRUint32(sTime);
 
-  sTime = 100;
-  nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (!prefs)
-    return PRUint32(sTime);
-  nsCOMPtr<nsIPrefBranch> prefBranch;
-  prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
-  if (!prefBranch)
-    return PRUint32(sTime);
-  nsresult rv =
-    prefBranch->GetIntPref("intl.tsf.on_layout_change_interval", &sTime);
-  if (NS_FAILED(rv))
-    return PRUint32(sTime);
-  sTime = PR_MAX(10, sTime);
+  sTime = NS_MAX(10,
+    Preferences::GetInt("intl.tsf.on_layout_change_interval", 100));
   return PRUint32(sTime);
 }
 
@@ -1625,15 +1615,8 @@ nsTextStore::Initialize(void)
     sTextStoreLog = PR_NewLogModule("nsTextStoreWidgets");
 #endif
   if (!sTsfThreadMgr) {
-    PRBool enableTsf = PR_TRUE;
-    nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (prefs) {
-      nsCOMPtr<nsIPrefBranch> prefBranch;
-      prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
-      if (prefBranch && NS_FAILED(prefBranch->GetBoolPref(
-            "intl.enable_tsf_support", &enableTsf)))
-        enableTsf = PR_TRUE;
-    }
+    PRBool enableTsf =
+      Preferences::GetBool("intl.enable_tsf_support", PR_FALSE);
     if (enableTsf) {
       if (SUCCEEDED(CoCreateInstance(CLSID_TF_ThreadMgr, NULL,
             CLSCTX_INPROC_SERVER, IID_ITfThreadMgr,
diff --git a/widget/src/windows/nsWinGesture.cpp b/widget/src/windows/nsWinGesture.cpp
index 385b75899ec..b811666e311 100644
--- a/widget/src/windows/nsWinGesture.cpp
+++ b/widget/src/windows/nsWinGesture.cpp
@@ -43,11 +43,11 @@
 #include "nscore.h"
 #include "nsWinGesture.h"
 #include "nsUXThemeData.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
 #include "nsIDOMSimpleGestureEvent.h"
 #include "nsGUIEvent.h"
+#include "mozilla/Preferences.h"
+
+using namespace mozilla;
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -140,17 +140,8 @@ PRBool nsWinGesture::InitLibrary()
 
   // Check to see if we want single finger gesture input. Only do this once
   // for the app so we don't have to look it up on every window create.
-  nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    nsCOMPtr<nsIPrefBranch> prefBranch;
-    prefs->GetBranch(0, getter_AddRefs(prefBranch));
-    if (prefBranch) {
-      PRBool flag;
-      if (NS_SUCCEEDED(prefBranch->GetBoolPref("gestures.enable_single_finger_input", &flag))
-          && flag)
-        gEnableSingleFingerPanEvents = PR_TRUE;
-    }
-  }
+  gEnableSingleFingerPanEvents =
+    Preferences::GetBool("gestures.enable_single_finger_input", PR_FALSE);
 
   return PR_TRUE;
 }
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 1df847a0546..21859e3b741 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -121,9 +121,6 @@
 #include "nsISupportsPrimitives.h"
 #include "nsIDOMNSUIEvent.h"
 #include "nsITheme.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefBranch2.h"
-#include "nsIPrefService.h"
 #include "nsIObserverService.h"
 #include "nsIScreenManager.h"
 #include "imgIContainer.h"
@@ -160,6 +157,7 @@
 #include "nsWindowGfx.h"
 #include "gfxWindowsPlatform.h"
 #include "Layers.h"
+#include "mozilla/Preferences.h"
 
 #ifdef MOZ_ENABLE_D3D9_LAYER
 #include "LayerManagerD3D9.h"
@@ -212,6 +210,7 @@
 
 using namespace mozilla::widget;
 using namespace mozilla::layers;
+using namespace mozilla;
 
 /**************************************************************
  **************************************************************
@@ -637,44 +636,22 @@ nsWindow::Create(nsIWidget *aParent,
   DispatchStandardEvent(NS_CREATE);
   SubclassWindow(TRUE);
 
+  // If the internal variable set by the config.trim_on_minimize pref has not
+  // been initialized, and if this is the hidden window (conveniently created
+  // before any visible windows, and after the profile has been initialized),
+  // do some initialization work.
   if (sTrimOnMinimize == 2 && mWindowType == eWindowType_invisible) {
-    /* The internal variable set by the config.trim_on_minimize pref
-       has not yet been initialized, and this is the hidden window
-       (conveniently created before any visible windows, and after
-       the profile has been initialized).
-       
-       Default config.trim_on_minimize to false, to fix bug 76831
-       for good.  If anyone complains about this new default, saying
-       that a Mozilla app hogs too much memory while minimized, they
-       will have that entire bug tattooed on their backside. */
-
-    sTrimOnMinimize = 0;
-    nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    if (prefs) {
-      nsCOMPtr<nsIPrefBranch> prefBranch;
-      prefs->GetBranch(0, getter_AddRefs(prefBranch));
-      if (prefBranch) {
-
-        PRBool temp;
-        if (NS_SUCCEEDED(prefBranch->GetBoolPref("config.trim_on_minimize",
-                                                 &temp))
-            && temp)
-          sTrimOnMinimize = 1;
-
-        if (NS_SUCCEEDED(prefBranch->GetBoolPref("intl.keyboard.per_window_layout",
-                                                 &temp)))
-          sSwitchKeyboardLayout = temp;
-
-        if (NS_SUCCEEDED(prefBranch->GetBoolPref("mozilla.widget.disable-native-theme",
-                                                 &temp)))
-          gDisableNativeTheme = temp;
-
-        if (NS_SUCCEEDED(prefBranch->GetBoolPref("mousewheel.enable_pixel_scrolling",
-                                                 &temp))) {
-          sEnablePixelScrolling = temp;
-        }
-      }
-    }
+    // Our internal trim prevention logic is effective on 2K/XP at maintaining
+    // the working set when windows are minimized, but on Vista and up it has
+    // little to no effect. Since this feature has been the source of numerous
+    // bugs over the years, disable it (sTrimOnMinimize=1) on Vista and up.
+    sTrimOnMinimize =
+      Preferences::GetBool("config.trim_on_minimize",
+                           (GetWindowsVersion() >= VISTA_VERSION)) ? 1 : 0;
+    sSwitchKeyboardLayout =
+      Preferences::GetBool("intl.keyboard.per_window_layout", PR_FALSE);
+    gDisableNativeTheme =
+      Preferences::GetBool("mozilla.widget.disable-native-theme", PR_FALSE);
   }
 
   return NS_OK;
@@ -3173,17 +3150,14 @@ struct LayerManagerPrefs {
 static void
 GetLayerManagerPrefs(LayerManagerPrefs* aManagerPrefs)
 {
-  nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    prefs->GetBoolPref("layers.acceleration.disabled",
+  Preferences::GetBool("layers.acceleration.disabled",
                        &aManagerPrefs->mDisableAcceleration);
-    prefs->GetBoolPref("layers.acceleration.force-enabled",
+  Preferences::GetBool("layers.acceleration.force-enabled",
                        &aManagerPrefs->mForceAcceleration);
-    prefs->GetBoolPref("layers.prefer-opengl",
+  Preferences::GetBool("layers.prefer-opengl",
                        &aManagerPrefs->mPreferOpenGL);
-    prefs->GetBoolPref("layers.prefer-d3d9",
+  Preferences::GetBool("layers.prefer-d3d9",
                        &aManagerPrefs->mPreferD3D9);
-  }
 
   const char *acceleratedEnv = PR_GetEnv("MOZ_ACCELERATED");
   aManagerPrefs->mAccelerateByDefault =
@@ -3355,16 +3329,8 @@ nsWindow::OnDefaultButtonLoaded(const nsIntRect &aButtonRect)
     return NS_OK;
   }
 
-  PRBool isAlwaysSnapCursor = PR_FALSE;
-  nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    nsCOMPtr<nsIPrefBranch> prefBranch;
-    prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
-    if (prefBranch) {
-      prefBranch->GetBoolPref("ui.cursor_snapping.always_enabled",
-                              &isAlwaysSnapCursor);
-    }
-  }
+  PRBool isAlwaysSnapCursor =
+    Preferences::GetBool("ui.cursor_snapping.always_enabled", PR_FALSE);
 
   if (!isAlwaysSnapCursor) {
     BOOL snapDefaultButton;
@@ -4342,7 +4308,6 @@ DisplaySystemMenu(HWND hWnd, nsSizeMode sizeMode, PRBool isRtl, PRInt32 x, PRInt
     mii.fState = MF_GRAYED;
     switch(sizeMode) {
       case nsSizeMode_Fullscreen:
-        SetMenuItemInfo(hMenu, SC_RESTORE, FALSE, &mii);
         // intentional fall through
       case nsSizeMode_Maximized:
         SetMenuItemInfo(hMenu, SC_SIZE, FALSE, &mii);
@@ -4660,16 +4625,10 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
           // Changing nsIPrefBranch entry which triggers callbacks
           // and flows into calling mDeviceContext->FlushFontCache()
           // to update the font cache in all the instance of Browsers
-          nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-          if (prefs) {
-            nsCOMPtr<nsIPrefBranch> fiPrefs;
-            prefs->GetBranch("font.internaluseonly.", getter_AddRefs(fiPrefs));
-            if (fiPrefs) {
-              PRBool fontInternalChange = PR_FALSE;
-              fiPrefs->GetBoolPref("changed", &fontInternalChange);
-              fiPrefs->SetBoolPref("changed", !fontInternalChange);
-            }
-          }
+          const char* kPrefName = "font.internaluseonly.changed";
+          PRBool fontInternalChange =
+            Preferences::GetBool(kPrefName, PR_FALSE);
+          Preferences::SetBool(kPrefName, !fontInternalChange);
         }
       } //if (NS_SUCCEEDED(rv))
     }
@@ -5268,6 +5227,13 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
                           MOZ_SYSCONTEXT_Y_POS);
         result = PR_TRUE;
       }
+      if (filteredWParam == SC_RESTORE &&
+          mSizeMode == nsSizeMode_Fullscreen) {
+        // Windows can handle restoring a normal window, but it doesn't
+        // understand our full screen mode.
+        MakeFullScreen(PR_FALSE);
+        result = PR_TRUE;
+      }
     }
     break;
 
@@ -6335,6 +6301,9 @@ nsWindow::InitMouseWheelScrollData()
     // See the comments for the case sMouseWheelScrollLines > WHEEL_DELTA.
     sMouseWheelScrollChars = WHEEL_PAGESCROLL;
   }
+
+  sEnablePixelScrolling =
+    Preferences::GetBool("mousewheel.enable_pixel_scrolling", PR_TRUE);
 }
 
 /* static */
@@ -7707,15 +7676,8 @@ PRBool nsWindow::OnScroll(UINT aMsg, WPARAM aWParam, LPARAM aLParam)
 {
   static PRInt8 sMouseWheelEmulation = -1;
   if (sMouseWheelEmulation < 0) {
-    nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    NS_ENSURE_TRUE(prefs, PR_FALSE);
-    nsCOMPtr<nsIPrefBranch> prefBranch;
-    prefs->GetBranch(0, getter_AddRefs(prefBranch));
-    NS_ENSURE_TRUE(prefBranch, PR_FALSE);
-    PRBool emulate;
-    nsresult rv =
-      prefBranch->GetBoolPref("mousewheel.emulate_at_wm_scroll", &emulate);
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
+    PRBool emulate =
+      Preferences::GetBool("mousewheel.emulate_at_wm_scroll", PR_FALSE);
     sMouseWheelEmulation = PRInt8(emulate);
   }
 
@@ -8078,10 +8040,8 @@ nsWindow::GetRootAccessible()
   static int accForceDisable = -1;
 
   if (accForceDisable == -1) {
-    nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
-    PRBool b = PR_FALSE;
-    nsresult rv = prefs->GetBoolPref("accessibility.win32.force_disabled", &b);
-    if (NS_SUCCEEDED(rv) && b) {
+    const char* kPrefName = "accessibility.win32.force_disabled";
+    if (Preferences::GetBool(kPrefName, PR_FALSE)) {
       accForceDisable = 1;
     } else {
       accForceDisable = 0;
@@ -8785,17 +8745,11 @@ PRBool nsWindow::CanTakeFocus()
 
 void nsWindow::GetMainWindowClass(nsAString& aClass)
 {
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv) && prefs) {
-    nsXPIDLCString name;
-    rv = prefs->GetCharPref("ui.window_class_override", getter_Copies(name));
-    if (NS_SUCCEEDED(rv) && !name.IsEmpty()) {
-      aClass.AssignASCII(name.get());
-      return;
-    }
+  NS_PRECONDITION(aClass.IsEmpty(), "aClass should be empty string");
+  nsresult rv = Preferences::GetString("ui.window_class_override", &aClass);
+  if (NS_FAILED(rv) || aClass.IsEmpty()) {
+    aClass.AssignASCII(sDefaultMainWindowClass);
   }
-  aClass.AssignASCII(sDefaultMainWindowClass);
 }
 
 /**
@@ -8815,20 +8769,15 @@ PRBool nsWindow::GetInputWorkaroundPref(const char* aPrefName,
     return aValueIfAutomatic;
   }
 
-  nsresult rv;
-  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
-  if (NS_SUCCEEDED(rv) && prefs) {
-    PRInt32 lHackValue;
-    rv = prefs->GetIntPref(aPrefName, &lHackValue);
-    if (NS_SUCCEEDED(rv)) {
-      switch (lHackValue) {
-        case 0: // disabled
-          return PR_FALSE;
-        case 1: // enabled
-          return PR_TRUE;
-        default: // -1: autodetect
-          break;
-      }
+  PRInt32 lHackValue = 0;
+  if (NS_SUCCEEDED(Preferences::GetInt(aPrefName, &lHackValue))) {
+    switch (lHackValue) {
+      case 0: // disabled
+        return PR_FALSE;
+      case 1: // enabled
+        return PR_TRUE;
+      default: // -1: autodetect
+        break;
     }
   }
   return aValueIfAutomatic;
diff --git a/widget/src/xpwidgets/GfxInfoBase.cpp b/widget/src/xpwidgets/GfxInfoBase.cpp
index 15878c7b4c1..2205e938495 100644
--- a/widget/src/xpwidgets/GfxInfoBase.cpp
+++ b/widget/src/xpwidgets/GfxInfoBase.cpp
@@ -197,13 +197,14 @@ RemovePrefForFeature(PRInt32 aFeature)
 static bool
 GetPrefValueForDriverVersion(nsCString& aVersion)
 {
-  return NS_SUCCEEDED(Preferences::GetChar(SUGGESTED_VERSION_PREF, &aVersion));
+  return NS_SUCCEEDED(Preferences::GetCString(SUGGESTED_VERSION_PREF,
+                                              &aVersion));
 }
 
 static void
-SetPrefValueForDriverVersion(const nsString& aVersion)
+SetPrefValueForDriverVersion(const nsAString& aVersion)
 {
-  Preferences::SetChar(SUGGESTED_VERSION_PREF, aVersion);
+  Preferences::SetString(SUGGESTED_VERSION_PREF, aVersion);
 }
 
 static void
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index ca45ef174b7..609abec7bf7 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -93,7 +93,7 @@ nsNativeTheme::GetContentState(nsIFrame* aFrame, PRUint8 aWidgetType)
     return nsEventStates();
 
   nsEventStateManager* esm = shell->GetPresContext()->EventStateManager();
-  nsEventStates flags = esm->GetContentState(aFrame->GetContent(), PR_TRUE);
+  nsEventStates flags = esm->GetContentState(aFrame->GetContent());
   
   if (isXULCheckboxRadio && aWidgetType == NS_THEME_RADIO) {
     if (IsFocused(aFrame))
diff --git a/widget/src/xpwidgets/nsPrintOptionsImpl.cpp b/widget/src/xpwidgets/nsPrintOptionsImpl.cpp
index cd9e3aadcff..8152eb1289e 100644
--- a/widget/src/xpwidgets/nsPrintOptionsImpl.cpp
+++ b/widget/src/xpwidgets/nsPrintOptionsImpl.cpp
@@ -308,7 +308,7 @@ nsPrintOptions::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName,
 
 #define GETSTRPREF(_prefname, _retval)                  \
   NS_SUCCEEDED(                                         \
-    Preferences::GetChar(                               \
+    Preferences::GetString(                             \
       GetPrefName(_prefname, aPrinterName), _retval     \
     )                                                   \
   )
@@ -623,7 +623,7 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
       DUMP_DBL(kWriteStr, kPrintPaperHeight, height);
       WritePrefDouble(GetPrefName(kPrintPaperHeight, aPrinterName), height);
       DUMP_STR(kWriteStr, kPrintPaperName, name);
-      Preferences::SetChar(GetPrefName(kPrintPaperName, aPrinterName), name);
+      Preferences::SetString(GetPrefName(kPrintPaperName, aPrinterName), name);
     }
   }
 
@@ -652,48 +652,48 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
   if (aFlags & nsIPrintSettings::kInitSaveHeaderLeft) {
     if (NS_SUCCEEDED(aPS->GetHeaderStrLeft(&uStr))) {
       DUMP_STR(kWriteStr, kPrintHeaderStrLeft, uStr);
-      Preferences::SetChar(GetPrefName(kPrintHeaderStrLeft, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintHeaderStrLeft, aPrinterName),
+                             uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveHeaderCenter) {
     if (NS_SUCCEEDED(aPS->GetHeaderStrCenter(&uStr))) {
       DUMP_STR(kWriteStr, kPrintHeaderStrCenter, uStr);
-      Preferences::SetChar(GetPrefName(kPrintHeaderStrCenter, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintHeaderStrCenter, aPrinterName),
+                             uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveHeaderRight) {
     if (NS_SUCCEEDED(aPS->GetHeaderStrRight(&uStr))) {
       DUMP_STR(kWriteStr, kPrintHeaderStrRight, uStr);
-      Preferences::SetChar(GetPrefName(kPrintHeaderStrRight, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintHeaderStrRight, aPrinterName),
+                             uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveFooterLeft) {
     if (NS_SUCCEEDED(aPS->GetFooterStrLeft(&uStr))) {
       DUMP_STR(kWriteStr, kPrintFooterStrLeft, uStr);
-      Preferences::SetChar(GetPrefName(kPrintFooterStrLeft, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintFooterStrLeft, aPrinterName),
+                             uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveFooterCenter) {
     if (NS_SUCCEEDED(aPS->GetFooterStrCenter(&uStr))) {
       DUMP_STR(kWriteStr, kPrintFooterStrCenter, uStr);
-      Preferences::SetChar(GetPrefName(kPrintFooterStrCenter, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintFooterStrCenter, aPrinterName),
+                             uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveFooterRight) {
     if (NS_SUCCEEDED(aPS->GetFooterStrRight(&uStr))) {
       DUMP_STR(kWriteStr, kPrintFooterStrRight, uStr);
-      Preferences::SetChar(GetPrefName(kPrintFooterStrRight, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintFooterStrRight, aPrinterName),
+                             uStr);
     }
   }
 
@@ -728,7 +728,7 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
   if (aFlags & nsIPrintSettings::kInitSavePlexName) {
     if (NS_SUCCEEDED(aPS->GetPlexName(&uStr))) {
       DUMP_STR(kWriteStr, kPrintPlexName, uStr);
-      Preferences::SetChar(GetPrefName(kPrintPlexName, aPrinterName), uStr);
+      Preferences::SetString(GetPrefName(kPrintPlexName, aPrinterName), uStr);
     }
   }
 
@@ -743,15 +743,15 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
   if (aFlags & nsIPrintSettings::kInitSaveColorspace) {
     if (NS_SUCCEEDED(aPS->GetColorspace(&uStr))) {
       DUMP_STR(kWriteStr, kPrintColorspace, uStr);
-      Preferences::SetChar(GetPrefName(kPrintColorspace, aPrinterName), uStr);
+      Preferences::SetString(GetPrefName(kPrintColorspace, aPrinterName), uStr);
     }
   }
 
   if (aFlags & nsIPrintSettings::kInitSaveResolutionName) {
     if (NS_SUCCEEDED(aPS->GetResolutionName(&uStr))) {
       DUMP_STR(kWriteStr, kPrintResolutionName, uStr);
-      Preferences::SetChar(GetPrefName(kPrintResolutionName, aPrinterName),
-                           uStr);
+      Preferences::SetString(GetPrefName(kPrintResolutionName, aPrinterName),
+                             uStr);
     }
   }
 
@@ -772,7 +772,7 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
   if (aFlags & nsIPrintSettings::kInitSavePrintCommand) {
     if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) {
       DUMP_STR(kWriteStr, kPrintCommand, uStr);
-      Preferences::SetChar(GetPrefName(kPrintCommand, aPrinterName), uStr);
+      Preferences::SetString(GetPrefName(kPrintCommand, aPrinterName), uStr);
     }
   }
 
@@ -781,7 +781,7 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
       && aPrinterName.IsEmpty()) {
     if (NS_SUCCEEDED(aPS->GetPrinterName(&uStr))) {
       DUMP_STR(kWriteStr, kPrinterName, uStr);
-      Preferences::SetChar(kPrinterName, uStr);
+      Preferences::SetString(kPrinterName, uStr);
     }
   }
 
@@ -795,7 +795,7 @@ nsPrintOptions::WritePrefs(nsIPrintSettings *aPS, const nsAString& aPrinterName,
   if (aFlags & nsIPrintSettings::kInitSaveToFileName) {
     if (NS_SUCCEEDED(aPS->GetToFileName(&uStr))) {
       DUMP_STR(kWriteStr, kPrintToFileName, uStr);
-      Preferences::SetChar(GetPrefName(kPrintToFileName, aPrinterName), uStr);
+      Preferences::SetString(GetPrefName(kPrintToFileName, aPrinterName), uStr);
     }
   }
 
@@ -906,7 +906,7 @@ nsPrintOptions::GetDefaultPrinterName(PRUnichar * *aDefaultPrinterName)
 
   // Look up the printer from the last print job
   nsAutoString lastPrinterName;
-  Preferences::GetChar(kPrinterName, &lastPrinterName);
+  Preferences::GetString(kPrinterName, &lastPrinterName);
   if (!lastPrinterName.IsEmpty()) {
     // Verify it's still a valid printer
     nsCOMPtr<nsIStringEnumerator> printers;
@@ -1096,7 +1096,7 @@ nsPrintOptions::ReadPrefDouble(const char * aPrefId, double& aVal)
   NS_ENSURE_ARG_POINTER(aPrefId);
 
   nsCAutoString str;
-  nsresult rv = Preferences::GetChar(aPrefId, &str);
+  nsresult rv = Preferences::GetCString(aPrefId, &str);
   if (NS_SUCCEEDED(rv) && !str.IsEmpty()) {
     aVal = atof(str.get());
   }
@@ -1111,7 +1111,7 @@ nsPrintOptions::WritePrefDouble(const char * aPrefId, double aVal)
   nsPrintfCString str("%6.2f", aVal);
   NS_ENSURE_TRUE(!str.IsEmpty(), NS_ERROR_FAILURE);
 
-  return Preferences::SetChar(aPrefId, str);
+  return Preferences::SetCString(aPrefId, str);
 }
 
 void
@@ -1119,9 +1119,9 @@ nsPrintOptions::ReadInchesToTwipsPref(const char * aPrefId, PRInt32& aTwips,
                                       const char * aMarginPref)
 {
   nsCAutoString str;
-  nsresult rv = Preferences::GetChar(aPrefId, &str);
+  nsresult rv = Preferences::GetCString(aPrefId, &str);
   if (NS_FAILED(rv) || str.IsEmpty()) {
-    rv = Preferences::GetChar(aMarginPref, &str);
+    rv = Preferences::GetCString(aMarginPref, &str);
   }
   if (NS_SUCCEEDED(rv) && !str.IsEmpty()) {
     nsAutoString justStr;
@@ -1143,7 +1143,7 @@ nsPrintOptions::WriteInchesFromTwipsPref(const char * aPrefId, PRInt32 aTwips)
   nsCAutoString inchesStr;
   inchesStr.AppendFloat(inches);
 
-  Preferences::SetChar(aPrefId, inchesStr);
+  Preferences::SetCString(aPrefId, inchesStr);
 }
 
 void
@@ -1175,7 +1175,7 @@ nsPrintOptions::ReadJustification(const char * aPrefId, PRInt16& aJust,
 {
   aJust = aInitValue;
   nsAutoString justStr;
-  if (NS_SUCCEEDED(Preferences::GetChar(aPrefId, &justStr))) {
+  if (NS_SUCCEEDED(Preferences::GetString(aPrefId, &justStr))) {
     if (justStr.EqualsASCII(kJustRight)) {
       aJust = nsIPrintSettings::kJustRight;
     } else if (justStr.EqualsASCII(kJustCenter)) {
@@ -1192,15 +1192,15 @@ nsPrintOptions::WriteJustification(const char * aPrefId, PRInt16 aJust)
 {
   switch (aJust) {
     case nsIPrintSettings::kJustLeft:
-      Preferences::SetChar(aPrefId, kJustLeft);
+      Preferences::SetCString(aPrefId, kJustLeft);
       break;
 
     case nsIPrintSettings::kJustCenter:
-      Preferences::SetChar(aPrefId, kJustCenter);
+      Preferences::SetCString(aPrefId, kJustCenter);
       break;
 
     case nsIPrintSettings::kJustRight:
-      Preferences::SetChar(aPrefId, kJustRight);
+      Preferences::SetCString(aPrefId, kJustRight);
       break;
   } //switch
 }
diff --git a/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/widget/src/xpwidgets/nsXPLookAndFeel.cpp
index e9a213ebcd9..594b481d070 100644
--- a/widget/src/xpwidgets/nsXPLookAndFeel.cpp
+++ b/widget/src/xpwidgets/nsXPLookAndFeel.cpp
@@ -259,7 +259,7 @@ void
 nsXPLookAndFeel::ColorPrefChanged (unsigned int index, const char *prefName)
 {
   nsAutoString colorStr;
-  nsresult rv = Preferences::GetChar(prefName, &colorStr);
+  nsresult rv = Preferences::GetString(prefName, &colorStr);
   if (NS_FAILED(rv)) {
     return;
   }
@@ -314,7 +314,7 @@ void
 nsXPLookAndFeel::InitColorFromPref(PRInt32 i)
 {
   nsAutoString colorStr;
-  nsresult rv = Preferences::GetChar(sColorPrefs[i], &colorStr);
+  nsresult rv = Preferences::GetString(sColorPrefs[i], &colorStr);
   if (NS_FAILED(rv) || colorStr.IsEmpty()) {
     return;
   }
diff --git a/widget/tests/test_bug485118.xul b/widget/tests/test_bug485118.xul
index 507ecc73dc0..a5e86b302c3 100644
--- a/widget/tests/test_bug485118.xul
+++ b/widget/tests/test_bug485118.xul
@@ -54,7 +54,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=485118
 
 SimpleTest.waitForExplicitFinish();
 
-SimpleTest.executeSoon(function start() {
+function runTest() {
   ["horizontal", "vertical"].forEach(function (orient) {
     ["", "Small"].forEach(function (size) {
       var elem = document.getElementById(orient + size);
@@ -65,8 +65,8 @@ SimpleTest.executeSoon(function start() {
     });
   });
   SimpleTest.finish();
-});
-
+}
+window.addEventListener("load", runTest, false);
 
 ]]>
 </script>
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index f050ea642c6..efa76216e4b 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -53,7 +53,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 6;
+  static const unsigned int kVersion = 7;
 
   struct CIDEntry;
 
diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h
index 22d8308a578..02e1b77fe66 100644
--- a/xpcom/glue/nsCycleCollectionParticipant.h
+++ b/xpcom/glue/nsCycleCollectionParticipant.h
@@ -436,6 +436,20 @@ public:
                  "not the nsISupports pointer we expect");                     \
     _class *tmp = Downcast(s);
 
+#define NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(_class, _base_class)    \
+  void                                                                         \
+  NS_CYCLE_COLLECTION_CLASSNAME(_class)::Trace(void *p,                        \
+                                               TraceCallback aCallback,        \
+                                               void *aClosure)                 \
+  {                                                                            \
+    nsISupports *s = static_cast<nsISupports*>(p);                             \
+    NS_ASSERTION(CheckForRightISupports(s),                                    \
+                 "not the nsISupports pointer we expect");                     \
+    _class *tmp = static_cast<_class*>(Downcast(s));                           \
+    NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Trace(s,                       \
+                                                      aCallback,               \
+                                                      aClosure);
+
 #define NS_IMPL_CYCLE_COLLECTION_TRACE_NATIVE_BEGIN(_class)                    \
   void                                                                         \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Trace(void *p,                        \
diff --git a/xpcom/glue/nsID.h b/xpcom/glue/nsID.h
index 2abb34c2c7c..26da5d6bb96 100644
--- a/xpcom/glue/nsID.h
+++ b/xpcom/glue/nsID.h
@@ -73,9 +73,10 @@ struct nsID {
    */
 
   inline PRBool Equals(const nsID& other) const {
+    // First cast to void* in order to silence the alignment warnings.
     return
-      ((PRUint64*) &m0)[0] == ((PRUint64*) &other.m0)[0] &&
-      ((PRUint64*) &m0)[1] == ((PRUint64*) &other.m0)[1];
+      ((PRUint64*)(void*) &m0)[0] == ((PRUint64*)(void*) &other.m0)[0] &&
+      ((PRUint64*)(void*) &m0)[1] == ((PRUint64*)(void*) &other.m0)[1];
   }
 
   /**
diff --git a/xpcom/system/nsIBlocklistService.idl b/xpcom/system/nsIBlocklistService.idl
index a829ff57dbc..43e6a5ad249 100644
--- a/xpcom/system/nsIBlocklistService.idl
+++ b/xpcom/system/nsIBlocklistService.idl
@@ -42,7 +42,7 @@
 interface nsIPluginTag;
 interface nsIVariant;
 
-[scriptable, uuid(8439f9c0-da03-4260-8b21-dc635eed28fb)]
+[scriptable, uuid(31845f85-718a-4581-a672-a45c0327cb21)]
 interface nsIBlocklistService : nsISupports
 {
   // Indicates that the item does not appear in the blocklist.
@@ -114,6 +114,24 @@ interface nsIBlocklistService : nsISupports
   unsigned long getPluginBlocklistState(in nsIPluginTag plugin,
                                         [optional] in AString appVersion,
                                         [optional] in AString toolkitVersion);
+
+  /**
+   * Determine the blocklist web page of an add-on.
+   * @param   id
+   *          The ID of the blocked add-on.
+   * @returns The URL of the description page.
+   */
+  AString getAddonBlocklistURL(in AString id, in AString version,
+                              [optional] in AString appVersion,
+                              [optional] in AString toolkitVersion);
+
+  /**
+   * Determine the blocklist web page of a plugin.
+   * @param   plugin
+   *          The blocked plugin that we are determining the web page for.
+   * @returns The URL of the description page.
+   */
+  AString getPluginBlocklistURL(in nsIPluginTag plugin);
 };
 
 /**
diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 2ffe677d735..f9878753346 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -125,6 +125,7 @@ static NS_DEFINE_CID(kWindowCID,           NS_WINDOW_CID);
 nsWebShellWindow::nsWebShellWindow(PRUint32 aChromeFlags)
   : nsXULWindow(aChromeFlags)
   , mSPTimerLock("nsWebShellWindow.mSPTimerLock")
+  , mSizeMode(-1)
 {
 }
 
@@ -385,12 +386,15 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         // min, max, and normal are all the same to apps, but for
         // fullscreen we need to let them know so they can update
         // their ui. 
-        if (modeEvent->mSizeMode == nsSizeMode_Fullscreen) {
+        if (modeEvent->mSizeMode == nsSizeMode_Fullscreen ||
+            eventWindow->mSizeMode == nsSizeMode_Fullscreen) {
           nsCOMPtr<nsIDOMWindowInternal> ourWindow = do_GetInterface(docShell);
           if (ourWindow)
-            ourWindow->SetFullScreen(PR_TRUE);
+            ourWindow->SetFullScreen(modeEvent->mSizeMode == nsSizeMode_Fullscreen);
         }
 
+        eventWindow->mSizeMode = modeEvent->mSizeMode;
+
         // Note the current implementation of SetSizeMode just stores
         // the new state; it doesn't actually resize. So here we store
         // the state and pass the event on to the OS. The day is coming
diff --git a/xpfe/appshell/src/nsWebShellWindow.h b/xpfe/appshell/src/nsWebShellWindow.h
index 3c26c02a2e0..6880b1cc50b 100644
--- a/xpfe/appshell/src/nsWebShellWindow.h
+++ b/xpfe/appshell/src/nsWebShellWindow.h
@@ -91,6 +91,7 @@ protected:
 
   nsCOMPtr<nsITimer>      mSPTimer;
   mozilla::Mutex          mSPTimerLock;
+  PRInt32                 mSizeMode;
 
   void        SetPersistenceTimer(PRUint32 aDirtyFlags);
   static void FirePersistenceTimer(nsITimer *aTimer, void *aClosure);
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 3c05ec12d18..90d375fac70 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -1225,16 +1225,29 @@ PRBool nsXULWindow::LoadMiscPersistentAttributesFromXUL()
           sizeMode = nsSizeMode_Fullscreen;
       }
     }
-    
+
+    // If we are told to ignore the size mode attribute update the
+    // document so the attribute and window are in sync.
+    if (mIgnoreXULSizeMode) {
+      nsAutoString sizeString;
+      if (sizeMode == nsSizeMode_Maximized)
+        sizeString.Assign(SIZEMODE_MAXIMIZED);
+      else if (sizeMode == nsSizeMode_Fullscreen)
+        sizeString.Assign(SIZEMODE_FULLSCREEN);
+      else if (sizeMode == nsSizeMode_Normal)
+        sizeString.Assign(SIZEMODE_NORMAL);
+      if (!sizeString.IsEmpty()) {
+        windowElement->SetAttribute(MODE_ATTRIBUTE, sizeString);
+      }
+    }
+
     if (sizeMode == nsSizeMode_Fullscreen) {
       nsCOMPtr<nsIDOMWindowInternal> ourWindow;
       GetWindowDOMWindow(getter_AddRefs(ourWindow));
       ourWindow->SetFullScreen(PR_TRUE);
-    }
-    else
+    } else {
       mWindow->SetSizeMode(sizeMode);
-
-    
+    }
     gotState = PR_TRUE;
   }